Merge remote-tracking branch 'origin/master'

src/views/club/list.vue

@@ -62,7 +62,7 @@
       <el-table-column label="账号" width="150" align="center" prop="account" />
       <el-table-column label="机构名称" width="180" align="center" prop="userName" />
       <el-table-column label="联系人" width="100" align="center" prop="linkMan" />
-      <el-table-column label="手机号" width="110" align="center" prop="bindMobile" />
+      <el-table-column label="手机号" width="140" align="center" prop="bindMobile" />
       <el-table-column class-name="status-col" label="上线状态" width="150" align="center" prop="status">
         <template slot-scope="{row}">
           <el-tag v-if="row.clubStatus*1===91" type="danger" size="small">已下线</el-tag>

src/views/club/operateList.vue

@@ -55,14 +55,16 @@
           {{ ((pageNum-1)*listQuery.pageSize)+scope.$index+1 }}
         </template>
       </el-table-column>
-      <el-table-column label="账号" width="130" align="center" prop="account" />
-      <el-table-column label="姓名" align="center" prop="linkName" />
-      <el-table-column label="手机号码" width="110" align="center" prop="mobile" />
-      <el-table-column label="邀请码" width="130" align="center" prop="invitationCode">
+      <el-table-column label="账号" align="center" prop="account" />
+      <el-table-column label="姓名" min-width="80" align="center" prop="linkName" />
+      <el-table-column label="手机号码" min-width="80" align="center" prop="mobile" />
+      <el-table-column label="邀请码" min-width="80" align="center" prop="invitationCode">
         <template slot-scope="{row}">
-          <span v-if="row.invitationCode" style="text-align: center;float:left">{{ row.invitationCode }}</span>
-          <span v-if="row.invitationCode" :style="{color: rexpStautsColor(row.effectiveFlag)}">{{ rexpStautsText(row.effectiveFlag) }}</span>
-          <span v-else type="info">----</span>
+          <div style="width:130px;margin: 0 auto;">
+            <span v-if="row.invitationCode" style="text-align: center;float:left">{{ row.invitationCode }}</span>
+            <span v-if="row.invitationCode" :style="{color: rexpStautsColor(row.effectiveFlag)}">{{ rexpStautsText(row.effectiveFlag) }}</span>
+            <span v-else type="info">----</span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column class-name="status-col" label="状态" width="50" align="center" prop="status">
@@ -71,7 +73,7 @@
           <!-- <i v-else class="el-icon-error" style="color: #E6A23C;font-size: 20px;" /> -->
         </template>
       </el-table-column>
-      <el-table-column align="center" label="微信昵称" prop="nickName">
+      <el-table-column label="微信昵称" align="center" prop="nickName">
         <template slot-scope="{row}">
           <span v-if="row.nickName">{{ row.nickName }}</span>
           <span v-else>----</span>

src/views/goods/list-commonly.vue

@@ -162,14 +162,12 @@ export default {
           sorts.push(item.id + '-' + Math.abs(item.commonlyProductSort))
         }
       })
-      this.listQuery.id = ''
-      this.listQuery.productName = ''
-      this.listQuery.shopName = ''
-      this.listQuery.classifyID = ''
       saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.modulesId }).then(response => {
         this.$message({ message: response.msg, type: 'success', center: true })
+        this.clearListQuery()
         this.fetchData()
       }).catch(() => {
+        this.clearListQuery()
         this.fetchData()
       })
     },
@@ -180,11 +178,19 @@ export default {
         type: 'warning'
       }).then(() => {
         canncelProduct({ id: row.id, modules: this.modulesId }).then(() => {
+          this.clearListQuery()
           this.fetchData()
         }).catch(() => {
+          this.clearListQuery()
           this.fetchData()
         })
       })
+    },
+    clearListQuery() {
+      this.listQuery.id = ''
+      this.listQuery.productName = ''
+      this.listQuery.shopName = ''
+      this.listQuery.classifyID = ''
     }
   }
 }

src/views/goods/list-preferential.vue

@@ -162,14 +162,12 @@ export default {
           sorts.push(item.id + '-' + Math.abs(item.preferentialProductSort))
         }
       })
-      this.listQuery.id = ''
-      this.listQuery.productName = ''
-      this.listQuery.shopName = ''
-      this.listQuery.classifyID = ''
       saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.modulesId }).then(response => {
         this.$message({ message: response.msg, type: 'success', center: true })
+        this.clearListQuery()
         this.fetchData()
       }).catch(() => {
+        this.clearListQuery()
         this.fetchData()
       })
     },
@@ -180,11 +178,19 @@ export default {
         type: 'warning'
       }).then(() => {
         canncelProduct({ id: row.id, modules: this.modulesId }).then(() => {
+          this.clearListQuery()
           this.fetchData()
         }).catch(() => {
+          this.clearListQuery()
           this.fetchData()
         })
       })
+    },
+    clearListQuery() {
+      this.listQuery.id = ''
+      this.listQuery.productName = ''
+      this.listQuery.shopName = ''
+      this.listQuery.classifyID = ''
     }
   }
 }

src/views/goods/list-preferred.vue

@@ -162,14 +162,12 @@ export default {
           sorts.push(item.id + '-' + Math.abs(item.preferredProductSort))
         }
       })
-      this.listQuery.id = ''
-      this.listQuery.productName = ''
-      this.listQuery.shopName = ''
-      this.listQuery.classifyID = ''
       saveGoodsSort({ newProducSorttList: sorts.join(','), modules: this.modulesId }).then(response => {
         this.$message({ message: response.msg, type: 'success', center: true })
+        this.clearListQuery()
         this.fetchData()
       }).catch(() => {
+        this.clearListQuery()
         this.fetchData()
       })
     },
@@ -180,11 +178,19 @@ export default {
         type: 'warning'
       }).then(() => {
         canncelProduct({ id: row.id, modules: this.modulesId }).then(() => {
+          this.clearListQuery()
           this.fetchData()
         }).catch(() => {
+          this.clearListQuery()
           this.fetchData()
         })
       })
+    },
+    clearListQuery() {
+      this.listQuery.id = ''
+      this.listQuery.productName = ''
+      this.listQuery.shopName = ''
+      this.listQuery.classifyID = ''
     }
   }
 }