Merge branch 'master' of http://47.100.2.119:3000/imengyu/mingnan

src/api/inhert/VillageApi.ts

@@ -22,10 +22,10 @@ export class VillageListItem extends DataModel<VillageListItem> {
     };
     this._afterSolveServer = () => {
       this.address = 
-        (this.province || '未知省') + 
-        (this.city || '未知市') + 
-        (this.district || '未知区') + 
-        (this.township || '未知村');
+        (this.province || '') + 
+        (this.city || '') + 
+        (this.district || '') + 
+        (this.township || '');
       if (!this.image && this.images && this.images.length > 0  ) {
         this.image = this.images[0]
       }

src/pages/home.vue

@@ -2,7 +2,7 @@
   <view class="home-container page-home d-flex flex-col bg-base">
     <image 
       class="w-100 position-absolute"
-      src="https://mncdn.wenlvti.net/app_static/minnan/images/home/BackgroundBanner3.jpg"
+      src="https://mn.wenlvti.net/app_static/minnan/images/home/BackgroundBanner5.jpg"
       mode="widthFix"
     />
     <view class="content d-flex flex-col wing-l">
@@ -180,7 +180,7 @@ const MainBoxIcon3 = 'https://mncdn.wenlvti.net/app_static/minnan/images/home/Ma
 const MainBoxIcon4 = 'https://mncdn.wenlvti.net/app_static/minnan/images/home/MainBoxIcon4.png';
 const MainBoxIcon5 = 'https://mncdn.wenlvti.net/app_static/minnan/images/home/MainBoxIcon5.png';
 const MainBoxIcon6 = 'https://mncdn.wenlvti.net/app_static/minnan/images/home/MainBoxIcon6.png';
-const MainBoxIcon7 = 'https://mncdn.wenlvti.net/app_static/minnan/images/home/MainBoxIcon7.png';
+const MainBoxIcon7 = 'https://mncdn.wenlvti.net/app_static/minnan/images/home/MainBoxIcon9.png';
 const MainBoxIcon8 = 'https://mncdn.wenlvti.net/app_static/minnan/images/home/MainBoxIcon8.png';
 const ImageTest = 'https://mncdn.wenlvti.net/app_static/minnan/images/home/ImageTest.jpg';
 

src/pages/inhert/village/details.vue

@@ -34,10 +34,6 @@
                 value: data.historyLevelText ,
               },
               {
-                label: '非遗级别',
-                value: data.ichLevelText ,
-              },
-              {
                 label: '年份时间',
                 value: data.ageText,
               },

src/pages/travel/nav/navto.vue

@@ -85,14 +85,6 @@ const { querys } = useLoadQuerys({
       }
     ];
 
-    function colorTrans(color1: number[], color2: number[], pec: number) {
-      return [
-        Math.round(color1[0] + (color2[0] - color1[0]) * pec),
-        Math.round(color1[1] + (color2[1] - color1[1]) * pec),
-        Math.round(color1[2] + (color2[2] - color1[2]) * pec),
-      ]
-    }
-
     polyline.value = await new Promise((resolve, reject) => {
       const color1 = [223, 53, 51];
       const color2 = [0, 145, 255];
@@ -117,15 +109,11 @@ const { querys } = useLoadQuerys({
               } 
             }
           } 
-          for (let j = 0; j < points.length; j++) {
-            colorList.push('rgb(' + colorTrans(color1, color2, j / points.length).join(',') + ')');
-          }
           distance.value = '距离您约 ' + formatMeter(data.paths[0].distance) + '米'
           taxi_cost.value =  '打车约' + parseInt(data.taxi_cost) + '元'
           resolve([{
             points: points,
             color: "#0091ff",
-            colorList: colorList,
             width: 6
           }]);
         },