Merge branch 'feature_20260413_陈列照片提交后修改' into uat(dev)

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

src/components/uploadVNormalTaskPhoto.vue

@@ -213,7 +213,7 @@ export default {
               let count = 1;
               // 1:店招内容识别(不能连拍和多选),3:调色机识别(不能连拍和多选) 需要实时识别的不支持连拍和多选
               if (that.photoIdentifyType != 1 && that.photoIdentifyType != 3) {
-                count = that.continuousShoot == '1' ? 5 : 1; //是否允许连拍/相册多选 最多5张
+                count = that.continuousShoot == '1' ? 20 : 1; //是否允许连拍/相册多选 最多5张
               }
               wx.chooseImage({
                 count: count,

src/views/deviceWithin/index.vue

@@ -930,7 +930,16 @@ export default {
       });
     },
     getUserInPlanList() {
-      this.list = [];
+      localStorage.setItem('outvstoreName', '');
+      localStorage.setItem('outvchainName', '');
+      localStorage.removeItem('outvstoreLabelTypes');
+      localStorage.removeItem('outvstoreCategoryList');
+      localStorage.setItem('outvchainCode', '');
+      localStorage.setItem('outvstoreName', '');
+      localStorage.setItem('outvsortType', '');
+      localStorage.setItem('outsortParam', '');
+      localStorage.setItem('lat', '');
+      localStorage.setItem('lon', '');
       var postType = localStorage.getItem('postType');
       this.customerVisits = localStorage.getItem('customerVisits');
       if (localStorage.getItem('postType') == 'JZ' || localStorage.getItem('postType') == 'GZ') {

src/views/deviceWithin/taskPhotoTaking.vue

@@ -373,6 +373,7 @@ export default {
     display: flex;
     flex-direction: column;
     padding-bottom: 46px;
+    overflow-y: auto;
     .container {
       background: #fff;
       width: 100%;
@@ -440,7 +441,7 @@ export default {
   .dataList {
     width: 100%;
     margin-top: 10px;
-    overflow-y: auto;
+    // overflow-y: auto;
     background: #fff;
     .dataItem {
       display: flex;