From 59acc71a5f36a0d7329f3bc69999f2babeb0cb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E9=A3=9E=E6=B4=8B?= <15778543+xufeiyang6017@user.noreply.gitee.com> Date: Thu, 4 Dec 2025 16:27:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E4=BA=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=9A=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.js | 19 ++++----- pages/profile/index.wxml | 8 ++-- pages/seller/index.js | 4 +- pages/settlement/index.js | 59 +++++++++++++++++++++++---- server-example/test_settlement_api.js | 2 +- 5 files changed, 65 insertions(+), 27 deletions(-) diff --git a/pages/index/index.js b/pages/index/index.js index 6c10b09..ff1831d 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -155,7 +155,7 @@ Page({ const existingUserId = wx.getStorageSync('userId') const existingUserInfo = wx.getStorageSync('userInfo') - if (existingOpenid && existingUserId && existingUserInfo && existingUserInfo.phoneNumber !== '13800138000') { + if (existingOpenid && existingUserId && existingUserInfo && existingUserInfo.phoneNumber) { console.log('用户已登录且手机号有效，直接完成身份设置') // 直接完成身份设置，跳过重复授权 const currentUserType = this.data.pendingUserType || this.data.currentUserType || 'buyer' @@ -268,8 +268,8 @@ Page({ const isNewPhone = phoneRes.isNewPhone || true const phoneNumber = phoneRes.phoneNumber || null - // 如果有手机号冲突且没有返回手机号，使用临时手机号 - const finalPhoneNumber = hasPhoneConflict && !phoneNumber ? '13800138000' : phoneNumber + // 如果有手机号冲突且没有返回手机号，使用实际返回的手机号 + const finalPhoneNumber = phoneNumber console.log('手机号解密结果:', { phoneNumber: finalPhoneNumber, @@ -419,7 +419,7 @@ Page({ wx.setStorageSync('userId', mockUserId) // 4. 模拟手机号解密结果 - const mockPhoneNumber = '13800138000' + const mockPhoneNumber = null console.log('模拟手机号解密成功:', mockPhoneNumber) // 5. 创建模拟用户信息 @@ -611,12 +611,8 @@ Page({ wx.setStorageSync('userInfo', userInfo) console.log('验证登录状态成功，用户信息已同步:', userInfo) - // 检查是否为临时手机号，如果是则提示用户重新授权 - if (userInfo.phoneNumber === '13800138000') { - console.warn('检测到临时手机号，建议用户重新授权') - // 设置重新授权标志 - wx.setStorageSync('needPhoneAuth', true) - } else { + // 如果手机号存在则清除重新授权标志 + if (userInfo.phoneNumber) { // 清除可能存在的重新授权标志 wx.removeStorageSync('needPhoneAuth') console.log('手机号验证通过:', userInfo.phoneNumber) @@ -742,8 +738,7 @@ Page({ const completeUserInfo = { ...userInfo, // 确保包含服务器需要的必要字段 - nickName: userInfo.nickName || '测试用户', - phoneNumber: userInfo.phoneNumber || '13800138000' + nickName: userInfo.nickName || '测试用户' } try { diff --git a/pages/profile/index.wxml b/pages/profile/index.wxml index 93f8a36..f60dfc7 100644 --- a/pages/profile/index.wxml +++ b/pages/profile/index.wxml @@ -8,8 +8,8 @@ {{userInfo.nickName || '未登录'}} 当前身份: {{userType || '未设置'}} - - 手机号: {{userInfo.phoneNumber === '13800138000' ? '临时手机号，请重新授权' : (userInfo.phoneNumber || '未绑定')}} + + 手机号: {{userInfo.phoneNumber || '未绑定'}} @@ -23,14 +23,14 @@ - + diff --git a/pages/seller/index.js b/pages/seller/index.js index 11d8a85..2e90c56 100644 --- a/pages/seller/index.js +++ b/pages/seller/index.js @@ -943,7 +943,7 @@ Page({ const existingUserId = wx.getStorageSync('userId') const existingUserInfo = wx.getStorageSync('userInfo') - if (existingOpenid && existingUserId && existingUserInfo && existingUserInfo.phoneNumber !== '13800138000') { + if (existingOpenid && existingUserId && existingUserInfo && existingUserInfo.phoneNumber) { console.log('用户已登录且手机号有效，直接完成身份设置') // 直接完成身份设置，跳过重复授权 const currentUserType = this.data.pendingUserType || 'seller' @@ -1042,7 +1042,7 @@ Page({ const hasPhoneConflict = phoneRes.phoneNumberConflict || false const isNewPhone = phoneRes.isNewPhone || true const phoneNumber = phoneRes.phoneNumber || null - const finalPhoneNumber = hasPhoneConflict && !phoneNumber ? '13800138000' : phoneNumber + const finalPhoneNumber = phoneNumber console.log('手机号解密结果:', { phoneNumber: finalPhoneNumber, diff --git a/pages/settlement/index.js b/pages/settlement/index.js index 9d339db..384122d 100644 --- a/pages/settlement/index.js +++ b/pages/settlement/index.js @@ -74,6 +74,18 @@ Page({ }); } + // 检查本地保存的settlementStatus + const settlementStatus = wx.getStorageSync('settlementStatus'); + if (settlementStatus && (settlementStatus === 'underreview' || settlementStatus === 'approved' || settlementStatus === 'reviewfailed')) { + console.log('检测到本地保存的审核状态:', settlementStatus); + this.setData({ + showGuidePage: false, + currentStep: 3, + partnerstatus: settlementStatus + }); + return; // 直接返回，不执行后续逻辑 + } + // 检查是否是从首页登录返回的 const pendingReturnPath = wx.getStorageSync('pendingReturnPath'); if (pendingReturnPath === 'settlement') { @@ -774,10 +786,39 @@ Page({ // 清除进度数据，因为已经提交了 this.clearSettlementProgress(); } else { - wx.showToast({ - title: result.message || '提交失败', - icon: 'none' - }); + // 检查是否是重复提交错误 + if (result.message && result.message.includes('请勿重复提交')) { + // 已有待审核申请，直接跳转到审核状态页面 + this.setData({ + currentStep: 3, // 设置为第4步（审核状态页面） + partnerstatus: 'underreview' // 审核中状态 + }); + // 调用API同步最新的用户信息和审核状态 + const API = require('../../utils/api.js'); + API.getUserInfo().then(userRes => { + console.log('用户完整数据:', userRes.data); + // 更新用户的申请状态 + if (userRes.data && userRes.data.partnerstatus) { + this.setData({ + partnerstatus: userRes.data.partnerstatus, + applicationId: userRes.data.applicationId + }); + // 保存最新状态到本地存储 + wx.setStorageSync('settlementStatus', userRes.data.partnerstatus); + if (userRes.data.applicationId) { + wx.setStorageSync('applicationId', userRes.data.applicationId); + } + } + }).catch(err => { + console.error('获取用户数据失败:', err); + }); + } else { + // 其他错误情况，显示错误提示 + wx.showToast({ + title: result.message || '提交失败', + icon: 'none' + }); + } } } catch (error) { console.error('提交入驻申请失败:', error); @@ -888,9 +929,10 @@ Page({ icon: 'success', duration: 1500, complete: () => { - // 登录成功后继续提交申请 + // 登录成功后关闭弹窗，让用户决定是否继续提交 setTimeout(() => { - this.submitApplication(); + this.closeOneKeyLoginModal(); + this.setData({ showAuthModal: false }); }, 1500); } }); @@ -963,9 +1005,10 @@ Page({ icon: 'success', duration: 1500, complete: () => { - // 登录成功后继续提交申请 + // 登录成功后关闭弹窗，让用户决定是否继续提交 setTimeout(() => { - this.submitApplication(); + this.closeOneKeyLoginModal(); + this.setData({ showAuthModal: false }); }, 1500); } }); diff --git a/server-example/test_settlement_api.js b/server-example/test_settlement_api.js index db0bdd9..701c9b9 100644 --- a/server-example/test_settlement_api.js +++ b/server-example/test_settlement_api.js @@ -17,7 +17,7 @@ const testData = { district: '海淀区', detailedaddress: '中关村科技园区', cooperation: 'wholesale', // 合作模式 - phone: '13800138000', + phone: null, applicationId: null // 将在测试过程中设置 };