From 89d90be40ad913a88c77ce23cc69ac32596f0899 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 20 Mar 2022 23:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=97=E5=BF=97=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/webView/webViewApi.js                      | 4 +---
 components/vc-user-account/vc-user-account.vue | 4 ++++
 core/vcRoute.js                                | 4 ++++
 lib/java110/page/PageH5.js                     | 4 ++--
 manifest.json                                  | 2 +-
 pages/myAccount/myAccount.vue                  | 6 +++++-
 pages/myAccount/myCoupons.vue                  | 1 +
 7 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/api/webView/webViewApi.js b/api/webView/webViewApi.js
index 30c6f99..fe3dee5 100644
--- a/api/webView/webViewApi.js
+++ b/api/webView/webViewApi.js
@@ -15,9 +15,7 @@ import {
 } from '../../lib/java110/utils/DateUtil.js'
 // #ifdef H5
 import WexinPayFactory from '../../factory/WexinPayFactory.js'
-import {
-	wechatRefreshToken
-} from '../../auth/H5Login.js'
+
 // #endif
 
 import {
diff --git a/components/vc-user-account/vc-user-account.vue b/components/vc-user-account/vc-user-account.vue
index 3f4b6cb..d5259d9 100644
--- a/components/vc-user-account/vc-user-account.vue
+++ b/components/vc-user-account/vc-user-account.vue
@@ -80,6 +80,10 @@
 					feeId: _feeId,
 					communityId: _communityId
 				}).then((data) => {
+					if(!data){
+						_that.accounts = [];
+						return;
+					}
 					_that.accounts = data;
 				})
 			},
diff --git a/core/vcRoute.js b/core/vcRoute.js
index 875e35d..5f2583b 100755
--- a/core/vcRoute.js
+++ b/core/vcRoute.js
@@ -43,6 +43,10 @@ export function navigateTo(_param, callback = () => {}) {
 		_newUrl = _url + ('?wAppId=' + getWAppId());
 		_tempUrl = _url;
 	}
+	
+	if(_tempUrl.startsWith("/")){
+		_tempUrl = _tempUrl.substring(1)
+	}
 
 	if (_url.indexOf('wAppId') < 0) {
 		_param.url = _newUrl;
diff --git a/lib/java110/page/PageH5.js b/lib/java110/page/PageH5.js
index b82e5bd..5dfac4b 100644
--- a/lib/java110/page/PageH5.js
+++ b/lib/java110/page/PageH5.js
@@ -83,7 +83,7 @@ export function pageCheckSession(_pageUrl,_call) {
 		_call();
 		return;
 	}
-	wechatRefreshToken('', 0, '/#'+_pageUrl);
+	wechatRefreshToken('', 0, location.origin+'/#'+_pageUrl);
 }
 
 export function wechatRefreshToken(errorUrl, _login, _redirectUrl) {
@@ -168,7 +168,7 @@ export function pageUserLogin(_obj) {
  */
 export function getPageLoginCode(options) {
 	return new Promise((resolve, reject) => {
-		let code = option.code;
+		let code = options.code;
 		if (code == '' || code == undefined) {
 			//跳转鉴权 //1标识登录页面 请下发code 不要下发key
 			wechatRefreshToken('', 1, window.location.href);
diff --git a/manifest.json b/manifest.json
index 65d8058..a59e2f6 100755
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "益掌通",
-    "appid" : "__UNI__D5E7505",
+    "appid" : "__UNI__CC7D9A9",
     "description" : "hc智慧家园小程序 是 HC小区开源项目的一个分支项目，主要给业主使用，其中包括缴物业费，缴停车费，投诉建议，家庭成员维护，房屋保修\r 房屋出租，公告查看，小区圈等功能。",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/pages/myAccount/myAccount.vue b/pages/myAccount/myAccount.vue
index b4a82ff..0f94cc3 100644
--- a/pages/myAccount/myAccount.vue
+++ b/pages/myAccount/myAccount.vue
@@ -34,7 +34,7 @@
 	export default {
 		data() {
 			return {
-				accounts: ""
+				accounts: []
 			};
 		},
 
@@ -108,6 +108,10 @@
 							link: _ownerInfo.link,
 							communityId: _ownerInfo.communityId
 						}).then((data) => {
+							if(!data){
+								_that.accounts=[];
+								return ;
+							}
 							_that.accounts = data;
 						})
 					}
diff --git a/pages/myAccount/myCoupons.vue b/pages/myAccount/myCoupons.vue
index 154fdbd..b375b9c 100644
--- a/pages/myAccount/myCoupons.vue
+++ b/pages/myAccount/myCoupons.vue
@@ -145,6 +145,7 @@
 				let _couponUsers = [];
 				getCouponUsers(_objData, _couponUsers)
 					.then((_couponList) => {
+						
 						_couponList.data.forEach(items => {
 							items.createTime = items.createTime.replaceAll('-', '/');
 							items.endTime= items.endTime.replaceAll('-', '/');