更新

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();

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({

subpkg/buyShare/buyShare.vue

@@ -22,8 +22,8 @@
      		<u-steps-item title="2023-08-30 20:23:59" desc="XXXX公司发布任务，任务未开始"></u-steps-item>
      	</u-steps>
     </view> -->
-    <mybtn text="前往支付页面" @click="navTo(`/subpkg/topUp/topUp?task_id=${task_id}`)"></mybtn>
-    <!-- <mybtn text="已支付" my_btn_disabled="true"></mybtn> -->
+    <mybtn v-if="task.status!=3 && task.status!=5" text="前往支付页面" @click="navTo(`/subpkg/topUp/topUp?task_id=${task_id}`)"></mybtn>
+    <mybtn v-else text="已支付" my_btn_disabled="true"></mybtn>
   </view>
 </template>
 
@@ -39,6 +39,7 @@
     onLoad(options) {
       this.task_id = options.task_id;
       this.loadTask();
+      uni.$on('upBuyShare', this.loadTask);
     },
     methods:{
       async loadTask(){

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;