src/views/deviceOutside/index.vue

@@ -172,15 +172,22 @@
                     placement="bottom"
                     width="120"
                     trigger="click"
-                    content="调色机5天未联网">
+                    content="调色机7天未调色">
                     <div
-                      v-if="item.storeLabels.ccmOffline"
+                      v-if="item.storeLabels.stopColorMixerSeven"
                       class="visitStoreIco"
                       style="background-color: #fff"
                       slot="reference">
                       <van-icon :name="Network" size="26" />
                     </div>
                   </el-popover>
+                  <el-popover popper-class="zpover" placement="bottom" width="120" trigger="click"
+                          content="调色机当月未调色">
+                          <div v-if="item.storeLabels.stopColorMixerMonth" class="visitStoreIco"
+                            style="background-color: #fff" slot="reference">
+                            <van-icon :name="WiFi" size="26" />
+                          </div>
+                        </el-popover>
                   <el-popover
                     popper-class="zpover"
                     placement="bottom"
@@ -606,6 +613,7 @@ import times from '@/assets/Icon/times.png';
 import order60 from '@/assets/order60.png';
 import targetOne from '@/assets/targetOne.png';
 import Network from '@/assets/Network.png';
+import WiFi from '@/assets/WiFi.png';
 import ord from '@/assets/ord.png';
 import timeico from '@/assets/Icon/datatims.png';
 import location from '@/assets/location.png';
@@ -651,6 +659,7 @@ export default {
       mapShow: false,
       otherShow: false,
       Network: Network,
+      WiFi: WiFi,
       order60: order60,
       targetOne: targetOne,
       chainName: '',

src/views/deviceOutside/rangeStore.vue

@@ -314,15 +314,22 @@
                   placement="top"
                   width="120"
                   trigger="click"
-                  content="调色机5天未联网">
+                  content="调色机7天未调色">
                   <div
-                    v-if="info.storeLabels.ccmOffline"
+                    v-if="info.storeLabels.stopColorMixerSeven"
                     class="visitStoreIco"
                     style="background-color: #fff"
                     slot="reference">
                     <van-icon :name="Network" size="26" />
                   </div>
                 </el-popover>
+                <el-popover popper-class="zpover" placement="bottom" width="120" trigger="click"
+                          content="调色机当月未调色">
+                          <div v-if="item.storeLabels.stopColorMixerMonth" class="visitStoreIco"
+                            style="background-color: #fff" slot="reference">
+                            <van-icon :name="WiFi" size="26" />
+                          </div>
+                        </el-popover>
                 <el-popover
                   popper-class="zpover"
                   placement="top"
@@ -706,6 +713,7 @@ import times from '@/assets/Icon/times.png';
 import order60 from '@/assets/order60.png';
 import targetOne from '@/assets/targetOne.png';
 import Network from '@/assets/Network.png';
+import WiFi from '@/assets/WiFi.png';
 import timeico from '@/assets/Icon/datatims.png';
 import paste from '@/assets/paste.png';
 import visitTimes from '@/assets/visitTimes.png';
@@ -773,6 +781,7 @@ export default {
       mapShow: false,
       otherShow: false,
       Network: Network,
+      WiFi: WiFi,
       order60: order60,
       ord: ord,
       targetOne: targetOne,

src/views/deviceOutside/topStore.vue

@@ -197,15 +197,22 @@
                       placement="bottom"
                       width="120"
                       trigger="click"
-                      content="调色机5天未联网">
+                      content="调色机7天未调色">
                       <div
-                        v-if="item.storeLabels.ccmOffline"
+                        v-if="item.storeLabels.stopColorMixerSeven"
                         class="visitStoreIco"
                         style="background-color: #fff"
                         slot="reference">
                         <van-icon :name="Network" size="26" />
                       </div>
                     </el-popover>
+                    <el-popover popper-class="zpover" placement="bottom" width="120" trigger="click"
+                          content="调色机当月未调色">
+                          <div v-if="item.storeLabels.stopColorMixerMonth" class="visitStoreIco"
+                            style="background-color: #fff" slot="reference">
+                            <van-icon :name="WiFi" size="26" />
+                          </div>
+                        </el-popover>
                     <el-popover
                       popper-class="zpover"
                       placement="bottom"
@@ -650,6 +657,7 @@ import times from '@/assets/Icon/times.png';
 import order60 from '@/assets/order60.png';
 import targetOne from '@/assets/targetOne.png';
 import Network from '@/assets/Network.png';
+import WiFi from '@/assets/WiFi.png';
 import ord from '@/assets/ord.png';
 import timeico from '@/assets/Icon/datatims.png';
 import location from '@/assets/location.png';
@@ -695,6 +703,7 @@ export default {
       call: call,
       otherShow: false,
       Network: Network,
+      WiFi: WiFi,
       order60: order60,
       targetOne: targetOne,
       chainName: '',

src/views/home/hintTabPage/index.vue

@@ -729,6 +729,7 @@ export default {
     .pantoneContent {
       padding-bottom: 10px;
       .title {
+        
         padding: 2px 5px;
         border-radius: 2px;
         background-color: #13b5b1;
@@ -737,11 +738,32 @@ export default {
         color: #fff;
       }
       .kekong{
+        color: #fff;
+        height: 21px;
+        margin-right: 6px;
+        /* width: 50px; */
+        text-align: center;
+        line-height: 21px;
+        border-radius: 2px;
+        margin: 4px 0;
+        width: -moz-max-content;
+        width: max-content;
+        padding: 0 3px;
         background: rgb(235, 104, 119);
       }
       .jinpai{
-        background: rgb(255, 165, 0);
-
+        color: #fff;
+        height: 21px;
+        margin-right: 6px;
+        /* width: 50px; */
+        text-align: center;
+        line-height: 21px;
+        border-radius: 2px;
+        margin: 4px 0;
+        width: -moz-max-content;
+        width: max-content;
+        padding: 0 3px;
+        background: rgb(241, 183, 137);
       }
       .pantoneItem {
         .item {
@@ -757,7 +779,7 @@ export default {
           }
           .right {
             display: flex;
-            width: 250px;
+            width: 180px;
             // justify-content: center;
             .valueIsClick {
               text-decoration: underline;

src/views/home/hintTabPage/warningStore.vue

@@ -256,7 +256,7 @@ export default {
   },
   data() {
     return {
-      typeShow: false,
+      typeShow: true,
       ord: ord,
       order: order,
       order60: order60,