Merge branch 'feature_20250312_建店家装展厅照片不显示问题修改' into release

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

src/views/deviceWithin/addStoreVisit.vue

@@ -179,7 +179,7 @@
                 </taskTips
               ></template>
               <template #right-icon>
-                <!-- <span v-if="item.isMustPicture == '0'" style="color: red">图片必填</span> -->
+                <span v-if="item.isMustPicture == '0'" class="van-f-red">*</span>
                 <van-icon
                   v-if="item.isPicture == '0'"
                   color="#666"
@@ -217,7 +217,7 @@
                 </taskTips
               ></template>
               <template #right-icon>
-                <!-- <span v-if="item.isMustPicture == '0'" style="color: red">图片必填</span> -->
+                <span v-if="item.isMustPicture == '0'" class="van-f-red">*</span>
                 <van-icon
                   v-if="item.isPicture == '0'"
                   color="#666"
@@ -255,7 +255,7 @@
                 </taskTips
               ></template>
               <template #right-icon>
-                <!-- <span v-if="item.isMustPicture == '0'" style="color: red">图片必填</span> -->
+                <span v-if="item.isMustPicture == '0'" class="van-f-red">*</span>
                 <van-icon
                   v-if="item.isPicture == '0'"
                   color="#666"
@@ -293,7 +293,7 @@
                 </taskTips
               ></template>
               <template #right-icon>
-                <!-- <span v-if="item.isMustPicture == '0'" style="color: red">图片必填</span> -->
+                <span v-if="item.isMustPicture == '0'" class="van-f-red">*</span>
                 <van-icon
                   v-if="item.isPicture == 0"
                   color="#666"
@@ -318,7 +318,7 @@
                 </taskTips
               ></template>
               <template #right-icon>
-                <!-- <span v-if="item.isMustPicture == '0'" style="color: red">图片必填</span> -->
+                <span v-if="item.isMustPicture == '0'" class="van-f-red">*</span>
                 <van-icon
                   v-if="item.isPicture == 0"
                   color="#666"
@@ -368,7 +368,7 @@
                 </taskTips
               ></template>
               <template #right-icon>
-                <!-- <span v-if="item.isMustPicture == '0'" style="color: red">图片必填</span> -->
+                <span v-if="item.isMustPicture == '0'" class="van-f-red">*</span>
                 <van-icon
                   v-if="item.isPicture == 0"
                   color="#666"
@@ -454,7 +454,7 @@
                   </taskTips
                 ></template>
                 <template #right-icon>
-                  <!-- <span v-if="item.isMustPicture == '0'" style="color: red">图片必填</span> -->
+                  <span v-if="item.isMustPicture == '0'" class="van-f-red">*</span>
                   <van-icon
                     v-if="item.isPicture == 0"
                     color="#666"
@@ -493,9 +493,7 @@
                           </taskTips>
                         </template>
                         <template #right-icon>
-                          <!-- <span v-if="childitem.isMustPicture == '0'" style="color: red"
-                            >图片必填</span
-                          > -->
+                          <span v-if="childitem.isMustPicture == '0'" class="van-f-red">*</span>
                           <van-icon
                             v-if="childitem.isPicture == 0"
                             color="#666"
@@ -546,9 +544,7 @@
                           </taskTips
                         ></template>
                         <template #right-icon>
-                          <!-- <span v-if="childitem.isMustPicture == '0'" style="color: red"
-                            >图片必填</span
-                          > -->
+                          <span v-if="childitem.isMustPicture == '0'" class="van-f-red">*</span>
                           <van-icon
                             v-if="childitem.isPicture == '0'"
                             color="#666"
@@ -594,9 +590,7 @@
                           </taskTips
                         ></template>
                         <template #right-icon>
-                          <!-- <span v-if="childitem.isMustPicture == '0'" style="color: red"
-                            >图片必填</span
-                          > -->
+                          <span v-if="childitem.isMustPicture == '0'" class="van-f-red">*</span>
                           <van-icon
                             v-if="childitem.isPicture == '0'"
                             color="#666"
@@ -643,9 +637,7 @@
                           </taskTips>
                         </template>
                         <template #right-icon>
-                          <!-- <span v-if="childitem.isMustPicture == '0'" style="color: red"
-                            >图片必填</span
-                          > -->
+                          <span v-if="childitem.isMustPicture == '0'" class="van-f-red">*</span>
                           <van-icon
                             v-if="childitem.isPicture == '0'"
                             color="#666"
