fix: 修复显示问题

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_renew.html

@@ -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/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_renew.html

@@ -49,7 +49,7 @@
             <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>
@@ -420,6 +420,12 @@
                         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));
                                 showGiveStatus(true)
                             } else {
                                 showGiveStatus(false)
@@ -509,6 +515,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 +533,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);
                 }