From b17d6ccb3bb614bc009b1a496749ce352e6bc6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Thu, 23 Mar 2023 13:39:28 +0800
Subject: [PATCH] upd

---
 manifest.json               |  2 +-
 pages.json                  | 24 ++++++++++++++++++++++--
 pages/pay/pay.vue           | 24 ++++++++++++------------
 pages/work/perfectBasis.vue |  6 +++---
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/manifest.json b/manifest.json
index 63c40ac..5fe86fe 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.3.6",
+    "versionName" : "1.3.7",
     "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages.json b/pages.json
index d2054f3..4df438c 100644
--- a/pages.json
+++ b/pages.json
@@ -343,7 +343,17 @@
 			"navigationBarTitleText": "机构信息",
 			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#446EFE",
-			"navigationBarTextStyle": "white"
+			"navigationBarTextStyle": "white",
+			"app-plus": {
+				"titleNView": {
+					"buttons": [{
+						"text": "使用账户信息",
+						"color": "#ffffff",
+						"fontSize": "30rpx",
+						"width": "180rpx"
+					}]
+				}
+			}
 		}
 	}, {
 		"path": "pages/work/perfectBasis",
@@ -353,7 +363,17 @@
 			"navigationBarTitleText": "基础信息",
 			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#446EFE",
-			"navigationBarTextStyle": "white"
+			"navigationBarTextStyle": "white",
+			"app-plus": {
+				"titleNView": {
+					"buttons": [{
+						"text": "使用账户信息",
+						"color": "#ffffff",
+						"fontSize": "30rpx",
+						"width": "180rpx"
+					}]
+				}
+			}
 		}
 	}, {
 		"path": "pages/transfers/lists",
diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
index 2e9e2ef..4494f1f 100644
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -195,14 +195,14 @@ import mixin from 'uview-ui/libs/mixin/mixin';
 						})
 						break;
 					case 'wx':
-						if(this.payType == 'price') this.onUmsPay('mp')
-						if(this.payType == 'diff') this.onDiffUmsPay('mp')
-						if(this.payType == 'free') this.onFreePay('mp')
+						if(this.payType == 'price') this.onUmsPay('app')
+						if(this.payType == 'diff') this.onDiffUmsPay('app')
+						if(this.payType == 'free') this.onFreePay('app')
 						break;
 					case 'ali':
-						if(this.payType == 'price') this.onUmsPay('mp_alipay')
-						if(this.payType == 'diff') this.onDiffUmsPay('mp_alipay')
-						if(this.payType == 'free') this.onFreePay('mp_alipay')
+						if(this.payType == 'price') this.onUmsPay('app_alipay')
+						if(this.payType == 'diff') this.onDiffUmsPay('app_alipay')
+						if(this.payType == 'free') this.onFreePay('app_alipay')
 						break;
 				}
 			},
@@ -223,10 +223,10 @@ import mixin from 'uview-ui/libs/mixin/mixin';
 					this.getState = true
 					this.trade_id = res.trade_id
 					switch (type){
-						case 'mp':
+						case 'app':
 							this.onMiniWx()
 							break;
-						case 'mp_alipay':
+						case 'app_alipay':
 							plus.runtime.openURL(res.alipay)
 							break;
 					}
@@ -252,10 +252,10 @@ import mixin from 'uview-ui/libs/mixin/mixin';
 					this.getState = true
 					this.trade_id = res.trade_id
 					switch (type){
-						case 'mp':
+						case 'app':
 							this.onMiniWx()
 							break;
-						case 'mp_alipay':
+						case 'app_alipay':
 							plus.runtime.openURL(res.alipay)
 							break;
 					}
@@ -277,10 +277,10 @@ import mixin from 'uview-ui/libs/mixin/mixin';
 					this.getState = true
 					this.trade_id = res.trade_id
 					switch (type){
-						case 'mp':
+						case 'app':
 							this.onMiniWx()
 							break;
-						case 'mp_alipay':
+						case 'app_alipay':
 							plus.runtime.openURL(res.alipay)
 							break;
 					}
diff --git a/pages/work/perfectBasis.vue b/pages/work/perfectBasis.vue
index c58081a..0417aa1 100644
--- a/pages/work/perfectBasis.vue
+++ b/pages/work/perfectBasis.vue
@@ -103,21 +103,21 @@
 				</view>
 				<view class="from-item from-item-100">
 					<label>
-						现居住地址
+						<text>*</text>现居住地址
 						<uni-icons v-if="baseInfo.check_params.now_domicile" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_domicile.description)"></uni-icons>
 					</label>
 					<input class="from-input" type="number" v-model="baseInfo.now_domicile" placeholder="输入现居住地址">
 				</view>
 				<view class="from-item from-item-100">
 					<label>
-						现单位地址
+						<text>*</text>现单位地址
 						<uni-icons v-if="baseInfo.check_params.now_company_address" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_address.description)"></uni-icons>
 					</label>
 					<input class="from-input" type="number" v-model="baseInfo.now_company_address" placeholder="输入现单位地址">
 				</view>
 				<view class="from-item from-item-100">
 					<label>
-						现单位名称
+						<text>*</text>现单位名称
 						<uni-icons v-if="baseInfo.check_params.now_company_name" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
 					</label>
 					<input class="from-input" type="number" v-model="baseInfo.now_company_name" placeholder="输入现单位名称">