linwenxin 1 anno fa
parent
commit
0018c6ca48
1 ha cambiato i file con 25 aggiunte e 4 eliminazioni
  1. 25 4
      src/common/utils/navPag.js

+ 25 - 4
src/common/utils/navPag.js

@@ -37,7 +37,14 @@ export const navToPage = (function() {
               if (uni.getStorageSync('miniProgram') == "jsm_env") {
                 // 家盛茂小程序环境
                 uniWebview[goToType]({
-                  url: url,
+                  ...(()=>{
+                    if(url){
+                      return {
+                        url:url
+                      }
+                    }
+                    return {}
+                  })(),
                   ...data
                 })
               } else {
@@ -46,13 +53,27 @@ export const navToPage = (function() {
                 if (!!~miniProgramPages.indexOf(url.split("?")[0])) {
                   // 第三方小程序跳转我们的h5页面处理
                   uniWebview[goToType]({
-                    url: `/pagesJsm/pages/middle?webUrl=${encodeURIComponent(webViewHref(url))}`,
+                    ...(()=>{
+                      if(url){
+                        return {
+                          url:`/pagesJsm/pages/middle?webUrl=${encodeURIComponent(webViewHref(url))}`
+                        }
+                      }
+                      return {}
+                    })(),
                     ...data
                   })
                 } else {
                   // 第三方小程序跳转我们的h5页面处理
                   uniWebview[goToType]({
-                    url: `/pagesJsm/pages/webview?webUrl=${encodeURIComponent(webViewHref(url))}`,
+                    ...(()=>{
+                      if(url){
+                        return {
+                          url:`/pagesJsm/pages/webview?webUrl=${encodeURIComponent(webViewHref(url))}`
+                        }
+                      }
+                      return {}
+                    })(),
                     ...data
                   })
                 }
@@ -246,4 +267,4 @@ export const crossPage = (function() {
   // #endif
 
   return funco
-})()
+})()