@@ -691,9 +683,7 @@
                           </taskTips
                         ></template>
                         <template #right-icon>
-                          <!-- <span v-if="childitem.isMustPicture == '0'" style="color: red"
-                            >图片必填</span
-                          > -->
+                          <span v-if="childitem.isMustPicture == '0'" class="van-f-red">*</span>
                           <van-icon
                             v-if="childitem.isPicture == 0"
                             color="#666"
@@ -719,9 +709,7 @@
                           </taskTips
                         ></template>
                         <template #right-icon>
-                          <!-- <span v-if="childitem.isMustPicture == '0'" style="color: red"
-                            >图片必填</span
-                          > -->
+                          <span v-if="childitem.isMustPicture == '0'" class="van-f-red">*</span>
                           <van-icon
                             v-if="childitem.isPicture == 0"
                             color="#666"
@@ -813,9 +801,7 @@
                             </taskTips>
                           </template>
                           <template #right-icon>
-                            <!-- <span v-if="childitem.isMustPicture == '0'" style="color: red"
-                              >图片必填</span
-                            > -->
+                            <span v-if="childitem.isMustPicture == '0'" class="van-f-red">*</span>
                             <van-icon
                               v-if="childitem.isPicture == 0"
                               color="#666"
@@ -860,9 +846,9 @@
                                     </taskTips
                                   ></template>
                                   <template #right-icon>
-                                    <!-- <span v-if="childitem1.isMustPicture == '0'" style="color: red"
-                                      >图片必填</span
-                                    > -->
+                                    <span v-if="childitem1.isMustPicture == '0'" class="van-f-red"
+                                      >*</span
+                                    >
                                     <van-icon
                                       v-if="childitem1.isPicture == 0"
                                       color="#666"
@@ -923,9 +909,9 @@
                                     </taskTips
                                   ></template>
                                   <template #right-icon>
-                                    <!-- <span v-if="childitem1.isMustPicture == '0'" style="color: red"
-                                      >图片必填</span
-                                    > -->
+                                    <span v-if="childitem1.isMustPicture == '0'" class="van-f-red"
+                                      >*</span
+                                    >
                                     <van-icon
                                       v-if="childitem1.isPicture == 0"
                                       color="#666"
@@ -1057,9 +1043,9 @@
                                     </taskTips
                                   ></template>
                                   <template #right-icon>
-                                    <!-- <span v-if="childitem1.isMustPicture == '0'" style="color: red"
-                                      >图片必填</span
-                                    > -->
+                                    <span v-if="childitem1.isMustPicture == '0'" class="van-f-red"
+                                      >*</span
+                                    >
                                     <van-icon
                                       v-if="childitem1.isPicture == 0"
                                       color="#666"
@@ -1109,11 +1095,9 @@
                                       </taskTips
                                     ></template>
                                     <template #right-icon>
-                                      <!-- <span
-                                        v-if="childitem1.isMustPicture == '0'"
-                                        style="color: red"
-                                        >图片必填</span
-                                      > -->
+                                      <span v-if="childitem1.isMustPicture == '0'" class="van-f-red"
+                                        >*</span
+                                      >
                                       <van-icon
                                         v-if="childitem1.isPicture == 0"
                                         color="#666"
@@ -1180,11 +1164,11 @@
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
-                                              <!-- <span
+                                              <span
                                                 v-if="child33item1.isMustPicture == '0'"
-                                                style="color: red"
-                                                >图片必填</span
-                                              > -->
+                                                class="van-f-red"
+                                                >*</span
+                                              >
                                               <van-icon
                                                 v-if="child33item1.isPicture == 0"
                                                 color="#666"
@@ -1265,11 +1249,11 @@
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
-                                              <!-- <span
+                                              <span
                                                 v-if="child33item1.isMustPicture == '0'"
-                                                style="color: red"
-                                                >图片必填</span
-                                              > -->
+                                                class="van-f-red"
+                                                >*</span
+                                              >
                                               <van-icon
                                                 v-if="child33item1.isPicture == 0"
                                                 color="#666"
@@ -1363,11 +1347,11 @@
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
-                                              <!-- <span
+                                              <span
                                                 v-if="child33item1.isMustPicture == '0'"
-                                                style="color: red"
-                                                >图片必填</span
-                                              > -->
+                                                class="van-f-red"
+                                                >*</span
+                                              >
                                               <van-icon
                                                 v-if="child33item1.isPicture == 0"
                                                 color="#666"
