From 5e2b2dcfda5d20f52dd2e7e627c31a171ea6cd62 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Fri, 10 Oct 2025 14:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/login/index.js | 13 +++++++------
pages/workBenchNew/index.js | 5 +++++
pages/workBenchNew/index.json | 3 ++-
pages/workBenchNew/index.wxml | 5 ++++-
pages/workBenchNew/index.wxss | 4 ++++
utils/request.js | 2 --
6 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/pages/login/index.js b/pages/login/index.js
index cb0d932..2dcd977 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -58,12 +58,13 @@ Page({
const { token, ...user } = data
wx.setStorageSync('user', user)
wx.setStorageSync('token', data?.token)
- // if (user.workStatus) {
- // wx.redirectTo({
- // url: '/pages/workBenchNew/index',
- // })
- // return
- // }
+ console.log("user.workStatus", user.workStatus)
+ if (user.workStatus) {
+ wx.redirectTo({
+ url: '/pages/workBenchNew/index',
+ })
+ return
+ }
wx.switchTab({
url: '/pages/home/index',
})
diff --git a/pages/workBenchNew/index.js b/pages/workBenchNew/index.js
index 2857dc9..a5333ab 100644
--- a/pages/workBenchNew/index.js
+++ b/pages/workBenchNew/index.js
@@ -56,6 +56,11 @@ Page({
url: '/pages/workBenchNew/components/workBenchReading/index',
})
},
+ jumpToHome() {
+ wx.switchTab({
+ url: '/pages/home/index',
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/workBenchNew/index.json b/pages/workBenchNew/index.json
index 4a01b10..de4f579 100644
--- a/pages/workBenchNew/index.json
+++ b/pages/workBenchNew/index.json
@@ -2,7 +2,8 @@
"usingComponents": {
"navigator": "/components/navigator/index",
"van-row": "@vant/weapp/row/index",
- "van-col": "@vant/weapp/col/index"
+ "van-col": "@vant/weapp/col/index",
+ "van-button": "@vant/weapp/button/index"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/workBenchNew/index.wxml b/pages/workBenchNew/index.wxml
index 632c286..3bc02fb 100644
--- a/pages/workBenchNew/index.wxml
+++ b/pages/workBenchNew/index.wxml
@@ -1,5 +1,5 @@
-
+
@@ -74,4 +74,7 @@
+
+ 回到首页
+
\ No newline at end of file
diff --git a/pages/workBenchNew/index.wxss b/pages/workBenchNew/index.wxss
index 2386856..421c238 100644
--- a/pages/workBenchNew/index.wxss
+++ b/pages/workBenchNew/index.wxss
@@ -41,4 +41,8 @@
page {
background-color: rgb(242,243,245);
+}
+
+.operate {
+ padding-bottom: 24rpx;
}
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 3a66981..15be215 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -44,7 +44,6 @@ const request = async function (options, config = {}) {
const setCookie = response.header['set-cookie'] || response.header['Set-Cookie'];
if (setCookie) {
const cookieMap = {};
-
if (localCookieString) {
const localCookies = localCookieString.split('; ');
for (const localCookie of localCookies) {
@@ -93,7 +92,6 @@ const parseResponse = function (response, url) {
alertError("服务错误")
return
}
- console.log('url', url,'statusCode', statusCode, 'response.data', response?.data)
if (code === 401) {
const currentUrl = getPageUrl()