From 94135fd604db283f890e9f649882add4c76164f7 Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期一, 12 六月 2023 15:14:12 +0800
Subject: [PATCH] change num
---
pages/login/newlogin.vue | 1 +
pages/login/login.vue | 1 +
pages/index/home.vue | 15 ++++++++++++---
App.vue | 3 ++-
store/index.js | 4 ++--
5 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/App.vue b/App.vue
index a138967..5a4b89d 100755
--- a/App.vue
+++ b/App.vue
@@ -72,8 +72,9 @@
await this.login(userInfo);
this.$request('/api/Member/checkNum', 'POST').then(res => {
console.log(res,"checkNumres")
- userInfo.num = res.data.num+res.data.pay_num // 鏇存柊鏁伴噺
+ userInfo.num = res.data.num // 鏇存柊鏁伴噺
this.syncUserInfo(userInfo)
+ this.$store.commit('syncUserInfo', userInfo)
})
}
this.$request('/api/Baseconfig/getInfo').then(res => {
diff --git a/pages/index/home.vue b/pages/index/home.vue
index cabfe3a..c62f486 100755
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -13,7 +13,7 @@
</view>
<view class="flex justify-center align-center flex-direction">
<button @click="toChat" style="width: calc(100vw - 60rpx); height: 100rpx;" class="cu-btn text-bold chat-button">
- 寮�濮嬪挩璇� (浣檣{num}}娆�) </button>
+ 寮�濮嬪挩璇� (浣檣{sum_num}}娆�) </button>
</view>
<view class="tool padding-top-xl">
<view class="header">
@@ -102,19 +102,28 @@
setting_data:'null',
user_data:'null',
shar_openid:'null',
- open_id_data
+ open_id_data,
+ userinfo_data:'null',
+ sum_num:0
}
},
computed: {
...mapState(['config', 'num', 'userInfo', 'token', 'main_model', 'tabbar'])
},
- onLoad(op) {
+ async onLoad(op) {
+ console.log(this.$store.state.userInfo,"home userinfo")
this.getTabIndex()
// #ifdef MP-WEIXIN || MP-JD
uni.hideHomeButton()
// #endif
+ if(this.$store.state.userInfo.num&&this.$store.state.userInfo.pay_num){
this.setting_data = setting
+ this.userinfo_data = this.$store.state.userInfo
+ this.sum_num = this.userinfo_data.num+this.userinfo_data.pay_num
+ }
+
+
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2c62cc1..8324e49 100755
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -247,6 +247,7 @@
res.data.token = res.token
uni.setStorageSync('userInfo',res.data);
uni.setStorageSync('token',res.token)
+ this.$store.commit('login',res.data)
this.login(res.data)
setTimeout(() => {
uni.redirectTo({
diff --git a/pages/login/newlogin.vue b/pages/login/newlogin.vue
index 62692f1..5f3351d 100644
--- a/pages/login/newlogin.vue
+++ b/pages/login/newlogin.vue
@@ -241,6 +241,7 @@
res.data.token = res.token
uni.setStorageSync('userInfo',res.data);
uni.setStorageSync('token',res.token)
+ this.$store.commit('login',res.data)
this.login(res.data)
setTimeout(() => {
uni.redirectTo({
diff --git a/store/index.js b/store/index.js
index 610e0b9..14687f5 100755
--- a/store/index.js
+++ b/store/index.js
@@ -38,12 +38,12 @@
mutations: {
login(state, userInfo) {
state.userInfo = userInfo;
- state.num = userInfo.num;
+ state.num = userInfo.num+userInfo.pay_num;
state.token = userInfo.token;
},
syncUserInfo(state, userInfo) {
state.userInfo = userInfo;
- state.num = userInfo.num;
+ state.num = userInfo.num+userInfo.pay_num;
},
syncUserNum(state, num) {
state.num = num;
--
Gitblit v1.9.1