From e1e583b14cb80b8dc362dfae3bbc169dfc10cf93 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 28 Aug 2023 19:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/task.js                    |  5 +++++
 pages/moreFun/moreFun.vue      | 29 ++++++++++++++++++++++++++++-
 pages/oaHome/oaHome.vue        |  1 +
 subpkg/buyShare/buyShare.vue   | 21 +++++++++++++++------
 subpkg/otherTask/otherTask.vue |  4 ++--
 subpkg/topUp/topUp.vue         | 31 +++++++++++++++++++++++++++----
 6 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/api/task.js b/api/task.js
index d2e84bf..fcd170a 100644
--- a/api/task.js
+++ b/api/task.js
@@ -25,3 +25,8 @@ export const taskTricycleDetail = (data) => oahttp.get('/task/tricycle_detail',
  * 任务:三轮游走上传位置
  */
 export const taskAddTricycleCoordinate = (data) => oahttp.post('/task/add_tricycle_coordinate', data)
+
+/**
+ * 任务:入股详情
+ */
+export const taskShareholder = (data) => oahttp.post('/task/shareholder', data)
diff --git a/pages/moreFun/moreFun.vue b/pages/moreFun/moreFun.vue
index e714254..297413b 100644
--- a/pages/moreFun/moreFun.vue
+++ b/pages/moreFun/moreFun.vue
@@ -2,7 +2,7 @@
   <view>
     <view class="fast_track">
       <block v-for="(item, index) in oaHomeData" :key="item.id">
-        <view class="track_item" @click="navTwo(item.paths, index)">
+        <view class="track_item" @click="navTo(item.paths)">
           <u--image
             :showLoading="true"
             :src="item.icon"
@@ -34,6 +34,33 @@
         })
         return arr;
       }
