Эх сурвалжийг харах

feat:超级订阅下单入口

yangfeng 3 жил өмнө
parent
commit
2d407809da
50 өөрчлөгдсөн 2321 нэмэгдсэн , 2217 устгасан
  1. 24 20
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_buyer-example.js
  2. 1456 1453
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_portrayal.js
  3. 58 55
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  4. 34 29
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js
  5. 19 18
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/keyWord.js
  6. 531 526
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js
  7. 4 2
      src/jfw/modules/app/src/web/templates/active/livePage/online.html
  8. 2 1
      src/jfw/modules/app/src/web/templates/big-member/page_client_follow_detail.html
  9. 2 1
      src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html
  10. 4 2
      src/jfw/modules/app/src/web/templates/commonPay/myOrderOld.html
  11. 4 2
      src/jfw/modules/app/src/web/templates/vipsubscribe/renew_notice.html
  12. 7 5
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index.html
  13. 15 6
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html
  14. 1 1
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html
  15. 2 2
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce_old.html
  16. 2 2
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html
  17. 2 1
      src/jfw/modules/app/src/web/templates/weixin/follow/set.html
  18. 4 2
      src/jfw/modules/app/src/web/templates/weixin/historypush.html
  19. 6 3
      src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html
  20. 10 5
      src/web/staticres/big-member/js/unit_portrayal.js
  21. 8 4
      src/web/staticres/common-module/collection/js/buyer-example.js
  22. 6 5
      src/web/staticres/common-module/collection/js/date-mobile.js
  23. 6 3
      src/web/staticres/common-module/collection/js/ent_portrait.js
  24. 2 1
      src/web/staticres/common-module/collection/js/index-wx.js
  25. 2 1
      src/web/staticres/common-module/collection/js/index.js
  26. 12 6
      src/web/staticres/common-module/collection/js/vip-dialog.js
  27. 4 2
      src/web/staticres/common-module/coupon/js/coupon-template.js
  28. 8 4
      src/web/staticres/common-module/order-list/js/order-list-config.js
  29. 6 3
      src/web/staticres/common-module/portraitRecord/js/index-wx.js
  30. 12 12
      src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js
  31. 2 1
      src/web/staticres/vipsubscribe/js/keyWord.js
  32. 4 2
      src/web/staticres/vipsubscribe/js/vip_index_new.js
  33. 4 2
      src/web/templates/active/livePage/live_online_wx.html
  34. 2 1
      src/web/templates/weixin/commonPay/bidfile/bidfiledetail.html
  35. 2 1
      src/web/templates/weixin/commonPay/integral/integralDetail.html
  36. 4 2
      src/web/templates/weixin/commonPay/myOrderOld.html
  37. 2 1
      src/web/templates/weixin/follow/set.html
  38. 8 4
      src/web/templates/weixin/historypush.html
  39. 2 1
      src/web/templates/weixin/member/aiForecastPackdetail.html
  40. 2 1
      src/web/templates/weixin/member/memberdetail.html
  41. 2 1
      src/web/templates/weixin/member/subAccountDetail.html
  42. 4 2
      src/web/templates/weixin/vipsubscribe/renew_notice.html
  43. 2 1
      src/web/templates/weixin/vipsubscribe/vip_UpgradeDetail.html
  44. 7 5
      src/web/templates/weixin/vipsubscribe/vip_index.html
  45. 8 6
      src/web/templates/weixin/vipsubscribe/vip_index_new.html
  46. 1 1
      src/web/templates/weixin/vipsubscribe/vip_introduce.html
  47. 2 2
      src/web/templates/weixin/vipsubscribe/vip_introduce_old.html
  48. 2 1
      src/web/templates/weixin/vipsubscribe/vip_order_detail.html
  49. 2 2
      src/web/templates/weixin/vipsubscribe/vip_purchase.html
  50. 6 3
      src/web/templates/weixin/wxinfocontent_rec.html

+ 24 - 20
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_buyer-example.js

