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
7b8ab06aa3

BIN
src/assets/Icon/arrow-down.png


BIN
src/assets/Icon/arrow-up.png


+ 1 - 1
src/views/historicalVisit/hisvistdeils.vue

@@ -254,7 +254,7 @@
           </div>
           </div>
           <el-table
           <el-table
             :data="photoSkuImgSummaryeList"
             :data="photoSkuImgSummaryeList"
-            style="width: 100%"
+            style="width: 100%; border-radius: 10px"
             border
             border
             class="table-headermd">
             class="table-headermd">
             <el-table-column label="SKU名称" prop="name" width="180" align="center">
             <el-table-column label="SKU名称" prop="name" width="180" align="center">

+ 20 - 3
src/views/week/dailyApproval.vue

@@ -387,9 +387,22 @@
             <div
             <div
               v-if="item.photos.length > 4"
               v-if="item.photos.length > 4"
               class="arrowIcon"
               class="arrowIcon"
-              style="text-align: center; padding: 3px 0"
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                padding: 5px 0;
+                font-size: 20px;
+              "
               @click="setVisitIMG1Flag(item)">
               @click="setVisitIMG1Flag(item)">
-              <van-icon size="28" :name="item.visitIMG1Flag ? 'arrow-up' : 'arrow-down'" />
+              <template v-if="item.visitIMG1Flag">
+                <span>折叠</span>
+                <van-icon size="20" :name="require('@/assets/Icon/arrow-up.png')" />
+              </template>
+              <template v-else>
+                <span>展开</span>
+                <van-icon size="20" :name="require('@/assets/Icon/arrow-down.png')" />
+              </template>
             </div>
             </div>
             <!-- 生动化陈列 sku -->
             <!-- 生动化陈列 sku -->
             <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
             <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
@@ -818,7 +831,7 @@ export default {
   border-radius: 2px;
   border-radius: 2px;
 }
 }
 </style>
 </style>
