Ver código fonte

fix: 兼容省份选择全国为-1时展示异常

zhangyuhan 1 ano atrás
pai
commit
91141d0fbf

+ 4 - 1
src/views/order/components/otherOrder.vue

@@ -769,6 +769,9 @@ export default {
             }
             if (res.data.userData) {
               this.areaNums = res.data.userData
+              if (this.areaNums?.areaCount < 0) {
+                this.areaNums.areaCount = 0
+              }
               // 服务到期时间
               const l_vip_endtime = res.data.userData?.l_vip_endtime
               this.serviceEndTime = l_vip_endtime ? dateFormatter(new Date(l_vip_endtime * 1000), 'yyyy-MM-dd') : ''
@@ -1537,7 +1540,7 @@ export default {
       gouDis: true,
       phoneReg: [],
       infoData: [],
-      areaNums: [],
+      areaNums: {},
       nameInfo: [],
       echoObject: {},//订单回显
       agree_time:dateFormatter(new Date(), 'yyyy-MM-dd') + ' 00:00:00',

+ 8 - 2
src/views/order/components/otherOrderEdit.vue

@@ -809,6 +809,9 @@ export default {
             }
             if (res.data.userData) {
               this.areaNums = res.data.userData
+              if (this.areaNums?.areaCount < 0) {
+                this.areaNums.areaCount = 0
+              }
               // 服务到期时间
               const l_vip_endtime = res.data.userData?.l_vip_endtime
               this.serviceEndTime = l_vip_endtime ? dateFormatter(new Date(l_vip_endtime * 1000), 'yyyy-MM-dd') : ''
@@ -1353,7 +1356,7 @@ export default {
     },
     show(data) {
       this.typeRestriction = true
-      const {contractRes, filterData, refundRes, res, returnInfo, returnRes, audit} = data
+      const {contractRes, filterData, res, returnInfo, audit} = data
       setTimeout(() => {
         // 已提交订单一些数据
         // 已提交过的原订单状态 res.orderStatus
@@ -1374,6 +1377,9 @@ export default {
         //购买省份
         if (productType == '5') {
           this.areaNums.areaCount = filterData.newBuyset.areacount
+          if (this.areaNums?.areaCount < 0) {
+            this.areaNums.areaCount = 0
+          }
           const area = Object.keys(filterData.area).map(name => {
             let reg = /[省,市,壮族,维吾尔,特别行政区,自治区,回族]/g
             if (name) {
@@ -1825,7 +1831,7 @@ export default {
       prosType: '',
       phoneReg: [],
       infoData: [],
-      areaNums: [],
+      areaNums: {},
       nameInfo: [],
       others: {
         phone: '',