Merge branch 'feature/9月基础迭代' into dev

# Conflicts:
#	src/components/axios/url.js

src/components/allCustomers/index.js

@@ -48,6 +48,7 @@ export default {
         searchAble: false,
         multipleAble: true
     },
+    isShowClique: '',
       importList:[
         {
           importType: 18,
@@ -250,6 +251,7 @@ export default {
     }
   },
   created() {
+    this.getcliqueMemberRelation();
     this.$store.commit("mutations-slide", true);
     this.initialize();
     this.getGradeList();
@@ -263,7 +265,12 @@ export default {
   mounted() {
     this.importList = this.importList.map((item, index)=>{
       if(this.getCodeAuth(item.btnCode)){
-        return item;
+        console.log(typeof this.isShowClique, 'this.isShowClique');
+        if(item.btnCode == 'importMember' && this.isShowClique == 1) {
+          return {};
+        }else {
+          return item;
+        }
       }else{
         return {};
       }
@@ -284,6 +291,15 @@ export default {
   },
   beforUpdate() {},
   methods: {
+    getcliqueMemberRelation() {
+      doFetchGet(url.cliqueMemberRelation, {}).then((res)=>{
+        console.log(res, 'res');
+        let {errorCode,result} = res.data;
+        if(errorCode == 0){
+          this.isShowClique = result;
+        }
+      })
+    },
     onSelectTreeChange(data) {
       this.customerType = data;
     },

src/components/allCustomers/order-list/order-table.vue

 <template>
-  <div>
+  <div v-loading="loadings">
     <div class="search-bar">
       <el-input v-model="params.orderNumber" @change="onSearch" prefix-icon="el-icon-search" clearable placeholder="请输入订单/退款/退换单号" style="width: 260px"></el-input>
       <el-select v-model="params.orderType" @change="onSearch" clearable placeholder="全部订单类型" style="margin-left: 10px;width: 160px">
@@ -257,6 +257,7 @@ export default {
         dateRange: [],
         total: 0
       },
+      loadings: false,
       tableData: [
         // {
         //   orderNumber: '单号（订单/退款单）',
@@ -375,6 +376,7 @@ export default {
       return result;
     },
     getTableData() {
+      this.loadings = true;
       const { memberId, pageSize, currentPage, orderType, channelType, dateRange, orderNumber } = this.params;
       const params = { memberId, pageSize, currentPage, orderType, channelType, orderNumber };
       if (Array.isArray(dateRange) && dateRange.length > 0) {
@@ -391,6 +393,7 @@ export default {
           return el;
         });
         this.params.total = page.totalCount;
+        this.loadings = false;
       });
     },
     onSearch() {

src/components/axios/url.js

@@ -124,7 +124,8 @@ const urlConfig = {
   batchUpdateFrozen: "/api-member/members-batch-update-frozen",
   getExceptionList: '/api-member/list-exception-member',
 
-  getErpIntegral: '/api-member/member-erp-integral'
+  getErpIntegral: '/api-member/member-erp-integral',
+  cliqueMemberRelation: '/api-member/clique-member-relation',//判断是否有展示会员导入的权限  1不可，2，null可
 }
 
 const defaultUrl = Object.assign({}, urlConfig);