update: 标签

src/components/allCustomers/customerDetail.vue

@@ -479,17 +479,25 @@
                 </el-tab-pane>
                 <!--活动标签-->
                 <el-tab-pane label="活动标签" name="activeTag">
-                  <ul v-if="tagAndRemarkInfo.activityTagList && tagAndRemarkInfo.activityTagList.length" class="flex-tag-wrap">
-                    <li
-                      v-for="active in tagAndRemarkInfo.activityTagList"
-                      :key="active"
+                  <template v-for="item in section.childrenList">
+                    <div
+                      v-if="tagAndRemarkInfo.activityTag[item.key]&&tagAndRemarkInfo.activityTag[item.key].length"
+                      class="hand-label-item"
+                      :key="item"
                     >
-                      <el-tag type="info">
-                        {{ active.tagsName }}
-                      </el-tag>
-                    </li>
-                  </ul>
-                  <div v-else class="empty-block" style="height:186px;">
+                      <p>{{ item.title }}：</p>
+                      <div class="flex-tag-wrap">
+                        <el-tag
+                          type="info"
+                          v-for="tag in tagAndRemarkInfo.activityTag[item.key]"
+                          :key="tag"
+                        >
+                          {{ tag.tagsName }}
+                        </el-tag>
+                      </div>
+                    </div>
+                  </template>
+                  <div v-if="!tagAndRemarkInfo.activityTag.marketingTagList.length&&!tagAndRemarkInfo.activityTag.sourceTagList.length" class="empty-block" style="height:186px;">
                     <img :src="require('../../../static/img/no-data_icon.png')" alt="">
                     <p>暂无数据</p>
                   </div>

src/components/allCustomers/info.js

@@ -65,6 +65,10 @@ export default {
         remarkList: [],
         // 身形字段
         dictFigureList: [],
+        activityTag: {
+          marketingTagList: [],
+          sourceTagList: []
+        }
       },
       tableData: [],
       logPageParam: {
@@ -194,6 +198,8 @@ export default {
             { title: '导购标签', key: 'tagsList' },
             { title: '其他标签', key: 'otherTagsList' },
             { title: '微盟标签', key: 'weimobTagsList' },
+            { title: '渠道标签', key: 'sourceTagList' },
+            { title: '营销活动标签', key: 'marketingTagList' },
           ],
         },
         { title: '客户日志', name: 'log', class: 'log-info-contain' },
@@ -312,7 +318,10 @@ export default {
                     },
                     remarkList: ret.tagAndRemarkInfo.remarkList || [],
                     dictFigureList: ret.tagAndRemarkInfo.dictFigureList || [],
-                    activityTagList: ret.tagAndRemarkInfo.activityTagList
+                    activityTag: {
+                      marketingTagList: ret.tagAndRemarkInfo.activityTag.marketingTagList || [],
+                      sourceTagList: ret.tagAndRemarkInfo.activityTag.sourceTagList || [],
+                    }
                   },
                 );
               }

static/css/index.styl

@@ -2,14 +2,17 @@
 @import "variables.styl"
 body, dl, dd, h1, h2, h3, h4, h5, h6, form{margin:0;}
 ol, ul{
-  margin:0; 
+  margin:0;
   padding:0;
 }
 li{
   list-style none
 }
 p {
-  margin 5px 0
+  margin 0;
+}
+span {
+  font-size: 14px;
 }
 .ell
   text-overflow: ellipsis
@@ -552,14 +555,14 @@ p {
 .el-table__expanded-cell[class*=cell]
   padding: 0
 
-.el-table th>.cell 
+.el-table th>.cell
   color: #9d9fa5
   font-size: 14px
 
 .is-focus .el-input__inner
   border-color: #2F54EB;
 
-.select-popper 
+.select-popper
   padding: 5px 0px;
 
 .member-span
@@ -588,4 +591,4 @@ p {
   margin-right: 16px
 
 .dm-checkbox + .dm-checkbox
-  margin-left: 0px
\ No newline at end of file
+  margin-left: 0px