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

src/components/allCustomers/customerDetail.vue

@@ -374,7 +374,7 @@
               <div :class="['scores', { 'is-clique': showClique }]">
                 <div class="scores-box" v-if="showClique" @click="goLinkWithClique('/enterpriseIntegralDataPage')">
                   <div class="scores-info">
-                    <icon-label-value label="集团积分" :value="memberInfo.cliqueMemberIntegral ? memberInfo.cliqueMemberIntegral : 0">
+                    <icon-label-value label="集团积分" :value="memberInfo.totalPointEnterprise || 0">
                     <div class="score-icon" slot="icon">
                       <i class="iconfont icon-jifenjiabei"></i>
                     </div>

src/components/allCustomers/info.js

@@ -182,11 +182,10 @@ export default {
   watch: {
     count: function (n, o) {
       if (n === 3) {
+        this.fullscreenLoading = false;
         if (this.memberInfo.erpIntegralFlag) {
-          // 需要erp积分
-          doFetch(url.getErpIntegral, { cardNo: this.memberInfo.cardNum })
+          doFetchGet(url.getErpIntegral, { cardNo: this.memberInfo.cardNum || ''})
             .then(res => {
-              this.fullscreenLoading = false;
               if (res.data.errorCode === 0) {
                 if (
                   res.data.result == null ||
@@ -201,15 +200,12 @@ export default {
                 this.memberInfo.accumulatPoints = res.data.result;
                 this.memberInfo.invalidIntegral = 0;
               } else {
-                this.fullscreenLoading = false;
                 checkFalse(res.data.message);
               }
             })
             .catch(err => {
               checkStatus(err);
             });
-        } else {
-          this.fullscreenLoading = false;
         }
       }
     },
@@ -321,7 +317,8 @@ export default {
               if (api === 'memberLoadmemberInfo') {
                
                 this.memberInfo = Object.assign({}, ret.memberInfo);
-                this.memberInfo.totalPoint= ret.memberInfo.invalidIntegral+ret.memberInfo.accumulatPoints
+                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/axios/url.js

@@ -107,7 +107,9 @@ const urlConfig = {
   getMemberLogReason: '/api-plug/member-oper-reason-list',
   getFrozenList: "/api-member/ajax-frozen-members",
   batchUpdateFrozen: "/api-member/members-batch-update-frozen",
-  getExceptionList: '/api-member/list-exception-member'
+  getExceptionList: '/api-member/list-exception-member',
+
+  getErpIntegral: '/api-member/member-erp-integral'
 }
 
 const defaultUrl = Object.assign({}, urlConfig);

src/components/wechatmembers/enterpriseIntegralDetial.vue

 <template>
        
-<div >
+<div v-loading="loading">
     <div class="search-top mBottom20">
       <div class="left-search-wrap">
         <el-select
@@ -68,8 +68,7 @@
         <el-table-column
           prop="createTime"
           label="时间"
-          min-width="155px"
-          show-overflow-tooltip
+          min-width="130px"
         >
         <template slot-scope="scope">
             <div class="line-20">{{ scope.row.createTime | formatYMD }}</div>
@@ -80,7 +79,6 @@
           prop="intervalInout"
           label="日志类型"
           min-width="90px"
-          show-overflow-tooltip
         >
           <template slot-scope="scope">
             <span v-if="scope.row.intervalInout == 1">积分获取</span>
@@ -91,20 +89,17 @@
           prop="memberIntegralName"
           label="事由"
           min-width="90px"
-          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           prop="intervalHistory"
           label="日志详情"
           min-width="90px"
-          show-overflow-tooltip
         ></el-table-column>
         <el-table-column prop="sourceType" label="来源渠道" min-width="90px" :formatter="formatSourceType" show-overflow-tooltip></el-table-column>
         <el-table-column
           prop="brandName"
           label="来源品牌"
           min-width="150px"
-          show-overflow-tooltip
         >
         <template slot-scope="scope">
           <el-tooltip placement="top">
@@ -113,17 +108,20 @@
               </div>
               <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.brandName }}</div>
           </el-tooltip>
-            <!-- <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.brandName || '--'}}</div> -->
         </template>
         </el-table-column>
         <el-table-column
           prop="remark"
           label="备注"
           min-width="160px"
-          show-overflow-tooltip
         >
         <template slot-scope="scope">
-            <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.remark }}</div>
+          <el-tooltip placement="top">
+              <div slot="content">
+                <p>{{scope.row.remark}}</p>
+              </div>
+              <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.remark }}</div>
+          </el-tooltip>
         </template>
         </el-table-column>
       </el-table>
@@ -192,15 +190,14 @@ export default {
         {label:'冻结积分',value:1},
         {label:'可用积分',value:0}
       ],
-      memberData: [
-        // {createTime:12334494943,intervalInout:1,memberIntegralName:'新增其他',intervalHistory:1333,sourceType:1}
-      ],
+      memberData: [],
       form:{
         intervalInOut: -1,
         dictCode: -1,
         sourceType: -1,
         frozenStatus:-1,
       },
+      loading: false
     };
   },
   mixins: [mixin],
@@ -225,31 +222,26 @@ export default {
       this.getIntegralDataPage();
     },
     getIntegralDataPage() {
+      this.loading = true;
       let para = this.form
       para['memberId'] = this.memberId
       para['pageSize'] = this.page.pageSize
       para['currentPage'] = this.page.currentPage
       para['beginTime'] = this.dateDefault[0]
       para['endTime'] = this.dateDefault[1]
-      // console.log(para);
       doFetch(url.enterpriseIntegralDetailData, para)
         .then(res => {
           if (res.data.errorCode === 0) {
-            this.memberData =
-              res.data.result.page.result 
-              // &&
-              // res.data.result.page.result.map(ele => ({
-              //   ...ele,
-              //   mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : "--",
-              //   openStoreName: !!ele.openStoreName ? ele.openStoreName : "--"
-              // }));
+            this.memberData = res.data.result.page.result;
             this.page.currentPage = res.data.result.page.currentPage;
             this.page.totalCount = res.data.result.page.totalCount;
           } else {
             checkFalse(res.data.message);
           }
+          this.loading = false;
         })
         .catch(err => {
+          this.loading = false;
           checkStatus(err);
         });
     },
@@ -285,7 +277,7 @@ export default {
 };
 </script>
 
-<style lang="stylus">
+<style lang="scss">
 .search-top{
   display: flex;
   justify-content:space-between;
@@ -306,6 +298,17 @@ export default {
   overflow: auto;
 }
 .line-20{
-  line-height: 20px;
+    line-height: 20px;
+}
+.integral-box{
+    display: flex;
+    align-items: center;
+}
+.text-ellipsis-2 {
+    overflow: hidden;
+    -webkit-line-clamp: 2;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
 }
 </style>