From 49ada1a6781ca07dcac71ec4d180b4eedd017a24 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 1 Sep 2023 11:11:26 +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

---
 store/modules/config.js              | 15 +++++++--------
 subpkg/shareCapital/shareCapital.vue |  7 ++++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/store/modules/config.js b/store/modules/config.js
index b87762c..600977b 100644
--- a/store/modules/config.js
+++ b/store/modules/config.js
@@ -46,14 +46,17 @@ const actions = {
   async initConfig({ state, commit }, data = false) {
     let res = await getConfig();
     commit('SET_CONFIG', res.data);
-    console.log(compareVersions(res.data.version, '1.0.0')==1&&compareVersions(res.data.version, Cache.get('wgt_version'))==1);
-    // #ifdef APP-PLUS
+    // console.log(compareVersions(res.data.version, '1.0.0')==1&&compareVersions(res.data.version, Cache.get('wgt_version'))==1);
     let os = uni.getSystemInfoSync();
+    // uni.showModal({
+    //   title: `当前:${os.appVersion},WGT:${Cache.get('wgt_version')},返回:${res.data.version}`
+    // })
+    // #ifdef APP-PLUS
     if(data) uni.showLoading({
       title: '检查更新中'
     })
     // 版本更新
-    if(compareVersions(res.data.version, os.appVersion)==1&&compareVersions(res.data.version, Cache.get('wgt_version')||'1.0.0')==1){
+    if(compareVersions(res.data.version, os.appVersion||Cache.get('wgt_version')||'1.0.0')==1&&compareVersions(res.data.version, Cache.get('wgt_version')||'1.0.0')==1){
       try{
         let info = res.data.version_info||{};
         let version = {
@@ -65,11 +68,7 @@ const actions = {
           quiet: info.quiet==1?true:false // 是否静默更新
         }
         Updater.update(version);
-        let suffix = ".wgt";
-        if(info.dow_url.substring(info.dow_url.length - suffix.length, info.dow_url.length)==suffix){
-          console.log('wgt update');
-          Cache.set('wgt_version', info.version);
-        }
+        Cache.set('wgt_version', info.version);
       }catch(e){
         console.log(e);
       }
diff --git a/subpkg/shareCapital/shareCapital.vue b/subpkg/shareCapital/shareCapital.vue
index d65269d..26935b9 100644
--- a/subpkg/shareCapital/shareCapital.vue
+++ b/subpkg/shareCapital/shareCapital.vue
@@ -4,7 +4,8 @@
       <view>账户入股金额</view>
       <view><text class="money">{{shareholder.shareholder_money}}</text>元</view>
     </view>
-    <view class="card" v-if="shareholder.is_contract">
+    <view v-if="!is_village" style="text-align: center;color: #aaa;">暂无村公司</view>
+    <view class="card" v-else-if="shareholder.is_contract">
       <view class="contract">
         <view class="left">
           <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
@@ -107,9 +108,9 @@
     </view> -->
     <view class="button">
       <view class="retreat" @click="retreat">退股</view>
-      <view class="hand" :class="{'disable': !shareholder.is_amount_turned}" @click="hand">上交</view>
+      <view class="hand" :class="{'disable': !shareholder.is_amount_turned||!shareholder.is_village}" @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>
+    <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>
 </template>