Merge branch 'feature_20241120_图像识别' into uat(dev)

# Conflicts:
#	src/components/imageAIVerifyErr.vue
#	vue.config.js

src/components/imageAIVerifyErr.vue

@@ -48,11 +48,7 @@
             <!-- 有门店身份证时 只显示门店身份证和本地拜访照 -->
             <template v-if="storeIDCardUrl">
               <div class="storeIDCardUrl imageItemAIVerify">
-                <img
-                  :src="storeIDCardUrl"
-                  width="100px"
-                  height="100px"
-                  @click="previewsImg(storeIDCardUrl)" />
+                <img :src="storeIDCardUrl" @click="previewsImg(storeIDCardUrl)" />
                 <span>门店标准店招</span>
               </div>
             </template>
@@ -61,26 +57,19 @@
                 <img
                   v-if="createStoreUrl"
                   :src="createStoreUrl"
-                  width="100px"
-                  height="100px"
                   @click="previewsImg(createStoreUrl)" />
-                <img v-else :src="imageEmpty" width="100px" height="100px" />
+                <img v-else :src="imageEmpty" />
                 <span>建店时门店照</span>
               </div>
               <div class="newestImage imageItemAIVerify">
-                <img
-                  v-if="lastVisitUrl"
-                  :src="lastVisitUrl"
-                  width="100px"
-                  height="100px"
-                  @click="previewsImg(lastVisitUrl)" />
-                <img v-else :src="imageEmpty" width="100px" height="100px" />
+                <img v-if="lastVisitUrl" :src="lastVisitUrl" @click="previewsImg(lastVisitUrl)" />
+                <img v-else :src="imageEmpty" />
                 <span>上次拜访店招</span>
               </div>
             </template>
             <div class="presentImage imageItemAIVerify">
-              <img v-if="url" :src="url" width="100px" height="100px" @click="previewsImg(url)" />
-              <img v-else :src="imageEmpty" width="100px" height="100px" />
+              <img v-if="url" :src="url" @click="previewsImg(url)" />
+              <img v-else :src="imageEmpty" />
               <span>本次拜访店招</span>
             </div>
           </div>
@@ -98,7 +87,7 @@
                 placeholder="请输入反馈意见" />
             </div>
           </div>
-          <div class="uploadBtnAIVerify">
+          <div class="uploadBtnAIVerify" style="justify-content: center">
             <div class="confirmUploadAIVerify" @click="uploadImg(true)">重新拍照</div>
             <div class="changeImageAIVerify" @click="confirmUpDataImage()">更新门店照</div>
           </div>
@@ -289,7 +278,7 @@ export default {
     text-align: center;
   }
   .AIVerifyErrdialog {
-    width: vw(690);
+    width: vw(690) !important;
     margin-top: 1vh !important;
     border-radius: 8px !important;
     font-size: vw(32) !important;
@@ -303,7 +292,7 @@ export default {
   }
   .AIVerifyErrMask {
     width: 100%;
-    padding: vw(30);
+    padding: vw(30) vw(30) 0 vw(30);
     overflow: hidden;
     /* min-height: 180px; */
     .errorImg {
@@ -311,6 +300,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
+      min-height: vw(303);
       img {
         width: vw(235);
         height: vw(303);
@@ -364,14 +354,13 @@ export default {
     }
   }
   .tipsAIVerify {
-    padding: vw(28) 0;
+    padding: vw(30) 0 vw(40) 0;
     font-size: vw(22);
     color: #999999;
   }
   .uploadBtnAIVerify {
     display: flex;
     align-items: center;
-    padding: vw(8) 0;
     margin-top: vw(30);
     div {
       display: flex;
@@ -418,6 +407,11 @@ export default {
         font-size: 12px;
         padding-top: 3px;
       }
+      img {
+        width: vw(196);
+        height: vw(228);
+        border-radius: vw(10);
+      }
     }
   }
   .tipsRemarkAIVerify {
@@ -445,8 +439,12 @@ export default {
       }
     }
     .van-field__body {
-      border: 1px solid #ccc;
-      padding-left: 10px;
+      border-radius: vw(10);
+      border: solid 1px #aaaaaa;
+      padding-left: vw(10);
+      background-color: #e7e7e7;
+      .van-field__control {
+      }
     }
   }
 }

src/components/uploadImgVStore.vue

@@ -101,36 +101,7 @@ export default {
       percentage: 0,
       timeFlag: null,
       imageAIVerifyFlag: false,
-      imageAIVerifyData: [
-        {
-          npkpiData: {
-            storeCode: null,
-            recognizeType: 1,
-            imageUrl:
-              'http://imagedt-nipponpaint.oss-cn-shenzhen.aliyuncs.com/77/772550faf0627de382d2336fb6c6ccfd.jpg',
-            shopSignInfo: {
-              name: null,
-              npStoreCode: null,
-              phone: '',
-              address: null,
-              contact: '',
-              businessScope: null,
-              mainBrand: null,
-            },
-            shopSignChange: 0,
-            checkInfo: {
-              cheatState: 0,
-              cheatType: null,
-              qualifiedState: 0,
-              unqualifiedReason: '纯色、非店招',
-            },
-            shopSignMatchList: [],
-          },
-          size: '82',
-          businessId: '8959656c-bd29-467a-b72a-6dc32a7e95f7',
-          url: 'https://cdn-svs-test.nipponpaint.com.cn/17401005962152025-02-21%E8%B0%88.jpg?Expires=2055633396&OSSAccessKeyId=LTAI5tG1DTJFA16BHkzHVxjz&Signature=8hlflptRBXlOfGIayDRZHRniKto%3D',
-        },
-      ], //图匠校验返回的数据
+      imageAIVerifyData: null, //图匠校验返回的数据
       controller: null, //取消请求状态
     };
   },