From 4234ea9dd93e9fdedbda686e78622e31e99f5ec5 Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Tue, 2 Dec 2025 18:43:56 +0800 Subject: [PATCH] update --- pages/pointsRedemption/index.vue | 93 +++++++++++++++++++------------- 1 file changed, 55 insertions(+), 38 deletions(-) diff --git a/pages/pointsRedemption/index.vue b/pages/pointsRedemption/index.vue index 250382d1..8c2eb681 100644 --- a/pages/pointsRedemption/index.vue +++ b/pages/pointsRedemption/index.vue @@ -158,9 +158,15 @@ export default { } }, - onLoad() { - this.getUserPoints(); - this.handleGetUserDetail() + async onLoad() { + // this.getUserPoints(); + // this.handleGetUserDetail() + const results = await Promise.all([ + this.getUserPoints(), + this.handleGetUserDetail() + ]); + this.userPoints = results[0] + this.platformUserPoints = results[1] }, computed: { ...mapGetters({ @@ -171,45 +177,46 @@ export default { // 拿到用户详情 async handleGetUserDetail() { let _this = this; - _this.$api + + const data = await _this.$api .getCoop({ action_type: "GetMembershipInfo", WechatUserId: _this.user.WechatUserId, noLoading: true, }) - .then(function (data) { - if (data.ResultCode === "100") { - let _data = data; - _this.userInfo = _data.Data - _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || ""; - _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || ""; - _this.user.MEMBERSHIP_LEVEL_TEXT = - _data.Data.MEMBERSHIP_LEVEL_TEXT || ""; - _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || ""; - _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || ""; - _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || ""; - _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || ""; - _this.user.ISPLUS = _data.Data.ISPLUS || ""; - _this.user.INDUSTRY_MEMBERSHIP_ID = - _data.Data.INDUSTRY_MEMBERSHIP_ID || ""; - _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || ""; - _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || ""; - _this.user.InviteCode = _data.Data.InviteCode || ""; - _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || ""; - _this.user.MEMBERSHIP_MOBILEPHONE = - _data.Data.MEMBERSHIP_MOBILEPHONE || ""; - _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL; - _this.user.TEST_MEMBER = _data.Data.TEST_MEMBER || ""; - _this.$store.commit("setUser", _this.user); + if (data.ResultCode === "100") { + let _data = data; + _this.userInfo = _data.Data + _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || ""; + _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || ""; + _this.user.MEMBERSHIP_LEVEL_TEXT = + _data.Data.MEMBERSHIP_LEVEL_TEXT || ""; + _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || ""; + _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || ""; + _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || ""; + _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || ""; + _this.user.ISPLUS = _data.Data.ISPLUS || ""; + _this.user.INDUSTRY_MEMBERSHIP_ID = + _data.Data.INDUSTRY_MEMBERSHIP_ID || ""; + _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || ""; + _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || ""; + _this.user.InviteCode = _data.Data.InviteCode || ""; + _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || ""; + _this.user.MEMBERSHIP_MOBILEPHONE = + _data.Data.MEMBERSHIP_MOBILEPHONE || ""; + _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL; + _this.user.TEST_MEMBER = _data.Data.TEST_MEMBER || ""; + _this.$store.commit("setUser", _this.user); - _this.platformUserPoints = _data.Data.MEMBERSHIP_POINT + // _this.platformUserPoints = _data.Data.MEMBERSHIP_POINT - _this.$forceUpdate() - } else { - // _this.setUser({}); - _this.$store.commit("setUser", user); - } - }); + _this.$forceUpdate() + return _data.Data.MEMBERSHIP_POINT + } else { + // _this.setUser({}); + _this.$store.commit("setUser", user); + return 0 + } }, // 切换兑换方向 @@ -232,12 +239,14 @@ export default { const data = await this.$api.$post('/MemberApi/ThirdInterface/GetYTSLMemberPoint', req) uni.hideLoading() if (data.Result_Code === 100) { - this.userPoints = data.Result_Data.balance; + // this.userPoints = data.Result_Data.balance; + return data.Result_Data.balance; } else { uni.showToast({ title: data.Result_Desc, icon: 'none' }); + return 0 } }, @@ -326,8 +335,16 @@ export default { }); this.sourcePointsInput = ''; this.destinationPointsOutput = 0; - this.getUserPoints(); // 刷新ETC积分 - this.handleGetUserDetail(); // 刷新彩云驿积分 + // this.getUserPoints(); // 刷新ETC积分 + // this.handleGetUserDetail(); // 刷新彩云驿积分 + + const results = await Promise.all([ + this.getUserPoints(), + this.handleGetUserDetail() + ]); + this.userPoints = results[0] + this.platformUserPoints = results[1] + } else { uni.showToast({ title: data.Result_Desc,