Merge branch 'feature/4月-会员通'

# Conflicts:
#	src/view/memberGroup/memberGroupDetail.vue

src/view/manualTag/manual-tag-value-edit-info.vue

@@ -74,16 +74,26 @@
                   </template>
                   <!-- 状态 -->
                   <template v-if="item.code == 'status'">
-                    <span
-                      :title="scope.row.wxStatus == 0 ? '未使用小程序' : scope.row.wxStatus == 1 ? '已使用小程序' : ''"
-                      class="channelicon"
-                      :class="scope.row.wxStatus == 0 ? 'xcxicongray' : scope.row.wxStatus == 1 ? 'xcxicon' : ''"
-                    ></span>
-                    <span
-                      :title="scope.row.status == 0 ? '取消关注公众号' : scope.row.status == 1 ? '已关注公众号' : '未关注公众号'"
-                      class="channelicon"
-                      :class="scope.row.status == 0 ? 'gzhiconcanclegray' : scope.row.status == 1 ? 'gzhicon' : 'gzhicongray'"
-                    ></span>
+                    <template v-if="!Array.isArray(scope.row.memberSources) || scope.row.memberSources.filter(el =>  el.highlight == 1 || el.highlight == 2).length == 0">--</template>
+                    <template v-else>
+                      <!-- 1100：公众号 1600：小程序 1700：企业微信 1303：微盟 1302：天猫会员通 -->
+                      <span class="channel-box" v-for="channel in (scope.row.memberSources || []).filter(el => el.highlight == 1 || el.highlight == 2)" :key="channel.parentSourceCode">
+                        <template v-if="channel.highlight == 1">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-1.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-1.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-1.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-1.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-1.png" alt="">
+                        </template>
+                        <template v-if="channel.highlight == 2">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-2.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-2.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-2.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-2.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-2.png" alt="">
+                        </template>
+                      </span>
+                    </template>
                   </template>
                   <!-- 关联渠道 -->
                   <template v-if="item.code == 'channel'">
@@ -637,6 +647,17 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.channel-box {
+  display: inline-block;
+  +.channel-box {
+    margin-left: 6px;
+  }
+  .channel-icon {
+    width: 20px;
+    height: 20px;
+    vertical-align: middle;
+  }
+}
 .manualTagDetail-wrap__head {
   font-size: 14px;
   border-bottom: 1px solid #ebeef5;

src/view/memberGroup/memberGroupDetail.vue

@@ -68,6 +68,7 @@
                     : 'custom'
                 "
                 :prop="item.code"
+                :min-width="item.code == 'status' ? '200px' : '150px'"
                 v-for="item in selectedFields" :key="item.code"
                 :fixed="item.code == 'name' ? true : false"
                 :min-width="item.code == 'name' ? 260 : 200"
@@ -95,16 +96,26 @@
                   </template>
                   <!-- 状态 -->
                   <template v-if="item.code == 'status'">
-                    <span
-                      :title="scope.row.wxStatus == 0 ? '未使用小程序' : scope.row.wxStatus == 1 ? '已使用小程序' : ''"
-                      class="channelicon"
-                      :class="scope.row.wxStatus == 0 ? 'xcxicongray' : scope.row.wxStatus == 1 ? 'xcxicon' : ''"
-                    ></span>
-                    <span
-                      :title="scope.row.status == 0 ? '取消关注公众号' : scope.row.status == 1 ? '已关注公众号' : '未关注公众号'"
-                      class="channelicon"
-                      :class="scope.row.status == 0 ? 'gzhiconcanclegray' : scope.row.status == 1 ? 'gzhicon' : 'gzhicongray'"
-                    ></span>
+                    <template v-if="!Array.isArray(scope.row.memberSources) || scope.row.memberSources.filter(el =>  el.highlight == 1 || el.highlight == 2).length == 0">--</template>
+                    <template v-else>
+                      <!-- 1100：公众号 1600：小程序 1700：企业微信 1303：微盟 1302：天猫会员通 -->
+                      <span class="channel-box" v-for="channel in (scope.row.memberSources || []).filter(el => el.highlight == 1 || el.highlight == 2)" :key="channel.parentSourceCode">
+                        <template v-if="channel.highlight == 1">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-1.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-1.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-1.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-1.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-1.png" alt="">
+                        </template>
+                        <template v-if="channel.highlight == 2">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-2.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-2.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-2.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-2.png" alt="">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-2.png" alt="">
+                        </template>
+                      </span>
+                    </template>
                   </template>
                   <!-- 关联渠道 -->
                   <template v-if="item.code == 'channel'">
@@ -721,6 +732,17 @@ export default {
 .fixedPiel {
   margin-top: 8px;
 }
+.channel-box {
+  display: inline-block;
+  +.channel-box {
+    margin-left: 6px;
+  }
+  .channel-icon {
+    width: 20px;
+    height: 20px;
+    vertical-align: middle;
+  }
+}
 .memberGroupDetail-wrap__head {
   font-size: 14px;
   border-bottom: 1px solid #ebeef5;