Merge branch 'feature/7月基础一异常冻结会员' into dev

* feature/7月基础一异常冻结会员:
  部分UI异常  bug修复

src/components/allCustomers/allCustomersList.less

@@ -128,6 +128,12 @@
   .basic-info-table {
     color: #303133;
     font-size: 14px;
+    .member-name{
+      width: 140px;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
     .nick-name {
       color: #909399;
       font-size: 14px;

src/components/allCustomers/allCustomersList.vue

@@ -123,7 +123,7 @@
                   <img :src="row.thirdImgUrl || defaultImg" class="basic-img" />
 
                   <div>
-                    <div>
+                    <div class="member-name">
                       <span v-if="row.memberName">{{
                         row.memberName
                       }}</span>
@@ -131,7 +131,7 @@
                         >({{ row.nickName }})</span
                       >
                     </div>
-                    <div v-if="row.phoneNumber">
+                    <div v-if="row.phoneNumber" class="phone-number">
                       {{ row.phoneNumber }}
                     </div>
                   </div>

src/components/wechatmembers/abnormal-member/abnormal-member-list/abnormal-member.js

@@ -436,7 +436,7 @@ export default {
         startDate,
         endDate,
         phoneNameCard,
-        all: selectPage.type == 2 ? 1 : 0,
+        all: selectPage.type == 2  ? 2 : 1,
         memberIds: multipleList.map(item => {
           return item.memberId;
         }),
@@ -461,7 +461,7 @@ export default {
           this.dialogExportFieldVisible = true;
         });
       } else {
-        this.$message.warning("无数据");
+        this.$message.warning("暂无数据，无法导出");
       }
     },
     // 去配置

src/components/wechatmembers/abnormal-member/abnormal-member-list/abnormal-member.less

@@ -26,6 +26,12 @@
   .basic-info-table {
     color: #303133;
     font-size: 14px;
+    .member-name{
+      width: 140px;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
     .nick-name {
       color: #909399;
       font-size: 14px;
@@ -109,6 +115,7 @@
     font-size: 14px;
   }
   .no-update-alert{
+    width: auto;
     margin-top: 15px;
     /deep/.el-icon-info{
       color: #2F54EB;

src/components/wechatmembers/abnormal-member/abnormal-member-list/abnormal-member.vue

@@ -117,7 +117,7 @@
                 <img :src="row.thirdImgUrl || defaultImg" class="basic-img" />
 
                 <div>
-                  <div>
+                  <div class="member-name">
                     <span v-if="row.memberName">{{ row.memberName }}</span>
                     <span class="nick-name" v-if="row.nickName"
                       >({{ row.nickName }})</span
@@ -345,14 +345,15 @@
           </svg>
           <div class="label">列表数据将在次日全量更新</div>
 
-          <el-alert
-            v-if="autoFrozen == 2"
-            class="no-update-alert"
-            title="异常会员规则配置已修改，如需解冻此前异常转冻结的会员，可前往冻结会员列表，筛选冻结方式，进行批量解冻"
-            type="info"
-            :closable="false"
-            show-icon
-          />
+          <el-row type="flex" justify="center" v-if="autoFrozen == 2">
+            <el-alert
+              class="no-update-alert"
+              title="异常会员规则配置已修改，如需解冻此前异常转冻结的会员，可前往冻结会员列表，筛选冻结方式，进行批量解冻"
+              type="info"
+              :closable="false"
+              show-icon
+            />
+          </el-row>
         </div>
       </div>
       

src/components/wechatmembers/frozen-member/frozen-list/frozen-list.js

@@ -267,7 +267,7 @@ export default {
         memberIds: ids.join(","), // 会员id
         remark: "", // 备注暂留
         //所有会员是2 当前是1 其他是0
-        isCurrent: selectPage.type == 2 ? 1 : 0,
+        isCurrent: selectPage.type == 2 ? 2 : 1,
         status: 0, // 1 冻结 0 解冻
         phoneNameCard,
       };

src/components/wechatmembers/frozen-member/frozen-list/frozen-list.less

@@ -26,6 +26,12 @@
   .basic-info-table {
     color: #303133;
     font-size: 14px;
+    .member-name{
+      width: 140px;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
     .nick-name {
       color: #909399;
       font-size: 14px;

src/components/wechatmembers/frozen-member/frozen-list/frozen-list.vue

@@ -111,7 +111,7 @@
                 <img :src="row.thirdImgUrl || defaultImg" class="basic-img" />
 
                 <div>
-                  <div>
+                  <div class="member-name">
                     <span v-if="row.memberName">{{ row.memberName }}</span>
                     <span class="nick-name" v-if="row.nickName"
                       >({{ row.nickName }})</span

src/components/wechatmembers/frozen-member/frozen-member/frozen-member.less

@@ -15,6 +15,12 @@
     .basic-info-table {
       color: #303133;
       font-size: 14px;
+      .member-name{
+        width: 140px;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
       .nick-name {
         color: #909399;
         font-size: 14px;

src/components/wechatmembers/frozen-member/frozen-member/frozen-member.vue

@@ -26,19 +26,21 @@
         ref="multipleTable"
         class="member-table"
         @selection-change="handleSelectionChange"
+        v-loading="load"
       >
         <el-table-column
           type="selection"
           min-width="30"
           fixed="left"
         ></el-table-column>
-        <el-table-column label="会员信息">
+        <el-table-column label="会员信息" :min-width="200">
           <template slot-scope="{ row }">
             <!-- 基本信息 -->
-            <el-row type="flex" align="middle" class="basic-info-table">
+            <el-row type="flex" align="middle" class="basic-info-table"
+            @click.native="linkDetail(row.memberId)">
               <img :src="row.thirdImgUrl || defaultImg" class="basic-img" />
               <div>
-                <div>
+                <div class="member-name">
                   <span v-if="row.memberName">{{ row.memberName }}</span>
                   <span class="nick-name" v-if="row.nickName"
                     >({{ row.nickName }})</span

src/components/wechatmembers/frozen-member/white-list/white-list.js

@@ -46,6 +46,7 @@ export default {
   },
   data() {
     return {
+      load: false,
       freezeDialogOptions: {
         count: 1,
         isBatchFreeze: 0,
@@ -81,6 +82,7 @@ export default {
   },
   methods: {
     loadData(){
+      this.load = true;
       doFetchGet(url.getFrozenWhiteList, this.searchData).then((res) => {
         let {errorCode,result} = res.data;
         if (errorCode === 0) {
@@ -90,7 +92,7 @@ export default {
         } else {
           checkFalse(res.data.message);
         }
-      });
+      }).finally(()=>this.load = false)
     },
     handleSizeChange(pageSize){
       this.searchData.pageSize = pageSize;
@@ -108,20 +110,19 @@ export default {
     },
     // 移出白名单
     clickRemoveItem(item){
+      this.load = true;
       doFetchGet(url.removeFrozenWhiteMember,{
         removeType: 1,
         memberId: item.memberId,
       }).then(res=>{
-        if(res.data.errorCode) {
+        if(res.data.errorCode == 0) {
           this.$message({
             message: "移出成功",
             type: "success"
           });
-          this.$nextTick(_ => {
-            this.loadData();
-          });
+          this.loadData();
         }
-      })
+      }).finally(()=>this.load = false)
     },
     // 点击删除并冻结
     clickRemoveAndFreeze(item){
@@ -131,6 +132,7 @@ export default {
         visible: true,
         title: '移出并冻结会员',
         submit:async (options)=>{
+          this.load = true;
           doFetchGet(url.removeFrozenWhiteMember,{
             removeType: 2,
             status: 1,
@@ -143,8 +145,9 @@ export default {
               this.freezeDialogOptions = {
                 visible: false
               };
+              this.loadData();
             }
-          })
+          }).finally(()=>this.load = false)
         }
       }
     },

src/components/wechatmembers/frozen-member/white-list/white-list.less

@@ -33,6 +33,12 @@
     .basic-info-table {
       color: #303133;
       font-size: 14px;
+      .member-name{
+        width: 140px;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
       .nick-name {
         color: #909399;
         font-size: 14px;

src/components/wechatmembers/frozen-member/white-list/white-list.vue

@@ -36,6 +36,7 @@
       tooltip-effect="dark"
       ref="multipleTable"
       class="member-table"
+      v-loading="load"
     >
       <el-table-column label="会员信息" :min-width="200">
         <template slot-scope="{ row }">
@@ -44,11 +45,11 @@
             type="flex"
             align="middle"
             class="basic-info-table"
-            @click="linkDetail(row.memberId)"
+            @click.native="linkDetail(row.memberId)"
           >
             <img :src="row.thirdImgUrl || defaultImg" class="basic-img" />
             <div>
-              <div>
+              <div class="member-name">
                 <span v-if="row.memberName">{{ row.memberName }}</span>
                 <span class="nick-name" v-if="row.nickName"
                   >({{ row.nickName }})</span