Prechádzať zdrojové kódy

refactor(miniprogram): 优化登录逻辑和数据处理

- 修正变量命名,提高代码可读性
- 优化登录流程,处理不同登录状态
- 调整 openid 获取逻辑
- 移除不必要的注释代码
wzg 7 mesiacov pred
rodič
commit
44a89b22e6

+ 15 - 16
miniprogram/pages/index/index.js

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

+ 1 - 1
miniprogram/utils/wxUtils.js

@@ -11,7 +11,7 @@ function wxSetSessionKey() {
           });
           if (data.status === 0) {
             let { openId } = data.result;
-            // let openId = "oiOWR5ch23L_mD2uYwSemzedD2dG8I2322221";
+            // openId = "oiOWR5ch23L_mD2uYwSemzedD2dG8I2323221";
             wx.setStorageSync("openId", openId);
             resolve({
               status: 0,