@@ -1428,11 +1412,11 @@
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
-                                              <!-- <span
+                                              <span
                                                 v-if="child33item1.isMustPicture == '0'"
-                                                style="color: red"
-                                                >图片必填</span
-                                              > -->
+                                                class="van-f-red"
+                                                >*</span
+                                              >
                                               <van-icon
                                                 v-if="child33item1.isPicture == '0'"
                                                 color="#666"
@@ -1503,11 +1487,11 @@
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
-                                              <!-- <span
+                                              <span
                                                 v-if="child33item1.isMustPicture == '0'"
-                                                style="color: red"
-                                                >图片必填</span
-                                              > -->
+                                                class="van-f-red"
+                                                >*</span
+                                              >
                                               <van-icon
                                                 v-if="child33item1.isPicture == '0'"
                                                 color="#666"
@@ -1576,11 +1560,11 @@
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
-                                              <!-- <span
+                                              <span
                                                 v-if="child33item1.isMustPicture == '0'"
-                                                style="color: red"
-                                                >图片必填</span
-                                              > -->
+                                                class="van-f-red"
+                                                >*</span
+                                              >
                                               <van-icon
                                                 v-if="child33item1.isPicture == 0"
                                                 color="#666"
@@ -1706,11 +1690,11 @@
                                                 </taskTips
                                               ></template>
                                               <template #right-icon>
-                                                <!-- <span
+                                                <span
                                                   v-if="child33item1.isMustPicture == '0'"
-                                                  style="color: red"
-                                                  >图片必填</span
-                                                > -->
+                                                  class="van-f-red"
+                                                  >*</span
+                                                >
                                                 <van-icon
                                                   v-if="child33item1.isPicture == 0"
                                                   color="#666"
@@ -1783,11 +1767,11 @@
                                                         </taskTips
                                                       ></template>
                                                       <template #right-icon>
-                                                        <!-- <span
+                                                        <span
                                                           v-if="child44item1.isMustPicture == '0'"
-                                                          style="color: red"
-                                                          >图片必填</span
-                                                        > -->
+                                                          class="van-f-red"
+                                                          >*</span
+                                                        >
                                                         <van-icon
                                                           v-if="child44item1.isPicture == 0"
                                                           color="#666"
@@ -1875,11 +1859,11 @@
                                                         </taskTips>
                                                       </template>
                                                       <template #right-icon>
-                                                        <!-- <span
+                                                        <span
                                                           v-if="child44item1.isMustPicture == '0'"
-                                                          style="color: red"
-                                                          >图片必填</span
-                                                        > -->
+                                                          class="van-f-red"
+                                                          >*</span
+                                                        >
                                                         <van-icon
                                                           v-if="child44item1.isPicture == 0"
                                                           color="#666"
@@ -1982,11 +1966,11 @@
                                                         </taskTips>
                                                       </template>
                                                       <template #right-icon>
-                                                        <!-- <span
+                                                        <span
                                                           v-if="child44item1.isMustPicture == '0'"
-                                                          style="color: red"
-                                                          >图片必填</span
-                                                        > -->
+                                                          class="van-f-red"
+                                                          >*</span
+                                                        >
                                                         <van-icon
                                                           v-if="child44item1.isPicture == 0"
                                                           color="#666"
@@ -2055,11 +2039,11 @@
                                                         </taskTips>
                                                       </template>
                                                       <template #right-icon>
-                                                        <!-- <span
+                                                        <span
                                                           v-if="child44item1.isMustPicture == '0'"
-                                                          style="color: red"
-                                                          >图片必填</span
-                                                        > -->
+                                                          class="van-f-red"
+                                                          >*</span
+                                                        >
                                                         <van-icon
                                                           v-if="child44item1.isPicture == '0'"
                                                           color="#666"
@@ -2137,11 +2121,11 @@
                                                         </taskTips>
                                                       </template>
                                                       <template #right-icon>
-                                                        <!-- <span
+                                                        <span
                                                           v-if="child44item1.isMustPicture == '0'"
-                                                          style="color: red"
-                                                          >图片必填</span
-                                                        > -->
+                                                          class="van-f-red"
+                                                          >*</span
+                                                        >
                                                         <van-icon
                                                           v-if="child44item1.isPicture == '0'"
                                                           color="#666"
