Commit f8c9a5fa authored by 和慭琛's avatar 和慭琛

bug-fix

parent 8c82b541
......@@ -137,7 +137,27 @@
},
methods: {
async getBaseInfo(vm,callBack){
console.log('getbaseifno')
uni.showLoading({
title:'加载中……'
})
const res = await vm.$u.api.getSettleBaseInfo()
if (!res.status) {
uni.showToast({
title: res.message || '获取基本信息错误',
icon: 'none'
});
return false;
}
this.globalData.settledInfo = res.data
console.log(res.data,'res.data')
callBack(vm,res.data)
uni.hideLoading()
return res.data
},
initAPIneedToken: function() {
......
......@@ -6,12 +6,18 @@
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/settle/index",
"style": {
"navigationBarTitleText": "充电桩安装招募"
}
{
"path": "pages/settle/index",
"style": {
"navigationBarTitleText": "充电桩安装招募"
}
},{
"path": "pages/settle/sign-contract",
"style": {
"navigationBarTitleText": "签约页面"
}
},{
"path": "pages/index/index",
"style": {
......@@ -87,13 +93,7 @@
"navigationBarTitleText": "入驻提示"
}
}, {
"path": "pages/settle/sign-contract",
"style": {
"navigationBarTitleText": "签约页面"
}
}, {
}, {
"path": "pages/settle/web",
"style": {
"navigationBarTitleText": "签约页面"
......
......@@ -331,8 +331,12 @@
}
const url = res.data
getApp().globalData.signUrl = url
uni.navigateTo({
url:'/pages/settle/web?url='+url
// url:'/pages/settle/web?url='+url
url:'/pages/settle/web?url='+encodeURIComponent(url)
})
}
},
......
......@@ -21,6 +21,16 @@
if(e.url){
webUrl = e.url
}
webUrl = decodeURIComponent(e.url);
console.log('web-webUrl:')
console.log(webUrl)
webUrl = getApp().globalData.signUrl
console.log('getApp-web-webUrl:')
console.log(webUrl)
this.webUrl = webUrl
}
......
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