Merge branch 'feature/6月抖音未激活' into test

src/components/allCustomers/customerDetail.vue

@@ -60,7 +60,7 @@
                         <!-- {{member.memberSources}} -->
                         <el-popover popper-class="channel-info-popover" v-if="channel.highlight == 1" trigger="hover" placement="top">
                           <div class="channel-info">
-                            <div class="channel-title">{{ channel.sourceName }}<span v-if="channel.activeFlag != 1" class="channel-title-tip"> (未激活)</span></div>
+                            <div class="channel-title">{{ channel.sourceName }}<span v-if="channel.parentSourceCode == 1304 && channel.activeFlag != 1" class="channel-title-tip"> (未激活)</span></div>
                             <div class="channel-info-item" v-if="!channel.event || channel.event != '-'">
                               <span class="channel-info-label">来 源：</span>
                               <span class="channel-info-value">{{ channel.event || '--' }}</span>