|
@@ -99,36 +99,36 @@ Page({
|
|
|
title: "正在登录...",
|
|
title: "正在登录...",
|
|
|
mask: true,
|
|
mask: true,
|
|
|
});
|
|
});
|
|
|
- let { data } = await postApi("/wx/getPhoneNumber", {
|
|
|
|
|
|
|
+ let { data: data1 } = await postApi("/wx/getPhoneNumber", {
|
|
|
code: e.detail.code,
|
|
code: e.detail.code,
|
|
|
});
|
|
});
|
|
|
- console.log("data1", data);
|
|
|
|
|
- if (data.status === 0) {
|
|
|
|
|
- let { phoneNumber: phone } = data.result;
|
|
|
|
|
- // let phone = "15136112233";
|
|
|
|
|
- let { data } = await postApi("/login", {
|
|
|
|
|
|
|
+ console.log("data1", data1);
|
|
|
|
|
+ if (data1.status === 0) {
|
|
|
|
|
+ let { phoneNumber: phone } = data1.result;
|
|
|
|
|
+ // phone = "15036112233";
|
|
|
|
|
+ let { data: data2 } = await postApi("/login", {
|
|
|
phone,
|
|
phone,
|
|
|
openId: wx.getStorageSync("openId"),
|
|
openId: wx.getStorageSync("openId"),
|
|
|
});
|
|
});
|
|
|
- console.log("data2", data);
|
|
|
|
|
|
|
+ console.log("data2", data2);
|
|
|
await new Promise((resolve) => {
|
|
await new Promise((resolve) => {
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
wx.hideLoading();
|
|
wx.hideLoading();
|
|
|
resolve();
|
|
resolve();
|
|
|
}, 1500);
|
|
}, 1500);
|
|
|
});
|
|
});
|
|
|
- if (data.status === 0) {
|
|
|
|
|
- console.log(data, "data2");
|
|
|
|
|
|
|
+ if (data2.status === 0) {
|
|
|
wx.setStorageSync("phone", phone);
|
|
wx.setStorageSync("phone", phone);
|
|
|
wx.setStorageSync(
|
|
wx.setStorageSync(
|
|
|
"accessToken",
|
|
"accessToken",
|
|
|
- data?.result?.tokenInfo?.tokenValue || ""
|
|
|
|
|
|
|
+ data2?.result?.tokenInfo?.tokenValue || ""
|
|
|
);
|
|
);
|
|
|
} else {
|
|
} else {
|
|
|
- console.log(data, "data23");
|
|
|
|
|
-
|
|
|
|
|
- if (data?.result?.userInfo?.userId) {
|
|
|
|
|
- console.log(data, "data24");
|
|
|
|
|
|
|
+ if (data2?.result?.userInfo?.userId) {
|
|
|
|
|
+ wx.setStorageSync(
|
|
|
|
|
+ "accessToken",
|
|
|
|
|
+ data2?.result?.tokenInfo?.tokenValue || ""
|
|
|
|
|
+ );
|
|
|
wx.showModal({
|
|
wx.showModal({
|
|
|
title: "提示",
|
|
title: "提示",
|
|
|
content: "您已注册但尚未绑定船舶,去绑定?",
|
|
content: "您已注册但尚未绑定船舶,去绑定?",
|
|
@@ -145,9 +145,8 @@ Page({
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
} else {
|
|
} else {
|
|
|
- console.log(data, "data25");
|
|
|
|
|
wx.showToast({
|
|
wx.showToast({
|
|
|
- title: data.msg,
|
|
|
|
|
|
|
+ title: data2.msg,
|
|
|
icon: "none",
|
|
icon: "none",
|
|
|
duration: 5000,
|
|
duration: 5000,
|
|
|
});
|
|
});
|