Browse Source

Merge branch 'feature_20250704_陈列SKU图片识别' into uat(dev)

# Conflicts:
#	src/views/week/dailyDetails.vue
#	src/views/week/dailyHistoricalDetails.vue
zhujindu 4 months ago
parent
commit
4941c07213

+ 6 - 5
src/views/week/dailyApproval.vue

@@ -392,16 +392,17 @@
                 align-items: center;
                 align-items: center;
                 justify-content: center;
                 justify-content: center;
                 padding: 5px 0;
                 padding: 5px 0;
-                font-size: 20px;
+                font-size: 14px;
+                color: #969799;
               "
               "
               @click="setVisitIMG1Flag(item)">
               @click="setVisitIMG1Flag(item)">
               <template v-if="item.visitIMG1Flag">
               <template v-if="item.visitIMG1Flag">
-                <span>折叠</span>
-                <van-icon size="20" :name="require('@/assets/Icon/arrow-up.png')" />
+                <span style="margin-right: 5px">折叠</span>
+                <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
               </template>
               </template>
               <template v-else>
               <template v-else>
-                <span>展开</span>
-                <van-icon size="20" :name="require('@/assets/Icon/arrow-down.png')" />
+                <span style="margin-right: 5px">展开</span>
+                <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
               </template>
               </template>
             </div>
             </div>
             <!-- 生动化陈列 sku -->
             <!-- 生动化陈列 sku -->

+ 6 - 5
src/views/week/dailyDetails.vue

@@ -428,16 +428,17 @@
                     align-items: center;
                     align-items: center;
                     justify-content: center;
                     justify-content: center;
                     padding: 5px 0;
                     padding: 5px 0;
-                    font-size: 20px;
+                    font-size: 14px;
+                    color: #969799;
                   "
                   "
                   @click="setVisitIMG1Flag(item)">
                   @click="setVisitIMG1Flag(item)">
                   <template v-if="item.visitIMG1Flag">
                   <template v-if="item.visitIMG1Flag">
-                    <span>折叠</span>
-                    <van-icon size="20" :name="require('@/assets/Icon/arrow-up.png')" />
+                    <span style="margin-right: 5px">折叠</span>
+                    <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
                   </template>
                   </template>
                   <template v-else>
                   <template v-else>
-                    <span>展开</span>
-                    <van-icon size="20" :name="require('@/assets/Icon/arrow-down.png')" />
+                    <span style="margin-right: 5px">展开</span>
+                    <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
                   </template>
                   </template>
                 </div>
                 </div>
                 <!-- 生动化陈列 sku -->
                 <!-- 生动化陈列 sku -->

+ 6 - 5
src/views/week/dailyHistoricalDetails.vue

@@ -422,16 +422,17 @@
                   align-items: center;
                   align-items: center;
                   justify-content: center;
                   justify-content: center;
                   padding: 5px 0;
                   padding: 5px 0;
-                  font-size: 20px;
+                  font-size: 14px;
+                  color: #969799;
                 "
                 "
                 @click="setVisitIMG1Flag(item)">
                 @click="setVisitIMG1Flag(item)">
                 <template v-if="item.visitIMG1Flag">
                 <template v-if="item.visitIMG1Flag">
-                  <span>折叠</span>
-                  <van-icon size="20" :name="require('@/assets/Icon/arrow-up.png')" />
+                  <span style="margin-right: 5px">折叠</span>
+                  <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
                 </template>
                 </template>
                 <template v-else>
                 <template v-else>
-                  <span>展开</span>
-                  <van-icon size="20" :name="require('@/assets/Icon/arrow-down.png')" />
+                  <span style="margin-right: 5px">展开</span>
+                  <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
                 </template>
                 </template>
               </div>
               </div>
               <!-- 生动化陈列 sku -->
               <!-- 生动化陈列 sku -->