From 515eaaf27433279d5112933f22bec82a3edd7a5f Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Fri, 1 Aug 2025 10:47:25 +0800
Subject: [PATCH] =?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
             }}</text>
           </view>
-          <view
-            v-if="
-              unSelected.includes('province') ||
-              (selectedData && selectedData.provinceData)
-            "
-            class="region-action"
-          >
+          <view v-if="unSelected.includes('province')" class="region-action">
             <button class="select-btn" @click="selectProvinceRegion">
               选择省级收益区域
             </button>
@@ -42,13 +36,7 @@
               selectedData.cityData.cityName
             }}</text>
           </view>
-          <view
-            v-if="
-              unSelected.includes('city') ||
-              (selectedData && selectedData.cityData)
-            "
-            class="region-action"
-          >
+          <view v-if="unSelected.includes('city')" class="region-action">
             <button class="select-btn" @click="selectCityRegion">
               选择市级收益区域
             </button>
@@ -75,13 +63,7 @@
               selectedData.countyData.countyName
             }}</text>
           </view>
-          <view
-            v-if="
-              unSelected.includes('county') ||
-              (selectedData && selectedData.countyData)
-            "
-            class="region-action"
-          >
+          <view v-if="unSelected.includes('county')" class="region-action">
             <button class="select-btn" @click="selectCountyRegion">
               选择区县收益区域
             </button>