Commit 92c423be by 李嘉林

代码还原

parent 7a6ada7c
...@@ -30,8 +30,7 @@ export default { ...@@ -30,8 +30,7 @@ export default {
return { return {
link: process.env.BASE_URL, link: process.env.BASE_URL,
page: "/", page: "/",
// params: "?mixid=" + this.$store.state.mixid, params: "?mixid=" + this.$store.state.mixid,
params: "",
ss: "", ss: "",
timestamp:"", timestamp:"",
isMiniPage : false, isMiniPage : false,
...@@ -41,9 +40,9 @@ export default { ...@@ -41,9 +40,9 @@ export default {
computed: { computed: {
pageUrl() { pageUrl() {
console.log(this.link,'******',this.page,'-------',this.params,'++++++++') console.log(this.link,'******',this.page,'-------',this.params,'++++++++')
let pageUrl = this.page.startsWith("http") ? this.page : (this.link + this.page);
return ( return (
pageUrl + this.link +
this.page +
this.params + this.params +
`&native_test=1&tabbar=${this.index}&location_obj=${wx.getStorageSync( `&native_test=1&tabbar=${this.index}&location_obj=${wx.getStorageSync(
"location" "location"
...@@ -56,7 +55,6 @@ export default { ...@@ -56,7 +55,6 @@ export default {
console.log('--onLoad') console.log('--onLoad')
let tabIndex = this.index>=this.mpApp.globalData.footerVal.componentData.list.length?this.mpApp.globalData.footerVal.componentData.list.length-1:this.index; let tabIndex = this.index>=this.mpApp.globalData.footerVal.componentData.list.length?this.mpApp.globalData.footerVal.componentData.list.length-1:this.index;
this.params = this.$options.data.call(this).params this.params = this.$options.data.call(this).params
console.log(options,'---------------onLoad--params')
let ss = wx.getStorageSync("sessionid"); let ss = wx.getStorageSync("sessionid");
this.ss = ss ? `&sessionid=${ss}` : ""; this.ss = ss ? `&sessionid=${ss}` : "";
...@@ -83,12 +81,8 @@ export default { ...@@ -83,12 +81,8 @@ export default {
console.log(query,'==================', this.params,'-----------------',urlPrams) console.log(query,'==================', this.params,'-----------------',urlPrams)
// // 只兼容底部导航进入活动页面添加参数,跳转完成删除 // // 只兼容底部导航进入活动页面添加参数,跳转完成删除
if(query){ if(query){
if(this.params) {
this.params+='&'+query this.params+='&'+query
} else { } else {
this.params+='?'+query
}
} else {
this.params+=urlPrams?'&'+urlPrams:'' this.params+=urlPrams?'&'+urlPrams:''
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment