Merge branch 'bd-dev' of gitee.com:cabbage_qd/web-base-h5 into bd-test

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)

pages/mine/region/index.vue

@@ -13,13 +13,7 @@
               selectedData.provinceData.provinceName
             }}</text>
           </view>
-          <view
+          <view v-if="unSelected.includes('province')" class="region-action">
-            v-if="
-              unSelected.includes('province') ||
-              (selectedData && selectedData.provinceData)
-            "
-            class="region-action"
-          >
             <button class="select-btn" @click="selectProvinceRegion">
               选择省级收益区域
             </button>
@@ -42,13 +36,7 @@
               selectedData.cityData.cityName
             }}</text>
           </view>
-          <view
+          <view v-if="unSelected.includes('city')" class="region-action">
-            v-if="
-              unSelected.includes('city') ||
-              (selectedData && selectedData.cityData)
-            "
-            class="region-action"
-          >
             <button class="select-btn" @click="selectCityRegion">
               选择市级收益区域
             </button>
@@ -75,13 +63,7 @@
               selectedData.countyData.countyName
             }}</text>
           </view>
-          <view
+          <view v-if="unSelected.includes('county')" class="region-action">
-            v-if="
-              unSelected.includes('county') ||
-              (selectedData && selectedData.countyData)
-            "
-            class="region-action"
-          >
             <button class="select-btn" @click="selectCountyRegion">
               选择区县收益区域
             </button>