From 387d1d097dc4677737299c73e05089dac1262e86 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 19 Nov 2021 10:17:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                        | 16 ++++++++--------
 pages.json                     |  2 +-
 pages/tabBar/user/user.vue     |  9 ++++++---
 subPages/unionPay/unionPay.vue | 23 ++++++++++++++---------
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/App.vue b/App.vue
index 7a477d6..47bd48d 100644
--- a/App.vue
+++ b/App.vue
@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://hsg.dctpay.com/crest',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl : 'https://hsg.dctpay.com/brest',
-			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+			url: 'https://hsg.dctpay.com/crest',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			brestUrl : 'https://hsg.dctpay.com/brest',
+			imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
-			brestUrl : 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// url: 'https://hsgcs.dctpay.com/crest',
+			// brestUrl : 'https://hsgcs.dctpay.com/brest',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo : '',
 			openId: '',
diff --git a/pages.json b/pages.json
index eb4e5d0..f39b609 100644
--- a/pages.json
+++ b/pages.json
@@ -447,7 +447,7 @@
 		}, {
 			"path": "pages/userLogin/userLogin",
 			"style": {
-				"navigationBarTitleText": "嗨森购",
+				"navigationBarTitleText": "嗨森逛",
 				"enablePullDownRefresh": false
 			}
 
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index 3ee062a..fc63cc7 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -264,6 +264,9 @@
 			this.showHeader = true;
 			// this.statusHeight = plus.navigator.getStatusbarHeight();
 			// #endif
+			if (!app.globalData.userInfo) {
+				this.findUser()
+			}
 		},
 		onReady() {
 			//此处，演示,每次页面初次渲染都把登录状态重置
@@ -275,9 +278,9 @@
 			});
 		},
 		onShow() {
-			// if (app.globalData.userInfo) {
-			this.findUser();
-			// }
+			if (app.globalData.userInfo) {
+				this.findUser();
+			}
 
 			if (!app.globalData.userInfo.isSetPayPwd) {
 				this.czList = [{
diff --git a/subPages/unionPay/unionPay.vue b/subPages/unionPay/unionPay.vue
index 39a72e3..2815265 100644
--- a/subPages/unionPay/unionPay.vue
+++ b/subPages/unionPay/unionPay.vue
@@ -24,15 +24,20 @@
 				// uni.navigateTo({
 					// url:'unionPay-entrance/unionPay-entrance'
 				// })
-				uni.navigateToMiniProgram({
-				  appId: '1900bc84497cab3b',
-				  path: '../../pages/goods/externalCoupon/externalCoupon',
-				  // extraData: {
-				  //   'data1': 'test'
-				  // },
-				  success(res) {
-				    // 打开成功
-				  }
+				// uni.navigateToMiniProgram({
+				//   appId: '1900bc84497cab3b',
+				//   path: '../../pages/goods/externalCoupon/externalCoupon',
+				//   // extraData: {
+				//   //   'data1': 'test'
+				//   // },
+				//   success(res) {
+				//     // 打开成功
+				//   }
+				// })
+				uni.showToast({
+					title: '暂未开放',
+					duration: 2000,
+					icon: "none"
 				})
 			},
 			//跳转到小程序