From 13f8966ee0fcf62536c3db4872f2951fce0008bf Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 23 Sep 2023 14:44:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=82=A1=E9=87=91=E4=B8=8A?=
 =?UTF-8?q?=E4=BA=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/shareholder.js                   |  8 ++++++--
 subpkg/shareCapital/shareCapital.vue | 15 +++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/api/shareholder.js b/api/shareholder.js
index 66fe3e2..8047043 100644
--- a/api/shareholder.js
+++ b/api/shareholder.js
@@ -5,7 +5,6 @@ import oahttp from "@/utils/oahttp.js";
  */
 export const companyAccountLog = (data) => oahttp.get('/company_account_log/lists', data)
 
-
 /**
  * 股金详情
  */
@@ -14,4 +13,9 @@ export const companyShareholderInfo = (data) => oahttp.get('/company/shareholder
 /**
  * 发起合同
  */
-export const initiateShareholderContract = (data) => oahttp.post('/company/initiate_shareholder_contract', data)
\ No newline at end of file
+export const initiateShareholderContract = (data) => oahttp.post('/company/initiate_shareholder_contract', data)
+
+/**
+ * 上交股金
+ */
+export const companyPayShareCapital = (data) => oahttp.post('/company/pay_share_capital', data)
\ No newline at end of file
diff --git a/subpkg/shareCapital/shareCapital.vue b/subpkg/shareCapital/shareCapital.vue
index ad4fb9e..2962089 100644
--- a/subpkg/shareCapital/shareCapital.vue
+++ b/subpkg/shareCapital/shareCapital.vue
@@ -108,7 +108,7 @@
     </view> -->
     <view class="button">
       <view class="retreat" @click="retreat">退股</view>
-      <view class="hand" :class="{'disable': !shareholder.is_amount_turned||!shareholder.is_village}" @click="hand">上交</view>
+      <view class="hand" :class="{'disable': !shareholder.is_done_task || !shareholder.is_contract }" @click="hand">上交</view>
     </view>
     <u-modal :show="modelShow" title="提醒" :content="modelType==1?'确定要生成合同吗':'请确认合同无误后再发送'" closeOnClickOverlay showCancelButton cancel-text="取消" confirm-text="确认" close="modelShow=false" @cancel="modelShow=false" @confirm="modelType==1?createContract():addContract();modelShow=false"></u-modal>
   </view>
@@ -122,7 +122,8 @@
   import {
     companyAccountLog,
     companyShareholderInfo,
-    initiateShareholderContract
+    initiateShareholderContract,
+    companyPayShareCapital
   } from "@/api/shareholder.js"
   import {
   	companyView,
@@ -139,6 +140,7 @@
         shareholder: {
           contract_url: "",
           is_contract: 0,
+          is_done_task: 0,
           shareholder_money: "0.00",
           contract_time: "",
           is_amount_turned: ""
@@ -237,8 +239,13 @@
         Toast('暂无内容')
       },
       hand() {
-        if(!this.shareholder.is_amount_turned) return Toast('暂时无法上交');
-        Toast('暂无内容')
+        if(!shareholder.is_done_task || !shareholder.is_contract) return Toast('暂时无法上交');
+        this.handShare();
+      },
+      async handShare(){
+        await companyPayShareCapital();
+        Toast('上交成功!');
+        uni.navigateBack();
       },
       clickContract(e){
         this.modelType = e;