Merge remote-tracking branch 'origin/feature/v4.7.55' into feature/v4.7.55

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/page_init.js

@@ -538,6 +538,11 @@ var vNode = {
                 this.inputArr[this.step.now].skip = true
                 var nowKey = this.inputArr[this.step.now].key
                 console.log('跳过当前步骤', nowKey)
+                if (!this.ajaxInitData[nowKey]) {
+                  this.ajaxInitData[nowKey] = [{
+                    'a_key': []
+                  }]
+                }
                 this.localInitData[nowKey] = JSON.parse(JSON.stringify(this.ajaxInitData[nowKey]))
                 this.initLocalData()
             }

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

@@ -27,7 +27,8 @@ var subNode = new Vue({
       subscribeTime: '', // 用户订阅的时间
       vSwitch: '', // 用户权限
       freeUserArea: {}, // 购买省份订阅包的用户所选择的地区
-      isNewVip: 0
+      isNewVip: 0,
+      entVipPower: false
     }
   },
   created () {
@@ -139,10 +140,14 @@ var subNode = new Vue({
       console.log(this.vipLink, subNode.isNewVip)
       let swipro = sessionStorage.getItem('switch-product')
       // 如果是老超级订阅者用户提示升级到新版超级订阅再续费
-      if (swipro && swipro == 'supervip' && subNode.isNewVip != 1) {
-        $('[data-update-tips]').show()
+      if (this.entVipPower) {
+        location.href = 'javascript:;'
       } else {
-        location.href = this.vipLink
+        if (swipro && swipro == 'supervip' && subNode.isNewVip != 1) {
+          $('[data-update-tips]').show()
+        } else {
+          location.href = this.vipLink
+        }
       }
     },
     // 是否显示切换图标
@@ -229,7 +234,9 @@ var subNode = new Vue({
             const data =  res.data || {}
             // 企业分配的超级订阅不展示“续费”、“升级”入口
             if(data.vip_power === 1){
+              _this.entVipPower = data.vip_power === 1
               $('.update_renew').hide()
+              $('.cycle .icon-arrow').hide()
             }
           }
         }

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

@@ -23,7 +23,8 @@ var subNode = new Vue({
             vSwitch:'', // 用户版本权限
             freeUserArea: {}, // 购买省份订阅包的用户所选择的地区
             isNewVip: 0,
-            infoRoot: {}
+            infoRoot: {},
+            entVipPower: false
         }
     },
     created () {
@@ -66,10 +67,15 @@ var subNode = new Vue({
         toSubCycle () {
           // 如果是老超级订阅者用户提示升级到新版超级订阅再续费
           if(this.vSwitch === 'v') {
-            if (this.isNewVip != 1) {
-              $('[data-update-tips]').show()
+            if (this.entVipPower) {
+              // 企业分配的超级订阅不能跳转去续费或升级
+              location.href = 'javascript:;'
             } else {
-              location.href = '/jy_mobile/common/order/create/svip?type=renew'
+              if (this.isNewVip != 1) {
+                $('[data-update-tips]').show()
+              } else {
+                location.href = '/jy_mobile/common/order/create/svip?type=renew'
+              }
             }
           } else if(this.vSwitch === 'm') {
             location.href = 'javascript:;'
@@ -224,7 +230,9 @@ var subNode = new Vue({
                 const data =  res.data || {}
                 // 企业分配的超级订阅不展示“续费”、“升级”入口
                 if(data.vip_power === 1){
+                  _this.entVipPower = data.vip_power === 1
                   $('.update_renew').hide()
+                  $('.cycle .icon-arrow').hide()
                 }
               }
             }