restore: 恢复橙色逍遥梦UI版本(2ea2860)到主分支

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
XingQue
2026-07-09 00:17:03 +08:00
parent 267de7c780
commit 566aeaa3b7
228 changed files with 22076 additions and 11864 deletions

View File

@@ -1,11 +1,11 @@
// utils/request.js
import { buildClubHeaders } from './club-context';
function request(options) {
const app = getApp();
const token = wx.getStorageSync('token');
// 🔥 没有 token 时不发送请求,直接返回一个“空响应”对象,不影响后续代码
if (!token) {
// 返回一个模拟的响应,状态码为 401但不会触发任何弹窗或跳转
return Promise.resolve({
statusCode: 401,
data: { code: 401, msg: '未登录' },
@@ -13,10 +13,10 @@ function request(options) {
});
}
const header = {
const header = buildClubHeaders({
'Content-Type': 'application/json',
...options.header,
};
});
if (token) {
header['Authorization'] = 'Bearer ' + token;
}
@@ -24,13 +24,12 @@ function request(options) {
return new Promise((resolve, reject) => {
wx.request({
url: app.globalData.apiBaseUrl + options.url,
method: options.method,
method: options.method || 'GET',
data: options.data || {},
header,
timeout: options.timeout || 15000,
success: async (res) => {
if (res.statusCode === 401 || res.statusCode === 403) {
// 注意:这里的弹窗逻辑只会在有 token 且 token 失效时触发
// 无 token 的情况已经在上面直接返回,不会走到这里
if (app.globalData.loginPromise) {
try {
await app.globalData.loginPromise;
@@ -65,9 +64,20 @@ function request(options) {
}
resolve(res);
},
fail: reject,
fail: (err) => {
// 网络层失败(超时/域名不可达等),避免未捕获 Promise 触发 MiniProgramError 红屏
console.warn('request fail:', options.url, err && err.errMsg);
resolve({
statusCode: 0,
data: {
code: 408,
msg: (err && err.errMsg) || '网络请求失败',
},
errMsg: (err && err.errMsg) || 'request:fail',
});
},
});
});
}
export default request;
export default request;