@@ -22,7 +22,7 @@ var buyerExample = {
   props: {
     'imgurl': {
       type: String,
-      default: function() {
+      default: function () {
         return ''
       }
     },
@@ -57,7 +57,7 @@ var buyerExample = {
       }
     },
   },
-  data: function() {
+  data: function () {
     return {
       titleText: '开通大会员',
       btnText: '免费体验',
@@ -82,56 +82,56 @@ var buyerExample = {
       //   textMap.btnText = '联系客服'
       // }
       switch (this.type) {
-          // 历史项目联系方式
+        // 历史项目联系方式
         case 'item_1': {
           textMap.headText.top = '采购单位项目动态全面获取,帮助企业'
           textMap.headText.bot = '洞察采购需求,开发新客户!',
-          textMap.source = 'buyer_portrait_contacts_freeuser'
+            textMap.source = 'buyer_portrait_contacts_freeuser'
           break
         }
-          // 年度项目统计
+        // 年度项目统计
         case 'item_2': {
           textMap.headText.top = '采购单位年度项目规模、增长趋势'
           textMap.headText.bot = '一目了然,快速分析市场!'
           textMap.source = 'buyer_portrait_yearData_freeuser'
           break
         }
-          // 月度采购规模统计
+        // 月度采购规模统计
         case 'item_3': {
           textMap.headText.top = '通过纵向对比近3年月度中标金额,'
           textMap.headText.bot = '快速分析行业月度采购趋势!'
           textMap.source = 'buyer_portrait_monthData_freeuser'
           break
         }
-          // 采购规模分布
+        // 采购规模分布
         case 'item_4': {
           textMap.headText.top = '全面了解采购单位的年度采购规划、'
           textMap.headText.bot = '项目预算,帮助投标人制定投标策略!'
           textMap.source = 'buyer_portrait_moneyRange_freeuser'
           break
         }
-          // 各类招标方式占比
+        // 各类招标方式占比
         case 'item_5': {
           textMap.headText.top = '洞察采购单位招标方式、数量、金额占比,'
           textMap.headText.bot = '综合了解采购单位,帮企业决策是否投标!'
           textMap.source = 'buyer_portrait_bidtypeData_freeuser'
           break
         }
-          // 各行业项目平均节支率
+        // 各行业项目平均节支率
         case 'item_6': {
           textMap.headText.top = '分析行业项目的预算、中标价格差额比率,'
           textMap.headText.bot = '帮助企业核算采购项目的利润率!'
           textMap.source = 'buyer_portrait_rate_freeuser'
           break
         }
-          // 各行业项目规模占比
+        // 各行业项目规模占比
         case 'item_7': {
           textMap.headText.top = '通过行业采购项目的规模、数量、利润率,'
           textMap.headText.bot = '洞悉采购单位的采购状况!'
           textMap.source = 'buyer_portrait_top12_freeuser'
           break
         }
-          // 重点合作企业
+        // 重点合作企业
         case 'item_8': {
           textMap.headText.top = '通过挖掘重点合作企业,直观了解采购单位'
           textMap.headText.bot = '与企业关系远近,辅助投标决策!'
@@ -145,14 +145,14 @@ var buyerExample = {
           textMap.source = 'buyer_portrait_firstShow_freeuser'
           break
         }
-          // 合作企业注册资本分布
+        // 合作企业注册资本分布
         case 'item_9': {
           textMap.headText.top = '通过分析合作企业注册资本、采购项目规模、'
           textMap.headText.bot = '利润率,全面洞察采购单位合作企业!'
           textMap.source = 'buyer_portrait_withCapitalData_freeuser'
           break
         }
-         // 合作企业年龄分布
+        // 合作企业年龄分布
         case 'item_10': {
           textMap.headText.top = '通过分析合作企业年龄、数量、规模分布情况,'
           textMap.headText.bot = '全面洞察采购单位合作企业!'
@@ -216,9 +216,9 @@ var buyerExample = {
     }
   },
   methods: {
-    linkFn: function(id, source) {
+    linkFn: function (id, source) {
       var isWeixin = utils.isWeiXinBrowser
-      if(!isWeixin) {
+      if (!isWeixin) {
         if (this.getTextMap.btnText == '立即解锁') {
           // 留资
           location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + source
@@ -230,9 +230,11 @@ var buyerExample = {
           // }
           location.href = '/jyapp/free/customer' // 客服
         } else if (this.getTextMap.btnText == '去开通') {
-          location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
         } else if (this.getTextMap.btnText == '前往升级') {
-          location.href = '/jyapp/vipsubscribe/upgradePage'
+          // location.href = '/jyapp/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
         }
       } else {
         if (this.getTextMap.btnText == '立即解锁') {
@@ -242,13 +244,15 @@ var buyerExample = {
           // location.href = 'tel:400-108-6670'
           location.href = '/big/wx/page/customer'
         } else if (this.getTextMap.btnText == '去开通') {
-          location.href = '/front/vipsubscribe/vipsubscribe_new'
+          // location.href = '/front/vipsubscribe/vipsubscribe_new'
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
         } else if (this.getTextMap.btnText == '前往升级') {
-          location.href = '/front/vipsubscribe/upgradePage'
+          // location.href = '/front/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
         }
       }
     },
-    goOpen: function(top, bot, source) {
+    goOpen: function (top, bot, source) {
       return
       console.log(this.$parent.encryptId)
       var params = {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 1456 - 1453
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_portrayal.js


+ 58 - 55
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -5,15 +5,15 @@ var vNode = {
     vipComponent: vipComponent,
     hisproComponent: hisproComponent
   },
-  data() {
+  data () {
     // 修改柱状条颜色为渐变色
     this.colorGreen = [new echarts.graphic.LinearGradient(
-        0, 0, 0, 1,
-        [
-          {offset: 1, color: '#2ABED1'},
-          {offset: 0.5, color: '#2ABED1'},
-          {offset: 0, color: '#8DE0EB'}
-        ], false
+      0, 0, 0, 1,
+      [
+        { offset: 1, color: '#2ABED1' },
+        { offset: 0.5, color: '#2ABED1' },
+        { offset: 0, color: '#8DE0EB' }
+      ], false
     ), '#FF9F40']
 
     return {
@@ -74,7 +74,7 @@ var vNode = {
       // 年度项目统计设置
       annualSetting: {
         showLine: ['项目金额'],
-        axisSite: {right: ['项目金额']}
+        axisSite: { right: ['项目金额'] }
       },
       // 地图配置项
       mapSettings: mapSettings,
@@ -136,10 +136,10 @@ var vNode = {
       canFreeExp: false,
       canFreeTrial: false,
       freeWinnerOpen: false,
-      colList:[],
-      isSC:0, //0未收藏 1收藏
-      idx:[],
-      list:[]
+      colList: [],
+      isSC: 0, //0未收藏 1收藏
+      idx: [],
+      list: []
     }
   },
   created: function () {
@@ -235,10 +235,10 @@ var vNode = {
       }
       return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts && !this.entvisit.visited)
     },
-    isMember() {
+    isMember () {
       return !this.conf._4 || this.powerInfo.memberStatus <= 0
     },
-    isShowUpTip() {
+    isShowUpTip () {
       // 出现升级提醒 是新超级订阅买的不是全国、次数已用完 、不是大会员
       return this.entvisit.provin == -1 ? false : true && !this.surplus && this.isVip && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited
     },
@@ -379,9 +379,11 @@ var vNode = {
         }
         // 去开通
         if (this.bidcollPowerInfo.vip == 1) {
-          location.href = '/jyapp/vipsubscribe/upgradePage'
+          // location.href = '/jyapp/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
         } else {
-          location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
         }
       }
       this.overlayShow = true
@@ -398,17 +400,17 @@ var vNode = {
       if (_this.powerInfo.memberStatus > 0 && _this.powerInfo.power.indexOf(4) > -1) {
         urls = '/bigmember/portrait/winner/getData'
       }
-          //  else if (_this.powerInfo.memberStatus > 2) {
-          //   if ( _this.isVip) { // 超级订阅
-          //     if(_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
-          //       urls = '/bigmember/portrait/winner/getData'
-          //     } else {
-          //       urls = '/bigmember/portrait/subVipPortrait/winner'
-          //     }
-          //   } else {
-          //     urls = '/bigmember/portrait/winner/getData'
-          //      // 商机版、自定义版
-          //   }
+      //  else if (_this.powerInfo.memberStatus > 2) {
+      //   if ( _this.isVip) { // 超级订阅
+      //     if(_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
+      //       urls = '/bigmember/portrait/winner/getData'
+      //     } else {
+      //       urls = '/bigmember/portrait/subVipPortrait/winner'
+      //     }
+      //   } else {
+      //     urls = '/bigmember/portrait/winner/getData'
+      //      // 商机版、自定义版
+      //   }
       // }
       else {
         urls = '/bigmember/portrait/subVipPortrait/winner'
@@ -498,7 +500,7 @@ var vNode = {
       });
     },
     //数据导出
-    onExport(){
+    onExport () {
       var _this = this
       var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
       var data = {
@@ -507,18 +509,18 @@ var vNode = {
         pageSize: this.topProject.pageSize
       }
       let requestUrl = '/bigmember/portrait/winner/winnerNewMsgExport'
-      if (_this.powerInfo.memberStatus<=0){
+      if (_this.powerInfo.memberStatus <= 0) {
         requestUrl = '/bigmember/portrait/subVipPortrait/winnerNewMsgExport'
       }
       $.ajax({
-        type:'POST',
+        type: 'POST',
         url: requestUrl,
         data: storageSet ? Object.assign(data, storageSet) : data,
         timeout: 8000,
-        success:function(res) {
+        success: function (res) {
           window.location.href = "/jyapp/front/dataExport/toCreateOrderPage?id=" + res.data
         },
-        error:function(err) {
+        error: function (err) {
           console.log(err)
         }
       })
@@ -526,7 +528,7 @@ var vNode = {
     //收藏
     addKeepStatus (item) {
       if (vKeepComponent) {
-        let canKeep = this.idx.indexOf(item.id) >-1
+        let canKeep = this.idx.indexOf(item.id) > -1
         vKeepComponent.changeBid(item.id, !canKeep)
       }
     },
@@ -541,7 +543,7 @@ var vNode = {
       }
     },
     //招标信息是否被收藏
-    getIsSc(){
+    getIsSc () {
       let _this = this
       $.ajax({
         url: '/publicapply/bidcoll/isColl',
@@ -565,16 +567,16 @@ var vNode = {
       if (_this.powerInfo.memberStatus > 0 && _this.powerInfo.power.indexOf(13) > -1) {
         urls = '/bigmember/portrait/winner/getNewMsg'
       }
-          // else if (_this.powerInfo.memberStatus > 2) {
-          //   if (_this.isVip) {
-          //     if (_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
-          //       urls = '/bigmember/portrait/winner/getNewMsg'
-          //     } else {
-          //       urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'
-          //     }
-          //   } else {
-          //     urls = '/bigmember/portrait/winner/getNewMsg'
-          //   }
+      // else if (_this.powerInfo.memberStatus > 2) {
+      //   if (_this.isVip) {
+      //     if (_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
+      //       urls = '/bigmember/portrait/winner/getNewMsg'
+      //     } else {
+      //       urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'
+      //     }
+      //   } else {
+      //     urls = '/bigmember/portrait/winner/getNewMsg'
+      //   }
       // }
       else {
         urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'
@@ -619,13 +621,13 @@ var vNode = {
                     )
                   )
                 })
-              } catch (error) {}
+              } catch (error) { }
               _this.topProject.list = res.data.list
-              _this.topProject.list.forEach((val)=>{
+              _this.topProject.list.forEach((val) => {
                 _this.list.push(val.id)
               })
               //查询是否收藏
-              if(_this.list.length>0){
+              if (_this.list.length > 0) {
                 _this.getIsSc()
               }
             }
@@ -719,9 +721,9 @@ var vNode = {
         }).then(function () {
           _this.changeFollowStateRequest()
         })
-            .catch(function () {
-              console.log('取消操作')
-            })
+          .catch(function () {
+            console.log('取消操作')
+          })
       } else {
         this.changeFollowStateRequest()
       }
@@ -758,8 +760,8 @@ var vNode = {
                 _this.isVip = true
               }
               //if (power.indexOf(4) != -1 || res.data.viper) {
-                // 获取企业画像信息-4
-                _this.conf._4 = true
+              // 获取企业画像信息-4
+              _this.conf._4 = true
               //}
               _this.canReadConf13()
               if (power.indexOf(12) != -1) {
@@ -1314,7 +1316,7 @@ var vNode = {
             `id=${item.id}`
           )
         )
-      } catch (error) {}
+      } catch (error) { }
       this.savePageState()
       if (item.id) {
         var href = '/jyapp/article/content/' + item.id + '.html'
@@ -1375,7 +1377,7 @@ var vNode = {
       return !!$data
     },
     // 高级分析设置
-    goHighSet() {
+    goHighSet () {
       sessionStorage.setItem('is-click-set', 1)
       location.href = './free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId')
       // var url = this.getProjectNewsUrl()
@@ -1399,7 +1401,8 @@ var vNode = {
       location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=ent_portrait_freeuser';
     },
     goOpenVip: function () {
-      location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+      // location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+      location.href = '/jy_mobile/common/order/create/svip?type=buy'
     }
   }
 }

+ 34 - 29
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js

@@ -7,14 +7,14 @@ var vNode = {
     hisproComponent: hisproComponent,
     buyerExample: buyerExample,
   },
-  data() {
+  data () {
     // 修改柱状条颜色为渐变色
     this.colorGreen = [new echarts.graphic.LinearGradient(
       0, 0, 0, 1,
       [
-        {offset: 1, color: '#2ABED1'},
-        {offset: 0.5, color: '#2ABED1'},
-        {offset: 0, color: '#8DE0EB'}
+        { offset: 1, color: '#2ABED1' },
+        { offset: 0.5, color: '#2ABED1' },
+        { offset: 0, color: '#8DE0EB' }
       ], false
     ), '#FF9F40']
     return {
@@ -40,7 +40,7 @@ var vNode = {
       },
       projectChartSettings: {
         showLine: ['项目金额'],
-        axisSite: {right: ['项目金额']}
+        axisSite: { right: ['项目金额'] }
       },
       isShow: {
         showDynamic: false,
@@ -66,7 +66,7 @@ var vNode = {
       },
       regCapSettings: {
         showLine: ['累计采购规模'],
-        axisSite: {right: ['累计采购规模']},
+        axisSite: { right: ['累计采购规模'] },
         // stack: { '注册资本分布': ['注册资本','企业数量', '采购项目数量', '平均节支率'] }
       },
       // 合作企业注册资本分布
@@ -245,7 +245,7 @@ var vNode = {
       }
     }
   },
-  created() {
+  created () {
     this.getPowerInfo()
     setTimeout(() => {
       this.getIsSc()
@@ -261,7 +261,7 @@ var vNode = {
       sessionStorage.removeItem('buyer_high_name')
     }
   },
-  beforeDestroy() {
+  beforeDestroy () {
     window.removeEventListener("resize", this.init, 20);
   },
   methods: {
@@ -276,7 +276,8 @@ var vNode = {
       }
     }, 300),
     goOpenVip: function () {
-      location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+      // location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+      location.href = '/jy_mobile/common/order/create/svip?type=buy'
     },
     // 查询超级订阅采购单位画像浏览次数
     getUsage: function () {
@@ -406,7 +407,7 @@ var vNode = {
         }
       })
     },
-    init() {
+    init () {
       setTimeout(function () {
         window.addEventListener('resize', function () {
           if (this.hotChart) {
@@ -478,7 +479,8 @@ var vNode = {
             confirmButtonText: '前往升级',
             showCancelButton: true
           }).then(function () {
-            location.href = '/jyapp/vipsubscribe/upgradePage'
+            // location.href = '/jyapp/vipsubscribe/upgradePage'
+            location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
           }).catch(function () {
           })
         } else {
@@ -490,7 +492,7 @@ var vNode = {
       }
     },
     //数据导出
-    onExport() {
+    onExport () {
       var storageSet = JSON.parse(sessionStorage.getItem('buyer_high_set'))
       // var isMember = this.bigStatus > 0 && this.power.indexOf(5) > -1
       var data = {
@@ -515,13 +517,13 @@ var vNode = {
       })
     },
     //收藏
-    addKeepStatus(item) {
+    addKeepStatus (item) {
       if (vKeepComponent) {
         let canKeep = this.idx.indexOf(item.id) > -1
         vKeepComponent.changeBid(item.id, !canKeep)
       }
     },
-    changeKeepStatus(id, type) {
+    changeKeepStatus (id, type) {
       let canHas = this.idx.indexOf(id) > -1
       if (type) {
         if (!canHas) {
@@ -532,7 +534,7 @@ var vNode = {
       }
     },
     //招标信息是否被收藏
-    getIsSc() {
+    getIsSc () {
       let _this = this
       $.ajax({
         url: '/publicapply/bidcoll/isColl',
@@ -590,7 +592,7 @@ var vNode = {
                       )
                     )
                   })
-                } catch (error) {}
+                } catch (error) { }
                 res.data.list.forEach((item) => {
                   if (that.dt.list.length < 3) {
                     that.dt.list.push(item)
@@ -780,7 +782,7 @@ var vNode = {
       }
     },
     //
-    changeList() {
+    changeList () {
       if (this.isActive == 0) {
         this.isActive = 1
       } else {
@@ -1233,12 +1235,12 @@ var vNode = {
       opt.graphic[0].children[0].style.text = '项目数量(个)';
       var pj = Math.floor((opt.visualMap.max / 5) * 100) / 100;
       opt.visualMap[0].pieces = [
-        {min: 0, max: 0, color: '#FFF4EB', symbol: 'rect'},
-        {min: 1, max: pj * 1, color: '#FFE7CF', symbol: 'rect'},
-        {min: pj * 1, max: pj * 2, color: '#FFCF9F', symbol: 'rect'},
-        {min: pj * 2, max: pj * 3, color: '#FFB366', symbol: 'rect'},
-        {min: pj * 3, max: pj * 4, color: '#F48A5D', symbol: 'rect'},
-        {min: pj * 4, color: '#F06326', symbol: 'rect'},
+        { min: 0, max: 0, color: '#FFF4EB', symbol: 'rect' },
+        { min: 1, max: pj * 1, color: '#FFE7CF', symbol: 'rect' },
+        { min: pj * 1, max: pj * 2, color: '#FFCF9F', symbol: 'rect' },
+        { min: pj * 2, max: pj * 3, color: '#FFB366', symbol: 'rect' },
+        { min: pj * 3, max: pj * 4, color: '#F48A5D', symbol: 'rect' },
+        { min: pj * 4, color: '#F06326', symbol: 'rect' },
       ];
       opt.series[0].tooltip.formatter = function (params) {
         // console.log(params.value[2])
@@ -1276,7 +1278,7 @@ var vNode = {
       var index;
       that.$nextTick(function () {
         var ref = that.$refs.hotChart;
-        that.hotChart = echarts.init(ref, null, {renderer: "svg"});
+        that.hotChart = echarts.init(ref, null, { renderer: "svg" });
         that.hotChart.setOption(chartOptions.hotChart);
         setTimeout(function () {
           // 默认展示某一个tooltip
@@ -1382,7 +1384,7 @@ var vNode = {
       }
       that.$nextTick(function () {
         var ref = that.$refs.pieChart;
-        that.pieChart = echarts.init(ref, null, {renderer: "svg"});
+        that.pieChart = echarts.init(ref, null, { renderer: "svg" });
         that.pieChart.setOption(chartOptions.deformPieChart);
         that.pieChart.resize();
       })
@@ -1590,9 +1592,11 @@ var vNode = {
           // }
           location.href = '/jyapp/free/customer'
         } else if (btnText == '前往升级') {
-          location.href = '/jyapp/vipsubscribe/upgradePage'
+          // location.href = '/jyapp/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
         } else if (btnText == '去开通') {
-          location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
         } else {
           _this.goBuyBuried('开通大会员,采购单位项目动态全面获取,帮助企业洞察采购需求,开发新客户!')
         }
@@ -1611,7 +1615,7 @@ var vNode = {
               `id=${item.id}`
             )
           )
-        } catch (error) {}
+        } catch (error) { }
         var href = '/jyapp/article/content/' + item.id + '.html'
         location.href = href
       } else {
@@ -1662,7 +1666,8 @@ var vNode = {
         cancelButtonText: '取消'
       }).then(function (data) {
         if (item == '前往升级') {
-          location.href = '/jyapp/vipsubscribe/upgradePage'
+          // location.href = '/jyapp/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
         } else if (item == '联系客服') {
           location.href = '/jyapp/free/customer'
         }

+ 19 - 18
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/keyWord.js

@@ -136,7 +136,7 @@ var vm = new Vue({
       var vSwitch = utils.getParam('vSwitch')
       if (vSwitch) {
         this.vSwitch = vSwitch
-      } else{
+      } else {
         $.ajax({
           type: 'POST',
           url: '/publicapply/subscribe/vipSwitch',
@@ -149,7 +149,7 @@ var vm = new Vue({
     },
     getKeywordsGroupList: function (needLoading) {
       var _this = this
-      if (needLoading)  {
+      if (needLoading) {
         var loading = this.showLoading()
       }
       $.ajax({
@@ -193,8 +193,8 @@ var vm = new Vue({
             } else if (_this.vSwitch === 's') {
               _this.userData = res.data.data
               if (res.data.data) {
-                if(res.data.data.length !==0 ) {
-                  res.data.data.forEach(function(item, index) {
+                if (res.data.data.length !== 0) {
+                  res.data.data.forEach(function (item, index) {
                     item.groupIndex = index
                   })
                 }
@@ -407,9 +407,9 @@ var vm = new Vue({
         console.log('确认批量删除关键词')
         _this.batchDeleteConfirmed()
       })
-      .catch(function() {
-        console.log('取消批量删除关键词')
-      })
+        .catch(function () {
+          console.log('取消批量删除关键词')
+        })
     },
     getSelectedArr: function () {
       var selectedArr = []
@@ -454,17 +454,17 @@ var vm = new Vue({
         delete_key: JSON.stringify(deleteKey)
       }
       let delUrl = '/publicapply/subscribe/setUserInfo'
-      if(this.vSwitch == 's') {
+      if (this.vSwitch == 's') {
         delUrl = '/entnicheNew/subscribe/key/update'
-        Object.keys(deleteKey).forEach(function(r, index) {
-          _this.userData.forEach(function(uitem, i) {
-            if(r == i) {
-              if(deleteKey[r].indexOf(',') != -1) {
+        Object.keys(deleteKey).forEach(function (r, index) {
+          _this.userData.forEach(function (uitem, i) {
+            if (r == i) {
+              if (deleteKey[r].indexOf(',') != -1) {
                 let keyiList = deleteKey[r].split(',')
                 keyiList = keyiList.sort((a, b) => {
                   return b - a
                 })
-                keyiList.forEach(function(de, dindex) {
+                keyiList.forEach(function (de, dindex) {
                   console.log(de)
                   uitem.a_key.splice(de, 1)
                 })
@@ -487,7 +487,7 @@ var vm = new Vue({
         url: delUrl,
         type: 'POST',
         data: data,
-        contentType:  this.vSwitch == 's'?'application/json' : 'application/x-www-form-urlencoded',
+        contentType: this.vSwitch == 's' ? 'application/json' : 'application/x-www-form-urlencoded',
         success: function (res) {
           loading && loading.clear()
           if (res.flag || res.data.status == 1) {
@@ -496,7 +496,7 @@ var vm = new Vue({
             _this.batchDeleteState = false
             location.reload()
           } else {
-            _this.showToast(res.msg ? res.msg : '删除失败' )
+            _this.showToast(res.msg ? res.msg : '删除失败')
           }
         },
         error: function () {
@@ -576,7 +576,7 @@ var vm = new Vue({
     // 根据分类名,得到分类索引
     getGroupIndexWithGroupName: function (gn) {
       var groupIndex = -1
-      this.keywordsGroupList.forEach(function(item) {
+      this.keywordsGroupList.forEach(function (item) {
         if (gn === item.s_item) {
           groupIndex = item.groupIndex
         }
@@ -609,7 +609,8 @@ var vm = new Vue({
     toBuyVIPService: function () {
       this.savePageState()
       // location.href = '/jyapp/vipsubscribe/introducePage'
-      location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+      // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+      location.href = '/jy_mobile/common/order/create/svip?type=buy'
     },
     toKeyManagePage: function () {
       this.filter.pickerShow = false
@@ -643,7 +644,7 @@ var vm = new Vue({
             JyObj.checkLab();
             sessionStorage.reloadHomePage = true;
             sessionStorage.reloadSubPage = true;
-          } catch (e) {}
+          } catch (e) { }
         },
         error: function () {
           loading && loading.clear()

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 531 - 526
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js


+ 4 - 2
src/jfw/modules/app/src/web/templates/active/livePage/online.html

@@ -110,9 +110,11 @@
         <div class="j-footer">
             <div class="j-button-group">
               {{if .T.isVip}}
-                <a href="/jyapp/vipsubscribe/vipsubscribe_renew" class="j-button-confirm j-button-1">立即抢购</a>
+                <!-- <a href="/jyapp/vipsubscribe/vipsubscribe_renew" class="j-button-confirm j-button-1">立即抢购</a> -->
+                <a href="/jy_mobile/common/order/create/svip?type=renew" class="j-button-confirm j-button-1">立即抢购</a>
               {{else}}
-                <a href="/jyapp/vipsubscribe/vipsubscribe_new" class="j-button-confirm j-button-1">立即抢购</a>
+                <!-- <a href="/jyapp/vipsubscribe/vipsubscribe_new" class="j-button-confirm j-button-1">立即抢购</a> -->
+                <a href="/jy_mobile/common/order/create/svip?type=buy" class="j-button-confirm j-button-1">立即抢购</a>
               {{end}}
             </div>
         </div>

+ 2 - 1
src/jfw/modules/app/src/web/templates/big-member/page_client_follow_detail.html

@@ -792,7 +792,8 @@
             },
             //下载报告跳转开通会员
             openVip: function () {
-                location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+                // location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+                location.href = "/jy_mobile/common/order/create/svip?type=buy"
             },
             //下载报告
             downReport: function (type) {

+ 2 - 1
src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html

@@ -655,7 +655,8 @@
             },
             //下载报告跳转开通会员
             openVip: function () {
-                location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+                // location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+                location.href = "/jy_mobile/common/order/create/svip?type=buy"
             },
             //下载报告
             downReport: function (type) {

+ 4 - 2
src/jfw/modules/app/src/web/templates/commonPay/myOrderOld.html

@@ -644,9 +644,11 @@
         setSessionStorage();
         var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
         if (pattern === 1) {
-            window.location.href = "/jyapp/vipsubscribe/vipsubscribe_renew?orderCode=" + orderCode;
+            // window.location.href = "/jyapp/vipsubscribe/vipsubscribe_renew?orderCode=" + orderCode;
+            window.location.href = "/jy_mobile/common/order/create/svip?type=renew&orderCode=" + orderCode;
         } else if (pattern === 2) {
-            window.location.href = "/jyapp/vipsubscribe/vipsubscribe_new?orderCode=" + orderCode;
+            // window.location.href = "/jyapp/vipsubscribe/vipsubscribe_new?orderCode=" + orderCode;
+            window.location.href = "/jy_mobile/common/order/create/svip?type=buy&orderCode=" + orderCode;
         }
     }
 

+ 4 - 2
src/jfw/modules/app/src/web/templates/vipsubscribe/renew_notice.html

@@ -215,10 +215,12 @@
     }
 
     $(".renew_service").on("click", function () {
-        window.location.replace("/jyapp/vipsubscribe/vipsubscribe_renew");
+        // window.location.replace("/jyapp/vipsubscribe/vipsubscribe_renew");
+        window.location.replace("/jy_mobile/common/order/create/svip?type=renew");
     });
     $(".aginBuy").on("click", function () {
-        window.location.replace("/jyapp/vipsubscribe/vipsubscribe_new?orderCode=" + orderCode);
+        // window.location.replace("/jyapp/vipsubscribe/vipsubscribe_new?orderCode=" + orderCode);
+        window.location.replace("/jy_mobile/common/order/create/svip?type=buy&orderCode=" + orderCode);
     });
 
     //

+ 7 - 5
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index.html

@@ -139,7 +139,7 @@
                     <i class="icon iconfont" id="nv_close_renew">&#xe61a;</i>
                     <span class="other">超级订阅服务还有 <span class="renew_day"></span> 天到期,请及时购买!</span>
                     <span class="today" style="display:none;">超级订阅服务今天到期,请及时购买!</span>
-                    <a href="/jyapp/vipsubscribe/vipsubscribe_new">去购买</a>
+                    <a href="/jy_mobile/common/order/create/svip?type=buy">去购买</a>
                 </div>
             </div>
             <!-- 升级 续费 -->
@@ -219,7 +219,7 @@
         })
         $('#nv_close_renew').on('click', () => {
             $('.nv_renew_toast').hide();
-            $(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/jyapp/vipsubscribe/vipsubscribe_new" class="update_btn">去购买</a>');
+            $(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/jy_mobile/common/order/create/svip?type=buy" class="update_btn">去购买</a>');
             $(".tabbar").show();
         })
         // 点击扩大
@@ -282,7 +282,7 @@
                             $(".tabbar").hide();
                         } else {
                             $(".to_expired").hide();
-                            $(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/jyapp/vipsubscribe/vipsubscribe_new" class="update_btn">去购买</a>')
+                            $(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/jy_mobile/common/order/create/svip?type=buy" class="update_btn">去购买</a>')
                         }
                         $('.free7days_pic').text("超级订阅服务");
                         $('.free7days_pic').append("<style>.free7days_pic::after{display:inline-block}</style>");
@@ -368,12 +368,14 @@
 
     //
     function upgrade() {
-        window.location.href = "/jyapp/vipsubscribe/toUpgradePage"
+        // window.location.href = "/jyapp/vipsubscribe/toUpgradePage"
+        window.location.href = "/jy_mobile/common/order/create/svip?type=upgrade"
     }
 
     //
     function rebuy() {
-        window.location.href = "/jyapp/vipsubscribe/vipsubscribe_renew"
+        // window.location.href = "/jyapp/vipsubscribe/vipsubscribe_renew"
+        window.location.href = "/jy_mobile/common/order/create/svip?type=renew"
     }
 </script>
 {{include "/common/baiducc.html"}}

+ 15 - 6
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -255,11 +255,11 @@
         {{end}}
         <ul class="vip-body" id="vip-body" v-cloak>
           <li class="sub-box">
-            <a data-href="/jyapp/vipsubscribe/introducePage?type=renew" class="banner-ad-box update"
+            <a data-href="/jy_mobile/common/order/create/svip?type=renew" class="banner-ad-box update"
               style="display: none">
               <span>限时续费,3个月起,续多久送多久!</span>
             </a>
-            <a href="/jyapp/vipsubscribe/vipsubscribe_new" class="banner-ad-box trial" style="display: none">
+            <a href="/jy_mobile/common/order/create/svip?type=buy" class="banner-ad-box trial" style="display: none">
               <span>限时购买,3个月起,买多久送多久!</span>
               <div>
                 <span>去抢</span>
@@ -333,7 +333,8 @@
         </ul>
         <!-- 升级 -->
         <div class="update_renew" style="display: none">
-          <div class="update-tips" data-update-tips>因系统升级,已购买用户可选择原套餐续费,或升级到新版本享受更多权益。</div>
+          <!-- <div class="update-tips" data-update-tips>因系统升级,已购买用户可选择原套餐续费,或升级到新版本享受更多权益。</div> -->
+          <div class="update-tips" data-update-tips style="display: none">因超级订阅产品全面升级,请升级到新版本享受更多权益。</div>
           <div class="footer-button-group j-button-group">
             <button class="j-button-confirm" data-bind-renew>续费</button>
             <button class="j-button-confirm" data-bind-update>升级</button>
@@ -377,12 +378,19 @@
       }
       // 跳转到续费页面
       $('*[data-bind-renew]').on('click',function() {
-        location.href = '/jyapp/vipsubscribe/vipsubscribe_renew'
+        console.log(subNode.isNewVip, '111');
+        if (subNode.isNewVip != 1) {
+          $('[data-update-tips]').show()
+        } else {
+          // location.href = '/jyapp/vipsubscribe/vipsubscribe_renew'
+          location.href = '/jy_mobile/common/order/create/svip?type=renew'
+        }
       })
       // 直接跳转到升级页面
       $('*[data-bind-update]').on('click',function() {
         sessionStorage.removeItem('vipSub_oldBuySet')
-        location.href = '/jyapp/vipsubscribe/upgradePage'
+        // location.href = '/jyapp/vipsubscribe/upgradePage'
+        location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
       })
       sessionStorage.removeItem('vip-cur-select-coupon')
       sessionStorage.removeItem('$select-coupon')
@@ -390,7 +398,8 @@
     </script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/vip_index_new.js?v=11{{Msg "seo" "version"}}'></script>
-</body>
+    <script></script>
+  </body>
 {{include "/common/baiducc.html"}}
 
 </html>

+ 1 - 1
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html

@@ -98,7 +98,7 @@
         <div class="pop-tip-group active" style="display: none">
                 <div>买1年送1年</div>
         </div>
-        <div class="pop-button" data-need-bind-phone data-url="/jyapp/vipsubscribe/vipsubscribe_new{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}"  id="vip-introduce">
+        <div class="pop-button" data-need-bind-phone data-url="/jy_mobile/common/order/create/svip?type=buy{{if .T.disWord}}&disWord={{.T.disWord}}{{end}}"  id="vip-introduce">
                 <img data-name="default" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/image/info/btnBottom.png?v={{Msg "seo" "version"}}">
                 <img data-name="active" style="display: none"  src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/image/info/btnBottom1212.png?v={{Msg "seo" "version"}}">
         </div>

+ 2 - 2
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce_old.html

@@ -172,10 +172,10 @@
                 <span class="text">试用7天</span>
             </span>-->
             {{end}}
-            <span class="vi-footer-r" data-need-bind-phone data-url="/jyapp/vipsubscribe/vipsubscribe_new{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}"  id="vip-introduce">
+            <span class="vi-footer-r" data-need-bind-phone data-url="/jy_mobile/common/order/create/svip?type=buy{{if .T.disWord}}&disWord={{.T.disWord}}{{end}}"  id="vip-introduce">
                 <span class="text">开通 超级订阅</span>
             </span>
-            <span style="display: none;" class="vi-footer-r" id="vip-introduce-renew" onclick="window.location.replace('/jyapp/vipsubscribe/vipsubscribe_renew{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}')">
+            <span style="display: none;" class="vi-footer-r" id="vip-introduce-renew" onclick="window.location.replace('/jy_mobile/common/order/create/svip?type=renew{{if .T.disWord}}&disWord={{.T.disWord}}{{end}}')">
                 <span class="text">去续费</span>
             </span>
         </div>

+ 2 - 2
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html

@@ -110,11 +110,11 @@
         {{else}}
           <div class="j-notice-bar bar-red free-7day-tip give" style="display: none;z-index:66;">
             <span class="label">限时购买,3个月起,买多久送多久! </span>
-            <a href="/jyapp/vipsubscribe/vipsubscribe_new" class="link" style="padding: 0.10rem 0.44rem;">去抢</a>
+            <a href="/jy_mobile/common/order/create/svip?type=buy" class="link" style="padding: 0.10rem 0.44rem;">去抢</a>
           </div>
           <div class="j-notice-bar bar-red free-7day-tip" style="display: none">
             <span class="label">现在购买,可享6折优惠。</span>
-            <a href="/jyapp/vipsubscribe/vipsubscribe_new" class="link">去购买</a>
+            <a href="/jy_mobile/common/order/create/svip?type=buy" class="link">去购买</a>
           </div>
         {{end}}
       </div>

+ 2 - 1
src/jfw/modules/app/src/web/templates/weixin/follow/set.html

@@ -833,7 +833,8 @@ $(function(){
 		methods: {
 			//下载报告跳转开通会员
 			openVip: function () {
-				location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+				// location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
+        location.href = '/jy_mobile/common/order/create/svip?type=buy'
 			},
 			//下载报告
 			downReport: function (type) {

+ 4 - 2
src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -2024,13 +2024,15 @@ function hasNoData() {
   //续费
   function torepay() {
       setSessionStorage();
-      window.location.href = "/jyapp/vipsubscribe/vipsubscribe_renew";
+      // window.location.href = "/jyapp/vipsubscribe/vipsubscribe_renew";
+      window.location.href = "/jy_mobile/common/order/create/svip?type=renew";
   }
 
   //购买
   function topay() {
       setSessionStorage();
-      window.location.href = "/jyapp/vipsubscribe/vipsubscribe_new";
+      // window.location.href = "/jyapp/vipsubscribe/vipsubscribe_new";
+      window.location.href = "/jy_mobile/common/order/create/svip?type=buy";
   }
   function updateReportStatus(tip) {
       $.post("/subscribepay/report/tipover?t=" + new Date().getTime(), {type:productType==2?"member":"vip"}, function (r) {

+ 6 - 3
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1152,7 +1152,8 @@
                     // 留过资 体验过的 提示开通超级订阅
                     $('.free-open-tip').css('display', 'flex')
                     $('.free-open-tip .open-vip-btn').click(function(){
-                      location.href= '/jyapp/vipsubscribe/vipsubscribe_new'
+                      // location.href= '/jyapp/vipsubscribe/vipsubscribe_new'
+                      location.href= '/jy_mobile/common/order/create/svip?type=buy'
                     })
                   }
                 }
@@ -1550,7 +1551,8 @@
                             width: 303,
                             messageAlign: 'left',
                           }).then(() => {
-                            location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+                            // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+                            location.href = '/jy_mobile/common/order/create/svip?type=buy'
                           })
                           .catch(() => {})
                           return
@@ -1598,7 +1600,8 @@
                               className: 'custom-dialog',
                               width: 303
                             }).then(() => {
-                              location.href = '/jyapp/vipsubscribe/upgradePage'
+                              // location.href = '/jyapp/vipsubscribe/upgradePage'
+                              location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
                             }).catch(() => {})
                             return
                           }

+ 10 - 5
src/web/staticres/big-member/js/unit_portrayal.js

@@ -271,7 +271,8 @@ var vNode = {
           }
         }, 300),
         goOpenVip: function () {
-          location.href = "/front/vipsubscribe/vipsubscribe_new"
+          // location.href = "/front/vipsubscribe/vipsubscribe_new"
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
         },
         // 查询超级订阅采购单位画像浏览次数
         getUsage: function () {
@@ -472,7 +473,8 @@ var vNode = {
                 confirmButtonText: '前往升级',
                 showCancelButton: true
               }).then(function () {
-                location.href = '/front/vipsubscribe/upgradePage'
+                // location.href = '/front/vipsubscribe/upgradePage'
+                location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
               }).catch(function () { })
             } else {
               this.openDialog()
@@ -1539,9 +1541,11 @@ var vNode = {
               // location.href = "tel: 400-108-6670"
               location.href = '/big/wx/page/customer'
             } else if (btnText == '前往升级') {
-              location.href = '/front/vipsubscribe/upgradePage'
+              // location.href = '/front/vipsubscribe/upgradePage'
+              location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
             } else if (btnText == '去开通') {
-              location.href = '/front/vipsubscribe/vipsubscribe_new'
+              // location.href = '/front/vipsubscribe/vipsubscribe_new'
+              location.href = '/jy_mobile/common/order/create/svip?type=buy'
             } else {
               _this.goBuyBuried('开通大会员,采购单位项目动态全面获取,帮助企业洞察采购需求,开发新客户!')
             }
@@ -1611,7 +1615,8 @@ var vNode = {
             cancelButtonText: '取消'
           }).then(function(data){
             if (item == '前往升级') {
-              location.href = '/front/vipsubscribe/upgradePage'
+              // location.href = '/front/vipsubscribe/upgradePage'
+              location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
             } else if (item == '联系客服') {
               location.href = '/big/wx/page/customer'
             }

+ 8 - 4
src/web/staticres/common-module/collection/js/buyer-example.js

@@ -230,9 +230,11 @@ var buyerExample = {
           // }
           location.href = '/jyapp/free/customer' // 客服
         } else if (this.getTextMap.btnText == '去开通') {
-          location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
         } else if (this.getTextMap.btnText == '前往升级') {
-          location.href = '/jyapp/vipsubscribe/upgradePage'
+          // location.href = '/jyapp/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
         }
       } else {
         if (this.getTextMap.btnText == '立即解锁') {
@@ -242,9 +244,11 @@ var buyerExample = {
           // location.href = 'tel:400-108-6670'
           location.href = '/big/wx/page/customer'
         } else if (this.getTextMap.btnText == '去开通') {
-          location.href = '/front/vipsubscribe/vipsubscribe_new'
+          // location.href = '/front/vipsubscribe/vipsubscribe_new'
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
         } else if (this.getTextMap.btnText == '前往升级') {
-          location.href = '/front/vipsubscribe/upgradePage'
+          // location.href = '/front/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
         }
       }
     },

+ 6 - 5
src/web/staticres/common-module/collection/js/date-mobile.js

@@ -481,11 +481,12 @@ var dateComponent = {
     },
     // 判断微信、app
     getWeixin: function() {
-      if(utils.isWeiXinBrowser) {
-        location.href = '/front/vipsubscribe/vipsubscribe_new'
-      } else {
-        location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
-      }
+      location.href = '/jy_mobile/common/order/create/svip?type=buy'
+      // if(utils.isWeiXinBrowser) {
+      //   location.href = '/front/vipsubscribe/vipsubscribe_new'
+      // } else {
+      //   location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+      // }
     },
     // 结束时间获取焦点
     getEndFocus: function(){

+ 6 - 3
src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -388,9 +388,11 @@ var vNode = {
         }
         // 去开通
         if (this.bidcollPowerInfo.vip == 1) {
-          location.href = '/front/vipsubscribe/upgradePage'
+          // location.href = '/front/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
         } else {
-          location.href = "/front/vipsubscribe/vipsubscribe_new"
+          // location.href = "/front/vipsubscribe/vipsubscribe_new"
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
         }
       }
       this.overlayShow = true
@@ -1371,7 +1373,8 @@ var vNode = {
       // }
     },
     goOpenVip: function() {
-      location.href = "/front/vipsubscribe/vipsubscribe_new"
+      // location.href = "/front/vipsubscribe/vipsubscribe_new"
+      location.href = '/jy_mobile/common/order/create/svip?type=buy'
     }
   }
 }

+ 2 - 1
src/web/staticres/common-module/collection/js/index-wx.js

@@ -398,7 +398,8 @@ var vNode = {
       } else if (data.name == 'winnerItem') {
         this.limitlist.winnerPhone = parseInt(data.data)
       } else if (data.name == 'rootItem') {
-        location.href = "/front/vipsubscribe/vipsubscribe_new";
+        // location.href = "/front/vipsubscribe/vipsubscribe_new";
+        location.href = '/jy_mobile/common/order/create/svip?type=buy'
         return
       }
       this.limitlist.pageNum = 1

+ 2 - 1
src/web/staticres/common-module/collection/js/index.js

@@ -394,7 +394,8 @@ var vNode = {
       } else if (data.name == 'winnerItem') {
         this.limitlist.winnerPhone = parseInt(data.data)
       } else if (data.name == 'rootItem') {
-        location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+        // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+        location.href = '/jy_mobile/common/order/create/svip?type=buy'
         return
       }
       isScreen = true

+ 12 - 6
src/web/staticres/common-module/collection/js/vip-dialog.js

@@ -235,7 +235,8 @@ var vipComponent = {
             // location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=ent_portrait'
           } else {
             // 跳转到超级订阅
-            location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+            // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+            location.href = '/jy_mobile/common/order/create/svip?type=buy'
           }
           break
         }
@@ -244,7 +245,8 @@ var vipComponent = {
           break
         }
         case '前往升级': {
-          location.href = '/jyapp/vipsubscribe/upgradePage'
+          // location.href = '/jyapp/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
           break
         }
         case '联系客服': {
@@ -256,7 +258,8 @@ var vipComponent = {
           break
         }
         default: {
-          location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
           break
         }
       }
@@ -269,7 +272,8 @@ var vipComponent = {
             location.href = '/big/wx/page/buy_commit'
           } else {
             // 跳转到超级订阅
-            location.href = '/front/vipsubscribe/vipsubscribe_new'
+            // location.href = '/front/vipsubscribe/vipsubscribe_new'
+            location.href = '/jy_mobile/common/order/create/svip?type=buy'
           }
           break
         }
@@ -278,7 +282,8 @@ var vipComponent = {
           break
         }
         case '前往升级': {
-          location.href = '/front/vipsubscribe/upgradePage'
+          // location.href = '/front/vipsubscribe/upgradePage'
+          location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
           break
         }
         case '联系客服': {
@@ -290,7 +295,8 @@ var vipComponent = {
           break
         }
         default: {
-          location.href = '/front/vipsubscribe/vipsubscribe_new'
+          // location.href = '/front/vipsubscribe/vipsubscribe_new'
+          location.href = '/jy_mobile/common/order/create/svip?type=buy'
           break
         }
       }

+ 4 - 2
src/web/staticres/common-module/coupon/js/coupon-template.js

@@ -120,7 +120,8 @@ Vue.component('coupon-list', {
           if(isVip){
             location.href = '/front/vipsubscribe/toSubVipSetPage?couponId=' + id;
           } else {
-            location.href = '/front/vipsubscribe/vipsubscribe_new?couponId=' + id;
+            // location.href = '/front/vipsubscribe/vipsubscribe_new?couponId=' + id;
+            location.href = '/jy_mobile/common/order/create/svip?type=buy&couponId=' + id;
           }
         } else if (isSingleAreaPack) {
           if (this.buyAreaPack) {
@@ -140,7 +141,8 @@ Vue.component('coupon-list', {
           if(isVip) {
             location.href = '/jyapp/vipsubscribe/toSubVipSetPage?couponId=' + id + "&vSwitch=v";
           } else {
-            location.href = '/jyapp/vipsubscribe/vipsubscribe_new?couponId=' + id;
+            // location.href = '/jyapp/vipsubscribe/vipsubscribe_new?couponId=' + id;
+            location.href = '/jy_mobile/common/order/create/svip?type=buy&couponId=' + id;
           }
         } else if (isSingleAreaPack) {
           if (this.buyAreaPack) {

+ 8 - 4
src/web/staticres/common-module/order-list/js/order-list-config.js

@@ -105,12 +105,16 @@ var assetsConf = {
       app: '/jyapp/pay/checkout_subvip'
     },
     renew: {
-      wx: '/front/vipsubscribe/vipsubscribe_renew',
-      app: '/jyapp/vipsubscribe/vipsubscribe_renew'
+      // wx: '/front/vipsubscribe/vipsubscribe_renew',
+      // app: '/jyapp/vipsubscribe/vipsubscribe_renew'
+      wx: '/jy_mobile/common/order/create/svip?type=renew',
+      app: '/jy_mobile/common/order/create/svip?type=renew'
     },
     buyAgain: {
-      wx: '/front/vipsubscribe/vipsubscribe_new',
-      app: '/jyapp/vipsubscribe/vipsubscribe_new'
+      // wx: '/front/vipsubscribe/vipsubscribe_new',
+      // app: '/jyapp/vipsubscribe/vipsubscribe_new'
+      wx: '/jy_mobile/common/order/create/svip?type=buy',
+      app: '/jy_mobile/common/order/create/svip?type=buy'
     },
     orderDetail: {
       wx: '/front/vipsubscribe/toOrderDetailPage',

+ 6 - 3
src/web/staticres/common-module/portraitRecord/js/index-wx.js

@@ -247,7 +247,8 @@ var vm = new Vue({
         } else if (this.points.provin !== -1 && this.points.usage == this.points.total) {
           var message = `${text}您当前订阅了<span class="on">${this.points.provin}</span>个省,如需查看更多,请前往订阅更多省份。`
           this.commonDialogFn(message, '前往升级', function() {
-            location.href = '/front/vipsubscribe/upgradePage'
+            // location.href = '/front/vipsubscribe/upgradePage'
+            location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
           })
         }
       } else {
@@ -264,7 +265,8 @@ var vm = new Vue({
         } else if (this.points.provin !== -1 && this.points.usage == this.points.total) {
           var message = `${text}您当前订阅了<span class="on">${this.points.provin}</span>个省,如需查看更多,请前往订阅更多省份。`
           this.commonDialogFn(message, '前往升级', function() {
-            location.href = '/front/vipsubscribe/upgradePage'
+            // location.href = '/front/vipsubscribe/upgradePage'
+            location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
           })
         }
       }
@@ -324,7 +326,8 @@ var vm = new Vue({
       location.href = '/big/wx/page/customer'
     },
     setBook() {
-      location.href = '/front/vipsubscribe/upgradePage'
+      // location.href = '/front/vipsubscribe/upgradePage'
+      location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
     }
   }
 })

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

@@ -633,12 +633,12 @@ var subComponent = {
     },
     userNoIndustry: function () {
       if (this.vSwitch === 'f') {
-        if (location.href.indexOf('front') !== -1) {
-          var href = '/front/vipsubscribe/vipsubscribe_new'
-        } else {
-          var href = '/jyapp/vipsubscribe/vipsubscribe_new'
-        }
-        this.linkobj.industry = href
+        // if (location.href.indexOf('front') !== -1) {
+        //   var href = '/front/vipsubscribe/vipsubscribe_new'
+        // } else {
+        //   var href = '/jyapp/vipsubscribe/vipsubscribe_new'
+        // }
+        this.linkobj.industry = '/jy_mobile/common/order/create/svip?type=buy'
       }
     },
     // 修改地区无次数点击事件
@@ -882,12 +882,12 @@ var subComponent = {
       })
     },
     toBuyVipSub: function () {
-      if (location.href.indexOf('front') !== -1) {
-        var href = '/front/vipsubscribe/vipsubscribe_new'
-      } else {
-        var href = '/jyapp/vipsubscribe/vipsubscribe_new'
-      }
-      location.href = href
+      // if (location.href.indexOf('front') !== -1) {
+      //   var href = '/front/vipsubscribe/vipsubscribe_new'
+      // } else {
+      //   var href = '/jyapp/vipsubscribe/vipsubscribe_new'
+      // }
+      location.href = '/jy_mobile/common/order/create/svip?type=buy'
     },
     // 解决ios返回不刷新页面的问题
     iosBackRefresh: function () {

+ 2 - 1
src/web/staticres/vipsubscribe/js/keyWord.js

@@ -522,7 +522,8 @@ var vm = new Vue({
     toBuyVIPService: function () {
       this.savePageState()
       // location.href = '/front/vipsubscribe/introducePage'
-      location.href = '/front/vipsubscribe/vipsubscribe_new'
+      // location.href = '/front/vipsubscribe/vipsubscribe_new'
+      location.href = '/jy_mobile/common/order/create/svip?type=buy'
     },
     fastImportDialogShow: function () {
       this.dialog.fastImport = true

+ 4 - 2
src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -451,9 +451,11 @@ $(function () {
 
     function showTimeOut(endTime, isTrail) {
         if (!isTrail) {
-            $('.vip-header .expire-remind .remind-link').attr('href', '/front/vipsubscribe/vipsubscribe_renew').text('去续费')
+            // $('.vip-header .expire-remind .remind-link').attr('href', '/front/vipsubscribe/vipsubscribe_renew').text('去续费')
+            $('.vip-header .expire-remind .remind-link').attr('href', '/jy_mobile/common/order/create/svip?type=renew').text('去续费')
         } else {
-            $('.vip-header .expire-remind .remind-link').attr('href', '/front/vipsubscribe/vipsubscribe_new').text('去购买')
+            // $('.vip-header .expire-remind .remind-link').attr('href', '/front/vipsubscribe/vipsubscribe_new').text('去购买')
+            $('.vip-header .expire-remind .remind-link').attr('href', '/jy_mobile/common/order/create/svip?type=buy').text('去购买')
         }
         var timeSub = endTime * 1000 - new Date().getTime();
         if (timeSub > 0 && timeSub < 60 * 60 * 24 * 1000 * 3) {

+ 4 - 2
src/web/templates/active/livePage/live_online_wx.html

@@ -210,9 +210,11 @@
                   if (isSub){
                     //是VIP且不是试用用户 跳到付费页面  免费用户跳到购买页面
                     if(isVip&&!isOnTail){
-                      window.location.href="/front/vipsubscribe/vipsubscribe_renew"
+                      // window.location.href="/front/vipsubscribe/vipsubscribe_renew"
+                      window.location.href="/jy_mobile/common/order/create/svip?type=renew"
                     }else{
-                      window.location.href="/front/vipsubscribe/vipsubscribe_new"
+                      // window.location.href="/front/vipsubscribe/vipsubscribe_new"
+                      window.location.href="/jy_mobile/common/order/create/svip?type=buy"
                     }
                   } else {
                     $androidActionSheet.fadeIn(200);

+ 2 - 1
src/web/templates/weixin/commonPay/bidfile/bidfiledetail.html

@@ -341,7 +341,8 @@
 
     //再次购买
     function payAgain() {
-        window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        // window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        window.location.href="/jy_mobile/common/order/create/svip?type=buy"
     }
 
     //查看发票

+ 2 - 1
src/web/templates/weixin/commonPay/integral/integralDetail.html

@@ -359,7 +359,8 @@
 
     //再次购买
     function payAgain() {
-        window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        // window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        window.location.href="/jy_mobile/common/order/create/svip?type=buy"
     }
 
     //查看发票

+ 4 - 2
src/web/templates/weixin/commonPay/myOrderOld.html

@@ -191,9 +191,11 @@
         setSessionStorage();
         var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
         if (pattern === 1) {
-            window.location.href = "/front/vipsubscribe/vipsubscribe_renew?orderCode" + orderCode;
+            // window.location.href = "/front/vipsubscribe/vipsubscribe_renew?orderCode" + orderCode;
+            window.location.href="/jy_mobile/common/order/create/svip?type=renew&orderCode=" + orderCode;
         } else if (pattern === 2) {
-            window.location.href = "/front/vipsubscribe/vipsubscribe_new?orderCode=" + orderCode;
+            // window.location.href = "/front/vipsubscribe/vipsubscribe_new?orderCode=" + orderCode;
+            window.location.href="/jy_mobile/common/order/create/svip?type=buy&orderCode=" + orderCode;
         }
     }
 

+ 2 - 1
src/web/templates/weixin/follow/set.html

@@ -730,7 +730,8 @@ $(function(){
 		methods: {
 			//下载报告跳转开通会员
 			openVip: function () {
-				location.href = "/front/vipsubscribe/vipsubscribe_new"
+				// location.href = "/front/vipsubscribe/vipsubscribe_new"
+        window.location.href="/jy_mobile/common/order/create/svip?type=buy"
 			},
 			//下载报告
 			downReport: function (type) {

+ 8 - 4
src/web/templates/weixin/historypush.html

@@ -2063,13 +2063,15 @@
     //续费
     function torepay() {
         setSessionStorage();
-        window.location.href = "/front/vipsubscribe/vipsubscribe_renew";
+        // window.location.href = "/front/vipsubscribe/vipsubscribe_renew";
+        window.location.href="/jy_mobile/common/order/create/svip?type=renew"
     }
 
     //购买
     function topay() {
         setSessionStorage();
-        window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        // window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        window.location.href="/jy_mobile/common/order/create/svip?type=buy"
     }
 
     //直播活动
@@ -2080,9 +2082,11 @@
     //直播
     function toPay_live(){
         if (parseInt(isOnTail) != 1) {
-            window.location.href = "/front/vipsubscribe/vipsubscribe_renew";
+            // window.location.href = "/front/vipsubscribe/vipsubscribe_renew";
+            window.location.href="/jy_mobile/common/order/create/svip?type=renew"
         }else{
-            window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+            // window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+            window.location.href="/jy_mobile/common/order/create/svip?type=buy"
         }
     }
 </script>

+ 2 - 1
src/web/templates/weixin/member/aiForecastPackdetail.html

@@ -387,7 +387,8 @@
 
     //再次购买
     function payAgain() {
-        window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        // window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        window.location.href="/jy_mobile/common/order/create/svip?type=buy"
     }
 
     //查看发票

+ 2 - 1
src/web/templates/weixin/member/memberdetail.html

@@ -470,7 +470,8 @@
 
     //再次购买
     function payAgain() {
-        window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        // window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        window.location.href="/jy_mobile/common/order/create/svip?type=buy"
     }
 
     //查看发票

+ 2 - 1
src/web/templates/weixin/member/subAccountDetail.html

@@ -380,7 +380,8 @@
 
     //再次购买
     function payAgain() {
-        window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        // window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        window.location.href="/jy_mobile/common/order/create/svip?type=buy"
     }
 
     //查看发票

+ 4 - 2
src/web/templates/weixin/vipsubscribe/renew_notice.html

@@ -218,10 +218,12 @@
     }
 
     $(".renew_service").on("click", function () {
-        window.location.replace("/front/vipsubscribe/vipsubscribe_renew");
+        // window.location.replace("/front/vipsubscribe/vipsubscribe_renew");
+        window.location.href="/jy_mobile/common/order/create/svip?type=renew"
     });
     $(".aginBuy").on("click", function () {
-        window.location.replace("/front/vipsubscribe/vipsubscribe_new?orderCode=" + orderCode);
+         window.location.href="/jy_mobile/common/order/create/svip?type=buy&orderCode=" + orderCode
+        // window.location.replace("/front/vipsubscribe/vipsubscribe_new?orderCode=" + orderCode);
     });
 
     //

+ 2 - 1
src/web/templates/weixin/vipsubscribe/vip_UpgradeDetail.html

@@ -40,7 +40,8 @@
 <script>
 $(function () {
     $('.j-button-confirm').on('click', function () {
-        location.href = '/front/vipsubscribe/upgradePage'
+        // location.href = '/front/vipsubscribe/upgradePage'
+        window.location.href="/jy_mobile/common/order/create/svip?type=upgrade"
     })
 })
 </script>

+ 7 - 5
src/web/templates/weixin/vipsubscribe/vip_index.html

@@ -145,7 +145,7 @@
                 <i class="icon iconfont" id="nv_close_renew">&#xe61a;</i>
                 <span class="other">超级订阅服务还有 <span class="renew_day"></span> 天到期,请及时购买!</span>
                 <span class="today" style="display:none;">超级订阅服务今天到期,请及时购买!</span>
-                <a href="/front/vipsubscribe/vipsubscribe_new">去购买</a>
+                <a href="/jy_mobile/common/order/create/svip?type=buy">去购买</a>
             </div>
         </div>
         <!-- 升级 续费 -->
@@ -226,7 +226,7 @@
         })
         $('#nv_close_renew').on('click', function () {
             $('.nv_renew_toast').hide();
-            $(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/front/vipsubscribe/vipsubscribe_new" class="update_btn">去购买</a>');
+            $(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/jy_mobile/common/order/create/svip?type=buy" class="update_btn">去购买</a>');
             $(".tabbar").show();
         })
         // 点击扩大
@@ -287,7 +287,7 @@
                             $(".tabbar").hide();
                         } else {
                             $(".to_expired").hide();
-                            $(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/front/vipsubscribe/vipsubscribe_new" class="update_btn">去购买</a>')
+                            $(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/jy_mobile/common/order/create/svip?type=buy" class="update_btn">去购买</a>')
                         }
                         $('.free7days_pic').text("超级订阅服务");
                         $('.free7days_pic').append("<style>.free7days_pic::after{display:inline-block}</style>");
@@ -377,12 +377,14 @@
 
     //
     function upgrade() {
-        window.location.href = "/weixin/pay/toUpgradePage"
+        // window.location.href = "/weixin/pay/toUpgradePage"
+        window.location.href="/jy_mobile/common/order/create/svip?type=upgrade"
     }
 
     //
     function rebuy() {
-        window.location.href = "/front/vipsubscribe/vipsubscribe_renew"
+        // window.location.href = "/front/vipsubscribe/vipsubscribe_renew"
+        window.location.href="/jy_mobile/common/order/create/svip?type=renew"
     }
 </script>
 {{include "/common/baiducc.html"}}

+ 8 - 6
src/web/templates/weixin/vipsubscribe/vip_index_new.html

@@ -107,10 +107,10 @@
     </div>
     <ul class="vip-body" id="vip-body" v-cloak>
         <li class="sub-box">
-            <a data-href="/front/vipsubscribe/introducePage?type=renew" class="banner-ad-box update" style="display: none">
+            <a data-href="/jy_mobile/common/order/create/svip?type=renew" class="banner-ad-box update" style="display: none">
                 <span>限时续费,3个月起,续多久送多久!</span>
             </a>
-          <a href="/front/vipsubscribe/vipsubscribe_new" class="banner-ad-box trial" style="display: none">
+          <a href="/jy_mobile/common/order/create/svip?type=buy" class="banner-ad-box trial" style="display: none">
             <span>限时购买,3个月起,买多久送多久!</span>
             <div>
                 <span>去抢</span>
@@ -164,7 +164,7 @@
                 </a>
             </li> -->
             <li class="cycle" data-bind-renew data-cl-event="c_wx_buy_buttonclick" v-show="vSwitch === 'v'">
-                <a class="item-container" href="/front/vipsubscribe/vipsubscribe_renew">
+                <a class="item-container" href="/jy_mobile/common/order/create/svip?type=renew">
                     <div class="item">
                       <span class="item-l">
                         <span class="item-label">订阅周期</span>
@@ -355,7 +355,7 @@
       <div class="expire-remind" style="display: none">
             <i class="j-icon icon-chahao red close-expire-remind"></i>
             <span class="remind-text">超级订阅服务试用即将过期,请及时购买!</span>
-            <a class="remind-link" href="/front/vipsubscribe/vipsubscribe_new">去购买</a>
+            <a class="remind-link" href="/jy_mobile/common/order/create/svip?type=buy">去购买</a>
       </div>
     </div>
     <!-- 升级 -->
@@ -712,11 +712,13 @@
   }
   // 跳转到续费页面
   $('*[data-bind-renew]').on('click',function() {
-    location.href = '/front/vipsubscribe/vipsubscribe_renew'
+    // location.href = '/front/vipsubscribe/vipsubscribe_renew'
+    window.location.href="/jy_mobile/common/order/create/svip?type=renew"
   })
   // 直接跳转到升级页面
   $('*[data-bind-update]').on('click',function() {
-    location.href = '/front/vipsubscribe/upgradePage'
+    // location.href = '/front/vipsubscribe/upgradePage'
+    window.location.href="/jy_mobile/common/order/create/svip?type=upgrade"
   })
   sessionStorage.removeItem('vip-cur-select-coupon')
   sessionStorage.removeItem('$select-coupon')

+ 1 - 1
src/web/templates/weixin/vipsubscribe/vip_introduce.html

@@ -94,7 +94,7 @@
             <div class="pop-tip-group active" style="display: none">
                 <div>买1年送1年</div>
             </div>
-            <div class="pop-button" data-need-bind-phone data-url="/front/vipsubscribe/vipsubscribe_new{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}"   id="vip-introduce">
+            <div class="pop-button" data-need-bind-phone data-url="/jy_mobile/common/order/create/svip?type=buy{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}"   id="vip-introduce">
                 <img data-name="default" src="{{Msg "seo" "cdn"}}/common-module/vipsubscribe/image/info/btnBottom.png?v={{Msg "seo" "version"}}">
                 <img data-name="active" style="display: none" src="{{Msg "seo" "cdn"}}/common-module/vipsubscribe/image/info/btnBottom1212.png?v={{Msg "seo" "version"}}">
             </div>

+ 2 - 2
src/web/templates/weixin/vipsubscribe/vip_introduce_old.html

@@ -167,10 +167,10 @@
                     <span class="text">试用7天</span>
                 </span>-->
                 {{end}}
-                <span class="vi-footer-r" data-need-bind-phone data-url="/front/vipsubscribe/vipsubscribe_new{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}"   id="vip-introduce">
+                <span class="vi-footer-r" data-need-bind-phone data-url="/jy_mobile/common/order/create/svip?type=buy{{if .T.disWord}}&disWord={{.T.disWord}}{{end}}"   id="vip-introduce">
                     <span class="text">开通 超级订阅</span>
                 </span>
-                <span class="vi-footer-r" style="display: none;" id="vip-introduce-renew"  onclick="window.location.replace('/front/vipsubscribe/vipsubscribe_renew{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}')">
+                <span class="vi-footer-r" style="display: none;" id="vip-introduce-renew"  onclick="window.location.replace('/jy_mobile/common/order/create/svip?type=renew{{if .T.disWord}}&disWord={{.T.disWord}}{{end}}')">
                     <span class="text">去续费</span>
                 </span>
             </div>

+ 2 - 1
src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -946,7 +946,8 @@
 
     //再次购买
     function payAgain() {
-        window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        // window.location.href = "/front/vipsubscribe/vipsubscribe_new";
+        window.location.href="/jy_mobile/common/order/create/svip?type=renew"
     }
 
     //查看发票

+ 2 - 2
src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -97,12 +97,12 @@
             {{else}}
                 <div class="j-notice-bar bar-red free-7day-tip give" style="display: none;z-index:66;">
                     <span class="label">限时购买,3个月起,买多久送多久! </span>
-                    <a href="/front/vipsubscribe/vipsubscribe_new" class="link"
+                    <a href="/jy_mobile/common/order/create/svip?type=buy" class="link"
                        style="padding: 0.10rem 0.44rem;">去抢</a>
                 </div>
                 <div class="j-notice-bar bar-red free-7day-tip" style="display: none">
                     <span class="label">现在购买,可享6折优惠。</span>
-                    <a href="/front/vipsubscribe/vipsubscribe_new" class="link">去购买</a>
+                    <a href="/jy_mobile/common/order/create/svip?type=buy" class="link">去购买</a>
                 </div>
             {{end}}
             <div class="choose_condition">

+ 6 - 3
src/web/templates/weixin/wxinfocontent_rec.html

@@ -1725,7 +1725,8 @@ function isOpening() {
               $('.free-down-text').hide()
               $('.free-open-tip').css('display', 'flex')
               $('.free-open-tip .open-vip-btn').click(function(){
-                location.href= '/front/vipsubscribe/vipsubscribe_new'
+                // location.href= '/front/vipsubscribe/vipsubscribe_new'
+                window.location.href="/jy_mobile/common/order/create/svip?type=buy"
               })
             }
           }
@@ -1838,7 +1839,8 @@ function andownload() {
                         width: 303,
                         messageAlign: 'left',
                       }).then(() => {
-                        location.href = '/front/vipsubscribe/vipsubscribe_new'
+                        // location.href = '/front/vipsubscribe/vipsubscribe_new'
+                        window.location.href="/jy_mobile/common/order/create/svip?type=buy"
                       })
                       .catch(() => {})
                       return
@@ -1928,7 +1930,8 @@ function andownload() {
                           className: 'custom-dialog',
                           width: 303
                         }).then(() => {
-                          location.href = '/front/vipsubscribe/upgradePage'
+                          // location.href = '/front/vipsubscribe/upgradePage'
+                          window.location.href="/jy_mobile/common/order/create/svip?type=upgrade"
                         }).catch(() => {})
                         return
                       }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно