Merge branch 'feature_20260421_完美门店详情接口速度优化' into master-20260422

# Conflicts:
#	src/api/index.js
#	src/views/deviceWithin/storeVisit.vue
#	src/views/deviceWithin/taskPhotoTaking.vue

src/api/index.js

@@ -1169,3 +1169,21 @@ export function getCljlaToDBLabel(query) {
     params: query,
   });
 }
+
+// 完美门店-陈列任务详情
+export function getVisitsDetailPerfectStoreByTaskId(query) {
+  return request({
+    url: 'mobile/storeGroup/getVisitsDetailPerfectStoreByTaskId',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 查询用户距离拜访门店得距离
+export function selectUserDistanceTheStore(query) {
+  return request({
+    url: 'mobile/storeGroup/selectUserDistanceTheStore',
+    method: 'get',
+    params: query,
+  });
+}

src/components/deleteUploadImgTaskPhoto.vue

@@ -1,9 +1,13 @@
 <template>
   <div class="deleteUploadImgTaskPhoto">
     <van-row gutter="10">
-      <van-col span="6" style="" v-if="insert == 'true' && formData.processStatus != 1">
+      <van-col
+        span="6"
+        style=""
+        v-if="formData.processStatus != 1 || formData.displayRewardTaskEditable">
         <div class="addImg">
           <uploadVNormalTaskPhoto
+            :formData="formData"
             :shouws="true"
             :storeGroupId="storeGroupId"
             :taskList="taskIds.split(',')"
@@ -22,9 +26,9 @@
       <van-col span="6" v-for="(urls, index) in imgArr" :key="index">
         <div class="imgview">
           <van-icon
-            v-if="insert == 'true' && formData.processStatus != 1"
+            v-if="formData.processStatus != 1 || formData.displayRewardTaskEditable"
             name="close"
-            size="16"
+            size="20"
             v-on:click="deleteImg(index, urls)" />
           <img
             :src="urls.fileUrl || urls.mediaFileUrl"
@@ -276,8 +280,8 @@ export default {
   display: inline-block;
   i {
     position: absolute;
-    right: -2px;
-    top: -3px;
+    right: -7px;
+    top: -7px;
     color: white;
     background: red;
     overflow: hidden;

src/views/deviceWithin/taskPhotoTaking.vue

@@ -3,7 +3,7 @@
     <van-nav-bar class="navBar" left-arrow title="生动化陈列" @click-left="onClickLeft">
       <template #right v-if="formData">
         <span
-          v-if="isEdit && insert == 'true' && formData.processStatus != 1"
+          v-if="formData.processStatus != 1"
           @click="onSubmit"
           style="
             color: white;
@@ -126,9 +126,15 @@
   </div>
 </template>
 <script>
-import { getCollectionInfosBatch, addCollectionAnswerBatch, getVisitsDetail } from '@/api/index';
+import {
+  getCollectionInfosBatch,
+  addCollectionAnswerBatch,
+  getVisitsDetail,
+  selectUserDistanceTheStore,
+} from '@/api/index';
 import taskTips from './taskTips';
 import deleteUploadImgTaskPhoto from '@/components/deleteUploadImgTaskPhoto';
+import { getPosition, getTicketFun } from '@/utils/TXApiFun';
 import { mapState } from 'vuex';
 export default {
   name: 'abnortaskPhotoTakingmalVisit',
@@ -140,7 +146,6 @@ export default {
   },
   data() {
     return {
-      isEdit: true,
       formData: null,
       dataList: null,
       taskIds: [],
@@ -154,6 +159,7 @@ export default {
       pos: 0,
       mediaIds: [],
       mediaInfos: [],
+      editFlag: true,
     };
   },
   activated() {
@@ -178,6 +184,39 @@ export default {
   },
   watch: {},
   methods: {
+    // 授权
+    getTicketFunfun() {
+      getTicketFun()
+        .then(() => {
+          getPosition()
+            .then((res) => {
+              let { TXisBD } = res;
+              // this.lat = TXisBD.lat;
+              // this.lon = TXisBD.lon;
+              this.selectUserDistanceTheStoreFun(TXisBD);
+            })
+            .catch((error) => {
+              this.$dialog.alert({
+                message: error,
+              });
+            });
+        })
+        .catch(() => {});
+    },
+    selectUserDistanceTheStoreFun(TXisBD) {
+      selectUserDistanceTheStore({
+        visitsId: this.visitsId, //	Long	拜访id
+        lon: TXisBD.lon, //	String	经度
+        lat: TXisBD.lat, //	String	纬度
+      }).then((res) => {
+        if (res.code == 200) {
+          this.editFlag = true;
+        } else {
+          this.editFlag = true;
+          this.$toast(res.msg);
+        }
+      });
+    },
     taskObjectSpanMethod({ row, column, rowIndex, columnIndex }) {
       const cellValue = row[column.property];
       if (cellValue && ['conditionIdentifyNum'].includes(column.property)) {
@@ -216,6 +255,7 @@ export default {
         if (res.data.sfaTaskList) {
           this.dataList = res.data.sfaTaskList.filter((val) => val.taskType == '5');
           this.formData = this.dataList[0];
+          this.isEditFun();
         } else {
           this.formData = null;
         }
@@ -232,11 +272,15 @@ export default {
         if (res.data && res.data.length) {
           this.dataList = res.data;
           this.formData = res.data[0];
+          this.isEditFun();
         } else {
           this.formData = null;
         }
       });
     },
+    isEditFun() {
+      this.getTicketFunfun();
+    },
     openDialog(item) {
       this.vanPopup = true;
       console.log(item);
@@ -335,6 +379,7 @@ export default {
     display: flex;
     flex-direction: column;
     padding-bottom: 46px;
+    // overflow-y: auto;
     .container {
       background: #fff;
       width: 100%;

src/views/historicalVisit/perfectStoreTask.vue

@@ -62,7 +62,7 @@
                 :insert="insert"
                 :objectType="objectType"
                 v-if="item.fileInfoList.length"></deleteUploadImg> -->
-              <span v-else>暂未识别到产品照片</span>
+              <span style="font-size: 16px" v-else>暂未识别到产品照片</span>
             </div>
           </div>
         </van-form>
@@ -106,23 +106,23 @@
           </el-table-column>
         </el-table>
       </div>
-      <div class="dataList" v-if="dataList">
+      <div class="dataList" v-if="formData">
         <div class="headline" style="margin-top: 10px">
           <span class="headlineIcon"></span>
           <span class="headlineTitle">陈列任务要求</span>
         </div>
-        <div class="dataItem" v-for="(item, index) in dataList">
+        <div class="dataItem">
           <div class="itemTop">
             <div class="itemIndex">
-              <p>{{ index + 1 }}、</p>
+              <p>1、</p>
             </div>
-            <div class="itemHtml" v-html="item.displayInstructions"></div>
+            <div class="itemHtml" v-html="formData.displayInstructions"></div>
           </div>
           <div class="itemBottom" v-if="insert == '0'">
-            <van-button round type="primary" v-if="item.taskPhotoConditionPassed == 1"
+            <van-button round type="primary" v-if="formData.taskPhotoConditionPassed == 1"
               >通过</van-button
             >
-            <van-button round type="danger" v-if="item.taskPhotoConditionPassed == 0"
+            <van-button round type="danger" v-if="formData.taskPhotoConditionPassed == 0"
               >不通过</van-button
             >
           </div>
@@ -171,7 +171,11 @@
   </div>
 </template>
 <script>
-import { addCollectionAnswerBatch, getVisitsDetailPerfectStore } from '@/api/index';
+import {
+  addCollectionAnswerBatch,
+  getVisitsDetailPerfectStore,
+  getVisitsDetailPerfectStoreByTaskId,
+} from '@/api/index';
 import taskTips from '@/views/deviceWithin/taskTips';
 import deleteUploadImg from '@/components/deleteUploadImgTaskPhoto';
 import { ImagePreview } from 'vant';
@@ -236,13 +240,13 @@ export default {
     },
     getVisitsDetailFun() {
       this.toastLoading(0, '加载中...', true);
-      getVisitsDetailPerfectStore({ visitsId: this.visitsId }).then((res) => {
+      getVisitsDetailPerfectStoreByTaskId({
+        visitsId: this.visitsId,
+        taskId: this.$route.query.taskId,
+      }).then((res) => {
         this.toastLoading().clear();
-        if (res.data.sfaTaskList) {
-          this.dataList = res.data.sfaTaskList.filter(
-            (val) => val.taskId == this.$route.query.taskId,
-          );
-          this.formData = this.dataList[0];
+        if (res.code == 200 && res.data) {
+          this.formData = res.data;
           console.log(this.formData.taskPhotoRecognitionResult);
           this.getSpanArr(this.formData.taskPhotoRecognitionResult);
           console.log(this.formData);