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

components/region-select/index.vue

@@ -2,7 +2,9 @@
   <div v-if="popupVisible" class="region-select-overlay">
     <div class="region-select-popup">
       <div class="popup-header">
-        <h3 class="popup-title">选择收益区域({{ typeEnumMap[area] }})</h3>
+        <h3 class="popup-title">
+          {{ reselected ? '修改' : '选择' }}收益区域({{ typeEnumMap[area] }})
+        </h3>
       </div>
       <div class="popup-content">
         <picker-view
@@ -60,6 +62,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    reselected: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {

pages/mine/region/index.vue

@@ -15,7 +15,7 @@
           </view>
           <view v-if="unSelected.includes('province')" class="region-action">
             <button class="select-btn" @click="selectProvinceRegion">
-              选择省级收益区域
+              {{ selectedData.provinceData ? '修改' : '选择' }}省级收益区域
             </button>
           </view>
         </view>
@@ -38,7 +38,7 @@
           </view>
           <view v-if="unSelected.includes('city')" class="region-action">
             <button class="select-btn" @click="selectCityRegion">
-              选择市级收益区域
+              {{ selectedData.cityData ? '修改' : '选择' }}市级收益区域
             </button>
           </view>
         </view>
@@ -65,7 +65,7 @@
           </view>
           <view v-if="unSelected.includes('county')" class="region-action">
             <button class="select-btn" @click="selectCountyRegion">
-              选择区县收益区域
+              {{ selectedData.countyData ? '修改' : '选择' }}区县收益区域
             </button>
           </view>
         </view>
@@ -82,6 +82,7 @@
     <RegionSelect
       @success="successHandle"
       :autoTrigger="false"
+      :reselected="reselected"
       ref="regionSelect"
       showCancelButton
     />
@@ -101,6 +102,7 @@ export default {
     return {
       unSelected: [],
       selectedData: {},
+      reselected: true,
       rawData: {}, // 保存原始接口数据
     }
   },
@@ -148,16 +150,26 @@ export default {
         }
       })
     },
+    updateReSelected(data) {
+      if (data) {
+        this.reselected = true
+      } else {
+        this.reselected = false
+      }
+    },
     // 选择省级收益区域
     selectProvinceRegion() {
+      this.updateReSelected(this.selectedData?.provinceData)
       this.$refs.regionSelect.open('province')
     },
     // 选择市级收益区域
     selectCityRegion() {
+      this.updateReSelected(this.selectedData?.cityData)
       this.$refs.regionSelect.open('city')
     },
     // 选择区县收益区域
     selectCountyRegion() {
+      this.updateReSelected(this.selectedData?.countyData)
       this.$refs.regionSelect.open('county')
     },
     successHandle(data) {