From c3445f25350805df114e0a790fc62636b0033fb1 Mon Sep 17 00:00:00 2001
From: Haiyi <1021441632@qq.com>
Date: Mon, 19 Dec 2022 11:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E8=B7=B3=E8=BD=AC=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=87=BD=E6=95=B0):=E4=BF=AE=E5=A4=8D=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/common.ts | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/common/common.ts b/src/common/common.ts
index f460e8e..02bd721 100644
--- a/src/common/common.ts
+++ b/src/common/common.ts
@@ -1,6 +1,26 @@
 import Taro from '@tarojs/taro'
 import Qs from 'qs'
 
+const setUrlQuery = (options: { url: string; query: object | null }) => {
+  let { url } = options
+  const { query } = options
+  if (!url) { return '' }
+  if (query) {
+    const queryArr: any[] = []
+    for (const key in query) {
+      if (query.hasOwnProperty(key)) {
+        queryArr.push(`${key}=${query[key]}`)
+      }
+    }
+    if (url.includes('?')) {
+      url = `${url}&${queryArr.join('&')}`
+    }
+    else {
+      url = `${url}?${queryArr.join('&')}`
+    }
+  }
+  return url
+}
 /**
  * 跳转
  * @param path
@@ -8,11 +28,11 @@ import Qs from 'qs'
  * @param type false 跳转普通页面，true 跳转tabbar页面
  */
 type ParamLink = 'navigateTo' | 'switchTab' | 'reLaunch' | 'redirectTo'
-export const goLink = (path = '', params = {}, way: ParamLink = 'navigateTo') => {
+export const goLink = (path = '', params: object | null = null, way: ParamLink = 'navigateTo') => {
   if (path) {
-    const params_str = Qs.stringify(params)
-    console.log('params_str==>', params_str)
-    path = params_str ? `${path}?${params_str}` : path
+    // let params_str = Qs_.stringify(params || {}, { encode: false })
+    // path = params_str ? path + '?' + params_str : path
+    path = setUrlQuery({ url: path, query: params })
     Taro[way]({ url: path })
   }
 }