Procházet zdrojové kódy

feat: 修复省份订阅包问题

zhangyuhan před 1 týdnem
rodič
revize
5fbe3fc407

+ 3 - 2
apps/bigmember_pc/src/views/subscribe/FreeConfig.vue

@@ -298,8 +298,9 @@ export default {
         }
 
 
-        this.setData.areaCount = getMaxSelectCount()
-        this.setData.canSelectArea = res?.areanum > 0
+        const maxSelectCount = getMaxSelectCount()
+        this.setData.areaCount = maxSelectCount
+        this.setData.canSelectArea = maxSelectCount === -1 ? true : (maxSelectCount > 0)s
 
         if (res.infotype && res.infotype.length) {
           // 免费用户格式不一样,需要转换

+ 4 - 1
apps/mobile/src/views/subscribe/Guide.vue

@@ -234,6 +234,9 @@ export default {
       'restfulApiUserTypeWitchVSwitch',
       'vSwitch'
     ]),
+    isAreaVip () {
+      return this.isFree && this.someInfo.areaCount > 1
+    },
     provinceList() {
       return this.expand ? onlyProvinceList : onlyProvinceList.slice(0, 12)
     },
@@ -526,7 +529,7 @@ export default {
         return this.$toast('请先设置主营产品')
       }
       const areParams =
-        this.vSwitch === 'f'
+        (this.vSwitch === 'f' && !this.isAreaVip)
           ? this.formatArrayToMap(this.freeSelectedProvince)
           : this.formatRegionLevel3ToLevel2(this.vipSelectedProvince)
       const { area, district } = areParams