From b57bc976f3797494d48306e7a1a9d5dab0eb52b2 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 23 Jan 2025 15:38:58 +0800
Subject: [PATCH] fixed webview query

---
 src/pages/index/index.vue                   | 5 ++++-
 src/pages/login/login.vue                   | 4 ++--
 src/pages/merchant_login/merchant_login.vue | 4 ++--
 src/subpackage/wallet/pages/index/index.vue | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 33a6169..5a35f8e 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -55,7 +55,7 @@
 
 		<authorization-login ref="authorizationLogin"></authorization-login>
 
-		<view class="fly_btn"  @click="toPageInfo(tabList[4])" v-if="loginState&&isPermissionShowTab(tabList[4])">
+		<view class="fly_btn"  @click="toPageInfo(getTabForID(4))" v-if="loginState&&isPermissionShowTab(getTabForID(4))">
 			<image class="f_bg" src="/static/images/icon/index/green_bg_circle.png" mode="scaleToFill"/>
 			<image class="f_icon" src="/static/images/icon/index/scan_icon_white.png" mode="scaleToFill"/>
 			<text>核销</text>
@@ -201,6 +201,9 @@
 			if(JSON.stringify(indexData)!='{}'&&loginState)getIndexInfo();
 		},
 		methods: {
+			getTabForID(id){
+				return tabList.find(e=>e.id === id) || {}
+			},
 			// 账号有开启了权限的才显示菜单，否则不显示【ID1000840】
 			isPermissionShowTab(e){
 				let { indexData } = this;
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index c7b5177..63cbafc 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -43,7 +43,7 @@
 <script>
 import { API } from '../../js/api';
 import { servers } from '../../js/server';
-import util from '../../utils/util';
+import util, { jsonStr } from '../../utils/util';
 // import wxplugin from '../../utils/wx_plugin';
 const uniGetSetting = util.promisify(uni.getSetting);
 const uniLogin = util.promisify(uni.login);
@@ -189,7 +189,7 @@ export default {
             }
         },
         toWebView(){
-            util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL');
+            util.routeTo(`/pages/web_view/web_view?src=${jsonStr("https://www.ouxuanzhineng.cn")}`,'rL');
         }
     },
 }
diff --git a/src/pages/merchant_login/merchant_login.vue b/src/pages/merchant_login/merchant_login.vue
index c8f7a1c..8327f6b 100644
--- a/src/pages/merchant_login/merchant_login.vue
+++ b/src/pages/merchant_login/merchant_login.vue
@@ -8,11 +8,11 @@
     </view>
 </template>
 <script>
-import util from '../../utils/util'
+import util, { jsonStr } from '../../utils/util'
 export default {
     methods: {
         toWebView(){
-            util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL');
+            util.routeTo(`/pages/web_view/web_view?src=${jsonStr("https://www.ouxuanzhineng.cn/")}`,'rL');
         }
     }
 }
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index fc10103..34175d7 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -34,7 +34,7 @@ import walletModalSuccess from '../../components/wallet_modal_success.vue';
 import rechargeModal from "./modules/recharge_modal.vue";
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
-import { routeTo, showLoad, hideLoad, debounce, showModal } from '@/utils/util';
+import { routeTo, showLoad, hideLoad, debounce, showModal, jsonStr } from '@/utils/util';
 export default {
     components: {
         'wallet-info': walletInfo,
@@ -80,7 +80,7 @@ export default {
             })
         }, 300, true),
         toWebView(){
-            routeTo(`/pages/web_view/web_view?src=${encodeURIComponent(this.getAdminAddress())}`,'nT');
+            routeTo(`/pages/web_view/web_view?src=${jsonStr(this.getAdminAddress())}`,'nT');
         },
         getAdminAddress(){
             let _appid = uni.getAccountInfoSync()?.miniProgram?.appId || '';