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

# Conflicts:
#	src/views/week/index.vue

src/components/imageAIVerifyErr.vue

@@ -20,7 +20,7 @@
           </div>
           <template v-if="shotsNum >= maxNum">
             <div class="feedbackMessage">
-              <div class="label">若图像识别不正确，可在下表反馈:</div>
+              <div class="label">若图像识别不正确，可在此反馈:</div>
               <div class="value">
                 <van-field
                   v-model="feedbackMessage"
@@ -88,7 +88,7 @@
             <span style="color: red">{{ contentMessage }}</span>
           </div>
           <div class="feedbackMessage">
-            <div class="label">若图像识别不正确，可在下表反馈:</div>
+            <div class="label">若图像识别不正确，可在此反馈:</div>
             <div class="value">
               <van-field
                 v-model="feedbackMessage"

src/views/AIImage/AIImageDetail.vue

@@ -5,8 +5,8 @@
     <div class="message" v-if="data">
       <div class="storeTitle">
         <div class="storeName">{{ data.storeName }}</div>
-        <div class="storeCode">
-          (<span style="color: #0057ba">{{ data.storeCode }}</span
+        <div class="storeCode" style="margin-left: 5px; margin-top: 2px">
+          (<span style="color: #0057ba; vertical-align: -1px">{{ data.storeCode }}</span
           >)
         </div>
       </div>
@@ -24,7 +24,7 @@
       </div>
       <div class="item">
         <div class="label">拜访时间：</div>
-        <div class="value">{{ data.approveTime }}</div>
+        <div class="value">{{ data.createTime }}</div>
       </div>
       <div class="item">
         <div class="label">拍摄类型：</div>
@@ -32,9 +32,11 @@
       </div>
       <div class="item">
         <div class="label">识别结果：</div>
-        <div class="value">{{ data.cheatType }}</div>
+        <div class="value">{{ data.unqualifiedReason }}</div>
+      </div>
+      <div class="item">
+        <div class="label">业务员反馈AI识别不正确：{{ data.feedbackMessage }}</div>
       </div>
-      <p>业务员反馈AI识别不正确：</p>
       <div class="item">
         <van-image
           width="100%"
@@ -190,19 +192,19 @@ export default {
     .storeTitle {
       display: flex;
       font-size: 16px;
-      font-weight: 600;
+      font-weight: bold;
       padding: 5px 0;
     }
     .item {
       display: flex;
-      font-size: 14px;
+      font-size: 13px;
       padding: 3px 0;
       .label {
-        width: 80px;
-        text-align: right;
+        /* width: 80px; */
+        text-align: left;
       }
       .value {
-        flex: 1;
+        /* flex: 1; */
       }
     }
   }
@@ -229,6 +231,7 @@ export default {
     padding-top: 20px;
     button {
       width: 100%;
+      background-color: #1a77cc;
     }
   }
 }

src/views/AIImage/list.vue

@@ -15,8 +15,8 @@
           @click="toDetail(item)">
           <div class="storeTitle">
             <div class="storeName">{{ item.storeName }}</div>
-            <div class="storeCode">
-              (<span style="color: #0057ba">{{ item.storeCode }}</span
+            <div class="storeCode" style="margin-left: 5px; margin-top: 2px">
+              (<span style="color: #0057ba; vertical-align: -1px">{{ item.storeCode }}</span
               >)
             </div>
           </div>
@@ -34,7 +34,7 @@
           </div>
           <div class="item">
             <div class="label">拜访时间：</div>
-            <div class="value">{{ item.approveTime }}</div>
+            <div class="value">{{ item.createTime }}</div>
           </div>
           <div class="item">
             <div class="label">拍摄类型：</div>
@@ -43,7 +43,7 @@
           </div>
           <div class="item">
             <div class="label">识别结果：</div>
-            <div class="value">{{ item.cheatType }}</div>
+            <div class="value">{{ item.unqualifiedReason }}</div>
           </div>
         </div>
         <van-empty description="暂无数据" v-if="listData.length == 0" />
@@ -131,16 +131,17 @@ export default {
       .storeTitle {
         display: flex;
         font-size: 16px;
-        font-weight: 600;
+        font-weight: bold;
         padding: 5px 0;
       }
       .item {
         display: flex;
-        font-size: 14px;
+        font-size: 13px;
         padding: 3px 0;
+        color: #666;
         .label {
-          width: 80px;
-          text-align: right;
+          /* width: 80px; */
+          text-align: left;
         }
         .value {
           flex: 1;

src/views/week/index.vue

@@ -83,8 +83,11 @@
             </template>
             <template #title>
               <span>拜访照片识别异常反馈</span>
-              &nbsp;
-              <van-tag type="danger" v-if="photoApprovalNum">({{ photoApprovalNum }})</van-tag>
+              <span
+                style="font-weight: 600; font-size: 16px; color: red; margin-left: 15px"
+                v-if="photoApprovalNum"
+                >({{ photoApprovalNum }})</span
+              >
             </template>
             <template #right-icon>
               <van-icon name="arrow" size="16" />