feat: 代码优化

src/common/utils/navPag.js

@@ -7,25 +7,27 @@ import {
 import store from '@/store/index.js'
 
 export function webViewHref(url, pam = {}) {
-  var pamstr = Object.entries(pam).map(item => item.join("=")).join("&");
-  // #ifdef H5
-  if (!!~url.indexOf("?")) {
-    return process.env.VUE_APP_HREF + url +
-      `${pamstr?"&"+pamstr:""}&x-token=${store.state.user.token||''}&openId=${store.state.user.openId||''}&userId=${store.state.user.userId}&username=${store.state.user.name||''}&useravatar=${store.state.user.avatar||''}`
-  } else {
-    return process.env.VUE_APP_HREF + url +
-      `?${pamstr?pamstr+"&":""}x-token=${store.state.user.token||''}&openId=${store.state.user.openId||''}&userId=${store.state.user.userId}&username=${store.state.user.name||''}&useravatar=${store.state.user.avatar||''}`
+
+  var defaultPam = {
+    ...pam,
+    "x-token": store.state.user.token,
+    openId: store.state.user.openId,
+    userId: store.state.user.userId,
+    username: store.state.user.name,
+    useravatar: store.state.user.avatar,
+    // #ifndef H5
+    miniProgram: "jsm_env",
+    // #endif
   }
-  // #endif
-  // #ifndef H5
+
+  var pamstr = Object.entries(defaultPam).map(item => item.join("=")).join("&");
+
   if (!!~url.indexOf("?")) {
-    return process.env.VUE_APP_HREF + url +
-      `${pamstr?"&"+pamstr:""}&x-token=${store.state.user.token||''}&openId=${store.state.user.openId||''}&userId=${store.state.user.userId}&username=${store.state.user.name||''}&useravatar=${store.state.user.avatar||''}&miniProgram=jsm_env`
+    return process.env.VUE_APP_HREF + url + `${pamstr?"&"+pamstr:""}`
   } else {
-    return process.env.VUE_APP_HREF + url +
-      `?${pamstr?pamstr+"&":""}x-token=${store.state.user.token||''}&openId=${store.state.user.openId||''}&userId=${store.state.user.userId}&username=${store.state.user.name||''}&useravatar=${store.state.user.avatar||''}&miniProgram=jsm_env`
+    return process.env.VUE_APP_HREF + url + `${pamstr?"?"+pamstr:""}`
   }
-  // #endif
+
 }
 
 export const navToPage = (function() {