diff --git a/huakai-app/pageSubPack/api/request.js b/huakai-app/pageSubPack/api/request.js index 43b6852..c52df1f 100644 --- a/huakai-app/pageSubPack/api/request.js +++ b/huakai-app/pageSubPack/api/request.js @@ -1,6 +1,7 @@ let baseUrl = ''; if (process.env.NODE_ENV === 'development') { - baseUrl = 'https://wuyeapi.bugtc.com'; // 开发环境 + // baseUrl = 'https://wuyeapi.ckdzkj.com'; // 开发环境 + baseUrl = "https://wuyeapi.bugtc.com" } else { baseUrl = 'https://wuyeapi.bugtc.com'; // 生产环境 } diff --git a/huakai-app/pages/paymentIndex/paymentIndex.vue b/huakai-app/pages/paymentIndex/paymentIndex.vue index 9c79fd6..5cf4911 100644 --- a/huakai-app/pages/paymentIndex/paymentIndex.vue +++ b/huakai-app/pages/paymentIndex/paymentIndex.vue @@ -21,8 +21,9 @@ {{item.type}} 已欠费 + (余额:{{item.balance|| 0.00}}元) - {{item.villageName+item.buildingName+item.fullAddress}} + {{item.villageName+"-"+item.buildingName+'-'+formatAddress(item.fullAddress)}} @@ -180,7 +181,7 @@ }) } catch (err) { uni.showToast({ - title: `${err}`, + title: err.msg, icon: 'none' }) console.error('列表接口报错:', err) @@ -211,7 +212,7 @@ paymentList.value = data } catch (err) { uni.showToast({ - title: `${err}`, + title: err.msg, icon: 'none' }) console.error('列表接口报错:', err) @@ -256,7 +257,12 @@ uni.setStorageSync('addPaymentType', type.name) } - const goBack = () => { + const formatAddress = (addr) => { + if (!addr) return '' + return addr.replace(/\d+[层楼]\s*/g, '').replace(/单元\s*/g, '-').replace(/\s+/g, '') + } + + const goBack = () => { console.log(uni.getStorageSync('sourcePage')) if (uni.getStorageSync('sourcePage') == 'serviceIndex') { uni.switchTab({ @@ -369,6 +375,8 @@ color: #333; margin-bottom: 10rpx; display: flex; + align-items: center; + gap: 10rpx; } .bill-desc { @@ -387,7 +395,16 @@ font-weight: 500; color: #fff; background-color: #E34D59; - margin-left: 10rpx; + } + + .balance-normal { + font-size: 28rpx; + color: #333; + } + + .balance-debt { + font-size: 28rpx; + color: #E34D59; } .arrow {