Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-h5 into bd-online

config/mine.js

@@ -43,3 +43,7 @@ export const setRegion = data =>
 // 获取可选择区域
 export const getRegionAreaTree = params =>
   http.get('/member/api/member/get-region-list', { params })
+
+// 获取已有区域
+export const getSelectedRegion = () =>
+  http.get('/member/api/member/get-all-region')

pages/mine/region/index.vue

@@ -13,7 +13,10 @@
               selectedData.provinceData.provinceName
             }}</text>
           </view>
-          <view v-if="unSelected.includes('province')" class="region-action">
+          <view
+            v-if="unSelected.includes('province') || selectedData.provinceData"
+            class="region-action"
+          >
             <button class="select-btn" @click="selectProvinceRegion">
               {{ selectedData.provinceData ? '修改' : '选择' }}省级收益区域
             </button>
@@ -36,7 +39,10 @@
               selectedData.cityData.cityName
             }}</text>
           </view>
-          <view v-if="unSelected.includes('city')" class="region-action">
+          <view
+            v-if="unSelected.includes('city') || selectedData.cityData"
+            class="region-action"
+          >
             <button class="select-btn" @click="selectCityRegion">
               {{ selectedData.cityData ? '修改' : '选择' }}市级收益区域
             </button>
@@ -63,7 +69,10 @@
               selectedData.countyData.countyName
             }}</text>
           </view>
-          <view v-if="unSelected.includes('county')" class="region-action">
+          <view
+            v-if="unSelected.includes('county') || selectedData.countyData"
+            class="region-action"
+          >
             <button class="select-btn" @click="selectCountyRegion">
               {{ selectedData.countyData ? '修改' : '选择' }}区县收益区域
             </button>
@@ -90,7 +99,7 @@
 </template>
 
 <script>
-import { getRegionSelect } from '@/config/mine.js'
+import { getRegionSelect, getSelectedRegion } from '@/config/mine.js'
 import RegionSelect from '@/components/region-select/index.vue'
 
 export default {
@@ -124,8 +133,17 @@ export default {
   },
   onShow() {
     this.getRegionSelect()
+    this.getSelectedRegion()
   },
   methods: {
+    getSelectedRegion() {
+      return new Promise((resolve, reject) => {
+        getSelectedRegion().then(res => {
+          this.selectedData = res.data?.data || {}
+          resolve()
+        })
+      })
+    },
     async getRegionSelect() {
       uni.showLoading({
         title: '加载中...',
@@ -140,7 +158,7 @@ export default {
               .filter(key => key !== 'data')
               .filter(key => res.data[key] === true)
             this.unSelected = unSelected
-            this.selectedData = res.data?.data || {}
+            // this.selectedData = res.data?.data || {}
             resolve()
           }
         } catch (error) {
@@ -173,7 +191,7 @@ export default {
       this.$refs.regionSelect.open('county')
     },
     successHandle(data) {
-      this.getRegionSelect()
+      this.getSelectedRegion()
     },
   },
 }