|
|
@@ -60,7 +60,7 @@ Page({ |
|
|
|
province, |
|
|
|
city |
|
|
|
}).then(res => { |
|
|
|
console.log(res,'保存用户信息返回的Res') |
|
|
|
console.log(res, '保存用户信息返回的Res') |
|
|
|
this.getUserSession() |
|
|
|
}).catch(error => { |
|
|
|
console.log(error, 'error appletLogin') |
|
|
@@ -69,9 +69,9 @@ Page({ |
|
|
|
// 获取用户信息弹框 |
|
|
|
onCheckboxChange() { |
|
|
|
if (!this.data.hasUserInfo) { |
|
|
|
if(!this.data.userInfo){ |
|
|
|
if (!this.data.userInfo) { |
|
|
|
this.getUserProfile() |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
this.setData({ |
|
|
|
hasUserInfo: true |
|
|
|
}) |
|
|
@@ -109,8 +109,29 @@ Page({ |
|
|
|
let that = this |
|
|
|
$request.post('/script/getSession.action', {}).then(res => { |
|
|
|
wx.hideLoading() |
|
|
|
console.log(res, '返回的res') |
|
|
|
app.globalData.customerId = res.data.customer.customerId; |
|
|
|
wx.navigateBack() |
|
|
|
app.globalData.customer = res.data.customer; |
|
|
|
let pages = getCurrentPages(); |
|
|
|
let Page = pages[pages.length - 1];//当前页 |
|
|
|
let prevPage = pages[pages.length - 2]; //上一个页面 |
|
|
|
let info = prevPage.data //取上页data里的数据也可以修改 |
|
|
|
console.log(prevPage,'prevPage'); |
|
|
|
console.log(info,'info'); |
|
|
|
// 如果是上一页是我的页面 |
|
|
|
if(prevPage.route == "pages/myModule/index"){ |
|
|
|
|
|
|
|
}else{ |
|
|
|
wx.navigateBack() |
|
|
|
} |
|
|
|
// let tempListData = info.listData; |
|
|
|
// tempListData.forEach(el => { |
|
|
|
// if (el.businessCommunicationDemandId == businessCommunicationDemandId) { |
|
|
|
// el.info = Page.data.detailValue |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// prevPage.setData({ listData: tempListData })//设置数据 |
|
|
|
// wx.navigateBack() |
|
|
|
}).catch(error => { |
|
|
|
console.log(error, "获取error") |
|
|
|
}) |