Merge branch 'dev4.6.11' of http://192.168.3.207:8080/qmx/jy into dev4.6.11

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

@@ -45,11 +45,11 @@ var subNode = new Vue({
   methods: {
     // 省份订阅包续费
     renewBtn: function () {
-      location.href = '/jyapp/areaPack/page/buy?type=renew'
+      location.href = '/jy_mobile/common/order/create/areapack?type=renew'
     },
     // 省份订阅包升级
     updateBtn: function () {
-      location.href = '/jyapp/areaPack/page/buy?type=upgrade&area=' + encodeURIComponent(JSON.stringify(this.freeUserArea))
+      location.href = '/jy_mobile/common/order/create/areapack?type=upgrade&area=' + encodeURIComponent(JSON.stringify(this.freeUserArea))
     },
     // 得到用户是否购买省份包
     getUserSubscribe: function () {

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

@@ -350,7 +350,7 @@
                 toPay: function () {
                     this.popupTip = false
                     var area = this.selectedArea
-                    var urlBase = '/jyapp/areaPack/page/buy'
+                    var urlBase = '/jy_mobile/common/order/create/areapack'
                     var areaJSON = encodeURIComponent(JSON.stringify(area))
                     this.savePageState()
                     if (this.userType) {

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -96,7 +96,7 @@
                 <div class="buy-data-pack-tip pay-way-tip">
                     数据流量包特惠充值，即充即导，2年有效
                     <span class="arrow-rightx3"></span>
-                    <a id="buy-data-pack-for-link" href="/jyapp/dataPack/createOrder">
+                    <a id="buy-data-pack-for-link" href="/jy_mobile/common/order/create/datapack">
                         <img src="/jyapp/dataExport/images/buy-now.png" alt="">
                     </a>
                 </div>
@@ -1193,7 +1193,7 @@
     $("#tipForPack .weui-dialog__ft a").on('click', function () {
         togglePackTip(false)
         if ($(this).text() == '立即充值') {
-            location.href = '/jyapp/dataPack/createOrder'
+            location.href = '/jy_mobile/common/order/create/datapack'
         }
     })
 

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

@@ -334,7 +334,7 @@
         <!-- 升级 -->
         <div class="update_renew" style="display: none">
           <!-- <div class="update-tips" data-update-tips>因系统升级，已购买用户可选择原套餐续费，或升级到新版本享受更多权益。</div> -->
-          <div class="update-tips" data-update-tips style="display: none">因超级订阅产品全面升级，请升级到新版本享受更多权益。</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>

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

@@ -836,7 +836,7 @@
           $(window).off('popstate')
           this.dialog.backTip = false
           this.saveState()
-          location.href = '/jyapp/areaPack/page/buy'
+          location.href = '/jy_mobile/common/order/create/areapack?type=buy'
         },
         restoreState: function () {
           var k = sessionStorage.getItem(this.sessKey)

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

@@ -639,7 +639,7 @@
         }
         function gotoPay() {
             $('#UserTips').hide()
-            location.href = '/jyapp/areaPack/page/buy?type=buy'
+            location.href = '/jy_mobile/common/order/create/areapack?type=buy'
         }
         // 得到用户是否需要提醒省份订阅包过期
         function getUserSubscribe() {

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

@@ -1396,7 +1396,7 @@
                     if(userId==""){
                         window.location.href='/jyapp/free/login?back=index';
                     }else{
-                        window.location.href='/jyapp/dataPack/createOrder?source=app_kongkim';
+                        window.location.href='/jy_mobile/common/order/create/datapack?source=app_kongkim';
                         // try {
                         //   JyObj.skipAppointTab('me')
                         // } catch (error) {}

src/web/staticres/common-module/coupon/js/coupon-template.js

@@ -127,7 +127,7 @@ Vue.component('coupon-list', {
           if (this.buyAreaPack) {
             location.href = '/front/vipsubscribe/toSubVipSetPage?couponId=' + id;
           } else {
-            location.href = '/areaPack/wx/page/buy?couponId=' + id
+            location.href = '/jy_mobile/common/order/create/areapack?type=buy&couponId=' + id
           }
         } else if (isSingleCourse) {
           location.href = '/jyxsapp/';
@@ -148,7 +148,7 @@ Vue.component('coupon-list', {
           if (this.buyAreaPack) {
             location.href = '/jyapp/vipsubscribe/toSubVipSetPage?couponId=' + id
           } else {
-            location.href = '/jyapp/areaPack/page/buy?couponId=' + id
+            location.href = '/jy_mobile/common/order/create/areapack?type=buy&couponId=' + id
           }
         } else if (isSingleCourse) {
           location.href = '/jyxsapp/?source=app_kongkim'

src/web/staticres/common-module/data-pack/js/index.js

@@ -92,9 +92,9 @@ var vm = new Vue({
       // 判断是否为微信浏览器
       var ua = window.navigator.userAgent.toLowerCase()
       if(ua.match(/MicroMessenger/i) == 'micromessenger'){
-          location.href = '/swordfish/dataPack/createOrder'
+          location.href = '/jy_mobile/common/order/create/datapack'
       }else{
-          location.href = '/jyapp/dataPack/createOrder'
+          location.href = '/jy_mobile/common/order/create/datapack'
       }
     },
     changeNum(data) {// 数字处理函数

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

@@ -341,8 +341,8 @@ var assetsConf = {
       app: '/jyapp/common/dataPack/orderDetail'
     },
     buyAgain: {
-      wx: '/swordfish/dataPack/createOrder',
-      app: '/jyapp/dataPack/createOrder'
+      wx: '/jy_mobile/common/order/create/datapack',
+      app: '/jy_mobile/common/order/create/datapack'
     },
     imgMap: {
       headerImg: {
@@ -383,12 +383,12 @@ var assetsConf = {
       app: '/jyapp/common/areaPack/orderDetail'
     },
     renew: {
-      wx: '/areaPack/wx/page/buy?type=renew',
-      app: '/jyapp/areaPack/page/buy?type=renew'
+      wx: '/jy_mobile/common/order/create/areapack?type=renew',
+      app: '/jy_mobile/common/order/create/areapack?type=renew'
     },
     buyAgain: {
-      wx: '/areaPack/wx/page/buy?type=buy',
-      app: '/jyapp/areaPack/page/buy?type=buy'
+      wx: '/jy_mobile/common/order/create/areapack?type=buy',
+      app: '/jy_mobile/common/order/create/areapack?type=buy'
     },
     imgMap: {
       headerImg: {

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

@@ -663,15 +663,15 @@ var subComponent = {
               onClick: function(){
                 if (_this.userType) {
                   if (location.href.indexOf('front') !== -1) {
-                    var href = '/areaPack/wx/page/buy?type=upgrade'
+                    var href = '/jy_mobile/common/order/create/areapack?type=upgrade'
                   } else {
-                    var href = '/jyapp/areaPack/page/buy?type=upgrade'
+                    var href = '/jy_mobile/common/order/create/areapack?type=upgrade'
                   }
                 } else {
                   if (location.href.indexOf('front') !== -1) {
-                    var href = '/areaPack/wx/page/buy?type=buy'
+                    var href = '/jy_mobile/common/order/create/areapack?type=buy'
                   } else {
-                    var href = '/jyapp/areaPack/page/buy?type=buy'
+                    var href = '/jy_mobile/common/order/create/areapack?type=buy'
                   }
                 }
                 location.href = href

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

@@ -73,11 +73,11 @@ var subNode = new Vue({
         },
         // 省份订阅包续费
         renewBtn: function () {
-            location.href = '/areaPack/wx/page/buy?type=renew'
+            location.href = '/jy_mobile/common/order/create/areapack?type=renew'
         },
         // 省份订阅包升级
         updateBtn: function () {
-            location.href = '/areaPack/wx/page/buy?type=upgrade&area=' +  encodeURIComponent(JSON.stringify(this.freeUserArea))
+            location.href = '/jy_mobile/common/order/create/areapack?type=upgrade&area=' +  encodeURIComponent(JSON.stringify(this.freeUserArea))
         },
         // 判断用户权限版本
         getUserType: function (data) {

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

@@ -350,7 +350,7 @@
                 toPay: function () {
                     this.popupTip = false
                     var area = this.selectedArea
-                    var urlBase = '/areaPack/wx/page/buy'
+                    var urlBase = '/jy_mobile/common/order/create/areapack'
                     var areaJSON = encodeURIComponent(JSON.stringify(area))
                     this.savePageState()
                     if (this.userType) {

src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -79,7 +79,7 @@
                 <div class="buy-data-pack-tip pay-way-tip">
                     数据流量包特惠充值，即充即导，2年有效
                     <span class="arrow-rightx3"></span>
-                    <a data-cl-event="c_wx_buy_buttonclick" id="buy-data-pack-for-link" href="/swordfish/dataPack/createOrder">
+                    <a data-cl-event="c_wx_buy_buttonclick" id="buy-data-pack-for-link" href="/jy_mobile/common/order/create/datapack">
                         <img src="/wx_dataExport/images/buy-now.png" alt="">
                     </a>
                 </div>
@@ -1116,7 +1116,7 @@
     $("#tipForPack .weui-dialog__ft a").on('click', function () {
         togglePackTip(false)
         if ($(this).text() == '立即充值') {
-            location.href = '/swordfish/dataPack/createOrder'
+            location.href = '/jy_mobile/common/order/create/datapack'
         }
     })
 

src/web/templates/weixin/historypush.html

@@ -988,7 +988,7 @@
     }
     function gotoPay() {
         $('#UserTips').hide()
-        location.href = '/areaPack/wx/page/buy?type=buy'
+        location.href = '/jy_mobile/common/order/create/areapack?type=buy'
     }
     // 得到用户是否需要提醒省份订阅包过期
     function getUserSubscribe() {

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

@@ -1244,7 +1244,7 @@
 	 	    window.location.href='/jyxsapp/';
 	    });
         $(".tab_container a:eq(3)").on('click', function () {
-            window.location.href = '/swordfish/dataPack/createOrder'
+            window.location.href = '/jy_mobile/common/order/create/datapack'
         });
 	    //APP下载跳转到关于剑鱼标讯
 	    $(".tab_container a:eq(4)").on('click', function () {

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

@@ -814,7 +814,7 @@
                   $(window).off('popstate')
                   this.dialog.backTip = false
                   this.saveState()
-                  location.href = '/areaPack/wx/page/buy'
+                  location.href = '/jy_mobile/common/order/create/areapack?type=buy'
                 },
                 restoreState: function () {
                   var k = sessionStorage.getItem(this.sessKey)