update: 接口

src/components/allCustomers/info.js

@@ -82,6 +82,7 @@ export default {
       labelDialogVisible: false, // 修改手工标签弹窗
       nationCodeList: [], // 手机区号列表
       gradeList: [], // 等级列表
+      count: 0,
       // 模块列表
       customerInfoItemList: [
         { title: "基本信息", name: "basic", class: "basic-info-contain" },
@@ -187,6 +188,11 @@ export default {
       ]
     };
   },
+  watch: {
+    count: function(n, o) {
+      if (n === 4) this.fullscreenLoading = false;
+    }
+  },
   filters: {
     customerTypeFilter: v => {
       switch (v) {
@@ -229,65 +235,89 @@ export default {
     this.getGradeList();
   },
   methods: {
-    async initData() {
+    initData() {
       this.fullscreenLoading = true;
-      await this.getCustomerDetail();
-      await this.getLogPage();
-      this.fullscreenLoading = false;
+      this.getAllDetail();
+      this.getLogPage();
     },
-    async getCustomerDetail() {
-      const res = await doFetch(url.memberLoadBaseDetail, {
-        memberId: this.memberId,
-        pageName: this.pageName
+    getAllDetail() {
+      const param = { memberId: this.memberId, pageName: this.pageName };
+      const urlArr = [
+        "memberLoadBaseDetail",
+        "memberLoadmemberInfo",
+        "memberLoadTagDetail"
+      ];
+      urlArr.map(api => {
+        doFetch(url[api], param)
+          .then(res => {
+            if (res.data.errorCode === 0) {
+              const ret = res.data.result;
+              if (api === "memberLoadBaseDetail") {
+                this.member = Object.assign({}, ret.member);
+                this.extendInfo = Object.assign({}, ret.extendInfo);
+              }
+              if (api === "memberLoadmemberInfo") {
+                this.memberInfo = Object.assign({}, ret.memberInfo);
+              }
+              if (api === "memberLoadTagDetail") {
+                this.tagAndRemarkInfo = Object.assign(
+                  {},
+                  {
+                    memberGroup: {
+                      memberGradeGroup:
+                        ret.tagAndRemarkInfo.memberGroup.memberGradeGroup || {},
+                      memberTagGroupList:
+                        ret.tagAndRemarkInfo.memberGroup.memberTagGroupList ||
+                        {}
+                    },
+                    tag: {
+                      tagsList: ret.tagAndRemarkInfo.tag.tagsList || [],
+                      otherTagsList:
+                        ret.tagAndRemarkInfo.tag.otherTagsList || [],
+                      weimobTagsList:
+                        ret.tagAndRemarkInfo.tag.weimobTagsList || []
+                    },
+                    remarkList: ret.tagAndRemarkInfo.remarkList || [],
+                    dictFigureList: ret.tagAndRemarkInfo.dictFigureList || []
+                  }
+                );
+              }
+            } else {
+              checkFalse(resBase.data.message);
+            }
+          })
+          .catch(err => {
+            checkStatus(err);
+          })
+          .finally(_ => this.count++);
       });
-      if (res.data.errorCode === 0) {
-        const ret = res.data.result;
-        this.member = Object.assign({}, ret.member);
-        this.extendInfo = Object.assign({}, ret.extendInfo);
-        this.memberInfo = Object.assign({}, ret.memberInfo);
-        this.tagAndRemarkInfo = Object.assign(
-          {},
-          {
-            memberGroup: {
-              memberGradeGroup:
-                ret.tagAndRemarkInfo.memberGroup.memberGradeGroup || {},
-              memberTagGroupList:
-                ret.tagAndRemarkInfo.memberGroup.memberTagGroupList || {}
-            },
-            tag: {
-              tagsList: ret.tagAndRemarkInfo.tag.tagsList || [],
-              otherTagsList: ret.tagAndRemarkInfo.tag.otherTagsList || [],
-              weimobTagsList: ret.tagAndRemarkInfo.tag.weimobTagsList || []
-            },
-            remarkList: ret.tagAndRemarkInfo.remarkList || [],
-            dictFigureList: ret.tagAndRemarkInfo.dictFigureList || []
-          }
-        );
-      } else {
-        checkFalse(res.data.message);
-        return false;
-      }
     },
     // 用户日志
-    async getLogPage() {
+    getLogPage() {
       this.tableLoading = true;
-      const res = await doFetch(url.logPage, {
+      doFetch(url.logPage, {
         ...this.logPageParam,
         memberId: this.memberId
-      });
-      this.tableLoading = false;
-      if (res.data.errorCode === 0) {
-        this.tableData = res.data.result.page.result || [];
-        this.tableData = this.tableData.map(el => {
-          if (typeof el.operRemark == "string")
-            el.operRemark = el.operRemark.replace(/\n/g, " <br />");
-          return el;
-        });
-        this.totalCount = res.data.result.page.totalCount;
-      } else {
-        checkFalse(res.data.message);
-        return false;
-      }
+      })
+        .then(res => {
+          this.tableLoading = false;
+          if (res.data.errorCode === 0) {
+            this.tableData = res.data.result.page.result || [];
+            this.tableData = this.tableData.map(el => {
+              if (typeof el.operRemark == "string")
+                el.operRemark = el.operRemark.replace(/\n/g, " <br />");
+              return el;
+            });
+            this.totalCount = res.data.result.page.totalCount;
+          } else {
+            checkFalse(res.data.message);
+            return false;
+          }
+        })
+        .catch(err => {
+          checkStatus(err);
+        })
+        .finally(_ => this.count++);
     },
     // 更新头像
     updateImgUrl() {

src/components/axios/url.js

@@ -65,7 +65,9 @@ const urlConfig = {
   integralOperateType:  '/api-member/member-integral-operate-type',//积分操作类型(字典列表)
   memberIntegralUpdate:  '/api-member/member-integral-update', //调整积分进行保存
   enterpriseInfo: '/api-member/enterprise-info',//获取企业配置信息
-  memberLoadBaseDetail: '/api-member/member-load-base-detail',//获取客户配置信息
+  memberLoadBaseDetail: '/api-member/member-load-base-detail',//获取客户基本信息
+  memberLoadTagDetail: '/api-member/member-load-tag-remark',//获取客户标签信息
+  memberLoadmemberInfo: '/api-member/member-load-member-info',//获取客户会员卡信息
   posInfo: '/api-member/member-load-member-pos-info',//pos会员详情 会员信息
   posBaseDetail: '/api-member/member-load-update-pos-base-detail',//修改pos会员基本信息
   batchUpdateStore: '/api-member/batch-update-members-store', // 回收站修改主门店