From ea689dd91eaa72425dc01759042c3b4eb2186512 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 六月 2026 10:14:44 +0800
Subject: [PATCH] 新增智能电表、空调管理
---
h5/utils/service.js | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/h5/utils/service.js b/h5/utils/service.js
index 70e1617..f3b1672 100644
--- a/h5/utils/service.js
+++ b/h5/utils/service.js
@@ -15,7 +15,7 @@
uni.request({
url: baseUrl + options.url,
data: options.data || {},
- method: options.method || 'GET',
+ method: options.method || 'POST',
header: options.header || {
// 鏍规嵁瀹為檯鎺ュ彛璁捐 key 鍙� token 鎴栬�� authorization
dm_user_token: token,
@@ -25,22 +25,32 @@
let data = res.data
// 鎺у埗鍙版樉绀烘暟鎹俊鎭�
uni.hideLoading()
- // 鐧诲綍杩囨湡
- if (data.code !== 200) {
- setTimeout(() => {
- uni.showToast({
- title: data.message,
- icon: "none",
- duration: 2000
- })
+ // Spring Boot / Gateway 榛樿閿欒浣擄紙HTTP 500 鏃舵棤 code 瀛楁锛�
+ if (data && data.status && data.code == null) {
+ const errMsg = data.message || data.error || '鏈嶅姟寮傚父锛岃绋嶅悗閲嶈瘯'
+ uni.showToast({
+ title: errMsg,
+ icon: 'none',
+ duration: 2500
})
- if (data.code === 500 || data.code === 5112) {
+ return resolve({ code: data.status, message: errMsg })
+ }
+ // 涓氬姟澶辫触
+ if (data.code !== 200) {
+ const msg = data.message || '鎿嶄綔澶辫触'
+ uni.showToast({
+ title: msg,
+ icon: 'none',
+ duration: 2500
+ })
+ // 浠呮湭鐧诲綍(5112)璺宠浆鐧诲綍椤碉紝閬垮厤鍟嗘埛鍙戠爜绛変笟鍔￠敊璇璺宠浆
+ if (data.code === 5112) {
+ const userType = uni.getStorageSync('userType')
uni.clearStorageSync()
- return uni.navigateTo({
- url: '/pages/login/login'
- })
+ const loginUrl = userType === 1 ? '/pages/customer/login' : '/pages/login'
+ return uni.navigateTo({ url: loginUrl })
}
- return
+ return resolve(data)
}
resolve(data)
// return response.data
--
Gitblit v1.9.3