@@ -2218,11 +2202,11 @@
                                                         </taskTips>
                                                       </template>
                                                       <template #right-icon>
-                                                        <!-- <span
+                                                        <span
                                                           v-if="child44item1.isMustPicture == '0'"
-                                                          style="color: red"
-                                                          >图片必填</span
-                                                        > -->
+                                                          class="van-f-red"
+                                                          >*</span
+                                                        >
                                                         <van-icon
                                                           v-if="child44item1.isPicture == 0"
                                                           color="#666"
@@ -2375,11 +2359,11 @@
                                                           </taskTips
                                                         ></template>
                                                         <template #right-icon>
-                                                          <!-- <span
+                                                          <span
                                                             v-if="child44item1.isMustPicture == '0'"
-                                                            style="color: red"
-                                                            >图片必填</span
-                                                          > -->
+                                                            class="van-f-red"
+                                                            >*</span
+                                                          >
                                                           <van-icon
                                                             v-if="child44item1.isPicture == 0"
                                                             color="#666"
@@ -2457,9 +2441,9 @@
                                     </taskTips>
                                   </template>
                                   <template #right-icon>
-                                    <!-- <span v-if="childitem1.isMustPicture == '0'" style="color: red"
-                                      >图片必填</span
-                                    > -->
+                                    <span v-if="childitem1.isMustPicture == '0'" class="van-f-red"
+                                      >*</span
+                                    >
                                     <van-icon
                                       v-if="childitem1.isPicture == '0'"
                                       color="#666"
@@ -2515,9 +2499,9 @@
                                     </taskTips>
                                   </template>
                                   <template #right-icon>
-                                    <!-- <span v-if="childitem1.isMustPicture == '0'" style="color: red"
-                                      >图片必填</span
-                                    > -->
+                                    <span v-if="childitem1.isMustPicture == '0'" class="van-f-red"
+                                      >*</span
+                                    >
                                     <van-icon
                                       v-if="childitem1.isPicture == '0'"
                                       color="#666"
@@ -2573,9 +2557,9 @@
                                     </taskTips>
                                   </template>
                                   <template #right-icon>
-                                    <!-- <span v-if="childitem1.isMustPicture == '0'" style="color: red"
-                                      >图片必填</span
-                                    > -->
+                                    <span v-if="childitem1.isMustPicture == '0'" class="van-f-red"
+                                      >*</span
+                                    >
                                     <van-icon
                                       v-if="childitem1.isPicture == 0"
                                       color="#666"
@@ -2648,8 +2632,8 @@
             :putInCode="putInCode"
             @newimgarr="newimgarr1"
             @typeshow="typeshow"
-            :pictureSource="pictureSource"
             :photoIdentifyType="photoIdentifyType"
+            :pictureSource="pictureSource"
             ref="uploadVNormal"></upload-img>
         </template>
       </van-cell>

src/views/storeManagement/storeDetail.vue

@@ -179,30 +179,7 @@
           </div>
           <template v-if="list.storeCategory != 'C917'">
             <div class="displayImg" style="padding: 16px">
-              <!-- <div class="displayImgBox">
-                <div v-if="storeTypePOP">
-                  <van-image
-                    width="100%"
-                    height="160"
-                    :src="setImgSrc(list.img)"
-                    @click="deleteImgs(list.img)" />
-                  <p style="text-align: center">
-                    {{ list.ifJzStoreType != 1 ? '建店时门店照' : '家装前台照片' }}
-                  </p>
-                </div>
-                <div v-else>
-                  <van-image
-                    width="100%"
-                    height="160"
-                    :src="setImgSrc(list.img)"
-                    @click="deleteImgs(list.img)" />
-                  <p style="text-align: center">
-                    {{ list.storeCategory == 'C912' ? '工地铭牌照片' : '公司照片' }}
-                  </p>
-                </div>
-              </div> -->
-              <template v-if="list.ifJzStoreType != 1"></template>
-              <template v-else>
+              <template v-if="list.imgSed">
                 <div class="displayImgBox">
                   <div v-if="storeTypePOP">
                     <van-image
@@ -219,7 +196,7 @@
             </div>
           </template>
           <van-row gutter="20" style="padding: 16px">
-            <van-col span="12" v-if="list.standardStorePhoto && list.storeCategory != 'C917'">
+            <van-col span="12" v-if="list.storeCategory != 'C917'">
               <div v-if="storeTypePOP">
                 <van-image
                   width="100%"