|
@@ -61,12 +61,15 @@ export const navToPage = (function() {
|
|
|
}
|
|
|
})()
|
|
|
|
|
|
-export function webViewHref(url) {
|
|
|
+export function webViewHref(url, pam = {}) {
|
|
|
+ var pamstr = Object.entries(pam).map(item => {
|
|
|
+ return item.join("=")
|
|
|
+ }).join("&");
|
|
|
if (!!~url.indexOf("?")) {
|
|
|
return process.env.VUE_APP_HREF + url +
|
|
|
- `&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||''}`
|
|
|
+ `${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 +
|
|
|
- `?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||''}`
|
|
|
+ `?${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||''}`
|
|
|
}
|
|
|
}
|