From fa0336a450e3cc54a21a8e78c06a0746b99cfc87 Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 1 Aug 2025 09:38:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(pay):=20=E4=BF=AE=E5=A4=8D=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=A1=B5=E9=9D=A2=E6=94=B6=E8=B5=B7=E6=97=B6=E5=85=85?= =?UTF-8?q?=E5=80=BC=E5=B1=95=E7=A4=BA=E6=94=AF=E4=BB=98=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/pay/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/pay/index.vue b/pages/pay/index.vue index 62ccaec..6cc6c73 100644 --- a/pages/pay/index.vue +++ b/pages/pay/index.vue @@ -1084,6 +1084,7 @@ export default { return } } + console.log(this.activeNames, '....this.activeNames') if (this.activeNames == 2) { // 非银行卡 if ( @@ -1358,6 +1359,7 @@ export default { if (e == 1) { this.activeNames = 2 } else { + if (this.isRecharge) return this.activeNames = 1 } }, From 515eaaf27433279d5112933f22bec82a3edd7a5f Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 1 Aug 2025 10:47:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(region):=20=E5=8C=BA=E5=9F=9F=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/region-select/index.vue | 6 +++++- pages/mine/region/index.vue | 24 +++--------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/components/region-select/index.vue b/components/region-select/index.vue index 674ba72..7d33d9a 100644 --- a/components/region-select/index.vue +++ b/components/region-select/index.vue @@ -112,8 +112,12 @@ export default { const needSelected = Object.keys(res?.data || {}) .filter(key => key !== 'data') .filter(key => res.data[key]) + .filter(key => !res.data?.data?.[`${key}Data`]) .reverse() - if (needSelected?.length) { + if ( + needSelected?.length && + Object.keys(res.data?.data || {}).length < needSelected?.length + ) { resolve(needSelected) } else { reject(false) diff --git a/pages/mine/region/index.vue b/pages/mine/region/index.vue index 76a062c..76b0a09 100644 --- a/pages/mine/region/index.vue +++ b/pages/mine/region/index.vue @@ -13,13 +13,7 @@ selectedData.provinceData.provinceName }} - + @@ -42,13 +36,7 @@ selectedData.cityData.cityName }} - + @@ -75,13 +63,7 @@ selectedData.countyData.countyName }} - + From 359410ae578086fbd6afd33bc97eded0ec3619ea Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 1 Aug 2025 13:33:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(region-index):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/region-select/index.vue | 4 +--- config/request.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/region-select/index.vue b/components/region-select/index.vue index 7d33d9a..9d56aad 100644 --- a/components/region-select/index.vue +++ b/components/region-select/index.vue @@ -8,7 +8,6 @@ @@ -67,7 +66,7 @@ export default { popupVisible: false, areaTree: [], pickerValue: [0, 0, 0], - indicatorStyle: `height: 50px;`, + // indicatorStyle: `height: 50px;`, selectedList: [], regionList: [], provinceList: [], @@ -329,7 +328,6 @@ export default { display: flex; align-items: center; justify-content: center; - height: 50px; font-size: 24rpx; color: #666; white-space: nowrap; diff --git a/config/request.js b/config/request.js index b963395..f800f96 100644 --- a/config/request.js +++ b/config/request.js @@ -19,7 +19,7 @@ module.exports = vm => { //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'http://localhost:8080' + config.baseURL = 'https://t-app.beida666.com/prod-api' //#endif //#ifdef QA_SERVER From 1ff6ec9d1333d7acee7a0f72e75f43d7c9fd5cd1 Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 1 Aug 2025 13:48:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(region-select):=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/region-select/index.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components/region-select/index.vue b/components/region-select/index.vue index 9d56aad..34cf438 100644 --- a/components/region-select/index.vue +++ b/components/region-select/index.vue @@ -284,7 +284,7 @@ export default { /* max-width: 680rpx; */ background-color: white; border-radius: 24rpx; - animation: scale-up 0.3s ease-out; + /* animation: scale-up 0.3s ease-out; */ max-height: 80vh; display: flex; flex-direction: column; @@ -321,7 +321,8 @@ export default { .picker-view { width: 100%; - height: 500rpx; + height: 600rpx; + /* margin-top: 20rpx; */ } .picker-item { @@ -329,6 +330,7 @@ export default { align-items: center; justify-content: center; font-size: 24rpx; + line-height: 100rpx; color: #666; white-space: nowrap; overflow: hidden; @@ -371,7 +373,7 @@ export default { box-shadow: 0 4rpx 12rpx rgba(0, 122, 255, 0.25); } -@keyframes scale-up { +/* @keyframes scale-up { from { transform: scale(0.8); opacity: 0; @@ -380,5 +382,5 @@ export default { transform: scale(1); opacity: 1; } -} +} */ From d2c8e7cd763d5c3111e9ae6cc2174fa212f368ac Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 1 Aug 2025 14:04:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(region-select):=20=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/region-select/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/region-select/index.vue b/components/region-select/index.vue index 34cf438..50018fb 100644 --- a/components/region-select/index.vue +++ b/components/region-select/index.vue @@ -281,7 +281,7 @@ export default { .region-select-popup { width: 90%; - /* max-width: 680rpx; */ + max-width: 680rpx; background-color: white; border-radius: 24rpx; /* animation: scale-up 0.3s ease-out; */