Merge branch 'feature_20250304_拜访任务图像识别次数提醒' into uat(dev)

# Conflicts:
#	src/components/uploadImgVStore.vue
#	src/components/uploadVNormal.vue
#	src/store/getters.js
#	src/utils/request.js
#	src/views/deviceWithin/addStoreVisit.vue
#	src/views/storeManagement/storeAdd.vue

src/components/uploadImgVStore.vue

@@ -79,16 +79,16 @@ export default {
       type: Number,
       default: 1,
     },
-    photoIdentifyType: {
-      // 图匠识别目的(1:店招内容识别,2:门店代码识别,3:调色机识别,4:更换店招)
-      type: String,
-      default: '',
-    },
     disabled: {
       // 是否可以添加或修改 true:不可以
       type: Boolean,
       default: false,
     },
+    photoIdentifyType: {
+      // 图匠识别目的(1:店招内容识别,2:门店代码识别,3:调色机识别,4:更换店招)
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {

src/components/uploadVNormal.vue

@@ -100,16 +100,16 @@ export default {
       type: String,
       default: '',
     },
-    photoIdentifyType: {
-      // 图匠识别目的(1:店招内容识别,2:门店代码识别,3:调色机识别,4:更换店招)
-      type: String,
-      default: '',
-    },
     pictureSource: {
       // 是否允许从相册选择图片 1:允许；0:不允许
       type: String,
       default: '0',
     },
+    photoIdentifyType: {
+      // 图匠识别目的(1:店招内容识别,2:门店代码识别,3:调色机识别,4:更换店招)
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {

src/utils/request.js

@@ -10,7 +10,8 @@ import { toastLoading } from '@/utils/commonVant';
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API,
-  timeout: 0, //30000
+  // timeout: 30000,
+  timeout: 0,
   withCredentials: true,
 });
 // request拦截器

src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -66,7 +66,8 @@
       <div
         v-if="addShow1"
         style="color: #999; font-size: 12px; padding: 10px; background-color: #f5f5f5">
-        <van-icon name="info-o" />&nbsp;今天拜访拍照内容，将同步传给部主管查阅。
+        <van-icon
+          name="info-o" />&nbsp;可控店及金牌店的店招任务中，若拍摄两次仍不通过，允许提交，不影响正常拜访。
       </div>
       <div class="card">
         <div

src/views/week/index.vue

@@ -73,6 +73,24 @@
             <template #right-icon>
               <van-icon name="arrow" size="16" />
             </template>
+          </van-cell> </van-cell-group
+        ><!--拜访照片识别异常反馈 部主管及以上-->
+        <van-cell-group inset class="mtb10">
+          <van-cell title="拜访照片识别异常反馈" to="/AIImage">
+            <template #icon>
+              <van-icon :name="history" class="zicon" />
+            </template>
+            <template #title>
+              <span>拜访照片识别异常反馈</span>
+              <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" />
+            </template>
           </van-cell>
         </van-cell-group>
         <!--拜访照片识别异常反馈 部主管及以上-->