src/views/home/hintTabPage/hintDetail.vue

@@ -522,12 +522,8 @@ export default {
       } else {
         getColorWarning().then((res) => {
           this.tabsItemPantone = res.data;
-          delete this.tabsItemPantone.tip;
-          // 初次获取tab数据延迟等待this.activaPantoneName当前激活tab赋值成功，获取其物料code
+          delete this.tabsItemPantone.reminderContent;
           this.$nextTick(() => {
-            this.materialCode = this.materialCode
-              ? this.materialCode
-              : this.tabsItemPantone[this.activaPantoneName].materialCode;
             this.getColorWarningFun(null, null);
           });
         });

src/views/home/hintTabPage/index.vue

@@ -204,9 +204,16 @@
           <template #title>
             <div class="itemHeader" @click.stop>
               <span class="itemTitle">{{ colorWarning.title }}</span>
-              <el-popover placement="right" trigger="click" popper-class="hintPopover">
-                <div class="popoverConten">
-                  {{ colorWarning.tip }}
+              <el-popover
+                placement="right"
+                trigger="click"
+                popper-class="hintPopover"
+                v-if="colorWarning.tip">
+                <div
+                  class="popoverConten"
+                  v-for="(item, index) in colorWarning.tip"
+                  :key="index">
+                  {{ item }}
                 </div>
                 <div slot="reference" class="hintIconBox">
                   <img class="hintIcon" :src="hintIcon" />
@@ -240,7 +247,7 @@
                       </div>
                     </div>
                     <div class="right">
-                      <div class="lebel">近两年DIS为0：</div>
+                      <div class="lebel">布机但近两年DIS为0：</div>
                       <div class="value valueIsClick" @click="colorWarningClick(val, key, val.mdwqsNum)">
                         {{ Micrometer(val.colorDis) }}家
                       </div>
@@ -499,7 +506,7 @@ export default {
       },
       colorWarning: {
         title: '调色预警',
-        tip: '调色预警tips',
+        tip: [],
         contentLosding: true,
         contentData: {},
       },
@@ -587,9 +594,9 @@ export default {
         this.colorWarning.contentLosding = true;
         getColorWarning().then((res) => {
           this.colorWarning.contentLosding = false;
-          this.colorWarning.tip = res.data.tip;
+          this.colorWarning.tip = res.data.reminderContent;
           this.colorWarning.contentData = res.data;
-          delete this.colorWarning.contentData.tip;
+          delete this.colorWarning.contentData.reminderContent;
         });
       }
     },
@@ -750,7 +757,7 @@ export default {
           }
           .right {
             display: flex;
-            width: 160px;
+            width: 250px;
             // justify-content: center;
             .valueIsClick {
               text-decoration: underline;

src/views/home/hintTabPage/warningStore.vue

@@ -11,7 +11,7 @@
             <div class="num">{{ val.storeNum }}家</div>
           </template>
           <div class="itemContent">
-            <template v-if="val.storeList && val.storeList.length > 1">
+            <template v-if="val.storeList && val.storeList.length >= 1">
               <div class="item" v-for="(item, index) in val.storeList" :key="index">
                 <van-cell>
                   <div class="card">
@@ -77,7 +77,7 @@
                         <el-popover popper-class="zpover zpover5" placement="bottom" width="200" trigger="click">
                           <div v-if="item.storeLabels">
                             <p>已参加:</p>
-                            <p v-for="tt in (item.storeLabels.targetOne + '').split(';')" :key="tt.index">
+                            <p v-for="tt in (item.storeLabels.targetOne + '').split(';')" :key="tt">
                               {{ tt }}
                             </p>
                           </div>
@@ -86,25 +86,22 @@
                             <van-icon :name="targetOne" size="26" />
                           </div>
                         </el-popover>
-                        <el-popover popper-class="zpover" placement="bottom" width="120" trigger="click" content="调色机5天未联网">
-                          <div v-if="item.storeLabels.ccmOffline" 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="调色机滚动7天未调色">
-                          <div v-if="item.storeLabels.stopColorMixerSeven" class="visitStoreIco" style="background-color: #ee0a24"
+                        <el-popover popper-class="zpover" placement="bottom" width="120" trigger="click"
+                          content="调色机7天未调色">
+                          <div 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: #ee0a24"
-                            slot="reference">
+                        <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" width="200" trigger="click" content="同城店近60天未下单">
+                        <el-popover popper-class="zpover" placement="bottom" width="200" trigger="click"
+                          content="同城店近60天未下单">
                           <div v-if="item.storeLabels.fxNoOrder" class="visitStoreIco" style="background-color: #fff"
                             slot="reference">
                             <van-icon :name="order60" size="26" />
@@ -200,7 +197,8 @@
                       ">
                         <div class="info" v-if="typeShow">
                           经销商：
-                          <div class="TCFXListItem" v-for="(item, index) in item.sfaStoreChainsContactList">
+                          <div class="TCFXListItem" v-for="(item, index) in item.sfaStoreChainsContactList"
+                            :key="index">
                             <el-popover popper-class="zpover zpoverStoreztype" placement="bottom-start" trigger="click">
                               <div>
                                 <div>{{ item.chainCode }}</div>
@@ -244,6 +242,7 @@ import { buryingPoint, ProductItemImge } from '@/api/index';
 import order from '@/assets/order.png';
 import order60 from '@/assets/order60.png';
 import targetOne from '@/assets/targetOne.png';
+import ord from '@/assets/ord.png';
 import Network from '@/assets/Network.png';
 import WiFi from '@/assets/WiFi.png';
 import paste from '@/assets/paste.png';
@@ -257,6 +256,8 @@ export default {
   },
   data() {
     return {
+      typeShow: false,
+      ord: ord,
       order: order,
       order60: order60,
       Network: Network,