zhujindu 1 anno fa
parent
commit
249b046a5a

+ 18 - 13
src/components/imageAIVerifyErr.vue

@@ -20,7 +20,7 @@
         </div>
         <div class="uploadBtnAIVerify" v-if="shotsNum >= 3 && shopSignChange != 1">
           <!-- 拜访店招显示 -->
-          <div class="tipsAIVerify" v-if="imageAIVerifyData.npkpiData.recognizeType == 1">
+          <div class="tipsAIVerify" v-if="npkpiData.recognizeType == 1">
             <!-- <div class="tipsAIVerify" @click="openTips"> -->
             <!-- <van-icon name="question-o" />上传后会有何影响 -->
             <van-icon name="question-o" />不规范的照片上传后会更换本店标准店招,未来每次拜访时校验。
@@ -102,6 +102,7 @@ export default {
       contentMessage: '', //提示内容
       vanPopup: true,
       shopSignChange: 0,
+      npkpiData: null,
     };
   },
   methods: {
@@ -113,36 +114,39 @@ export default {
       // cheatType	作弊类型
       // qualifiedState 是否合格(0:不合格,1:合格)
       // unqualifiedReason	不合格原因
-      let npkpiData =
+      this.npkpiData =
         this.source == 'visit'
           ? this.imageAIVerifyData.npkpiData
           : this.imageAIVerifyData[0].npkpiData;
       // 照片和历史照片是否一致
-      this.shopSignChange = npkpiData.shopSignChange;
-      this.shopSignMatchList = npkpiData.shopSignMatchList;
-      if (npkpiData.shopSignChange == 1) {
+      this.shopSignChange = this.npkpiData.shopSignChange;
+      this.shopSignMatchList = this.npkpiData.shopSignMatchList;
+      if (this.npkpiData.shopSignChange == 1) {
         this.contentMessage = '与历史照片不一致,请确认店招是否更换?';
         return;
       }
       // 照片是否合格
-      if (npkpiData.checkInfo) {
+      if (this.npkpiData.checkInfo) {
         // 照片合格并且没有作弊
-        if (npkpiData.checkInfo.qualifiedState == 1 && npkpiData.checkInfo.cheatState == 0) {
+        if (
+          this.npkpiData.checkInfo.qualifiedState == 1 &&
+          this.npkpiData.checkInfo.cheatState == 0
+        ) {
           // this.close();
           // this.$emit('normalFlow', { data: this.imageAIVerifyData });
           // recognizeType 识别目的(1:店招内容识别,2:门店代码识别,3:调色机识别)
-          let isUpdate = npkpiData.recognizeType == 1 ? 'isUpdate' : null;
+          let isUpdate = this.npkpiData.recognizeType == 1 ? 'isUpdate' : null;
           this.confirmUpload(isUpdate);
         } else {
           // 失败次数增加超过三次特殊处理
           store.dispatch('setShotsNum', this.shotsNum + 1);
           // 不合格
-          if (npkpiData.checkInfo.qualifiedState == 0) {
-            this.contentMessage = this.contentMessage + npkpiData.checkInfo.unqualifiedReason;
+          if (this.npkpiData.checkInfo.qualifiedState == 0) {
+            this.contentMessage = this.contentMessage + this.npkpiData.checkInfo.unqualifiedReason;
           }
           // 作弊
-          if (npkpiData.checkInfo.cheatState == 1) {
-            this.contentMessage = this.contentMessage + npkpiData.checkInfo.cheatType;
+          if (this.npkpiData.checkInfo.cheatState == 1) {
+            this.contentMessage = this.contentMessage + this.npkpiData.checkInfo.cheatType;
           }
         }
       }
@@ -252,7 +256,7 @@ export default {
     border-top: 1px solid #ccc;
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: center;
     padding: 8px 0;
     div {
       width: 40%;
@@ -262,6 +266,7 @@ export default {
       font-size: 14px;
       color: #fff;
       border-radius: 6px;
+      margin: 0 5px;
     }
     .tipsAIVerify {
       font-size: 14px;

+ 0 - 3
src/components/uploadImgVStore.vue

@@ -253,9 +253,6 @@ export default {
       this.imageAIVerifyFlag = false;
     },
   },
-  beforeDestroy() {
-    this.imageAIVerifyFlag = false;
-  },
 };
 </script>
 

+ 0 - 3
src/components/uploadVNormal.vue

@@ -372,9 +372,6 @@ export default {
     // 取消图片上传
     progressClose() {},
   },
-  beforeDestroy() {
-    this.imageAIVerifyFlag = false;
-  },
 };
 </script>
 <style lang="scss" scoped>

+ 9 - 1
src/views/deviceWithin/addStoreVisit.vue

@@ -2648,7 +2648,8 @@
             :putInCode="putInCode"
             @newimgarr="newimgarr1"
             @typeshow="typeshow"
-            :photoIdentifyType="photoIdentifyType"></upload-img>
+            :photoIdentifyType="photoIdentifyType"
+            ref="uploadVNormal"></upload-img>
         </template>
       </van-cell>
     </van-dialog>
@@ -2840,6 +2841,13 @@ export default {
     this.getPhotoTypeList();
     this.info();
   },
+  watch: {
+    $route(to, from) {
+      if (from.path == '/addStoreVisit') {
+        if (this.$refs.uploadVNormal) this.$refs.uploadVNormal.close();
+      }
+    },
+  },
   created() {
     this.taskType = this.$route.query.taskType;
     this.PhotoType = this.$route.query.photoType;