|
@@ -47,13 +47,19 @@ Page({
|
|
|
Object.keys(obj).forEach(function (key) {
|
|
Object.keys(obj).forEach(function (key) {
|
|
|
wx.setStorageSync(key, obj[key]);
|
|
wx.setStorageSync(key, obj[key]);
|
|
|
});
|
|
});
|
|
|
- wx.setStorageSync("accessToken", data.result.tokenInfo.tokenValue);
|
|
|
|
|
|
|
+ wx.setStorageSync(
|
|
|
|
|
+ "accessToken",
|
|
|
|
|
+ data?.result?.tokenInfo?.tokenValue || ""
|
|
|
|
|
+ );
|
|
|
wx.switchTab({
|
|
wx.switchTab({
|
|
|
url: "/pages/takePhoto/takePhoto",
|
|
url: "/pages/takePhoto/takePhoto",
|
|
|
});
|
|
});
|
|
|
} else {
|
|
} else {
|
|
|
if (data?.result?.userInfo?.userId) {
|
|
if (data?.result?.userInfo?.userId) {
|
|
|
- wx.setStorageSync("accessToken", data.result.tokenInfo.tokenValue);
|
|
|
|
|
|
|
+ wx.setStorageSync(
|
|
|
|
|
+ "accessToken",
|
|
|
|
|
+ data?.result?.tokenInfo?.tokenValue || ""
|
|
|
|
|
+ );
|
|
|
wx.showModal({
|
|
wx.showModal({
|
|
|
title: "提示",
|
|
title: "提示",
|
|
|
content: "您已注册但尚未绑定船舶,去绑定?",
|
|
content: "您已注册但尚未绑定船舶,去绑定?",
|
|
@@ -98,9 +104,8 @@ Page({
|
|
|
});
|
|
});
|
|
|
console.log("data1", data);
|
|
console.log("data1", data);
|
|
|
if (data.status === 0) {
|
|
if (data.status === 0) {
|
|
|
- let { phoneNumber: phone } = data.result;
|
|
|
|
|
- // let phone = "19213811213";
|
|
|
|
|
- wx.setStorageSync("phone", phone);
|
|
|
|
|
|
|
+ // let { phoneNumber: phone } = data.result;
|
|
|
|
|
+ let phone = "15136162222";
|
|
|
let { data } = await postApi("/login", {
|
|
let { data } = await postApi("/login", {
|
|
|
phone,
|
|
phone,
|
|
|
openId: wx.getStorageSync("openId"),
|
|
openId: wx.getStorageSync("openId"),
|
|
@@ -114,11 +119,19 @@ Page({
|
|
|
});
|
|
});
|
|
|
if (data.status === 0) {
|
|
if (data.status === 0) {
|
|
|
console.log(data, "data2");
|
|
console.log(data, "data2");
|
|
|
- wx.setStorageSync("accessToken", data.result.tokenInfo.tokenValue);
|
|
|
|
|
|
|
+ wx.setStorageSync("phone", phone);
|
|
|
|
|
+ wx.setStorageSync(
|
|
|
|
|
+ "accessToken",
|
|
|
|
|
+ data?.result?.tokenInfo?.tokenValue || ""
|
|
|
|
|
+ );
|
|
|
} else {
|
|
} else {
|
|
|
console.log(data, "data23");
|
|
console.log(data, "data23");
|
|
|
- wx.setStorageSync("accessToken", data.result.tokenInfo.tokenValue);
|
|
|
|
|
|
|
+ wx.setStorageSync(
|
|
|
|
|
+ "accessToken",
|
|
|
|
|
+ data?.result?.tokenInfo?.tokenValue || ""
|
|
|
|
|
+ );
|
|
|
if (data?.result?.userInfo?.userId) {
|
|
if (data?.result?.userInfo?.userId) {
|
|
|
|
|
+ console.log(data, "data24");
|
|
|
wx.showModal({
|
|
wx.showModal({
|
|
|
title: "提示",
|
|
title: "提示",
|
|
|
content: "您已注册但尚未绑定船舶,去绑定?",
|
|
content: "您已注册但尚未绑定船舶,去绑定?",
|
|
@@ -135,8 +148,9 @@ Page({
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ console.log(data, "data25");
|
|
|
wx.showToast({
|
|
wx.showToast({
|
|
|
- title: data2.msg,
|
|
|
|
|
|
|
+ title: data.msg,
|
|
|
icon: "none",
|
|
icon: "none",
|
|
|
duration: 5000,
|
|
duration: 5000,
|
|
|
});
|
|
});
|
|
@@ -158,7 +172,14 @@ Page({
|
|
|
icon: "error",
|
|
icon: "error",
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
- } catch (error) {}
|
|
|
|
|
|
|
+ } catch (error) {
|
|
|
|
|
+ wx.showToast({
|
|
|
|
|
+ title: "系统错误",
|
|
|
|
|
+ icon: "none",
|
|
|
|
|
+ duration: 5000,
|
|
|
|
|
+ });
|
|
|
|
|
+ console.error("Error:", error);
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
onLoad: function (options) {},
|
|
onLoad: function (options) {},
|
|
|
|
|
|
|
@@ -229,7 +250,10 @@ Page({
|
|
|
Object.keys(obj).forEach(function (key) {
|
|
Object.keys(obj).forEach(function (key) {
|
|
|
wx.setStorageSync(key, obj[key]);
|
|
wx.setStorageSync(key, obj[key]);
|
|
|
});
|
|
});
|
|
|
- wx.setStorageSync("accessToken", data.result.tokenInfo.tokenValue);
|
|
|
|
|
|
|
+ wx.setStorageSync(
|
|
|
|
|
+ "accessToken",
|
|
|
|
|
+ data?.result?.tokenInfo?.tokenValue || ""
|
|
|
|
|
+ );
|
|
|
wx.showToast({
|
|
wx.showToast({
|
|
|
title: "绑定成功",
|
|
title: "绑定成功",
|
|
|
icon: "success",
|
|
icon: "success",
|