|
|
|
@ -14,7 +14,7 @@ Page({
|
|
|
|
reg_type:'a',
|
|
|
|
reg_type:'a',
|
|
|
|
wxCode: '',
|
|
|
|
wxCode: '',
|
|
|
|
btnColor:false,
|
|
|
|
btnColor:false,
|
|
|
|
switch1Checked: true,
|
|
|
|
switch1Checked: false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
switch1Change: function (e) {
|
|
|
|
switch1Change: function (e) {
|
|
|
|
console.log("radio发生change事件，携带value值为：", e.detail.value);
|
|
|
|
console.log("radio发生change事件，携带value值为：", e.detail.value);
|
|
|
|
@ -178,10 +178,13 @@ Page({
|
|
|
|
code: that.data.wxCode,
|
|
|
|
code: that.data.wxCode,
|
|
|
|
iv: iv,
|
|
|
|
iv: iv,
|
|
|
|
encryptedData: encryptedData,
|
|
|
|
encryptedData: encryptedData,
|
|
|
|
|
|
|
|
type: "yishoudan",
|
|
|
|
|
|
|
|
appId:'wxd7aba642f7fd77fd'
|
|
|
|
},
|
|
|
|
},
|
|
|
|
success: function (res) {
|
|
|
|
success: function (res) {
|
|
|
|
console.log(res);
|
|
|
|
console.log(res);
|
|
|
|
app.globalData.openId = res.data.data.openId;
|
|
|
|
app.globalData.openId = res.data.data.openId;
|
|
|
|
|
|
|
|
app.globalData.unionid = res.data.data.unionid;
|
|
|
|
let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null);
|
|
|
|
let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null);
|
|
|
|
promise.then(res => {
|
|
|
|
promise.then(res => {
|
|
|
|
wx.reLaunch({
|
|
|
|
wx.reLaunch({
|
|
|
|
@ -209,6 +212,8 @@ Page({
|
|
|
|
code: res.code,
|
|
|
|
code: res.code,
|
|
|
|
iv: iv,
|
|
|
|
iv: iv,
|
|
|
|
encryptedData: encryptedData,
|
|
|
|
encryptedData: encryptedData,
|
|
|
|
|
|
|
|
type: "dtdl",
|
|
|
|
|
|
|
|
appId:'wxd7aba642f7fd77fd'
|
|
|
|
},
|
|
|
|
},
|
|
|
|
success: function (res) {
|
|
|
|
success: function (res) {
|
|
|
|
console.log(res);
|
|
|
|
console.log(res);
|
|
|
|
@ -288,7 +293,7 @@ Page({
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
wx.request({
|
|
|
|
wx.request({
|
|
|
|
url: app.globalData.ip + '/appLoginByTel',
|
|
|
|
url: app.globalData.ip + '/appLoginByTelYiShouDan',
|
|
|
|
data: {
|
|
|
|
data: {
|
|
|
|
tel: that.data.tel,
|
|
|
|
tel: that.data.tel,
|
|
|
|
code: that.data.msgCode,
|
|
|
|
code: that.data.msgCode,
|
|
|
|
@ -297,6 +302,8 @@ Page({
|
|
|
|
autoLoginTag: 0,
|
|
|
|
autoLoginTag: 0,
|
|
|
|
loginType: 'login',
|
|
|
|
loginType: 'login',
|
|
|
|
isScanQRCodes: app.globalData.isScanQRCodes,
|
|
|
|
isScanQRCodes: app.globalData.isScanQRCodes,
|
|
|
|
|
|
|
|
wxCode: that.data.wxCode,
|
|
|
|
|
|
|
|
appId:'wxd7aba642f7fd77fd'
|
|
|
|
},
|
|
|
|
},
|
|
|
|
header: {
|
|
|
|
header: {
|
|
|
|
'content-type': 'application/json'
|
|
|
|
'content-type': 'application/json'
|
|
|
|
@ -307,59 +314,7 @@ Page({
|
|
|
|
console.log(res.data);
|
|
|
|
console.log(res.data);
|
|
|
|
|
|
|
|
|
|
|
|
if (res.data.status == 200) {
|
|
|
|
if (res.data.status == 200) {
|
|
|
|
app.globalData.user = res.data.data.user;
|
|
|
|
that.setLoginData(res);
|
|
|
|
app.globalData.sessionId = res.data.data.sessionId;
|
|
|
|
|
|
|
|
app.globalData.headers.Cookie = 'JSESSIONID=' + res.data.data.sessionId;
|
|
|
|
|
|
|
|
app.globalData.headers2.Cookie = 'JSESSIONID=' + res.data.data.sessionId;
|
|
|
|
|
|
|
|
app.globalData.isLogin = true;
|
|
|
|
|
|
|
|
app.globalData.agencyStatus = res.data.data.agencyStatus;
|
|
|
|
|
|
|
|
app.globalData.loginUserInfo = res.data.data;
|
|
|
|
|
|
|
|
//登录设置缓存
|
|
|
|
|
|
|
|
app.globalData.userLoginTokenInfo.tel = res.data.data.tel;
|
|
|
|
|
|
|
|
app.globalData.userLoginTokenInfo.token = null;
|
|
|
|
|
|
|
|
wx.setStorageSync('loginUserTokenInfo', app.globalData.userLoginTokenInfo);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
console.log(111);
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
var comeFrom = wx.getStorageSync('comeFromPage');
|
|
|
|
|
|
|
|
// var comeFromPageParam = wx.getStorageSync('comeFromPageParam');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(comeFrom == 'me') {
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: '/pages/me/index'
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
} else if (comeFrom == 'index') {
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: '/pages/tgIndex/index'
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
} else if (comeFrom == 'detail') {
|
|
|
|
|
|
|
|
wx.navigateBack({
|
|
|
|
|
|
|
|
delta: 1
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// wx.reLaunch({
|
|
|
|
|
|
|
|
// url: "/pages/detail/index?storeJobId=" + comeFromPageParam.storeJobId
|
|
|
|
|
|
|
|
// })
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
wx.setStorage({
|
|
|
|
|
|
|
|
key: "comeFrom",
|
|
|
|
|
|
|
|
data: "login"
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: "../me/index"
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch (e) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wx.setStorage({
|
|
|
|
|
|
|
|
key: "comeFrom",
|
|
|
|
|
|
|
|
data: "login"
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: "/pages/me/index"
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
console.log(222);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
wx.showToast({
|
|
|
|
wx.showToast({
|
|
|
|
@ -373,6 +328,70 @@ Page({
|
|
|
|
})
|
|
|
|
})
|
|
|
|
//console.log('form发生了submit事件，携带数据为：', e.detail.value)
|
|
|
|
//console.log('form发生了submit事件，携带数据为：', e.detail.value)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
setLoginData(res) {
|
|
|
|
|
|
|
|
app.globalData.user = res.data.data.user;
|
|
|
|
|
|
|
|
app.globalData.sessionId = res.data.data.sessionId;
|
|
|
|
|
|
|
|
app.globalData.headers.Cookie = "JSESSIONID=" + res.data.data.sessionId;
|
|
|
|
|
|
|
|
app.globalData.headers2.Cookie = "JSESSIONID=" + res.data.data.sessionId;
|
|
|
|
|
|
|
|
app.globalData.isLogin = true;
|
|
|
|
|
|
|
|
app.globalData.agencyStatus = res.data.data.agencyStatus;
|
|
|
|
|
|
|
|
app.globalData.loginUserInfo = res.data.data;
|
|
|
|
|
|
|
|
//登录设置缓存
|
|
|
|
|
|
|
|
app.globalData.userLoginTokenInfo.tel = res.data.data.tel;
|
|
|
|
|
|
|
|
app.globalData.userLoginTokenInfo.token = null;
|
|
|
|
|
|
|
|
wx.setStorageSync("loginUserTokenInfo", app.globalData.userLoginTokenInfo);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
console.log(111);
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
var comeFrom = wx.getStorageSync("comeFromPage");
|
|
|
|
|
|
|
|
// var comeFromPageParam = wx.getStorageSync('comeFromPageParam');
|
|
|
|
|
|
|
|
console.log(comeFrom);
|
|
|
|
|
|
|
|
if (comeFrom == "me") {
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: "/pages/me/index",
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
} else if (comeFrom == "index") {
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: "/pages/index/index",
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
} else if (comeFrom == "detail") {
|
|
|
|
|
|
|
|
wx.navigateBack({
|
|
|
|
|
|
|
|
delta: 1,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// wx.reLaunch({
|
|
|
|
|
|
|
|
// url: "/pages/detail/index?storeJobId=" + comeFromPageParam.storeJobId
|
|
|
|
|
|
|
|
// })
|
|
|
|
|
|
|
|
} else if (comeFrom == "collect") {
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: "/pages/collect/index",
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
} else if (comeFrom == "BillInfo") {
|
|
|
|
|
|
|
|
// console.log(wx.getStorageSync('QRBillInfo'));
|
|
|
|
|
|
|
|
// console.log(JSON.stringify(wx.getStorageSync('QRBillInfo')));
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: "/pages/wodeBillDetail/index?info=" + JSON.stringify(wx.getStorageSync("QRBillInfo")),
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
wx.removeStorageSync("QRBillInfo");
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
wx.setStorage({
|
|
|
|
|
|
|
|
key: "comeFrom",
|
|
|
|
|
|
|
|
data: "login",
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: "/pages/index/index",
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch (e) {
|
|
|
|
|
|
|
|
wx.setStorage({
|
|
|
|
|
|
|
|
key: "comeFrom",
|
|
|
|
|
|
|
|
data: "login",
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
wx.reLaunch({
|
|
|
|
|
|
|
|
url: "/pages/index/index",
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
ohShitfadeOut() {
|
|
|
|
ohShitfadeOut() {
|
|
|
|
var fadeOutTimeout = setTimeout(() => {
|
|
|
|
var fadeOutTimeout = setTimeout(() => {
|
|
|
|
this.setData({ popErrorMsg: '', pop: 0 });
|
|
|
|
this.setData({ popErrorMsg: '', pop: 0 });
|
|
|
|
|
