fix:修复订阅管理页面数据异常的问题

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

@@ -23,7 +23,7 @@ var subNode = new Vue({
             userType: false, // 用户是否为付费用户
             userAreaAllNum: 1, // 用户可修改地区总次数
             subscribeTime: '', // 用户订阅的时间
-            vSwitch: 'f' // 用户权限
+            vSwitch: '' // 用户权限
         }
     },
     created () {
@@ -81,8 +81,6 @@ var subNode = new Vue({
                         } else if(num == 3) {
                             $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_sj"></em>订阅管理-大会员</span>')
 
-                        } else if(num <= 0) {
-                            $('.custom-header-title').html('<span class="title-text"></em>订阅管理-免费订阅</span>')
                         } else {
                             $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_zj"></em>订阅管理-大会员</span>')
                         }
@@ -96,17 +94,23 @@ var subNode = new Vue({
                             pushsetting: '/jyapp/big/page/push_setting_detail?header=大会员推送设置&type=member_subscribe'
                         }
                         this.subInfoAjax = '/bigmember/use/info?t=' + new Date().getTime()
+                    } else if(num <= 0) {
+                        $('.custom-header-title').html('<span class="title-text">订阅管理-免费订阅</span>')
+                        this.subInfoAjax = '/publicapply/free/subscribe'
                     } else {
                         $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_vip"></em>订阅管理-超级订阅</span>')
                         this.subInfoAjax = '/subscribepay/vipsubscribe/getSubBuyMsg?t=' + new Date().getTime()
                     }
-                } else {
+                } else if(swipro == 'supervip') {
                     $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_vip"></em>订阅管理-超级订阅</span>')
                     this.subInfoAjax = '/subscribepay/vipsubscribe/getSubBuyMsg?t=' + new Date().getTime()
+                } else {
+                    $('.custom-header-title').html('<span class="title-text">订阅管理-免费订阅</span>')
+                    this.subInfoAjax = '/publicapply/free/subscribe'
                 }
             } else {
-                $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_vip"></em>订阅管理-超级订阅</span>')
-                this.subInfoAjax = '/subscribepay/vipsubscribe/getSubBuyMsg?t=' + new Date().getTime()
+                $('.custom-header-title').html('<span class="title-text">订阅管理-免费订阅</span>')
+                this.subInfoAjax = '/publicapply/free/subscribe'
             }
         },
         // 是否显示切换图标
@@ -156,6 +160,7 @@ var subNode = new Vue({
                             _this.vipLink = 'javascript:;'
                             _this.arrowShow = false
                             _this.subInfoAjax = '/publicapply/free/subscribe'
+                            sessionStorage.setItem('switch-product', 'free')
                         }
                         let bms = sessionStorage.getItem('big_member_status')
                         _this.initPage(bms)
@@ -325,7 +330,9 @@ $(function () {
                     res.data.startTime = r.data.member_starttime
                     res.data.endTime = r.data.member_endtime
                   }
-              }else {
+              } else if (switchProduct == 'free') {
+                subNode.initData = r.data
+              } else {
                 res = r
               }
           }
