Merge branch 'release'

src/components/deleteUploadImg1.vue

@@ -4,7 +4,7 @@
       <van-col span="6" v-for="(urls, index) in imgs" :key="urls.id">
         <div class="imgview">
           <van-icon
-            v-if="photoIdentifyType != 6 && types != 'edit'"
+            v-if="(photoIdentifyType != 6 || photoIdentifyType != 7) && types != 'edit'"
             name="close"
             size="16"
             v-on:click="deleteImg(index, urls.id)" />

src/components/uploadVNormal.vue

@@ -476,7 +476,10 @@ export default {
     // 照片是否入库，1.照片识别三次不通过仍要上传，2.照片识别通过
     // isUpdate:是否更新店招照片，只有门店店招需要更新
     confirmUpload(res) {
-      if (this.photoIdentifyType && this.photoIdentifyType != '6') {
+      if (
+        this.photoIdentifyType &&
+        (this.photoIdentifyType != '6' || this.photoIdentifyType != '7')
+      ) {
         var form = {
           mediaIds: [],
           fileUrl: '',

src/views/deviceWithin/addStoreVisit.vue

@@ -3692,7 +3692,7 @@ export default {
           // this.showCode = false;
         }
         // 生动化陈列是否可以编辑
-        if (this.$route.query.types == 'edit' && this.photoIdentifyType == '6') {
+        if (this.$route.query.types == 'edit' && (this.photoIdentifyType == '6' || this.photoIdentifyType == '7')) {
           this.isEditSDHCL = false;
         } else {
           this.isEditSDHCL = true;