Merge branch 'feature_20260203_完美门店' into uat(dev)

src/views/deviceOutside/index.vue

@@ -437,13 +437,21 @@
             <template v-if="item.stateString == '已拜访'">
               <div
                 class="statstext"
-                style="border-bottom-left-radius: 15px; border-top-left-radius: 15px"
+                style="
+                  border-bottom-left-radius: 15px;
+                  border-top-left-radius: 15px;
+                  background-color: #e3f0fe;
+                  color: #387bca;
+                "
                 v-if="item.jinpaiStore"
                 @click="openPerfectStore(item)">
-                已拜访<br />
-                <div style="margin: 3px 0; font-size: 12px">
-                  <p style="line-height: 18px; margin: 0">点击查看</p>
-                  <p style="line-height: 18px; margin: 0">完美门店</p>
+                <div style="margin: 3px 0; font-size: 16px; font-weight: 600">
+                  <p style="line-height: 25px; margin: 0">
+                    查看<img
+                      style="width: 18px; height: 25px; margin-left: 5px; vertical-align: -5px"
+                      :src="require('@/assets/shouzhi.png')" />
+                  </p>
+                  <p style="line-height: 25px; margin: 0">完美门店</p>
                 </div>
               </div>
               <div class="statstext" v-else>已拜访</div>

src/views/historicalVisit/perfectStore.vue

@@ -178,15 +178,17 @@
             class="itemList"
             v-for="(value, index) in taskTypeArr"
             @click="historiStoreVisit(value)">
-            <div class="itemTitle">
-              {{ convertToChinese(index + 1) }}、{{ value.taskName }} <van-icon name="arrow" />
-            </div>
-            <!-- <div class="jiantou">
-              <van-icon name="arrow" />
-            </div> -->
-            <div class="" style="margin-left: 10px">
-              <van-icon name="success" color="#07c160" v-if="value.taskPhotoConditionPassed == 1" />
-              <van-icon name="cross" color="#ee0a24" v-else />
+            <div class="itemTitle">{{ convertToChinese(index + 1) }}、{{ value.taskName }}</div>
+            <div class="" style="display: flex">
+              <van-button round type="primary" v-if="value.taskPhotoConditionPassed == 1"
+                >通过</van-button
+              >
+              <van-button round type="danger" v-else>不通过</van-button>
+              <!-- <van-icon name="success" color="#07c160" v-if="value.taskPhotoConditionPassed == 1" />
+              <van-icon name="cross" color="#ee0a24" v-else /> -->
+              <div class="jiantou">
+                <van-icon name="arrow" />
+              </div>
             </div>
           </div>
         </div>
@@ -635,8 +637,15 @@ export default {
           color: rgb(25, 137, 250);
         }
         .jiantou {
-          margin: 0 20px 0 10px;
+          margin: 0 10px 0 5px;
           color: rgb(25, 137, 250);
+          display: flex;
+          align-items: center;
+        }
+        button {
+          width: 60px;
+          height: 30px;
+          padding: 0;
         }
       }
     }
@@ -736,6 +745,10 @@ export default {
       display: flex;
     }
   }
+  .van-button--danger {
+    background-color: #ee0a24 !important;
+    border: 1px solid #ee0a24 !important;
+  }
 }
 .zpoverSuccess {
   background-color: #28e978 !important;

src/views/historicalVisit/perfectStoreSku.vue

@@ -17,9 +17,9 @@
           <span class="headlineIcon"></span>
           <span class="headlineTitle">生动化陈列</span>
         </div>
-        <div class="tipsTitle" style="padding: 10px">
+        <!-- <div class="tipsTitle" style="padding: 10px">
           目前识别桶装和战略产品合计106个，后续会增加识别产品数
-        </div>
+        </div> -->
         <div style="padding: 10px">
           <van-row gutter="10">
             <van-col span="4" v-for="(urls, index) in detail.fileUrlList" :key="index">