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

# Conflicts:
#	src/components/allCustomers/allCustomersList.vue
#	src/components/allCustomers/customerDetail.vue

src/components/allCustomers/allCustomersList.vue

@@ -140,6 +140,19 @@
                         <img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-2.png" alt="">
                         <!-- <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt=""> -->
                       </template>
+                      <template v-if="channel.parentSourceCode == 1304">
+                        <template v-if="channel.activeFlag!=1">
+                          <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-0.png" alt="">
+                        </template>
+                        <template v-if="channel.activeFlag==1">
+                          <template v-if="channel.highlight == 1">
+                            <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt="">
+                          </template>
+                          <template v-if="channel.highlight == 2">
+                            <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt="">
+                          </template>
+                        </template>
+                      </template>
                     </span>
                   </template>
                 </span>

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.parentSourceCode == 1304 && channel.activeFlag !=1">(未激活)</span></div>
+                            <div class="channel-title">{{ channel.sourceName }}<span v-if="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>
@@ -77,9 +77,9 @@
                             <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="">
                             <!-- <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt=""> -->
-                            <span  v-if="channel.parentSourceCode == 1304">
+                             <span  v-if="channel.parentSourceCode == 1304">
                                <img class="channel-icon" v-if="channel.activeFlag == 1" src="../../../static/img/channel-icon/douyin-1.png" alt="">
-                               <img class="channel-icon" v-else src="../../../static/img/channel-icon/douyin-2.png" alt="">
+                               <img class="channel-icon" v-else src="../../../static/img/channel-icon/douyin-0.png" alt="">
                             </span>
                           </template>
                         </el-popover>

src/components/axios/url.js

@@ -96,7 +96,10 @@ const urlConfig = {
   wechatLogPage: '/api-marketing/member/wechat-log-page',
   getMarketingRecordNum: '/api-marketing/member/marketing-count',
   aiLogPage: '/api-marketing/member/page-ai-member-log',
-  getOrderList: '/api-member/member-all-order-page'
+  getOrderList: '/api-member/member-all-order-page',
+  getFrozenList: "/api-member/ajax-frozen-members",
+  batchUpdateFrozen: "/api-member/members-batch-update-frozen",
+  getExceptionList: '/api-member/list-exception-member'
 }
 
 const defaultUrl = Object.assign({}, urlConfig);

src/components/wechatmembers/abnormal-member.vue

@@ -457,7 +457,7 @@ export default {
         isClerk: select3,
         frozenStatus: select4 || undefined
       }
-      doFetchqs("/api-member/list-exception-member", params).then(res => {
+      doFetchqs(url.getExceptionList, params).then(res => {
         if (res.data.errorCode === 0) {
           if (res.data.result.result) {
             this.frozenList =
@@ -566,7 +566,7 @@ export default {
         status: options.frozenType, // 1 冻结 0 解冻
         phoneNameCard: this.keywords // 会员名称 手机号
       };
-      doFetch("/api-member/members-batch-update-frozen", datas).then(res => {
+      doFetch(url.batchUpdateFrozen, datas).then(res => {
         if (res.data.errorCode === 0) {
           this.$message({
             message: options.frozenType == 0 ? "解冻成功" : "冻结成功",

src/components/wechatmembers/frozenList.vue

@@ -375,7 +375,7 @@ export default {
       if (this.sortColName) {
         datas.sortColName = this.sortColName;
       }
-      doFetch("/api-member/ajax-frozen-members", datas).then(res => {
+      doFetch(url.getFrozenList, datas).then(res => {
         this.load = true;
         if (res.data.errorCode === 0) {
           this.load = false;
@@ -491,7 +491,7 @@ export default {
         status: options.frozenType, // 1 冻结 0 解冻
         phoneNameCard: this.keywords // 会员名称 手机号
       };
-      doFetch("/api-member/members-batch-update-frozen", datas).then(async res => {
+      doFetch(url.batchUpdateFrozen, datas).then(async res => {
         if (res.data.errorCode === 0) {
           this.$message({
             message: "解冻成功",