diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 2f6c304..c85f88f 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -271,7 +271,6 @@ export default {
onShow () {
// this.getUserIndex()
// this.getIndexList()
- this.$store.dispatch('initConfig');
this.getApproveList();
this.initUserInfo();
this.showToask();
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index a10dc62..b88a2c2 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -109,7 +109,6 @@
})
let res = await loginAccount(that.formData);
encrypt.encode('ACT', this.formData);
- this.$store.dispatch('initConfig');
this.$store.commit('SET_USERINFO', {
user: data,
token: res.data.token
@@ -118,6 +117,7 @@
data
} = await userInfo();
this.$store.commit('setUserInfo', data);
+ await this.$store.dispatch('initConfig');
uni.hideLoading()
if (data.is_new_user) {
uni.showLoading({
diff --git a/subpkg/buyShare/buyShare.vue b/subpkg/buyShare/buyShare.vue
index 856e22b..a30031e 100644
--- a/subpkg/buyShare/buyShare.vue
+++ b/subpkg/buyShare/buyShare.vue
@@ -22,8 +22,8 @@
-->
-
-
+
+
@@ -39,6 +39,7 @@
onLoad(options) {
this.task_id = options.task_id;
this.loadTask();
+ uni.$on('upBuyShare', this.loadTask);
},
methods:{
async loadTask(){
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index 66c8ada..da2ac07 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -109,7 +109,7 @@
money: this.payMoney.money
};
if(this.task_id>0) {
- queryData.id = this.task_id;
+ queryData.task_id = this.task_id;
}
let { data } = await recharge(queryData);
let res = await payWay({
@@ -152,12 +152,18 @@
from: data.from,
}).then((status)=>{
uni.showToast({
- icon:status.data.pay_status?'success':'none',
+ icon: status.data.pay_status?'success':'none',
title: status.data.pay_status?'支付成功':'支付失败'
})
- userInfo().then(user=>{
- this.$store.commit('setUserInfo', user.data);
- })
+ if(this.task_id>0){
+ uni.$emit('upBuyShare');
+ uni.navigateBack();
+ }
+ else{
+ userInfo().then(user=>{
+ this.$store.commit('setUserInfo', user.data);
+ })
+ }
})
},
fail: (e) => {
@@ -236,7 +242,7 @@
.item {
display: flex;
- justify-content: space-around;
+ justify-content: space-between;
font-size: 32rpx;
font-weight: 400;
color: #333333;