Merge branch 'dev2.10.9' of http://192.168.3.207:10080/qmx/jy into dev2.10.9

src/jfw/modules/app/src/seo.json

@@ -1,8 +1,7 @@
 {	
-	"cdn":"http://web-jydev-wss.jianyu360.cn",
+	"cdn":"http://web-jydev-xzh.jianyu360.cn",
 	"cdns":{
-	 "app2-jytest.jianyu360.cn":"res://app2-jytest.jianyu360.cn",
-	 "web-jydev-wss.jianyu360.cn":"http://web-jydev-wss.jianyu360.cn"
+	 	"web-jydev-xzh.jianyu360.cn":""
 	},
     "qfw": {
         "swordfish": {
@@ -84,6 +83,7 @@
 	"ZBADDRESS":"https://res.jianyu360.com",
 	"liveActiveStartTime": "1592755200",
 	"liveActiveEndTime": "1594051200",
+	"activeDiscount": "0.6",
 	"IosExam":{
 		"flag":false,
 		"phone":"18613717801",

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

@@ -565,6 +565,7 @@
 }
 
 .jy-alert .weui-dialog__bd {
+  margin: 0;
   padding: 0 0.4rem 0.48rem;
   font-size: 0.28rem;
   color: #686868;

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

@@ -264,6 +264,9 @@ $(function () {
         pickerShow('.billing-list-container', false)
         pickerShow('.coupon-picker', false)
     })
+    $('body').on('click', '.jy-dialog .weui-mask', function () {
+        pickerShow('.jy-dialog', false)
+    })
 
     $('.close-expire-remind').on("click", function () {
         $(".expire-remind").hide();
@@ -344,6 +347,7 @@ $(function () {
             //cancelTip(module);
             window.history.back();
         });
+        window.removeEventListener('popstate')
         setTimeout(function () {
             window.addEventListener("popstate", function (e) {
                 //如果订单计费清单显示，则关闭清单；
@@ -730,18 +734,19 @@ $(function () {
 			var nowTime = new Date().getTime();
 			var startTime = live20200707.startTime;
 			var endTime = live20200707.endTime;
+            var activeDiscount = parseFloat(live20200707.activeDiscount)
 			var startTimes = parseInt(startTime) * 1000;
 			var endTimes = parseInt(endTime) * 1000;
 			if (nowTime >= startTimes && nowTime < endTimes) {
 				var price = status[0];
 				$(".price-num").text(price);
-				status[0] = parseFloat(price) * 0.6;
-				var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * 0.6);
+				status[0] = parseFloat(price) * activeDiscount;
+				var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * activeDiscount);
 				$(".reduce-price").text(formatMoney(activePrice));
 				// for (var i=0;i<status.length;i++){
 				// 	if(i===3){
 				// 		for (var a in status[i]){
-				// 			status[i][a].price = parseFloat(status[i][a].price) * 0.6;
+				// 			status[i][a].price = parseFloat(status[i][a].price) * activeDiscount;
 				// 		}
 				// 	}
 				// }
@@ -870,9 +875,7 @@ $(function () {
         var confirmButton = $('.coupon-picker .weui-picker__btn')
         var cancelButton = $('.coupon-picker .cancel')
         var value = input.val()
-        input.focus(function (e) {
-          e.target.scrollIntoView({ 'block': 'center' })
-        }).on('input', function () {
+        input.val('').focus().val(value).on('input', function () {
             value = this.value
             confirmButton.prop('disabled', (value === '' || value === undefined))
         })

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

@@ -62,7 +62,7 @@ var purchase = {
 				isUsedActiveCode = true;
 			}
 			if (sessionStorage.liveActiveCode_renew === "jianyu360"){
-				$('.coupon-code-tx .keywords-text').text("支付成功赠送30天订阅周期");
+				$('.coupon-code-tx .keywords-text').text("支付成功赠送30天订阅周期");
 				$('.coupon-picker .weui-input').val("jianyu360");
 				$('.coupon-code-tx').off('click');
 			}
@@ -165,13 +165,14 @@ var purchase = {
 		var showPrice = formatMoney(price);
 		var nowTime = new Date().getTime();
 		var startTime = live20200707.startTime;
-		var endTime = live20200707.endTime;
+		var endTime = live20200707.endTime;
+        var activeDiscount = parseFloat(live20200707.activeDiscount)
 		var startTimes = parseInt(startTime) * 1000;
 		var endTimes = parseInt(endTime) * 1000;
 		if (nowTime >= startTimes && nowTime < endTimes) {
 			$(".price-num").text(showPrice);
-			showPrice = formatMoney(parseFloat(price) * 0.6);
-			var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * 0.6);
+			showPrice = formatMoney(parseFloat(price) * activeDiscount);
+			var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * activeDiscount);
 			$(".reduce-price").text(formatMoney(activePrice));
 		}
 		if (flag === 1) {
@@ -602,12 +603,10 @@ $('.coupon-code-tx').on('click', function() {
 	var confirmButton = $('.coupon-picker .weui-picker__btn')
 	var cancelButton = $('.coupon-picker .cancel')
 	var value = input.val()
-	input.focus(function (e) {
-    e.target.scrollIntoView({ 'block': 'center' })
-  }).on('input', function() {
-		value = this.value
-		confirmButton.prop('disabled', (value === '' || value === undefined))
-	})
+	input.val('').focus().val(value).on('input', function () {
+    value = this.value
+    confirmButton.prop('disabled', (value === '' || value === undefined))
+  })
 
 	confirmButton.on('click', function() {
 		if (value.toLowerCase() !== couponInfo.code) {

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

@@ -1822,7 +1822,7 @@
 													+orderHtml
 												+'</div>'
 												+'<div class="card-content">'
-													+'<a  eid='+orderCode_vip+' class="media" isvipOrder="true" href="/jyapp/vipsubscribe/toOrderDetailPage?orderCode=' + orderCode_vip + '">'
+													+'<a onclick="setSessionStorage()"  eid='+orderCode_vip+' class="media" isvipOrder="true" href="/jyapp/vipsubscribe/toOrderDetailPage?orderCode=' + orderCode_vip + '">'
 														+'<div class="media-img">'
 															+'<img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/vipBook.png?v=51430">'
 														+'</div>'
@@ -1833,7 +1833,8 @@
 														+'</div>'
 													+'</a>'
 									if(isUsedActiveCode){
-										var originPrice = (parseFloat(orderMoney_vip) / 0.6).toFixed(2);
+                                        var activeDiscount = {{Msg "seo" "activeDiscount"}};
+                                        var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
 										listhtml+= '<div class="price">'
 														+ '<span class="origin-price-container">'
 														+ '<span>原价：￥</span>'
@@ -1860,7 +1861,7 @@
 															+orderHtml
 														+'</div>'
 														+'<div class="card-content">'
-															+'<a  eid='+orderCode_vip+' class="media" isvipOrder="true" href="/jyapp/vipsubscribe/toOrderDetailPage?orderCode=' + orderCode_vip + '">'
+															+'<a onclick="setSessionStorage()"  eid='+orderCode_vip+' class="media" isvipOrder="true" href="/jyapp/vipsubscribe/toOrderDetailPage?orderCode=' + orderCode_vip + '">'
 																+'<div class="media-img">'
 																	+'<img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/vipBook.png?v=51430">'
 																+'</div>'
@@ -1872,7 +1873,8 @@
 																+'</div>'
 															+'</a>'
 											if(isUsedActiveCode){
-												var originPrice = (parseFloat(orderMoney_vip) / 0.6).toFixed(2);
+                                                var activeDiscount = {{Msg "seo" "activeDiscount"}};
+                                                var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
 												listhtml+= '<div class="price">'
 																+ '<span class="origin-price-container">'
 																+ '<span>原价：￥</span>'

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

@@ -520,7 +520,8 @@
         });
 		var live20200707 = {
 			startTime: {{Msg "seo" "liveActiveStartTime"}},
-			endTime: {{Msg "seo" "liveActiveEndTime"}}
+			endTime: {{Msg "seo" "liveActiveEndTime"}},
+            activeDiscount: {{Msg "seo" "activeDiscount"}}
 		}
     </script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}"></script>

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

@@ -229,7 +229,7 @@
 	<div class="j-container" id="order_detail">
 	<!--			过期的订单-->
 	<div class="nothing" style="display:none">
-        <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/vipsubscribe/image/nothing.png?v=51430"/>
+        <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/nothing.png?v=51430"/>
 		<div class="nothingDiv">
 			该订单记录已删除
 		</div>
@@ -381,7 +381,7 @@
       if(r.success){
 		if(r.data.order.order_status==-1){
 			$(".nothing").show();
-			$(".j-body").hide();
+			$(".j-body").remove();
 		}
         //下单时间
         if(r.data.order.create_time) {
@@ -401,7 +401,8 @@
 		if(!r.data.order.isLiveActive){
 			$(".origin-price-container").hide();
 		}else{
-			var originPrice = (r.data.order.original_price/100 / 0.6).toFixed(2);
+            var activeDiscount = {{Msg "seo" "activeDiscount"}};
+			var originPrice = (r.data.order.original_price/100 / parseFloat(activeDiscount)).toFixed(2);
 			$(".price-num").text(originPrice);
 			$(".bill-origin-price").css("display","flex");
 		}

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

@@ -565,13 +565,14 @@
 						var nowTime = new Date().getTime();
 						var startTime = {{Msg "seo" "liveActiveStartTime"}};
 						var endTime = {{Msg "seo" "liveActiveEndTime"}};
+                        var activeDiscount = {{Msg "seo" "activeDiscount"}};
 						var startTimes = parseInt(startTime)* 1000;
 						var endTimes = parseInt(endTime)* 1000;
 						var buyCount = {{.T.buyCount}};
 						if (nowTime >= startTimes && nowTime < endTimes) {
 							$(".price-num").text(showPrice);
-							showPrice = formatMoney(parseFloat(price) * 0.6);
-							var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * 0.6);
+							showPrice = formatMoney(parseFloat(price) * parseFloat(activeDiscount));
+							var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * parseFloat(activeDiscount));
 							$(".reduce-price").text(formatMoney(activePrice));
 							$(".bought-num").text(buyCount);
 						}

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

@@ -358,7 +358,8 @@
 	    });
 		var live20200707 = {
 			startTime: {{Msg "seo" "liveActiveStartTime"}},
-			endTime: {{Msg "seo" "liveActiveEndTime"}}
+			endTime: {{Msg "seo" "liveActiveEndTime"}},
+            activeDiscount: {{Msg "seo" "activeDiscount"}}
 		}
 	</script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/vip_renew.js?v={{Msg "seo" "version"}}"></script>

src/jfw/modules/subscribepay/src/config.json

@@ -56,5 +56,6 @@
 	"orderCountdown":"48h",
 	"liveOrderCountdown":"72h",
 	"liveActiveStartTime":1592755200,
-	"liveActiveEndTime":1594051200
+	"liveActiveEndTime":1594051200,
+	"activeDiscount":0.6
 }

src/jfw/modules/subscribepay/src/config/config.go

@@ -52,6 +52,7 @@ type config struct {
 	LiveOrderCountdown  interface{}
 	LiveActiveStartTime int64
 	LiveActiveEndTime   int64
+	ActiveDiscount      float64
 }
 type timeTaskConfig struct {
 	ExpireRemind   string //到期提醒
@@ -82,6 +83,8 @@ type WxTplMsg struct {
 	Second   *qrpc.TmplItem
 	Third    *qrpc.TmplItem
 	Fourth   *qrpc.TmplItem
+	Fifth    *qrpc.TmplItem
+	Sixth    *qrpc.TmplItem
 	Keyword1 *qrpc.TmplItem
 	Keyword2 *qrpc.TmplItem
 	Keyword3 *qrpc.TmplItem

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -153,6 +153,10 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 	//}
 	//支付成功后
 	if flag {
+		//支付成功后 清除首页redis缓存
+		go func() {
+			redis.Del("other", "p1_indexMessage_"+userid)
+		}()
 		//支付提醒
 		liveStart := Config.LiveActiveStartTime
 		liveEnd := Config.LiveActiveEndTime

src/jfw/modules/subscribepay/src/message.json

@@ -69,6 +69,14 @@
 			"value":"您的订单 %s 还未支付，将在 2 小时后关闭，现在支付享VIP订阅 6 折活动，立省%s元，全年仅此一次，错过不再有，请及时付款。",
 			"color":"#FE737A"
 		},
+		"fifth":{
+			"value":"您的订单 %s 还未支付，请及时付款。",
+			"color":"#FE737A"
+		},
+		"sixth":{
+			"value":"您的订单 %s 还未支付，将在 2 小时后关闭，请及时付款。",
+			"color":"#FE737A"
+		},
 		"keyword3": {
 			"value":"%s元"
 		},

src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -194,8 +194,9 @@ func (this *SubscribeChange) SaveChange() {
 		nowTime := time.Now().Unix()
 		liveActiveStartTime := config.Config.LiveActiveStartTime
 		liveActiveEndTime := config.Config.LiveActiveEndTime
+		activeDiscount := config.Config.ActiveDiscount
 		if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
-			final_price = int(float64(final_price) * 0.6)
+			final_price = int(float64(final_price) * activeDiscount)
 			log.Println("final_price", final_price)
 		}
 		if activeCode == "jianyu360" {

src/jfw/modules/subscribepay/src/service/vipSubscribePay.go

@@ -100,9 +100,10 @@ func (this *SubVipPayOrder) CreateOrder() {
 		nowTime := time.Now().Unix()
 		liveActiveStartTime := config.Config.LiveActiveStartTime
 		liveActiveEndTime := config.Config.LiveActiveEndTime
+		activeDiscount := config.Config.ActiveDiscount
 		if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
 			if totalfee > 100 {
-				totalfee = int(float64(totalfee) * 0.6)
+				totalfee = int(float64(totalfee) * activeDiscount)
 			}
 			log.Println("totalfee", totalfee)
 		}

src/jfw/modules/subscribepay/src/util/liveActiveMsgRemind.go

@@ -187,7 +187,8 @@ func (m *activeMsgRemind) run() {
 			if !ok || user == nil || len(*user) == 0 {
 				return true
 			}
-			origin := float64(unpaidOrder.orderMoney)/100/0.6 - float64(unpaidOrder.orderMoney)/100
+			activeDiscount := Config.ActiveDiscount
+			origin := float64(unpaidOrder.orderMoney)/100/activeDiscount - float64(unpaidOrder.orderMoney)/100
 			originPrice := fmt.Sprintf("%.2f", origin)
 			buyCount := strconv.Itoa(util.IntAll(redis.Get("other", "liveactiveRTB")))
 			log.Println("buyCount", buyCount)
@@ -219,17 +220,17 @@ func (m *activeMsgRemind) run() {
 				}
 				if remind_status == 1 {
 					tmplData["first"] = &qrpc.TmplItem{
-						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Second.Value, unpaidOrder.orderCode, originPrice),
+						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Fifth.Value, unpaidOrder.orderCode),
 						Color: MessageConfig.WxTpl_Unpaid.First.Color,
 					}
 				} else if remind_status == 2 {
 					tmplData["first"] = &qrpc.TmplItem{
-						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Third.Value, unpaidOrder.orderCode, buyCount, originPrice),
+						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Fifth.Value, unpaidOrder.orderCode),
 						Color: MessageConfig.WxTpl_Unpaid.First.Color,
 					}
 				} else if remind_status == 3 {
 					tmplData["first"] = &qrpc.TmplItem{
-						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Fourth.Value, unpaidOrder.orderCode, originPrice),
+						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Sixth.Value, unpaidOrder.orderCode),
 						Color: MessageConfig.WxTpl_Unpaid.First.Color,
 					}
 				}
@@ -254,7 +255,7 @@ func (m *activeMsgRemind) run() {
 				if remind_status == 1 {
 					tmplData["first"] = fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Second.Value, unpaidOrder.orderCode, originPrice)
 				} else if remind_status == 2 {
-					tmplData["first"] = fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Third.Value, unpaidOrder.orderCode, originPrice)
+					tmplData["first"] = fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Third.Value, unpaidOrder.orderCode, buyCount, originPrice)
 				} else if remind_status == 3 {
 					tmplData["first"] = fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Fourth.Value, unpaidOrder.orderCode, originPrice)
 				}

src/seo.json

@@ -480,5 +480,6 @@
     },
 	"orderCountdown":"72h",
 	"liveActiveStartTime": "1592755200",
-	"liveActiveEndTime": "1594051200"
+	"liveActiveEndTime": "1594051200",
+	"activeDiscount": "0.6"
 }

src/web/staticres/vipsubscribe/css/vip_index_new.css

@@ -560,6 +560,7 @@
 }
 
 .jy-alert .weui-dialog__bd {
+  margin: 0;
   padding: 0 0.4rem 0.48rem;
   font-size: 0.28rem;
   color: #686868;

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

@@ -266,6 +266,9 @@ $(function () {
         pickerShow('.billing-list-container', false)
         pickerShow('.coupon-picker', false)
     })
+    $('body').on('click', '.jy-dialog .weui-mask', function () {
+        pickerShow('.jy-dialog', false)
+    })
 
     $('.close-expire-remind').on("click", function () {
         $(".expire-remind").hide();
@@ -345,15 +348,15 @@ $(function () {
         $('.vip-footer .button-l.reset').off("click").on("click", function () {
             cancelTip(module);
         });
+        window.removeEventListener('popstate')
         window.addEventListener("popstate", function (e) {
-            //如果订单计费清单显示，则关闭清单；
+            // 如果订单计费清单显示，则关闭清单；
             if ($(".billing-list-container").css("display") != "none" && module === 2) {
                 pickerShow('.billing-list-container', false);
                 pushHistory();
             } else {//提示是否保存
                 $('.weui-mask').trigger('click')
                 cancelTip(module);
-                //pushHistory();
             }
         }, false);
     }
@@ -737,18 +740,19 @@ $(function () {
             var nowTime = new Date().getTime();
             var startTime = live20200707.startTime;
             var endTime = live20200707.endTime;
+            var activeDiscount = parseFloat(live20200707.activeDiscount);
             var startTimes = parseInt(startTime) * 1000;
             var endTimes = parseInt(endTime) * 1000;
             if (nowTime >= startTimes && nowTime < endTimes) {
               var price = status[0];
               $(".price-num").text(price);
-              status[0] = parseFloat(price) * 0.6;
-              var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * 0.6);
+              status[0] = parseFloat(price) * activeDiscount;
+              var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * activeDiscount);
               $(".reduce-price").text(formatMoney(activePrice));
               // for (var i=0;i<status.length;i++){
               //   if(i===3){
               //     for (var a in status[i]){
-              //       status[i][a].price = parseFloat(status[i][a].price) * 0.6;
+              //       status[i][a].price = parseFloat(status[i][a].price) * activeDiscount;
               //     }
               //   }
               // }
@@ -874,11 +878,9 @@ $(function () {
         var confirmButton = $('.coupon-picker .weui-picker__btn')
         var cancelButton = $('.coupon-picker .cancel')
         var value = input.val()
-        input.focus(function (e) {
-          e.target.scrollIntoView({ 'block': 'center' })
-        }).on('input', function () {
-            value = this.value
-            confirmButton.prop('disabled', (value === '' || value === undefined))
+        input.val('').focus().val(value).on('input', function () {
+          value = this.value
+          confirmButton.prop('disabled', (value === '' || value === undefined))
         })
 
         confirmButton.on('click', function () {

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

@@ -1175,7 +1175,8 @@
                     //}
                     listhtml += '</div></a>'
 					if(isUsedActiveCode){
-						var originPrice = (parseFloat(orderMoney_vip) / 0.6).toFixed(2);
+                        var activeDiscount = {{Msg "seo" "activeDiscount"}};
+						var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
 						listhtml += '<div class="price">'
 						+ '<span class="origin-price-container">'
 						+ '<span>原价：￥</span>'
@@ -1214,7 +1215,8 @@
                     //}
                     listhtml += '</div></a>'
                     if(isUsedActiveCode){
-						var originPrice = (parseFloat(orderMoney_vip) / 0.6).toFixed(2);
+						var activeDiscount = {{Msg "seo" "activeDiscount"}};
+						var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
                     	listhtml += '<div class="price">'
                     	+ '<span class="origin-price-container">'
                     	+ '<span>原价：￥</span>'

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

@@ -524,7 +524,8 @@
     });
 	var live20200707 = {
 		startTime: {{Msg "seo" "liveActiveStartTime"}},
-		endTime: {{Msg "seo" "liveActiveEndTime"}}
+		endTime: {{Msg "seo" "liveActiveEndTime"}},
+        activeDiscount: {{Msg "seo" "activeDiscount"}}
 	}
     try {
         var signature = {{.T.signature}};

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

@@ -245,7 +245,8 @@ try{
 		if(!r.data.order.isLiveActive){
 			$(".origin-price-container").hide();
 		}else{
-			var originPrice = (r.data.order.original_price/100 / 0.6).toFixed(2);
+            var activeDiscount = {{Msg "seo" "activeDiscount"}};
+			var originPrice = (r.data.order.original_price/100 / parseFloat(activeDiscount)).toFixed(2);
 			$(".price-num").text(originPrice);
             $(".bill-origin-price").css("display","flex")
 		}

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

@@ -346,7 +346,8 @@
         });
 		var live20200707 = {
 			startTime: {{Msg "seo" "liveActiveStartTime"}},
-			endTime: {{Msg "seo" "liveActiveEndTime"}}
+			endTime: {{Msg "seo" "liveActiveEndTime"}},
+            activeDiscount: {{Msg "seo" "activeDiscount"}}
 		}
         //微信支付start
         {{if not .T.isTrial }}
@@ -601,15 +602,16 @@
                     //var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, time, this.price);
                     var showPrice = formatMoney(price);
 					var nowTime = new Date().getTime();
-					var startTime = {{Msg "seo" "liveActiveStartTime"}};
-					var endTime = {{Msg "seo" "liveActiveEndTime"}};
+					var startTime = live20200707.startTime;
+					var endTime = live20200707.endTime;
+                    var activeDiscount = parseFloat(live20200707.activeDiscount);
 					var startTimes = parseInt(startTime)* 1000;
 					var endTimes = parseInt(endTime)* 1000;
 					var buyCount = {{.T.buyCount}};
 					if (nowTime >= startTimes && nowTime < endTimes) {
 						$(".price-num").text(showPrice);
-						showPrice = formatMoney(parseFloat(price) * 0.6);
-						var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * 0.6);
+						showPrice = formatMoney(parseFloat(price) * activeDiscount);
+						var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * activeDiscount);
 						$(".reduce-price").text(formatMoney(activePrice));
 						$(".bought-num").text(buyCount);
 					}

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

@@ -338,7 +338,8 @@
     });
 	var live20200707 = {
 		startTime: {{Msg "seo" "liveActiveStartTime"}},
-		endTime: {{Msg "seo" "liveActiveEndTime"}}
+		endTime: {{Msg "seo" "liveActiveEndTime"}},
+        activeDiscount: {{Msg "seo" "activeDiscount"}}
 	}
     try {
         var signature = {{.T.signature}};
@@ -553,12 +554,13 @@
 			var nowTime = new Date().getTime();
 			var startTime = live20200707.startTime;
 			var endTime = live20200707.endTime;
+            var activeDiscount = parseFloat(live20200707.activeDiscount);
 			var startTimes = parseInt(startTime) * 1000;
 			var endTimes = parseInt(endTime) * 1000;
 			if (nowTime >= startTimes && nowTime < endTimes) {
 				$(".price-num").text(showPrice);
-				showPrice = formatMoney(parseFloat(price) * 0.6);
-				var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * 0.6);
+				showPrice = formatMoney(parseFloat(price) * activeDiscount);
+				var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * activeDiscount);
 				$(".reduce-price").text(formatMoney(activePrice));
 			}
             if (flag === 1) {