|
@@ -22,22 +22,6 @@ function _clearAuthAndRedirect() {
|
|
|
}, 1500)
|
|
}, 1500)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-function _showNoFamilyDialog() {
|
|
|
|
|
- uni.showModal({
|
|
|
|
|
- title: '请先创建或加入家庭',
|
|
|
|
|
- content: '您需要加入一个家庭才能使用全部功能。请选择:',
|
|
|
|
|
- confirmText: '创建家庭',
|
|
|
|
|
- cancelText: '加入家庭',
|
|
|
|
|
- success: function(r) {
|
|
|
|
|
- if (r.confirm) {
|
|
|
|
|
- uni.navigateTo({ url: '/pages/profile-extra/family-members?action=create' })
|
|
|
|
|
- } else if (r.cancel) {
|
|
|
|
|
- uni.navigateTo({ url: '/pages/profile-extra/family-members' })
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- })
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
const request = (url, method = 'POST', data = {}, options = {}) => {
|
|
const request = (url, method = 'POST', data = {}, options = {}) => {
|
|
|
// Append query params from options to URL if provided (e.g., { guideId } for GET requests)
|
|
// Append query params from options to URL if provided (e.g., { guideId } for GET requests)
|
|
|
if (options && Object.keys(options).length > 0) {
|
|
if (options && Object.keys(options).length > 0) {
|
|
@@ -68,10 +52,9 @@ const request = (url, method = 'POST', data = {}, options = {}) => {
|
|
|
reject(res.data)
|
|
reject(res.data)
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
- // 5001: 用户无家庭 — 弹出创建/加入家庭对话框
|
|
|
|
|
|
|
+ // 5001: 用户无家庭 — 仅拒绝请求,不再弹创建/加入家庭对话框
|
|
|
if (res.data.code === 5001) {
|
|
if (res.data.code === 5001) {
|
|
|
console.warn('[API] 5001 ' + method + ' ' + fullUrl + ' — 无家庭')
|
|
console.warn('[API] 5001 ' + method + ' ' + fullUrl + ' — 无家庭')
|
|
|
- _showNoFamilyDialog()
|
|
|
|
|
reject(res.data)
|
|
reject(res.data)
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|