优化代码

2025-08-05 22:05:56 +08:00
parent 3eddd94922
commit 40c3282515
86 changed files with 1700 additions and 399 deletions
--- a/unpackage/dist/dev/mp-weixin/components/VerifyLogin.js
+++ b/unpackage/dist/dev/mp-weixin/components/VerifyLogin.js
@@ -1,6 +1,6 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
-function VerifyLogin() {
+function VerifyLogin(id) {
  return new Promise((resolve, reject) => {
    common_vendor.index.getStorage({
      key: "userinfo",
@@ -9,19 +9,18 @@ function VerifyLogin() {
          if (res.data.nickName) {
            resolve(true);
          } else {
-            common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+            common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route + "?inid=" + id);
            common_vendor.index.reLaunch({ url: "/pages/UserInformation/UserInformation" });
            resolve(false);
          }
        } else {
-          common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+          common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route + "?inid=" + id);
          common_vendor.index.navigateTo({ url: "/pages/login/login" });
          resolve(false);
        }
      },
      fail: (err) => {
-        common_vendor.index.__f__("error", "at components/VerifyLogin.js:22", "获取用户信息失败", err);
-        common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+        common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route + "?inid=" + id);
        common_vendor.index.navigateTo({ url: "/pages/login/login" });
        reject(err);
      }
--- a/unpackage/dist/dev/mp-weixin/components/request.js
+++ b/unpackage/dist/dev/mp-weixin/components/request.js
@@ -3,7 +3,7 @@ const common_vendor = require("../common/vendor.js");
 const components_addPrefixToHeaderIcon = require("./addPrefixToHeaderIcon.js");
 function request(urldata) {
  const { url, data, method, header, userInfo } = urldata;
-  const baseUrl = "https://pk.zhukeping.com/" + url;
+  const baseUrl = "http://192.168.1.174:8086/" + url;
  if (userInfo) {
    return new Promise((resolve, reject) => {
      common_vendor.index.getStorage({
@@ -11,17 +11,28 @@ function request(urldata) {
        success: (res) => {
          if (res.data) {
            if (res.data.nickName) {
-              common_vendor.index.request({
-                url: baseUrl,
-                data,
-                method,
-                header,
-                success: function(res2) {
-                  common_vendor.index.__f__("log", "at components/request.js:21", "请求成功", res2);
-                  resolve(components_addPrefixToHeaderIcon.addPrefixToHeaderIcon(res2.data));
+              common_vendor.index.getStorage({
+                key: "token",
+                success: (res2) => {
+                  common_vendor.index.__f__("log", "at components/request.js:18", "token", res2.data);
+                  common_vendor.index.request({
+                    url: baseUrl,
+                    data,
+                    method,
+                    header: {
+                      token: res2.data,
+                      ...header
+                    },
+                    success: function(res3) {
+                      common_vendor.index.__f__("log", "at components/request.js:28", "请求成功", res3);
+                      resolve(components_addPrefixToHeaderIcon.addPrefixToHeaderIcon(res3.data));
+                    },
+                    fail: function(res3) {
+                      reject(res3);
+                    }
+                  });
                },
-                fail: function(res2) {
-                  reject(res2);
+                fail: (res2) => {
                }
              });
            } else {
@@ -42,17 +53,43 @@ function request(urldata) {
    });
  } else {
    return new Promise((resolve, reject) => {
-      common_vendor.index.request({
-        url: baseUrl,
-        data,
-        method,
-        header,
-        success: function(res) {
-          common_vendor.index.__f__("log", "at components/request.js:52", "请求成功", res);
-          resolve(components_addPrefixToHeaderIcon.addPrefixToHeaderIcon(res.data));
+      common_vendor.index.getStorage({
+        key: "token",
+        success: (res) => {
+          common_vendor.index.__f__("log", "at components/request.js:59", "token", res.data);
+          common_vendor.index.request({
+            url: baseUrl,
+            data,
+            method,
+            header: {
+              token: res.data,
+              ...header
+            },
+            success: function(res2) {
+              common_vendor.index.__f__("log", "at components/request.js:69", "请求成功", res2);
+              resolve(components_addPrefixToHeaderIcon.addPrefixToHeaderIcon(res2.data));
+            },
+            fail: function(res2) {
+              reject(res2);
+            }
+          });
        },
-        fail: function(res) {
-          reject(res);
+        fail: (res) => {
+          common_vendor.index.request({
+            url: baseUrl,
+            data,
+            method,
+            header: {
+              ...header
+            },
+            success: function(res2) {
+              common_vendor.index.__f__("log", "at components/request.js:86", "请求成功", res2);
+              resolve(components_addPrefixToHeaderIcon.addPrefixToHeaderIcon(res2.data));
+            },
+            fail: function(res2) {
+              reject(res2);
+            }
+          });
        }
      });
    });
--- a/unpackage/dist/dev/mp-weixin/components/topNavigation/topNavigation.js
+++ b/unpackage/dist/dev/mp-weixin/components/topNavigation/topNavigation.js
@@ -4,7 +4,8 @@ const _sfc_main = {
  data() {
    return {
      title: "Hello",
-      Select: false
+      Select: true
+      //是否选中实时PK/今日PK false/大厅 true
    };
  },
  onLoad() {
@@ -28,12 +29,12 @@ const _sfc_main = {
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
  return {
-    a: common_vendor.o((...args) => $options.MakeAppointmentPK && $options.MakeAppointmentPK(...args)),
-    b: !$data.Select ? 1 : "",
-    c: $data.Select ? 1 : "",
-    d: common_vendor.o((...args) => $options.RealTimePk && $options.RealTimePk(...args)),
-    e: $data.Select ? 1 : "",
-    f: !$data.Select ? 1 : "",
+    a: common_vendor.o((...args) => $options.RealTimePk && $options.RealTimePk(...args)),
+    b: $data.Select ? 1 : "",
+    c: !$data.Select ? 1 : "",
+    d: common_vendor.o((...args) => $options.MakeAppointmentPK && $options.MakeAppointmentPK(...args)),
+    e: !$data.Select ? 1 : "",
+    f: $data.Select ? 1 : "",
    g: common_vendor.o((...args) => $options.screening && $options.screening(...args))
  };
 }
--- a/unpackage/dist/dev/mp-weixin/components/topNavigation/topNavigation.wxml
+++ b/unpackage/dist/dev/mp-weixin/components/topNavigation/topNavigation.wxml
@@ -1 +1 @@
-<view class="topNavigation data-v-ce2f6748"><view bindtap="{{a}}" class="{{[b && 'Selectcss', c && 'NoSelectcss', 'RealTime', 'data-v-ce2f6748']}}">今日PK</view><view bindtap="{{d}}" class="{{[e && 'Selectcss', f && 'NoSelectcss', 'MakeAppointment', 'data-v-ce2f6748']}}">PK大厅</view><view bindtap="{{g}}" class="Screening data-v-ce2f6748">筛选</view></view>
+<view class="topNavigation data-v-ce2f6748"><view bindtap="{{a}}" class="{{[b && 'Selectcss', c && 'NoSelectcss', 'RealTime', 'data-v-ce2f6748']}}">PK大厅</view><view bindtap="{{d}}" class="{{[e && 'Selectcss', f && 'NoSelectcss', 'MakeAppointment', 'data-v-ce2f6748']}}">今日PK</view><view bindtap="{{g}}" class="Screening data-v-ce2f6748">筛选</view></view>