From 656d094a5facd12f89d8ec16c9acfb5fb7371092 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 2 Jan 2024 18:02:07 +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

---
 manifest.json                      |  8 +++---
 pages/chat/customer_list/index.vue |  2 +-
 pages/index/index.vue              | 42 +++++++++++++++++-------------
 pages/users/gather_list/index.vue  |  2 +-
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/manifest.json b/manifest.json
index 5e36366..913f312 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -12,8 +12,8 @@
         "nvueCompiler" : "uni-app",
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
-        "compatible":{
-          "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+        "compatible" : {
+            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
         },
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue
index fd7fc3a..e548227 100644
--- a/pages/chat/customer_list/index.vue
+++ b/pages/chat/customer_list/index.vue
@@ -121,7 +121,7 @@
 				getUserInfo().then(res => {
           if (res.data.mer_info.length == 0) {
             return uni.showModal({
-              title: '暂无商户信息',
+              title: '暂未开通商户',
               complete(res) {
                 // #ifdef APP-PLUS
                 uni.sendHostEvent('closeApp',  (ret) => {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ac4c8cd..cd4f032 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -326,7 +326,7 @@
               <view class="item">
                 <view class="acea-row row-middle">
                   <text class="item-name">开户网点:</text>
-                  <input type="text" placeholder="请输入开户行地址" v-model="merchantData.bank_opening" @input="validateBtn"
+                  <input type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening" @input="validateBtn"
                     placeholder-class='placeholder' />
                 </view>
               </view>
@@ -350,10 +350,10 @@
                   </view>
                 </view>
 
-              </view>
+              </view> -->
               <view class="item">
                 <view class="acea-row row-middle">
-                  <text class="item-name">银行卡反面:</text>
+                  <text class="item-name">银行卡图片:</text>
                 </view>
                 <view class="item-card">
                   <view class="item-carda" @click='uploadpic({type:3})' v-if='merchantData.bank_front.length==0'>
@@ -362,15 +362,14 @@
                   <view class="item-carda" @click='DelPic({type:3})' v-else>
                     <image :src="merchantData.bank_front" mode="aspectFit"></image>
                   </view>
-                  <view class="item-cardb" @click='uploadpic({type:4})' v-if='merchantData.bank_back.length==0'>
+                  <!-- <view class="item-cardb" @click='uploadpic({type:4})' v-if='merchantData.bank_back.length==0'>
                     <image src="@/static/images/YHKF.png" mode="aspectFit"></image>
                   </view>
-
                   <view class="item-cardb" @click='DelPic({type:4})' v-else>
                     <image :src="merchantData.bank_back" mode="aspectFit"></image>
-                  </view>
+                  </view> -->
                 </view>
-              </view> -->
+              </view>
 
 
               <button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
@@ -424,6 +423,7 @@ import { Toast } from '../../libs/uniApi';
       return {
         isAuto: false, //没有授权的不会自动授权
         isShowAuth: false, //是否隐藏授权
+        loadEndFlag: false,
         list: [{
           name: '今日成交额',
           value: 0
@@ -635,7 +635,12 @@ import { Toast } from '../../libs/uniApi';
     async onLoad() {
       this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
       await this.$onLaunched;
-      this.list1()
+      this.list1();
+      this.getUserInfo();
+      this.codelist();
+      this.$u.sleep(5000).then(()=>{
+        this.loadEndFlag = true;
+      })
     },
 
 
@@ -652,10 +657,11 @@ import { Toast } from '../../libs/uniApi';
     },
 
 
-    async onShow() {
-      await this.$onLaunched;
-      this.getUserInfo()
-      this.codelist()
+    onShow() {
+      if(this.loadEndFlag){
+        this.getUserInfo();
+        this.codelist();
+      }
     },
 
     beforeDestroy() {
@@ -886,19 +892,19 @@ import { Toast } from '../../libs/uniApi';
           title: '请输入对公账号'
         });
         if (!value.bank_username) return that.$util.Tips({
-          title: '请输入开户行名称'
+          title: '请输入银行名称'
         });
         if (!value.bank_opening) return that.$util.Tips({
-          title: '请输入开户行地址'
+          title: '请输入开户网点'
         });
 
         // if (value.bank_front.length == 0) return that.$util.Tips({
         //   title: '请上传一张或者多张图片'
         // });
 
-        // if (value.bank_back.length == 0) return that.$util.Tips({
-        //   title: '请上传一张或者多张图片'
-        // });
+        if (value.bank_back.length == 0) return that.$util.Tips({
+          title: '请上传银行卡正面图片'
+        });
         // if (value.cardno_front.length == 0) return that.$util.Tips({
         //   title: '请上传一张或者多张图片'
         // });
@@ -1084,7 +1090,7 @@ import { Toast } from '../../libs/uniApi';
           }
           if (res.data.mer_info.length == 0) {
             uni.showModal({
-              title: '暂无商户信息',
+              title: '暂未开通商户',
               complete(res) {
                 // #ifdef APP-PLUS
                 uni.sendHostEvent('closeApp',  (ret) => {
diff --git a/pages/users/gather_list/index.vue b/pages/users/gather_list/index.vue
index 8221182..b211b52 100644
--- a/pages/users/gather_list/index.vue
+++ b/pages/users/gather_list/index.vue
@@ -52,7 +52,7 @@
           <image class="left" src="@/static/images/qianbao.png" style="width: 60rpx;height: 60rpx;"></image>
           <view class="right">
             <view class="item">
-              <view class="item_title">佣金提现到银行卡</view>
+              <view class="item_title">余额提现到银行卡</view>
               <view class="item_money">+{{item.extract_money}}</view>
             </view>
             <view class="item">