@@ -351,12 +358,18 @@ $(function () {
   var resObj = {}
   // 每次请求接口
   console.log(document.referrer)
-  let subUrl = '/subscribepay/vipsubscribe/getSubBuyMsg'
+  let subUrl
+  if (subNode.vSwitch === 'v') {
+    subUrl = '/subscribepay/vipsubscribe/getSubBuyMsg'
+  } else if (subNode.vSwitch === 'm') {
+    subUrl = '/bigmember/use/info?t=' + new Date().getTime()
+  } else {
+    subUrl = '/publicapply/free/subscribe'
+  }
     $DoPost(subUrl, {}, function(sum) {
-        if(sum.success) {
-            resObj = sum
-            getDataWitXHR()
-        }
+        console.info('sum',sum)
+        resObj = sum
+        getDataWitXHR()
     })
 
   // 设置已选择的区域和行业

src/jfw/modules/app/src/web/templates/areaPack/page_set_area.html

@@ -219,7 +219,7 @@
                 type: 'POST',
                 success: function (res) {
                     userType = res.data.provincenum === 0 ? false : true
-                    maxSelect = res.data.areanum !== -1 ? res.data.provincenum : res.data.areanum
+                    maxSelect = res.data.areanum
                     // _this.$emit('UserSubscribe',res)
                     if (maxSelect === -1) {
                         $('#canSelect').text(`全国`)

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

@@ -266,8 +266,8 @@
                 <i class="iconfont icon-arrow"></i>
               </div>
             </a>
-            <ul class="sub-info" :class="vSwitch !== 'm' && vSwitch !== 'v' ? 'go_to_levelup' : ''" @click="toPaySupSub">
-              <li class="cycle">
+            <ul class="sub-info" :class="vSwitch !== 'm' && vSwitch !== 'v' ? 'go_to_levelup' : ''" @click="toPaySupSub" style="min-height: 1.48rem">
+              <li class="cycle" v-show="vSwitch !== 'f'">
                 <a class="item-container" :href="vipLink">
                   <div class="item">
                     <span class="item-l">

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -230,7 +230,7 @@
 		<div class="updateTips-btnWrap">
 			<div class="updateTips-btn" id="cancel2" onclick="hiddenTips2()">取消</div>
 			<div class="updateTips-line"></div>
-			<div class="updateTips-btn levelUp" id="newLevelUp"  onclick="updateJump2()">立即升级</div>
+			<div class="updateTips-btn levelUp" id="newLevelUp"  onclick="updateJump2()">立即更新</div>
 		</div>
 	</div>
 </div>

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -134,6 +134,7 @@
         bottom: 0;
         z-index: 99999;
         background-color:rgba(0, 0, 0, 0.7);
+        display: none;
     }
     .updateTips-wrap{
         width: 6.06rem;
@@ -192,7 +193,7 @@
 <div id="jyKeepComponent">
     <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
 </div>
-<div class="oldUserTips" id="UserTips">
+<!-- <div class="oldUserTips" id="UserTips">
     <div class="updateTips-wrap">
         <div class="updateTips-title">开通超级订阅</div>
         <div class="updateTips-text">免费用户最多可查看500条招标搜索结果，可前往购买超级订阅解锁查看更多信息</div>
@@ -202,8 +203,8 @@
             <div class="updateTips-btn levelUp" id="gotoPay"  onclick="gotoPay()">去开通</div>
         </div>
     </div>
-</div>
-<div class="oldUserTips" id="tipsType">
+</div> -->
+<div class="oldUserTips" id="tipsType" >
 	<div class="updateTips-wrap" style="height: 3.3rem;">
 		<div class="updateTips-title">版本更新</div>
 		<div class="updateTips-text" style="text-align: center;">免费订阅新版来了，请前往订阅设置更新功能后使用。</div>

src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js

@@ -766,6 +766,7 @@ var subComponent = {
           url: '/publicapply/free/subscribe',
           type: 'POST',
           success: function (res) {
+            console.info(res)
               _this.UserSubscribe = res
               _this.info.area = res.data.area
               _this.userAreaNum = res.data.areanum
@@ -939,7 +940,7 @@ var custom = {
             sessionStorage.removeItem('infoTypeVswitch')
               if(res.flag) {
                   sessionStorage.removeItem('big-setInfoType')
-                  // location.reload()
+                  location.reload()
               } else {
                   vueComponent.$toast(res.data.error_msg)
               }

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

@@ -72,9 +72,12 @@ var subNode = new Vue({
                     if (res.data.vt !== 'v' ) {
                         _this.vSwitch = 'f'
                         $('.update_renew').hide()
+                        $('.super-title').text('订阅管理-免费订阅');
+                        $('.super-title').css('background', 'none')
                     } else {
                         _this.vSwitch = 'v'
                         $('.update_renew').show()
+                        $('.super-title').show();
                     }
                 }
             })

src/web/templates/areaPack/wx/page_set_area.html

@@ -213,7 +213,7 @@
                 type: 'POST',
                 success: function (res) {
                     userType = res.data.provincenum === 0 ? false : true
-                    maxSelect = res.data.areanum !== -1 ? res.data.provincenum : res.data.areanum
+                    maxSelect = res.data.provincenum
                     // _this.$emit('UserSubscribe',res)
                     if (maxSelect === -1) {
                         $('#canSelect').text(`全国`)

src/web/templates/weixin/historypush.html

@@ -665,7 +665,7 @@
                 <div class="updateTips-btnWrap">
                     <div class="updateTips-btn" id="cancel2" onclick="hiddenTips2()">取消</div>
                     <div class="updateTips-line"></div>
-                    <div class="updateTips-btn levelUp" id="newLevelUp"  onclick="updateJump2()">立即升级</div>
+                    <div class="updateTips-btn levelUp" id="newLevelUp"  onclick="updateJump2()">立即更新</div>
                 </div>
             </div>
         </div>
@@ -1058,7 +1058,7 @@
                 sessionStorage.setItem(vm.sessStorageKey, JSON.stringify(vm.$data))
                 let thisType = sessionStorage.getItem('userIsNew')
                 if (userNewType || thisType) {
-                    location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
+                    location.href = '/front/vipsubscribe/toSubVipSetPage'
                 } else {
                     tokeysetForFree()
                 }

src/web/templates/weixin/search/mainSearch.html

@@ -509,7 +509,7 @@
 <div id="jyKeepComponent">
     <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
 </div>
-<div class="oldUserTips" id="UserTips">
+<!-- <div class="oldUserTips" id="UserTips">
     <div class="updateTips-wrap">
         <div class="updateTips-title">开通超级订阅</div>
         <div class="updateTips-text">免费用户最多可查看500条招标搜索结果，可前往购买超级订阅解锁查看更多信息</div>
@@ -519,7 +519,7 @@
             <div class="updateTips-btn levelUp" id="gotoPay"  onclick="gotoPay()">去开通</div>
         </div>
     </div>
-</div>
+</div> -->
 <div class="oldUserTips" id="tipsType">
 	<div class="updateTips-wrap" style="height: 3.3rem;">
 		<div class="updateTips-title">版本更新</div>