fix:修改省份订阅包购买全国显示数量问题,修改省份订阅包升级按钮传参格式错误问题

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

@@ -47,11 +47,7 @@ var subNode = new Vue({
         },
         // 省份订阅包升级 
         updateBtn: function () {
-            let thisList = []
-            for (const key in this.freeUserArea) {
-                thisList.push(key)
-            }
-            location.href = '/jyapp/areaPack/page/buy?type=upgrade&area=' +  encodeURIComponent(JSON.stringify(thisList))
+            location.href = '/jyapp/areaPack/page/buy?type=upgrade&area=' +  encodeURIComponent(JSON.stringify(this.freeUserArea))
         },
         // 得到用户是否购买省份包
         getUserSubscribe: function () {
@@ -63,7 +59,7 @@ var subNode = new Vue({
                     _this.freeUserArea = res.data.area
                     _this.userAreaNum = res.data.areanum
                     _this.userType = res.data.provincenum === 0 ? false : true
-                    _this.userAreaAllNum = res.data.provincenum
+                    _this.userAreaAllNum = res.data.provincenum === -1 ? '全国' : res.data.provincenum
                     // _this.$emit('UserSubscribe',res)
                     _this.subscribeTime = new Date(res.data.ppstart * 1000).pattern('yyyy年MM月dd日') + "-" + new Date(res.data.ppend * 1000).pattern('yyyy年MM月dd日')
                     _this.initdata = res.data
@@ -416,13 +412,14 @@ $(function () {
   // 设置已购买的区域和行业
   function setBuyAreaAndInd(buySet) {
       // 设置已购买区域
-      var buySetCitySum = arrSum(buySet.newcitys)
+      if (buySet) {
+        var buySetCitySum = arrSum(buySet.newcitys)
+      }
       var text = {
           p: buySet.areacount === 0 ? '' : buySet.areacount + '个省',
           c: buySetCitySum === 0 ? '' : buySetCitySum + '个市',
           s: buySet.newcitys.length === 1 ? '' : '(分布在' + buySet.newcitys.length + '个省内)'
       }
-
       if (buySet.areacount === -1) {
           $('.vip-body .area .buy-set-area').text('全国')
       } else {

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -297,7 +297,7 @@
             <div class="provincePay">
               <div class="provincePay-text">订阅周期：${subscribeTime}</div>
               <div class="provincePay-text provincePay-numText">
-                省份数量：<span class="provincePay-num">&nbsp;<span v-html="userAreaAllNum"></span>&nbsp;</span>个
+                省份数量：<span class="provincePay-num">&nbsp;<span v-html="userAreaAllNum"></span>&nbsp;</span><span v-show="userAreaAllNum !== '全国'">个</span>
               </div>
               <div class="provincePay-btnWrap">
                 <div class="privincePay-btn"  @click="renewBtn">续费</div>

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -49,7 +49,7 @@ var subNode = new Vue({
                     _this.freeUserArea = res.data.area
                     _this.userAreaNum = res.data.areanum
                     _this.userType = res.data.provincenum === 0 ? false : true
-                    _this.userAreaAllNum = res.data.provincenum
+                    _this.userAreaAllNum = res.data.provincenum === -1 ? '全国' : res.data.provincenum
                     // _this.$emit('UserSubscribe',res)
                     _this.subscribeTime = new Date(res.data.ppstart * 1000).pattern('yyyy年MM月dd日') + "-" + new Date(res.data.ppend * 1000).pattern('yyyy年MM月dd日')
                     _this.initdata = res.data
@@ -62,12 +62,7 @@ var subNode = new Vue({
         },
         // 省份订阅包升级 
         updateBtn: function () {
-            // '&area=' +  encodeURIComponent(JSON.stringify(thisData))
-            let thisList = []
-            for (const key in this.freeUserArea) {
-                thisList.push(key)
-            }
-            location.href = '/areaPack/wx/page/buy?type=upgrade&area=' +  encodeURIComponent(JSON.stringify(thisList))
+            location.href = '/areaPack/wx/page/buy?type=upgrade&area=' +  encodeURIComponent(JSON.stringify(this.freeUserArea))
         },
         // 判断用户权限版本
         getUserType: function (data) {

src/web/templates/weixin/vipsubscribe/vip_index_new.html

@@ -193,7 +193,7 @@
             <div class="provincePay">
               <div class="provincePay-text">订阅周期：${subscribeTime}</div>
               <div class="provincePay-text provincePay-numText">
-                省份数量：<span class="provincePay-num">&nbsp;<span v-html="userAreaAllNum"></span>&nbsp;</span>个
+                省份数量：<span class="provincePay-num">&nbsp;<span v-html="userAreaAllNum"></span>&nbsp;</span><span v-show="userAreaAllNum !== '全国'">个</span>
               </div>
               <div class="provincePay-btnWrap">
                 <div class="privincePay-btn" @click="renewBtn">续费</div>