Merge branch 'feature/7月迭代-会员' into dev

src/components/allCustomers/info.js

@@ -184,7 +184,7 @@ export default {
       if (n === 3) {
         this.fullscreenLoading = false;
         if (this.memberInfo.erpIntegralFlag) {
-          doFetch(url.getErpIntegral, { cardNo: this.memberInfo.cardNum || ''})
+          doFetchGet(url.getErpIntegral, { cardNo: this.memberInfo.cardNum || ''})
             .then(res => {
               if (res.data.errorCode === 0) {
                 if (
@@ -317,8 +317,8 @@ export default {
               if (api === 'memberLoadmemberInfo') {
                
                 this.memberInfo = Object.assign({}, ret.memberInfo);
-                this.memberInfo.totalPoint= ret.memberInfo.invalidIntegral+ret.memberInfo.accumulatPoints;
-                this.memberInfo.totalPointEnterprise= ret.memberInfo.cliqueMemberInvalidIntegral+ret.memberInfo.cliqueMemberIntegral;
+                this.memberInfo.totalPoint= ret.memberInfo.invalidIntegral + ret.memberInfo.accumulatPoints;
+                this.memberInfo.totalPointEnterprise= parseInt(ret.memberInfo.cliqueMemberInvalidIntegral) + parseInt(ret.memberInfo.cliqueMemberIntegral);
               }
               if (api === 'memberLoadTagDetail') {
                 this.tagAndRemarkInfo = Object.assign(

src/components/wechatmembers/enterpriseIntegralDetial.vue

 <template>
        
-<div >
+<div v-loading="loading">
     <div class="search-top mBottom20">
       <div class="left-search-wrap">
         <el-select
@@ -197,6 +197,7 @@ export default {
         sourceType: -1,
         frozenStatus:-1,
       },
+      loading: false
     };
   },
   mixins: [mixin],
@@ -221,6 +222,7 @@ export default {
       this.getIntegralDataPage();
     },
     getIntegralDataPage() {
+      this.loading = true;
       let para = this.form
       para['memberId'] = this.memberId
       para['pageSize'] = this.page.pageSize
@@ -236,8 +238,10 @@ export default {
           } else {
             checkFalse(res.data.message);
           }
+          this.loading = false;
         })
         .catch(err => {
+          this.loading = false;
           checkStatus(err);
         });
     },

src/components/wechatmembers/enterpriseIntergralWithhold.vue

 <template>
 
-  <div>
+  <div v-loading="loading">
     <div class="mBottom20 search-top">
       <div class="left-search-wrap">
         <el-select class="width160" v-model="processStatus" placeholder="处理状态" @change="handleSearch">
@@ -128,7 +128,8 @@ export default {
            {code: 3 ,name:'到时失效',icon:'dm-status--error'},
             {code: 4 ,name:'取消操作',icon:'dm-status--info'},
         ],
-        processStatus: -1
+        processStatus: -1,
+        loading: false
     };
   },
   methods: {
@@ -145,6 +146,7 @@ export default {
       this.getIntegralDataPage();
     },
     getIntegralDataPage() {
+      this.loading = true;
       doFetch(url.enterpriseIntegralWithholdData, {
         memberId: this.memberId,
         pageSize: this.page.pageSize,
@@ -154,8 +156,8 @@ export default {
         endTime: this.dateDefault[1],
       })
         .then(res => {
+          this.loading = false;
           if (res.data.errorCode === 0) {
-            // res.data.result.page.result[0].openStoreName = '积分兑换积分兑换是吗积分兑换是吗积分兑换是吗积分兑换是吗是吗'
             this.memberData = res.data.result.page.result;
             this.page.currentPage = res.data.result.page.currentPage;
             this.page.totalCount = res.data.result.page.totalCount;
@@ -164,6 +166,7 @@ export default {
           }
         })
         .catch(err => {
+          this.loading = false;
           checkStatus(err);
         });
     },