fix: 修复金额

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_upgrade.js

@@ -115,14 +115,18 @@ var purchase = {
     //   }
     // }
     // 老套餐0：选择省份数量大于原省份数量 新套餐1： 选择省份数量大于等于原省份数量
-    if (purchase.oldBuySet.upgrade == 0) {
-      if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
-        $('.error-update-tips').show()
-      }
-    } else {
-      if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length < old.areacount) {
-        $('.error-update-tips').show()
-      }
+    // if (purchase.oldBuySet.upgrade == 0) {
+    //   if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
+    //     $('.error-update-tips').show()
+    //   }
+    // } else {
+    //   console.log(Object.keys(purchase.areaSelect))
+    //   if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length < old.areacount) {
+    //     $('.error-update-tips').show()
+    //   }
+    // }
+    if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length < old.areacount) {
+      $('.error-update-tips').show()
     }
     //初始化 
     Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList,  purchase.price, this.endTime)
@@ -222,16 +226,15 @@ var purchase = {
     */
     if (this.oldBuySet.areacount == -1) {
       $('[data-upgrade-to-area]').attr('href', 'javascript:;')
-    } else {
-      // 如果原购买的省份数量大于当前选择的 则按最大的数量走
-      if (obj.areacount != -1 && this.oldBuySet.areacount > obj.areacount) {
-        obj.areacount = this.oldBuySet.areacount
-      }
+    } 
+    console.log(purchase.areaSelect)
+    if (JSON.stringify(purchase.areaSelect).indexOf('全国') > -1) {
+      purchase.areaSelect = {}
     }
+    obj.areacount = Object.keys(purchase.areaSelect).length == 0 ? -1 : Object.keys(purchase.areaSelect).length
     var price = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), time)
     var givePrice = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), [time[1] === 1 ? 1 : time[0], time[1]])
-    console.log(typeof price,price, 'price')
-    price = price[0] / 100
+    price = Number(price[0] / 100) < 0 ? 0 : Number(price[0] / 100)
     var showPrice = formatMoney(price);
     if (flag === 1) {
       $('.billing-price').text(showPrice);

src/web/staticres/vipsubscribe/js/vip_upgrade.js

@@ -116,14 +116,17 @@ var purchase = {
     console.log(this.nowBuyset,this.oldBuySet)
     var old = this.oldBuySet
     //初始化 非试用用户 已经购买了 1个省份 两个省份【1个城市、两个城市】 3个行业 非升级版超级订阅
-    if (purchase.oldBuySet.upgrade == 0) {
-      if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
-        $('.error-update-tips').show()
-      }
-    } else {
-      if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length < old.areacount) {
-        $('.error-update-tips').show()
-      }
+    // if (purchase.oldBuySet.upgrade == 0) {
+    //   if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
+    //     $('.error-update-tips').show()
+    //   }
+    // } else {
+    //   if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length < old.areacount) {
+    //     $('.error-update-tips').show()
+    //   }
+    // }
+    if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length < old.areacount) {
+      $('.error-update-tips').show()
     }
     Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList, purchase.price, this.endTime)
   },
@@ -215,17 +218,15 @@ var purchase = {
     if (this.oldBuySet.areacount == -1) {
       $('[data-upgrade-to-area]').attr('href', 'javascript:;')
       // $('[data-upgrade-to-area] .iconfont').hide()
-      obj.areacount = -1
-    } else {
-      // 如果原购买的省份数量大于当前选择的 则按最大的数量走
-      if (obj.areacount != -1 && this.oldBuySet.areacount > obj.areacount) {
-        obj.areacount = this.oldBuySet.areacount
-      }
     }
-    console.log(obj, 'obj')
+    console.log(purchase.areaSelect)
+    if (JSON.stringify(purchase.areaSelect).indexOf('全国') > -1) {
+      purchase.areaSelect = {}
+    }
+    obj.areacount = Object.keys(purchase.areaSelect).length == 0 ? -1 : Object.keys(purchase.areaSelect).length
     var price = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), time)
     var givePrice = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), [time[1] === 1 ? 1 : time[0], time[1]])
-    price = price[0] / 100
+    price = Number(price[0] / 100) < 0 ? 0 : Number(price[0] / 100)
 
     var showPrice = formatMoney(price);
     var nowTime = new Date().getTime();