-<style>
+<style lang="scss">
 .linep .van-cell__title {
 .linep .van-cell__title {
   color: #1e5398;
   color: #1e5398;
   font-weight: 500;
   font-weight: 500;
@@ -896,6 +909,10 @@ export default {
   width: 98% !important;
   width: 98% !important;
   margin: 0 auto;
   margin: 0 auto;
   border-right: 0;
   border-right: 0;
+  border-radius: 10px;
+  .el-table__cell {
+    padding: 6px 0 !important;
+  }
 }
 }
 .table-headermd th.el-table__cell {
 .table-headermd th.el-table__cell {
   background-color: #1989fa;
   background-color: #1989fa;

+ 19 - 2
src/views/week/dailyDetails.vue

@@ -423,9 +423,22 @@
                 <div
                 <div
                   v-if="item.photos.length > 4"
                   v-if="item.photos.length > 4"
                   class="arrowIcon"
                   class="arrowIcon"
-                  style="text-align: center; padding: 3px 0"
+                  style="
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    padding: 5px 0;
+                    font-size: 20px;
+                  "
                   @click="setVisitIMG1Flag(item)">
                   @click="setVisitIMG1Flag(item)">
-                  <van-icon size="28" :name="item.visitIMG1Flag ? 'arrow-up' : 'arrow-down'" />
+                  <template v-if="item.visitIMG1Flag">
+                    <span>折叠</span>
+                    <van-icon size="20" :name="require('@/assets/Icon/arrow-up.png')" />
+                  </template>
+                  <template v-else>
+                    <span>展开</span>
+                    <van-icon size="20" :name="require('@/assets/Icon/arrow-down.png')" />
+                  </template>
                 </div>
                 </div>
                 <!-- 生动化陈列 sku -->
                 <!-- 生动化陈列 sku -->
                 <template
                 <template
@@ -1065,6 +1078,10 @@ export default {
   width: 98% !important;
   width: 98% !important;
   margin: 0 auto;
   margin: 0 auto;
   border-right: 0;
   border-right: 0;
+  border-radius: 10px;
+  .el-table__cell {
+    padding: 6px 0 !important;
+  }
 }
 }
 .table-headermd th.el-table__cell {
 .table-headermd th.el-table__cell {
   background-color: #1989fa;
   background-color: #1989fa;

+ 19 - 2
src/views/week/dailyHistoricalDetails.vue

@@ -417,9 +417,22 @@
               <div
               <div
                 v-if="item.photos.length > 4"
                 v-if="item.photos.length > 4"
                 class="arrowIcon"
                 class="arrowIcon"
-                style="text-align: center; padding: 3px 0"
+                style="
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  padding: 5px 0;
+                  font-size: 20px;
+                "
                 @click="setVisitIMG1Flag(item)">
                 @click="setVisitIMG1Flag(item)">
-                <van-icon size="28" :name="item.visitIMG1Flag ? 'arrow-up' : 'arrow-down'" />
+                <template v-if="item.visitIMG1Flag">
+                  <span>折叠</span>
+                  <van-icon size="20" :name="require('@/assets/Icon/arrow-up.png')" />
+                </template>
+                <template v-else>
+                  <span>展开</span>
+                  <van-icon size="20" :name="require('@/assets/Icon/arrow-down.png')" />
+                </template>
               </div>
               </div>
               <!-- 生动化陈列 sku -->
               <!-- 生动化陈列 sku -->
               <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
               <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
@@ -1248,5 +1261,9 @@ export default {
   width: 98% !important;
   width: 98% !important;
   margin: 0 auto;
   margin: 0 auto;
   border-right: 0;
   border-right: 0;
+  border-radius: 10px;
+  .el-table__cell {
+    padding: 6px 0 !important;
+  }
 }
 }
 </style>
 </style>

+ 6 - 14
src/views/week/index.vue

@@ -62,7 +62,7 @@
         </van-cell-group>
         </van-cell-group>
         <!--      客资类-->
         <!--      客资类-->
         <van-cell-group inset class="mtb10">
         <van-cell-group inset class="mtb10">
-          <van-cell title="客资&投诉任务" to="/clew" v-if="customerClueButton">
+          <van-cell title="客资&投诉任务" to="/clew" v-if="customerClueButton" is-link>
             <template #icon>
             <template #icon>
               <van-icon :name="history" class="zicon" />
               <van-icon :name="history" class="zicon" />
             </template>
             </template>
@@ -72,11 +72,8 @@
                 customerClueNum
                 customerClueNum
               }}</van-tag>
               }}</van-tag>
             </template>
             </template>
-            <template #right-icon>
-              <van-icon name="arrow" size="16" />
-            </template>
           </van-cell>
           </van-cell>
-          <van-cell title="待分配客资" to="/assignAwait" v-if="isAssignFlag">
+          <van-cell title="待分配客资" to="/assignAwait" v-if="isAssignFlag" is-link>
             <template #icon>
             <template #icon>
               <van-icon :name="history" class="zicon" />
               <van-icon :name="history" class="zicon" />
             </template>
             </template>
@@ -86,13 +83,11 @@
                 notAllocationNum
                 notAllocationNum
               }}</van-tag>
               }}</van-tag>
             </template>
             </template>
-            <template #right-icon>
-              <van-icon name="arrow" size="16" />
-            </template>
-          </van-cell> </van-cell-group
-        ><!--拜访照片识别异常反馈 部主管及以上-->
+          </van-cell>
+        </van-cell-group>
+        <!--拜访照片识别异常反馈 部主管及以上-->
         <van-cell-group inset class="mtb10">
         <van-cell-group inset class="mtb10">
-          <van-cell title="拜访照片识别异常反馈" to="/AIImage">
+          <van-cell title="拜访照片识别异常反馈" to="/AIImage" is-link>
             <template #icon>
             <template #icon>
               <van-icon :name="history" class="zicon" />
               <van-icon :name="history" class="zicon" />
             </template>
             </template>
@@ -104,9 +99,6 @@
                 <van-tag type="danger">{{ photoApprovalNum }}</van-tag>
                 <van-tag type="danger">{{ photoApprovalNum }}</van-tag>
               </span>
               </span>
             </template>
             </template>
-            <template #right-icon>
-              <van-icon name="arrow" size="16" />
-            </template>
           </van-cell>
           </van-cell>
         </van-cell-group>
         </van-cell-group>
         <!--      汇报类-->
         <!--      汇报类-->