Merge branch 'dev3.0active' of http://192.168.3.207:10080/qmx/jy into dev3.0active

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

@@ -28,7 +28,7 @@ $(function () {
                 $(".productType").text("超级订阅（试用）");
             }
             //价格
-            $(".price").text("￥ " + r.data.order.original_price / 100 + "元");
+            $(".price").text("￥ " + formatMoney(parseFloat(r.data.order.original_price) / 100) + "元");
             if (!r.data.order.isLiveActive) {
                 $(".origin-price-container").hide();
             } else {
@@ -52,7 +52,7 @@ $(function () {
                     giveTime = giveTime < 12 ? (giveTime + '个月') : ('1年')
                     $(".discount-container .highlight-text").text('赠送' + giveTime);
                     $(".discount-container").removeClass("hide");
-                    var originPrice = (filterObj.original_price / 100).toFixed(2);
+                    var originPrice = formatMoney(parseFloat(filterObj.original_price) / 100)
                     $(".price-num").text(originPrice);
                     $(".origin-price-container").show()
                     $(".bill-origin-price").css("display", "flex");

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

@@ -63,12 +63,14 @@ var purchase = {
                 if (r) {
                     purchase.price = r;
                     if (r.isActiving && r.isWritten === 0) {
-                        purchase.timeValue = "1年";
-                        purchase.timeSelect_tmp = [1,1]
-                        purchase.timeSelect = purchase.timeSelect_tmp;
-                        purchase.showTime();
-                        purchase.flushPrice(purchase.timeSelect, 1);
-                        sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
+                        if (!sessionStorage.getItem("vipSubSelectTime")) {
+                            purchase.timeValue = "1年";
+                            purchase.timeSelect_tmp = [1,1]
+                            purchase.timeSelect = purchase.timeSelect_tmp;
+                            purchase.showTime();
+                            purchase.flushPrice(purchase.timeSelect, 1);
+                            sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
+                        }
                         showGiveStatus(true)
                     } else {
                         showGiveStatus(false)

src/jfw/modules/app/src/web/templates/commonPay/myOrder.html

@@ -1644,13 +1644,18 @@
                         + '<div class="media-info">'
                         + '<p class="item-ifo ellipsis">区域：' + region_vip + '</p>'
                         + '<p class="item-ifo ellipsis">行业：' + industry_vip + '</p>'
-                        + '<p class="item-ifo ellipsis">订阅周期：' + effectiveduration_vip + '</p>'
+                        + '<p class="item-ifo ellipsis">订阅周期：' + effectiveduration_vip
+                        + (can1111 ? ('&nbsp;+&nbsp;' + '<span style="color: #2ABED1;">赠送' + (giveCycle < 12 ? (giveCycle + '个月') : '1年') + '</span>')  : '')
+                        + '</p>'
                         + '<p class="item-ifo ellipsis">有效日期：' + effectivetime_vip + '</p>'
                         + '</div>'
                         + '</a>'
                     listhtml += '<div class="price">'
-                    if (isLiveActive) {
+                    if (can1111 || isLiveActive) {
                         var originPrice = formatMoney(parseFloat(orginsPrices) / 0.6);
+                        if (can1111) {
+                            originPrice = formatMoney(parseFloat(orginsPrices) / 100)
+                        }
                         listhtml += '<span class="origin-price-container">'
                             + '<span>原价：￥</span>'
                             + '<span class="origin-price">' + originPrice + '</span>'

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

@@ -63,7 +63,7 @@
     $(function () {
         $.get('/jyactive/doubleEleven/isActiving', function (r) {
             if (r && r.data) {
-                if (r.data.isActiving) {
+                if (r.data.isActiving && r.data.isWritten < 2) {
                     try {
                         var title = {{.T.title}}
                         if (title.indexOf('超级订阅') !== -1 && title.indexOf('超级订阅试用') === -1) {

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

@@ -27,7 +27,7 @@
         }
     </style>
 </head>
-<body>
+<body  data-weui-theme="light">
 <div class="app-layout-header jy-app-header">
     <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
     超级订阅

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

@@ -36,7 +36,7 @@
         }
     </style>
 </head>
-<body class="no-touch">
+<body class="no-touch"  data-weui-theme="light">
 <div class="app-layout-header jy-app-header">
     <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
     超级订阅续费
@@ -52,7 +52,7 @@
             <span class="header-right">您的超级订阅服务即将到期，为不影响您的使用。请立即续费</span>
         </div>
         <div class="vip-body">
-            <div class="j-notice-bar bar-red vip-bar" style="text-align: center;">现在购买，买多久送多久，错过再等一年！</div>
+            <div class="j-notice-bar bar-red vip-bar" style="text-align: center;">现在续费，续多久送多久，错过再等一年！</div>
             <ul style="padding: .16rem .24rem;">
                 <li class="body-item area">
                     <a class="item-container" href="/jyapp/vipsubscribe/toChooseArea">
@@ -133,7 +133,7 @@
             </ul>
             <ul style="padding: 0 .24rem;" id="giveTimeBox" style="display: none;">
                 <li class="body-item select_cycle">
-                    <a class="item-container" href="javascript:;">
+                    <div class="item-container" href="javascript:;">
                         <div class="item">
                         <span class="item-l">
                             <span class="item-label">赠送周期</span>
@@ -142,7 +142,7 @@
                             <span id="giveTime" class="buy-cycle text" style="font-size: 14px;color: #9B9CA3;">6个月</span>
                         </span>
                         </div>
-                    </a>
+                    </div>
                 </li>
             </ul>
         </div>

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

@@ -437,8 +437,12 @@
     $.get('/jyactive/doubleEleven/isActiving', function (r) {
         if (r && r.data) {
             if (r.data.isActiving && r.data.isWritten === 1) {
-                history.pushState({state: 'full'}, null)
-                location.href = '/jyapp/big/page/write_infor'
+                var readToDay = localStorage.getItem('doubleEleven_isActiving') === new Date().toDateString()
+                localStorage.setItem('doubleEleven_isActiving', new Date().toDateString())
+                if (!readToDay) {
+                    history.pushState({state: 'full'}, null)
+                    location.href = '/jyapp/big/page/write_infor'
+                }
             }
         }
     })

src/web/templates/weixin/historypush.html

@@ -550,9 +550,9 @@
             {{else}}
             <div class="left">
                 <img src="/vipsubscribe/image/vip-icon.png">
-                <h4>300组关键词特权</h4>
+                <h4>买超级订阅，买多久送多久！</h4>
             </div>
-            <a onclick="tointroducepage()" id="app-historypush-vipSub-topBanner" class="right freeuse" style="text-decoration: none;background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%)">免费试用</a>
+            <a onclick="tointroducepage()" id="app-historypush-vipSub-topBanner" class="right freeuse" style="text-decoration: none;background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%)">去抢</a>
             {{end}}
         </div>
     </div>
@@ -1109,7 +1109,7 @@
           var nokeyNoDataShow = $('.findnull-no-key').is(':visible')
           $(".listcontent").hide();
           $(".loading_").hide();
-          
+
           if (nokeyNoDataShow) return
           $(".findnull_").show().siblings('.empty').hide()
       }

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

@@ -99,8 +99,12 @@
   $.get('/jyactive/doubleEleven/isActiving', function (r) {
       if (r && r.data) {
           if (r.data.isActiving && r.data.isWritten === 1) {
-              history.pushState({state: 'full'}, null)
-              location.href = '/big/wx/page/write_infor_wx'
+              var readToDay = localStorage.getItem('doubleEleven_isActiving') === new Date().toDateString()
+              localStorage.setItem('doubleEleven_isActiving', new Date().toDateString())
+              if (!readToDay) {
+                  history.pushState({state: 'full'}, null)
+                  location.href = '/big/wx/page/write_infor_wx'
+              }
           }
       }
   })

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

@@ -201,7 +201,7 @@
                     $(".productType").text("超级订阅（试用）");
                 }
                 //价格
-                $(".price").text("￥ " + r.data.order.original_price / 100 + "元");
+                $(".price").text("￥ " + formatMoney(parseFloat(r.data.order.original_price) / 100) + "元");
 
                 //优惠码
                 if (r.data.order.isUsedActiveCode) {
@@ -219,7 +219,7 @@
                         giveTime = giveTime < 12 ? (giveTime + '个月') : ('1年')
                         $(".discount-container .highlight-text").text('赠送' + giveTime);
                         $(".discount-container").removeClass("hide");
-                        var originPrice = (filterObj.original_price / 100).toFixed(2);
+                        var originPrice = formatMoney(parseFloat(filterObj.original_price) / 100)
                         $(".price-num").text(originPrice);
                         $(".origin-price-container").show()
                         $(".bill-origin-price").css("display", "flex");

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

@@ -51,12 +51,12 @@
     $(function () {
         $.get('/jyactive/doubleEleven/isActiving', function (r) {
             if (r && r.data) {
-                if (r.data.isActiving) {
+                if (r.data.isActiving && r.data.isWritten < 2) {
                     try {
                         var title = {{.T.title}}
                         if (title.indexOf('超级订阅') !== -1 && title.indexOf('超级订阅试用') === -1) {
                             setTimeout(function () {
-                                location.href = '/jyapp/big/page/write_infor_wx'
+                                location.href = '/big/wx/page/write_infor_wx'
                             }, 3000)
                         }
                     } catch (e) {

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

@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/vip_purchase.css?v={{Msg "seo" "version"}}">
 </head>
-<body>
+<body  data-weui-theme="light">
 <div style="height: 100%;">
     {{if not .T.isLiveActive}}
     <div class="vip_purchase">

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

@@ -34,7 +34,7 @@
     </style>
 </head>
 
-<body class="no-touch">
+<body class="no-touch"  data-weui-theme="light">
 
 {{if not .T.isLiveActive}}
 <div class="vip-renew">
@@ -46,10 +46,10 @@
             <span class="header-right">您的超级订阅服务即将到期，为不影响您的使用。请立即续费</span>
         </div>
         <div class="vip-body">
-            <div class="j-notice-bar bar-red vip-bar" style="text-align: center;">现在购买，买多久送多久，错过再等一年！</div>
+            <div class="j-notice-bar bar-red vip-bar" style="text-align: center;">现在续费，续多久送多久，错过再等一年！</div>
             <ul style="padding: .16rem .24rem;">
                 <li class="body-item area">
-                    <a class="item-container" href="/jyapp/vipsubscribe/toChooseArea">
+                    <a class="item-container" href="/front/vipsubscribe/toChooseArea">
                         <div class="item">
                         <span class="item-l">
                             <span class="item-label">区域</span>
@@ -100,7 +100,7 @@
         </ul>
         <ul style="padding: 0 .24rem;" id="giveTimeBox" style="display: none;">
                 <li class="body-item select_cycle">
-                    <a class="item-container" href="javascript:;">
+                    <div class="item-container" href="javascript:;">
                         <div class="item">
                         <span class="item-l">
                             <span class="item-label">赠送周期</span>
@@ -109,7 +109,7 @@
                             <span id="giveTime" class="buy-cycle text" style="font-size: 14px;color: #9B9CA3;">6个月</span>
                         </span>
                         </div>
-                    </a>
+                    </div>
                 </li>
             </ul>
         </div>
@@ -346,7 +346,6 @@
             $(".origin-price").hide()
         }
     }
-    showGiveStatus(true)
 
     $(window).bind("pageshow", function (event) {
             if (event.originalEvent.persisted) {
@@ -420,6 +419,14 @@
                         if (r) {
                             purchase.price = r;
                             if (r.isActiving && r.isWritten === 0) {
+                                if (!sessionStorage.getItem("vipSubSelectTime")) {
+                                    purchase.timeValue = "1年";
+                                    purchase.timeSelect_tmp = [1,1]
+                                    purchase.timeSelect = purchase.timeSelect_tmp;
+                                    purchase.showTime();
+                                    purchase.flushPrice(purchase.timeSelect, 1);
+                                    sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
+                                }
                                 showGiveStatus(true)
                             } else {
                                 showGiveStatus(false)
@@ -509,6 +516,7 @@
                 //var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, time, this.price);
                 var times = [time[0], time[1]];
                 var price = getsubVipOrderPriceBybuyset(this.nowBuyset, time);
+                var givePrice = getsubVipOrderPriceBybuyset(this.nowBuyset, [time[1] === 1 ? 1 :time[0], time[1]]);
                 var showPrice = formatMoney(price);
                 var nowTime = new Date().getTime();
                 var startTime = live20200707.startTime;
@@ -526,13 +534,13 @@
                 }
                 if (flag === 1) {
                     $('.billing-price').text(showPrice);
-                    $('.origin-price .price-num').text(formatMoney(parseFloat(price) * 2));
+                    $('.origin-price .price-num').text(formatMoney(parseFloat(price + givePrice)));
 
                 } else if (flag === 2) {
                     $('.computed_price').html(showPrice);
                 } else {
                     $('.billing-price').text(showPrice);
-                    $('.origin-price .price-num').text(formatMoney(parseFloat(price) * 2));
+                    $('.origin-price .price-num').text(formatMoney(parseFloat(price + givePrice)));
 
                     $('.computed_price').html(showPrice);
                 }