From 4682ef8dc5cb53df887e673b21052cf679771cd0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 21 Mar 2022 14:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/java110/page/PageApp.js |  4 ++--
 lib/java110/page/PageH5.js  | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/java110/page/PageApp.js b/lib/java110/page/PageApp.js
index ca15659..21bc2bd 100644
--- a/lib/java110/page/PageApp.js
+++ b/lib/java110/page/PageApp.js
@@ -8,13 +8,13 @@ import {
 import url from '../../../constant/url.js'
 export function pageOnLoad(options) {
 
-	getWAppId()
+	getPageWAppId()
 }
 
 /**
  * 获取WAppId
  */
-export function getWAppId() {
+export function getPageWAppId() {
 	let wAppId = conf.wAppId;
 	//5.0 存储至磁盘中
 	saveWAppId(wAppId)
diff --git a/lib/java110/page/PageH5.js b/lib/java110/page/PageH5.js
index 5dfac4b..bc5ef06 100644
--- a/lib/java110/page/PageH5.js
+++ b/lib/java110/page/PageH5.js
@@ -22,7 +22,7 @@ export function pageOnLoad(options) {
 		doLoginOwnerByKey(_key, callback);
 	}
 
-	getPageWAppId()
+	getPageWAppId(options)
 }
 
 /**
@@ -41,7 +41,7 @@ export function doLoginOwnerByKey(_key, callback = () => {}) {
 			let _param = res.data;
 			if (_param.code != 0) {
 				uni.navigateTo({
-					url: '/pages/showlogin/showlogin?wAppId=' + getPageWAppId()
+					url: '/pages/showlogin/showlogin?wAppId=' + getWAppId()
 				});
 				return;
 			}
@@ -53,14 +53,19 @@ export function doLoginOwnerByKey(_key, callback = () => {}) {
 		fail: function(error) {
 			// 调用服务端登录接口失败
 			uni.navigateTo({
-				url: '/pages/showlogin/showlogin?wAppId=' + getPageWAppId()
+				url: '/pages/showlogin/showlogin?wAppId=' + getWAppId()
 			});
 		}
 	});
 }
 
-export function getPageWAppId() {
-	let wAppId = getWAppId();
+export function getPageWAppId(options) {
+	let wAppId = options.wAppId;
+	if (!isNull(wAppId)) {
+		saveWAppId(wAppId)
+		return wAppId;
+	}
+	 wAppId = getWAppId();
 	if (isNull(wAppId)) {
 		uni.showToast({
 			icon: 'none',