From 9be76c63861dc65c584a3e9c089659fa4fb33779 Mon Sep 17 00:00:00 2001 From: zhouyanli <593579392@qq.com> Date: Tue, 28 Jul 2026 17:48:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=BF=94=E5=9B=9E=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.claude/settings.local.json | 18 ++++++++++++- property-uniapp-project/App.vue | 24 +++++++++++++++-- .../activity-list/activityListDetails.vue | 2 +- .../pageSubPack/api/request.js | 4 +-- .../pageSubPack/my/houseDetail.vue | 8 +++--- .../online-repair/personalRepair.vue | 2 +- .../online-repair/publicRepair.vue | 2 +- .../payment-list/arrearsPayment.vue | 26 +----------------- .../payment-list/propertyFeePayment.vue | 27 +------------------ .../pageSubPack/visitor/visitor-add.vue | 4 +-- 10 files changed, 52 insertions(+), 65 deletions(-) diff --git a/property-uniapp-project/.claude/settings.local.json b/property-uniapp-project/.claude/settings.local.json index c73c50b..364fa09 100644 --- a/property-uniapp-project/.claude/settings.local.json +++ b/property-uniapp-project/.claude/settings.local.json @@ -11,7 +11,23 @@ "Bash(node *)", "Bash(git checkout *)", "Bash(sed -i '207,213d' D:/wuye-jumin-front/property-uniapp-project/pageSubPack/loginSub/login.vue)", - "Bash(sed -n '203,213p' D:/wuye-jumin-front/property-uniapp-project/pageSubPack/loginSub/login.vue)" + "Bash(sed -n '203,213p' D:/wuye-jumin-front/property-uniapp-project/pageSubPack/loginSub/login.vue)", + "Bash(xargs -I{} sh -c 'echo \"== {} ==\" && cat {}')", + "WebSearch", + "Bash(sed -i '115s/\\(result\\)/\\(type, result\\)/' pageSubPack/payment-list/addHydropower.vue)", + "Bash(sed -i \"117s/'扫码成功', result/'扫码成功 type=' + type + ' result=' + result/\" pageSubPack/payment-list/addHydropower.vue)", + "Bash(xxd)", + "Bash(sed -i '311s/^\\\\t//' pageSubPack/payment-list/paymentIndex.vue)", + "Bash(sed -i '312s/^\\\\t//' pageSubPack/payment-list/paymentIndex.vue)", + "Bash(sed -i '225,242d' pages/index/index.vue)", + "Bash(sed -i '224a\\\\\\\\n\\\\t// banner点击跳转\\\\n\\\\tconst bannerClick = \\(index\\) => {\\\\n\\\\t const item = bannerRawData.value[index]\\\\n\\\\t if \\(item \\\\&\\\\& item.link\\) {\\\\n\\\\t uni.navigateTo\\({ url: item.link }\\)\\\\n\\\\t }\\\\n\\\\t}' pages/index/index.vue)", + "Bash(sed -i '229s/^\\\\t\\\\/\\\\//\\\\t\\\\/\\\\//' pages/index/index.vue)", + "Bash(sed -i '230s/^\\\\t\\\\tconst/\\\\tconst/' pages/index/index.vue)", + "Bash(sed -i '231s/^\t\t / /' pages/index/index.vue)", + "Bash(sed -i '232s/^\t\t /\\\\t\\\\t/' pages/index/index.vue)", + "Bash(sed -i '233s/^\t\t /\\\\t\\\\t\\\\t/' pages/index/index.vue)", + "Bash(awk 'NR==235 { print substr\\($0, 2\\); next } 1' \"D:/wuye-jumin-front/property-uniapp-project/pages.json\")", + "Bash(mv /tmp/pages_temp.json \"D:/wuye-jumin-front/property-uniapp-project/pages.json\")" ] } } diff --git a/property-uniapp-project/App.vue b/property-uniapp-project/App.vue index d01443b..7550da6 100644 --- a/property-uniapp-project/App.vue +++ b/property-uniapp-project/App.vue @@ -32,8 +32,28 @@ } // 有 token：已在首页，不做跳转 }) - onShow(() =>{ - console.log('App Show') + onShow((options) => { + console.log('App Show', options) + + // 处理从小程序返回的支付结果 + if (options && options.referrerInfo && options.referrerInfo.extraData) { + const extraData = options.referrerInfo.extraData + console.log('小程序返回数据：', extraData) + if (extraData.retCode === 'SUCCESS') { + // 支付成功：返回缴费列表页并刷新数据 + uni.showToast({ title: '支付成功', icon: 'success' }) + setTimeout(() => { + uni.redirectTo({ + url: '/pageSubPack/payment-list/paymentIndex' + }) + }, 1500) + return + } else if (extraData.retCode === 'FAIL') { + uni.showToast({ title: extraData.retMsg || '支付失败', icon: 'none' }) + return + } + } + // #ifdef APP-PLUS // 每次回到前台时检查 CID 是否有效，没有则重新获取 const savedCid = uni.getStorageSync('push_cid') diff --git a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue index 84c25f8..694c867 100644 --- a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue +++ b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue @@ -268,7 +268,7 @@ onLoad((option) =>{ curActivityId.value = option?.id statusTextFromParam.value = option?.statusText || '' // 处理applied参数 - hasSigned.value = option?.applied === true + hasSigned.value = option?.applied === 'true' // console.log('hasSigned.value',hasSigned.value) // 2. 初始化数据 if (curActivityId.value) { diff --git a/property-uniapp-project/pageSubPack/api/request.js b/property-uniapp-project/pageSubPack/api/request.js index 01dd69c..3898ed4 100644 --- a/property-uniapp-project/pageSubPack/api/request.js +++ b/property-uniapp-project/pageSubPack/api/request.js @@ -1,7 +1,7 @@ let baseUrl = ''; if (process.env.NODE_ENV === 'development') { - // baseUrl = 'http://192.168.1.222:8080'; // 开发环境 - baseUrl = 'https://wuyeapi.ckdzkj.com'; + baseUrl = 'http://192.168.1.222:8080'; // 开发环境 + // baseUrl = 'https://wuyeapi.ckdzkj.com'; } else { baseUrl = 'https://wuyeapi.ckdzkj.com'; // 生产环境 } diff --git a/property-uniapp-project/pageSubPack/my/houseDetail.vue b/property-uniapp-project/pageSubPack/my/houseDetail.vue index a996255..7079366 100644 --- a/property-uniapp-project/pageSubPack/my/houseDetail.vue +++ b/property-uniapp-project/pageSubPack/my/houseDetail.vue @@ -192,7 +192,7 @@ console.log(form.value); } catch (err) { uni.showToast({ - title: `${err}`, + title: err.msg || '网络异常', icon: 'none' }) console.error('列表接口报错：', err) @@ -232,14 +232,14 @@ } else { uni.showToast({ title: res.msg, - icon: 'error' + icon: 'none' }); } }).catch(err => { uni.showToast({ - title: err, - icon: 'error' + title: err.msg, + icon: 'none' }); }) diff --git a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue index 565b377..5f8a369 100644 --- a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue +++ b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue @@ -22,7 +22,7 @@ 标题 - + diff --git a/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue b/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue index 51368ad..9434e24 100644 --- a/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue +++ b/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue @@ -15,7 +15,7 @@ 标题 - + diff --git a/property-uniapp-project/pageSubPack/payment-list/arrearsPayment.vue b/property-uniapp-project/pageSubPack/payment-list/arrearsPayment.vue index 05871a1..90ca71e 100644 --- a/property-uniapp-project/pageSubPack/payment-list/arrearsPayment.vue +++ b/property-uniapp-project/pageSubPack/payment-list/arrearsPayment.vue @@ -122,31 +122,7 @@ initPaymentData() }) - // 从支付收银台返回时检查支付结果 - onShow((options) => { - // 检查是否有从日照银行小程序返回的支付结果 - if (options && options.referrerInfo && options.referrerInfo.extraData) { - const extraData = options.referrerInfo.extraData - if (extraData.retCode === 'SUCCESS') { - sendPaySuccessPush() - uni.redirectTo({ - url: '/pageSubPack/payment-list/addPaymentSuccess?type=pay' - }) - return - } else if (extraData.retCode === 'FAIL') { - uni.showToast({ title: extraData.retMsg || '支付失败', icon: 'none' }) - return - } - } - - const paySuccess = uni.getStorageSync('paySuccess') - if (paySuccess) { - uni.removeStorageSync('paySuccess') - uni.redirectTo({ - url: '/pageSubPack/payment-list/addPaymentSuccess?type=pay' - }) - } - }) + onShow(() => {}) // 初始化缴费数据 const initPaymentData = () => { diff --git a/property-uniapp-project/pageSubPack/payment-list/propertyFeePayment.vue b/property-uniapp-project/pageSubPack/payment-list/propertyFeePayment.vue index e061945..cb30c31 100644 --- a/property-uniapp-project/pageSubPack/payment-list/propertyFeePayment.vue +++ b/property-uniapp-project/pageSubPack/payment-list/propertyFeePayment.vue @@ -105,32 +105,7 @@ } }) - // 从支付收银台返回时检查支付结果 - onShow((options) => { - // 检查是否有从日照银行小程序返回的支付结果 - if (options && options.referrerInfo && options.referrerInfo.extraData) { - const extraData = options.referrerInfo.extraData - if (extraData.retCode === 'SUCCESS') { - sendPaySuccessPush() - uni.redirectTo({ - url: '/pageSubPack/payment-list/addPaymentSuccess?type=pay' - }) - return - } else if (extraData.retCode === 'FAIL') { - uni.showToast({ title: extraData.retMsg || '支付失败', icon: 'none' }) - return - } - } - - const paySuccess = uni.getStorageSync('paySuccess') - if (paySuccess) { - uni.removeStorageSync('paySuccess') - uni.redirectTo({ - url: '/pageSubPack/payment-list/addPaymentSuccess?type=pay' - }) - // currentStep.value = 2 - } - }) + onShow(() => {}) // 初始化缴费数据 const initPaymentData = () => { diff --git a/property-uniapp-project/pageSubPack/visitor/visitor-add.vue b/property-uniapp-project/pageSubPack/visitor/visitor-add.vue index 22be35d..e3f25d2 100644 --- a/property-uniapp-project/pageSubPack/visitor/visitor-add.vue +++ b/property-uniapp-project/pageSubPack/visitor/visitor-add.vue @@ -47,7 +47,7 @@ *访客联系方式 - + @@ -68,7 +68,7 @@ *随行人数 - +