From 77094dd01f0c6ff59b4fb4fa1105addf34b2398c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 16 六月 2026 18:49:03 +0800
Subject: [PATCH] 新增智能电表、空调管理

---
 h5/utils/service.js |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/h5/utils/service.js b/h5/utils/service.js
index 6df5176..f3b1672 100644
--- a/h5/utils/service.js
+++ b/h5/utils/service.js
@@ -25,20 +25,30 @@
 					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'
-							})
+							const loginUrl = userType === 1 ? '/pages/customer/login' : '/pages/login'
+							return uni.navigateTo({ url: loginUrl })
 						}
 						return resolve(data)
 					}

--
Gitblit v1.9.3