Merge branch 'release' into uat(dev)

# Conflicts:
#	src/components/uploadVNormalTaskPhoto.vue

src/components/uploadVNormalTaskPhoto.vue

@@ -140,12 +140,12 @@ export default {
       imageWhiteStoreData: null,
       imageWhiteStoreFlag: false,
       localIdsArr: [],
-      interfaceUsageTime: null,
       uploadImgFlag: false, //上传图片中
       uploadImgTotal: 0, // 上传图片总数
       d2running: false,
       d2count: 0,
       d2timer: null,
+      interfaceUsageTime: null,
     };
   },
   activated() {

src/views/componentsTarget/createStoreBJ.vue

@@ -131,7 +131,7 @@
       </van-col>
       <van-col span="12">
         <p>
-          <span class="colLabel colLabel_TCFX">仿石漆店:</span>
+          <span class="colLabel colLabel_TCFX">仿石漆店</span>
           <span class="colorbalck">{{ Micrometer(reportTargetAll.fsqShopYearAct) }}</span>
           <span class="colorbalck" v-if="reportTargetAll.fsqShopYearRate">
             ({{ reportTargetAll.fsqShopYearRate }}%)

src/views/home/hintTabPage/noVisit.vue

@@ -100,7 +100,9 @@ export default {
         type = '同城分销-涂料店';
       } else if (value == 'QiTa') {
         type = '同城分销-其他店';
-      }else if (value == 'FuWuShang') {
+      } else if (value == 'Tcfx') {
+        type = '同城分销';
+      } else if (value == 'FuWuShang') {
         type = '服务商';
       }
       return type;
@@ -220,7 +222,7 @@ export default {
         this.TXisBD.lat,
         this.TXisBD.lon,
         this.TXisBD.lat,
-        this.TXisBD.lon
+        this.TXisBD.lon,
       ).toFixed(2);
       // GZ:工装店铺 直接进入拜访
       // if (localStorage.getItem('postType') == 'GZ') {