+    },
+    methods: {
+      navTo (url) {
+        if(url){
+          uni.showLoading({
+            title: '加载中',
+            mask: true
+          });
+          uni.navigateTo({
+          	url: url,
+            success() {
+              uni.hideLoading()
+            },
+            fail () {
+              uni.switchTab({
+                url: url,
+                success() {
+                  uni.hideLoading()
+                },
+                fail() {
+                  uni.hideLoading()
+                }
+              });
+            },
+          })
+        }else Toast('暂未开放')
+      },
     }
   }
 </script>
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index c85f88f..2f6c304 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -271,6 +271,7 @@ export default {
   onShow () {
     // this.getUserIndex()
     // this.getIndexList()
+    this.$store.dispatch('initConfig');
     this.getApproveList();
     this.initUserInfo();
     this.showToask();
diff --git a/subpkg/buyShare/buyShare.vue b/subpkg/buyShare/buyShare.vue
index 7fc92e6..856e22b 100644
--- a/subpkg/buyShare/buyShare.vue
+++ b/subpkg/buyShare/buyShare.vue
@@ -1,17 +1,17 @@
 <template>
   <view style="padding-top: 28rpx;">
     <view class="card">
-      <view class="title">任务名称: 入股任务</view>
+      <view class="title">任务名称: {{task.title}}</view>
       <u-line style="margin: 14rpx 0;"></u-line>
-      <view class="text">阶段类型: 单次</view>
-      <view class="text" style="color: #FF7C32;">任务金额: 3000元</view>
+      <!-- <view class="text">阶段类型: 单次</view> -->
+      <view class="text" style="color: #FF7C32;" v-if="task.extend&&task.extend.shareholder">入股金额: {{task.extend.shareholder.money}}元</view>
     </view>
     <view class="card">
       <view class="title">任务描述</view>
       <u-line style="margin: 14rpx 0;"></u-line>
-      <view class="text">完成公司分配入股任务，时限30日内。完成公司分配入股任务，时限30日内。完成公司分配入股任务，时限30日内。</view>
+      <view class="text">{{task.content}}</view>
     </view>
-    <view class="card">
+    <!-- <view class="card">
       <view class="title">历史记录</view>
       <u-line style="margin: 14rpx 0;"></u-line>
      <u-steps current="1" direction="column" activeColor="#0122c7">
@@ -21,23 +21,32 @@
      		</u-steps-item>
      		<u-steps-item title="2023-08-30 20:23:59" desc="XXXX公司发布任务，任务未开始"></u-steps-item>
      	</u-steps>
-    </view>
+    </view> -->
     <mybtn text="前往支付页面" @click="navTo(`/subpkg/topUp/topUp?task_id=${task_id}`)"></mybtn>
     <!-- <mybtn text="已支付" my_btn_disabled="true"></mybtn> -->
   </view>
 </template>
 
 <script>
+  import { taskShareholder } from "@/api/task.js"
   export default {
     data() {
       return {
+        task:{},
         task_id: -1,
       };
     },
     onLoad(options) {
       this.task_id = options.task_id;
+      this.loadTask();
     },
     methods:{
+      async loadTask(){
+        let res = await taskShareholder({
+          id: this.task_id
+        });
+        this.task = res.data;
+      },
       navTo (url) {
         if(url){
           uni.showLoading({
diff --git a/subpkg/otherTask/otherTask.vue b/subpkg/otherTask/otherTask.vue
index 2560bd9..354a9ca 100644
--- a/subpkg/otherTask/otherTask.vue
+++ b/subpkg/otherTask/otherTask.vue
@@ -12,11 +12,11 @@
       <view class="text">完成公司分配入股任务，时限30日内。完成公司分配入股任务，时限30日内。完成公司分配入股任务，时限30日内。</view>
     </view>
     <view class="card">
-      <view class="title">完成任务</view>
+      <view class="title">详情描述</view>
       <u-line style="margin: 14rpx 0;"></u-line>
       <u--textarea v-model="formData.text" placeholder="请输入内容" style="font-size: 28rpx;" autoHeight></u--textarea>
     </view>
-    <mybtn text="完成任务"></mybtn>
+    <mybtn text="确认提交"></mybtn>
   </view>
 </template>
 
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index da6a8aa..66c8ada 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -13,7 +13,7 @@
     <view class="price">
       <view class="title">充值金额</view>
       <view class="tab">
-        <view v-if="task_id>0" class="item active" style="margin: 0;">3000元</view>
+        <view v-if="task_id>0" class="item active" style="margin: 0;">{{this.payMoney.money}}元</view>
         <view v-else class="item" :class="index==changeMoney?'active':''" @click="changePrice(index)"
           v-for="(item, index) in priceList" :key="index">{{item}}</view>
       </view>
@@ -33,6 +33,7 @@
   import { userInfo } from "@/api/oaUser.js"
   import { debounce, throttle } from 'lodash'
   import { Toast } from '@/libs/uniApi.js'
+  import { taskShareholder } from "@/api/task.js"
   export default {
     data() {
       return {
@@ -44,6 +45,7 @@
         payTimer: null,
         timeCount: 5,
         task_id: -1, //任务id,当为任务时,不可自选充值金额
+        task: {}
       }
     },
     // 点击充值记录
@@ -55,7 +57,10 @@
       }
     },
     onLoad(options) {
-      options.task_id?this.task_id=options.task_id:null;
+      if(options.task_id){
+        this.task_id=options.task_id;
+        this.loadTask();
+      }
     },
     onShow() {},
     methods: {
@@ -65,6 +70,19 @@
         if(this.priceList[index]=='自定义')this.payMoney.money = '';
         else this.payMoney.money = this.priceList[index].split('元')[0];
       },
+      // 加载任务
+      async loadTask(){
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        })
+        let res = await taskShareholder({
+          id: this.task_id
+        });
+        this.task = res.data;
+        this.payMoney.money = res.data?.extend?.shareholder?.money;
+        uni.hideLoading();
+      },
       //充值
       pay(){
         if(!this.payMoney.money)return Toast('请先填写充值金额!')
@@ -87,9 +105,13 @@
         uni.showLoading({
           title:'获取支付信息',
           success: async () => {
-            let { data } = await recharge({
+            let queryData = {
               money: this.payMoney.money
-            });
+            };
+            if(this.task_id>0) {
+              queryData.id = this.task_id;
+            }
+            let { data } = await recharge(queryData);
             let res = await payWay({
               order_id: data.order_id,
               from: data.from,
@@ -139,6 +161,7 @@
                     })
                   },
                   fail: (e) => {
+                    console.log(e);
                     uni.hideLoading();
                     uni.showToast({
                       icon:'error',