Merge branch 'dev2.10.9' of ssh://192.168.3.207:10022/qmx/jy into dev2.10.9

src/active.json

@@ -1,9 +1,10 @@
 {
 	"live_Preheat_Start":1593432000,
 	"live_Preheat_End":1594123200,
-	"live_Active_Start":1594123200,
+	"live_Active_Start":1593739500,
 	"live_Active_End":1594728000,
 	"live_Ing_Start":1594123200,
 	"live_Ing_End":1594130400,
-	"live_After_Date":1597413600
+	"live_After_Date":1597413600,
+	"activeDiscount":0.6
 }

src/jfw/config/active.go

@@ -6,13 +6,14 @@ import (
 
 //系统配置
 type activeConfig struct {
-	Live_Preheat_Start int64 `json:"live_Preheat_Start"` //预热活动开始时间
-	Live_Preheat_End   int64 `json:"live_Preheat_End"`   //预热活动结束时间
-	Live_Active_Start  int64 `json:"live_Active_Start"`  //直播活动开始时间
-	Live_Active_End    int64 `json:"live_Active_End"`    //直播活动结束时间
-	Live_Ing_Start     int64 `json:"live_Ing_Start"`     //直播开始时间
-	Live_Ing_End       int64 `json:"live_Ing_End"`       //直播结束时间
-	Live_After_Date    int64 `json:"live_After_Date"`    //直播活动结束后 活动已结束提示时间段（暂定一个月） 一个月后 跳转到VIP介绍页
+	Live_Preheat_Start int64   `json:"live_Preheat_Start"` //预热活动开始时间
+	Live_Preheat_End   int64   `json:"live_Preheat_End"`   //预热活动结束时间
+	Live_Active_Start  int64   `json:"live_Active_Start"`  //直播活动开始时间
+	Live_Active_End    int64   `json:"live_Active_End"`    //直播活动结束时间
+	Live_Ing_Start     int64   `json:"live_Ing_Start"`     //直播开始时间
+	Live_Ing_End       int64   `json:"live_Ing_End"`       //直播结束时间
+	Live_After_Date    int64   `json:"live_After_Date"`    //直播活动结束后 活动已结束提示时间段（暂定一个月） 一个月后 跳转到VIP介绍页
+	ActiveDiscount     float64 `json:"activeDiscount"`     //直播活动折扣
 }
 
 var ActiveConfig activeConfig

src/jfw/front/dataExport.go

@@ -180,6 +180,9 @@ func (d *DataExport) ToMyOrder() error {
 	}
 	d.T["shareid"] = se.EncodeString("10")
 	d.T["logid"] = config.Seoconfig["dataexport"].(string)
+	d.T["liveActiveStartTime"] = config.ActiveConfig.Live_Active_Start
+	d.T["liveActiveEndTime"] = config.ActiveConfig.Live_Active_End
+	d.T["activeDiscount"] = config.ActiveConfig.ActiveDiscount
 	d.Render("/pc/myOrder.html", &d.T)
 	return nil
 }
@@ -263,8 +266,8 @@ func (d *DataExport) QueryOrder() error {
 
 			//优惠码
 			product_type := util.ObjToString(v["product_type"])
-			liveActiveStartTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveStartTime"].(string), 10, 64)
-			liveActiveEndTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveEndTime"].(string), 10, 64)
+			liveActiveStartTime := config.ActiveConfig.Live_Active_Start
+			liveActiveEndTime := config.ActiveConfig.Live_Active_End
 			if product_type == "VIP订阅" {
 				create_time_str := util.ObjToString(v["create_time"])
 				create_time, _ := time.ParseInLocation(util.Date_Full_Layout, create_time_str, time.Local)

src/jfw/front/vipsubscribe.go

@@ -9,7 +9,6 @@ import (
 	"net/url"
 	"qfw/util"
 	"qfw/util/redis"
-	"strconv"
 	"time"
 
 	"github.com/go-xweb/xweb"
@@ -64,6 +63,12 @@ func init() {
 	xweb.AddAction(&Subscribepay{})
 }
 
+var (
+	liveActiveStartTime = config.ActiveConfig.Live_Active_Start
+	liveActiveEndTime   = config.ActiveConfig.Live_Active_End
+	activeDiscount      = config.ActiveConfig.ActiveDiscount
+)
+
 //推送设置
 func (s *Subscribepay) ToVIPViewPage() {
 	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
@@ -115,11 +120,12 @@ func (s *Subscribepay) ToSetInfoTypePage() {
 //订阅设置
 func (s *Subscribepay) ToSetPage() {
 	nowTime := time.Now().Unix()
-	startTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveStartTime"].(string), 10, 64)
-	endTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveEndTime"].(string), 10, 64)
-	if nowTime >= startTime && nowTime < endTime {
+	if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
 		s.T["isLiveActive"] = true
 	}
+	s.T["liveActiveStartTime"] = liveActiveStartTime
+	s.T["liveActiveEndTime"] = liveActiveEndTime
+	s.T["activeDiscount"] = activeDiscount
 	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
 	mynickname, _ := s.Session().Get("s_nickname").(string)
 	myavatar, _ := s.Session().Get("s_avatar").(string)
@@ -185,9 +191,7 @@ func (s *Subscribepay) Introduce() error {
 		return s.Redirect("/swordfish/about")
 	}
 	nowTime := time.Now().Unix()
-	startTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveStartTime"].(string), 10, 64)
-	endTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveEndTime"].(string), 10, 64)
-	if nowTime >= startTime && nowTime < endTime {
+	if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
 		s.T["isLiveActive"] = true
 	}
 	obj := util.ObjToMap((*m)["o_vipjy"])
@@ -223,14 +227,15 @@ func (s *Subscribepay) TrialInfo() error {
 func (s *Subscribepay) ToPurchasePage(flag string) {
 	//直播活动
 	nowTime := time.Now().Unix()
-	startTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveStartTime"].(string), 10, 64)
-	endTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveEndTime"].(string), 10, 64)
-	if nowTime >= startTime && nowTime < endTime {
+	if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
 		s.T["isLiveActive"] = true
 		//虚拟人数
 		buyCount := redis.Get("other", "liveactiveRTB")
 		s.T["buyCount"] = buyCount
 	}
+	s.T["liveActiveStartTime"] = liveActiveStartTime
+	s.T["liveActiveEndTime"] = liveActiveEndTime
+	s.T["activeDiscount"] = activeDiscount
 	if flag == "trial" { //试用
 		s.T["isTrial"] = true
 		s.T["orderType"] = -1
@@ -270,6 +275,9 @@ func (s *Subscribepay) ToPaySuccessPage() {
 //订阅收费支付订单详情页面
 func (s *Subscribepay) ToOrderDetailPage() {
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url()) //微信支付准备参数
+	s.T["liveActiveStartTime"] = liveActiveStartTime
+	s.T["liveActiveEndTime"] = liveActiveEndTime
+	s.T["activeDiscount"] = activeDiscount
 	s.Render("/weixin/vipsubscribe/vip_order_detail.html")
 }
 

src/jfw/front/wxMyOrder.go

@@ -189,6 +189,9 @@ func (w *WxMyOrder) ToMyWxOrder() error {
 			return errors.New("未登录")
 		}
 	}
+	w.T["liveActiveStartTime"] = config.ActiveConfig.Live_Active_Start
+	w.T["liveActiveEndTime"] = config.ActiveConfig.Live_Active_End
+	w.T["activeDiscount"] = config.ActiveConfig.ActiveDiscount
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
 	myopenid, _ := w.Session().Get("s_m_openid").(string)
 	w.T["openid"] = se.EncodeString(myopenid)

src/jfw/modules/app/src/active_zb.json

@@ -1,9 +1,10 @@
 {
 	"live_Preheat_Start": 1592841600,
 	"live_Preheat_End": 1594123200,
-	"live_Active_Start": 1594123200,
+	"live_Active_Start": 1593739500,
 	"live_Active_End": 1594728000,
 	"live_Ing_Start": 159412320,
 	"live_Ing_End": 1594130400,
-	"live_After_Date": 1597413600
+	"live_After_Date": 1597413600,
+	"activeDiscount":0.6
 }

src/jfw/modules/app/src/app/config/active_zb.go

@@ -8,13 +8,14 @@ import (
 var Active_zb active_zb
 
 type active_zb struct {
-	Live_Preheat_Start int64 //预约开始
-	Live_Preheat_End   int64 //预约结束
-	Live_Active_Start  int64 //活动开始
-	Live_Active_End    int64 //活动结束
-	Live_Ing_Start     int64 //直播开始
-	Live_Ing_End       int64 //直播结束
-	Live_After_Date    int64 //直播活动结束后 活动已结束提示时间段（暂定一个月） 一个月后 跳转到VIP介绍页
+	Live_Preheat_Start int64   //预约开始
+	Live_Preheat_End   int64   //预约结束
+	Live_Active_Start  int64   //活动开始
+	Live_Active_End    int64   //活动结束
+	Live_Ing_Start     int64   //直播开始
+	Live_Ing_End       int64   //直播结束
+	Live_After_Date    int64   //直播活动结束后 活动已结束提示时间段（暂定一个月） 一个月后 跳转到VIP介绍页
+	ActiveDiscount     float64 //直播活动折扣
 }
 
 func init() {

src/jfw/modules/app/src/app/front/myorder.go

@@ -1,8 +1,8 @@
 package front
 
 import (
+	appconfig "app/config"
 	"encoding/json"
-
 	"jfw/public"
 	"log"
 	"qfw/util"
@@ -114,6 +114,9 @@ func (m *MyOrder) ToMyOrder() error {
 	if userId == nil || userId == "" {
 		return m.Redirect("/jyapp/free/login")
 	}
+	m.T["liveActiveStartTime"] = appconfig.Active_zb.Live_Active_Start
+	m.T["liveActiveEndTime"] = appconfig.Active_zb.Live_Active_End
+	m.T["activeDiscount"] = appconfig.Active_zb.ActiveDiscount
 	return m.Render("/dataExport/dataExport_toMyOrder.html")
 }
 

src/jfw/modules/app/src/app/front/vipsubscribe.go

@@ -4,11 +4,9 @@ import (
 	appconfig "app/config"
 	. "app/jyutil"
 	"encoding/hex"
-	"jfw/config"
 	"jfw/public"
 	"qfw/util"
 	"qfw/util/redis"
-	"strconv"
 	"strings"
 	"time"
 
@@ -53,6 +51,12 @@ func init() {
 	xweb.AddAction(&Subscribepay{})
 }
 
+var (
+	liveActiveStartTime = appconfig.Active_zb.Live_Active_Start
+	liveActiveEndTime   = appconfig.Active_zb.Live_Active_End
+	activeDiscount      = appconfig.Active_zb.ActiveDiscount
+)
+
 //推送设置
 func (s *Subscribepay) ToVIPViewPage() {
 	s.Render("/vipsubscribe/vip_viewPage.html")
@@ -76,11 +80,12 @@ func (s *Subscribepay) ToSetInfoTypePage() {
 //订阅设置
 func (s *Subscribepay) ToSetPage() {
 	nowTime := time.Now().Unix()
-	startTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveStartTime"].(string), 10, 64)
-	endTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveEndTime"].(string), 10, 64)
-	if nowTime >= startTime && nowTime < endTime {
+	if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
 		s.T["isLiveActive"] = true
 	}
+	s.T["liveActiveStartTime"] = liveActiveStartTime
+	s.T["liveActiveEndTime"] = liveActiveEndTime
+	s.T["activeDiscount"] = activeDiscount
 	s.Render("/vipsubscribe/vip_index_new.html")
 }
 
@@ -115,9 +120,7 @@ func (s *Subscribepay) Introduce() error {
 		return s.Redirect("/jyapp/login")
 	}
 	nowTime := time.Now().Unix()
-	startTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveStartTime"].(string), 10, 64)
-	endTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveEndTime"].(string), 10, 64)
-	if nowTime >= startTime && nowTime < endTime {
+	if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
 		s.T["isLiveActive"] = true
 	}
 	if util.IntAll((*m)["i_vip_status"]) > 0 {
@@ -153,14 +156,16 @@ func (s *Subscribepay) TrialInfo() error {
 func (s *Subscribepay) ToPurchasePage(flag string) {
 	//直播活动
 	nowTime := time.Now().Unix()
-	startTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveStartTime"].(string), 10, 64)
-	endTime, _ := strconv.ParseInt(config.Seoconfig["liveActiveEndTime"].(string), 10, 64)
-	if nowTime >= startTime && nowTime < endTime {
+	if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
 		s.T["isLiveActive"] = true
 		//虚拟人数
 		buyCount := redis.Get("other", "liveactiveRTB")
 		s.T["buyCount"] = buyCount
 	}
+	s.T["liveActiveStartTime"] = liveActiveStartTime
+	s.T["liveActiveEndTime"] = liveActiveEndTime
+	s.T["activeDiscount"] = activeDiscount
+	//
 	if flag == "trial" { //试用
 		s.T["isTrial"] = true
 		s.T["orderType"] = -1
@@ -194,6 +199,9 @@ func (s *Subscribepay) ToPaySuccessPage() {
 
 //订阅收费支付订单详情页面
 func (s *Subscribepay) ToOrderDetailPage() {
+	s.T["liveActiveStartTime"] = liveActiveStartTime
+	s.T["liveActiveEndTime"] = liveActiveEndTime
+	s.T["activeDiscount"] = activeDiscount
 	s.Render("/vipsubscribe/vip_order_detail.html")
 }
 

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

@@ -81,9 +81,6 @@
 	},
 	"jyDomain":"https://www.jianyu360.com",
 	"ZBADDRESS":"https://res.jianyu360.com",
-	"liveActiveStartTime": "1592755200",
-	"liveActiveEndTime": "1594051200",
-	"activeDiscount": "0.6",
 	"IosExam":{
 		"flag":false,
 		"phone":"18613717801",

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

@@ -1853,7 +1853,7 @@
                           +'</a>'
                   listhtml+= '<div class="price">'
 									if(isLiveActive){
-                    var activeDiscount = {{Msg "seo" "activeDiscount"}};
+                    var activeDiscount = {{.T.activeDiscount}};
                     var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
 										listhtml+= '<span class="origin-price-container">'
 														+ '<span>原价：￥</span>'
@@ -1892,7 +1892,7 @@
                               +'</a>'
                       listhtml+= '<div class="price">'
 											if(isLiveActive){
-                              var activeDiscount = {{Msg "seo" "activeDiscount"}};
+                              var activeDiscount = {{.T.activeDiscount}};
                               var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
 												listhtml+= '<span class="origin-price-container">'
 																+ '<span>原价：￥</span>'

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

@@ -519,9 +519,9 @@
             }
         });
 		var live20200707 = {
-			startTime: {{Msg "seo" "liveActiveStartTime"}},
-			endTime: {{Msg "seo" "liveActiveEndTime"}},
-            activeDiscount: {{Msg "seo" "activeDiscount"}}
+			startTime: {{.T.liveActiveStartTime}},
+			endTime: {{.T.liveActiveEndTime}},
+            activeDiscount: {{.T.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

@@ -158,9 +158,9 @@
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
 <script>
-  var activeDiscount = {{Msg "seo" "activeDiscount"}};
-  var liveActiveStartTime = {{Msg "seo" "liveActiveStartTime"}};
-  var liveActiveEndTime = {{Msg "seo" "liveActiveEndTime"}}
+  var activeDiscount = {{.T.activeDiscount}};
+  var liveActiveStartTime = {{.T.liveActiveStartTime}};
+  var liveActiveEndTime = {{.T.liveActiveEndTime}}
 </script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/vip_order_detail.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/baiducc.html"}}

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

@@ -563,9 +563,9 @@
                         //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 activeDiscount = {{Msg "seo" "activeDiscount"}};
+						var startTime = {{.T.liveActiveStartTime}};
+						var endTime = {{.T.liveActiveEndTime}};
+                        var activeDiscount = {{.T.activeDiscount}};
 						var startTimes = parseInt(startTime)* 1000;
 						var endTimes = parseInt(endTime)* 1000;
 						var buyCount = {{.T.buyCount}};

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

@@ -357,9 +357,9 @@
 	        }
 	    });
 		var live20200707 = {
-			startTime: {{Msg "seo" "liveActiveStartTime"}},
-			endTime: {{Msg "seo" "liveActiveEndTime"}},
-            activeDiscount: {{Msg "seo" "activeDiscount"}}
+			startTime: {{.T.liveActiveStartTime}},
+			endTime: {{.T.liveActiveEndTime}},
+		    activeDiscount: {{.T.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/service/orderListDetails.go

@@ -158,11 +158,11 @@ func (o *OrderListDetails) MyOrder() error {
 	//queryM["product_type"] = map[string]interface{}{"ne": "企业商机管理"}
 	page_size := o.GetString("page_size")
 	i_page_size, _ := strconv.Atoi(page_size)
-	log.Println("=========", queryM)
+	// log.Println("=========", queryM)
 	haveNextPage, res, _ := o.Datas(queryM, 1, i_page_size)
-	log.Println("-----2------", queryM)
+	// log.Println("-----2------", queryM)
 	if res != nil {
-		log.Println("-----------1", queryM)
+		// log.Println("-----------1", queryM)
 		o.SetRes(res, queryM)
 	}
 	o.ServeJson(map[string]interface{}{
@@ -205,7 +205,7 @@ func (o *OrderListDetails) MyOrderPaging() error {
 	if o.GetString("fromPage") != "" && o.GetString("fromPage") == "wx" { //微信暂无企业商机管理
 		queryM["product_type"] = map[string]interface{}{"ne": "企业商机管理"}
 	}
-	log.Println("====", queryM)
+	// log.Println("====", queryM)
 	haveNextPage, res, _ := o.Datas(queryM, pageNum, 10)
 	if res != nil {
 		o.SetRes(res, queryM)
@@ -312,9 +312,9 @@ func (o *OrderListDetails) SetEmail() {
 		}
 		if email_used {
 			lastSendDEVerify := qutil.Int64All(o.GetSession("CreatEVerifyTime"))
-			log.Println(qutil.Int64All(o.GetSession("CreatEVerifyTime")), "----", time.Now().Unix())
+			// log.Println(qutil.Int64All(o.GetSession("CreatEVerifyTime")), "----", time.Now().Unix())
 			timeSpaceing := lastSendDEVerify - time.Now().Unix() + 60*5
-			log.Println("timeSpaceing--------:", timeSpaceing)
+			// log.Println("timeSpaceing--------:", timeSpaceing)
 			incurKey := fmt.Sprintf("SendEmail_%s_%d", o.GetSession("userId"), time.Now().Day())
 			log.Println("incurKey:---", incurKey)
 			if lastSendDEVerify == 0 || timeSpaceing < 0 {
@@ -378,7 +378,7 @@ func (o *OrderListDetails) EmailOperation() {
 	operation := o.GetString("operation")
 	email := o.GetString("email")
 	userId := qutil.ObjToString(o.GetSession("userId"))
-	log.Println("userid---", userId)
+	// log.Println("userid---", userId)
 	bo := false
 	if email != "" {
 		switch operation {
@@ -426,7 +426,7 @@ func (o *OrderListDetails) GetValuationList() error {
 			}
 		}
 	}
-	log.Println("upgradeSubtotail:", upgradeSubtotail)
+	// log.Println("upgradeSubtotail:", upgradeSubtotail)
 	o.ServeJson(map[string]interface{}{
 		"list":        upgradeSubtotail,
 		"order_money": (*filter)["order_money"],
@@ -564,19 +564,19 @@ func (o *OrderListDetails) EntIsCanBuy() {
 }
 
 func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[string]interface{}) {
-	log.Println("-----------", queryM)
+	// log.Println("-----------", queryM)
 	entid := o.GetUserEntId() //用户购买的entid
 	ent_ordercode := GetEntOrdercode(queryM, entid)
 	var create_time_stamp int64 = 0
 	//获取最后一次购买的vip订单
 	queryM["product_type"] = "VIP订阅"
-	log.Println("-----------", queryM)
+	// log.Println("-----------", queryM)
 	lastbuy := *util.Mysql.Find(tableName_order, queryM, "order_code,pay_time", "pay_time desc", -1, 0)
 	lastbuy_code := ""
-	log.Println(lastbuy)
+	// log.Println(lastbuy)
 	if len(lastbuy) > 0 && lastbuy != nil {
-		log.Println("------------", lastbuy_code)
 		lastbuy_code = qutil.ObjToString(lastbuy[0]["order_code"])
+		log.Println("------------", lastbuy_code)
 	}
 	delete(queryM, "product_type")
 

src/seo.json

@@ -478,8 +478,5 @@
         "downloadUrl_win": "http://w2blmjy.qmx.top/res/JianYu for Windows.exe",
         "downloadUrl_mac": "http://w2blmjy.qmx.top/res/JianYu for Mac.dmg"
     },
-	"orderCountdown":"72h",
-	"liveActiveStartTime": "1592755200",
-	"liveActiveEndTime": "1594051200",
-	"activeDiscount": "0.6"
+	"orderCountdown":"72h"
 }

src/web/staticres/course/js/order_detail.js

@@ -96,7 +96,8 @@ $(function () {
                 }
                 if(d.orderStatus==-2){
                     //已取消
-                    $("#status_cancelled").show().removeClass("hide");
+                    $("#status_cancelled").show().removeClass("hide");
+                    $(".o_m_thead").removeClass('greenBg').addClass('qxBg');
                 }
                 //发票信息不为空
                     //申请开发票，到场领取

src/web/templates/course/pc/order_detail.html

@@ -34,6 +34,13 @@
 			color: #fff;
 			text-decoration: none;
 		}
+        .qxBg{
+            border-top: 2px solid #999999;
+            background-color: #ececec;
+        }
+        .qxBgFont{
+            color: #686868;
+        }
     </style>
 </head>
 <body>
@@ -59,7 +66,7 @@
                     <span class="greenFont hide" id="status_success">已完成</span>
                     <span class="redFont hide" id="status_wait_pay">待付款</span>
                     <span class="redFont hide" id="status_verify">转账审核中</span>
-                    <span class="greenFont hide" id="status_cancelled">已取消</span>
+                    <span class="qxBgFont hide" id="status_cancelled">已取消</span>
                     <span class="redFont hide" id="status_no_transfer_received">未收到转账!</span>
                     <span class="service_number hide" id="service_num" style="margin-left: 20px" >客服电话：400-108-6670</span>
                     <!-- 当订单状态为待付款时显示去支付 -->

src/web/templates/order/pc/datareport/detail.html

@@ -38,6 +38,13 @@
 		    padding-bottom: 0px !important;
 		    background-color: #fff;
 		}
+        .qxBg{
+            border-top: 2px solid #999999;
+            background-color: #ececec;
+        }
+        .qxBgFont{
+            color: #686868;
+        }
     </style>
 </head>
 <body>
@@ -57,7 +64,7 @@
                     <!--greenFont为绿色字体 redFont为红色字体 -->
                     <span class="greenFont hide" id="status_success">已完成</span>
                     <span class="redFont hide" id="status_wait_pay">待付款</span>
-                    <span class="greenFont hide" id="status_cancelled">已取消</span>
+                    <span class="qxBgFont hide" id="status_cancelled">已取消</span>
 					
 					<!-- 当状态为已完成时显示开发票 或 查看发票 -->
 					<a class="go_pay payOrder" style="display: none;">去支付</a>
@@ -166,7 +173,7 @@
 						}
 						if(r.data.orderInfo.state==-2){
 							$("#status_cancelled").removeClass("hide");
-							$("#bg").addClass("greenBg").removeClass("redBg");
+							$("#bg").addClass("qxBg").removeClass("greenBg");
 							if (r.data.orderInfo.payMoney){
 								$(".pay_money").text("￥"+price+"元");
 							}else{

src/web/templates/pc/entniche_orderDetail.html

@@ -32,7 +32,14 @@
 		    padding-top: 76px;
 		    padding-bottom: 0px !important;
 		    background-color: #fff;
-		}
+		}
+        .qxBg{
+            border-top: 2px solid #999999;
+            background-color: #ececec;
+        }
+        .qxBgFont{
+            color: #686868;
+        }
     </style>
 </head>
 <body>
@@ -52,7 +59,7 @@
                     <!--greenFont为绿色字体 redFont为红色字体 -->
                     <span class="greenFont hide" id="status_success">已完成</span>
                     <span class="redFont hide" id="status_wait_pay">待付款</span>
-                    <span class="greenFont hide" id="status_cancelled">已取消</span>
+                    <span class="qxBgFont hide" id="status_cancelled">已取消</span>
 					
 					<!-- 当状态为已完成时显示开发票 或 查看发票 -->
 					<a  class="openinvoice go_pay" style="display: none;">开发票</a>
@@ -151,7 +158,7 @@
 						}
 						if(r.data.order_status==-2){
 							$("#status_cancelled").removeClass("hide");
-							$("#bg").addClass("greenBg").removeClass("redBg");
+							$("#bg").addClass("qxBg").removeClass("greenBg");
 						}
 						if(r.data.order_status==0){
 							$("#status_wait_pay").removeClass("hide");

src/web/templates/pc/myOrder.html

@@ -202,6 +202,7 @@
 			};
 			var pageFlag = true;
 			var p = null;
+            var activeDiscount = {{.T.activeDiscount}}
 			$(function() {
 				selcetIndexNav(6);
 				haslogin({{.T.logid}});
@@ -624,12 +625,9 @@
 								var priceHtml = '<div class="fl m_number '+orderStatusClassOne+'">¥' + FormatNum(orderMoney) + '</div>'
 								if(obj.product_type === "VIP订阅"){
 									if(isLiveActive){
-										var originPrice = (parseFloat(orderMoney) / 0.6).toFixed(2);
+										var originPrice = (parseFloat(orderMoney) / parseFloat(activeDiscount)).toFixed(2);
 										priceHtml = '<div style="line-height:106px;" class="fl m_number '+orderStatusClassOne+'"><p style="height:20px;text-decoration:line-through;color:#9B9CA3;">¥' + FormatNum(originPrice) + '</p><p>¥' + FormatNum(orderMoney) + '</p></div>';
 									}
-                                    if(isUsedActiveCode){
-                                        
-                                    }
 								}
 								temp += '<div class="order_list '+orderStatusClassOne+'">'
 										+'<div class="clearfix o_l_top '+orderStatusClassTwo+'">'

src/web/templates/pc/orderDetail.html

@@ -111,6 +111,13 @@
         border-top: 2px solid #ccc;
         margin-bottom: 20px;
         margin-top: 16px;
+    }
+    .qxBg{
+        border-top: 2px solid #999999;
+        background-color: #ececec;
+    }
+    .qxBgFont{
+        color: #686868;
     }
     </style>
     <script>
@@ -142,7 +149,7 @@
                 <!--greenFont为绿色字体 redFont为红色字体 -->
                 <span class="greenFont" id="status_success" style="display: none;">已完成</span>
                 <span class="redFont" id="status_wait_pay" style="display: none;">待付款</span>
-                <span class="greenFont" id="status_cancelled" style="display: none;">已取消</span>
+                <span class="qxBgFont" id="status_cancelled" style="display: none;">已取消</span>
                 
                 <!-- 当状态为已完成时显示开发票 或 查看发票 -->
 				<a class="go_pay payOrder" style="display: none;">去支付</a>
@@ -410,6 +417,7 @@
 			}
 		}else{
 			$("#status_cancelled").show();
+            $(".o_m_thead").removeClass("greenBg").addClass("qxBg")
 		}
 		
 		$(".payOrder").on("click", function(){

src/web/templates/pc/vip_orderDetail.html

@@ -32,7 +32,14 @@
 		    padding-top: 76px;
 		    padding-bottom: 0px !important;
 		    background-color: #fff;
-		}
+		}
+        .qxBg{
+            border-top: 2px solid #999999;
+            background-color: #ececec;
+        }
+        .qxBgFont{
+            color: #686868;
+        }
     </style>
 </head>
 <body>
@@ -52,7 +59,7 @@
                     <!--greenFont为绿色字体 redFont为红色字体 -->
                     <span class="greenFont hide" id="status_success">已完成</span>
                     <span class="redFont hide" id="status_wait_pay">待付款</span>
-                    <span class="greenFont hide" id="status_cancelled">已取消</span>
+                    <span class="qxBgFont hide" id="status_cancelled">已取消</span>
 					
 					<!-- 当状态为已完成时显示开发票 或 查看发票 -->
 					<a  class="openinvoice go_pay" style="display: none;">开发票</a>
@@ -131,12 +138,12 @@
 						if(!r.data.order.isUsedActiveCode){
 							$(".discount-container").hide();
 						}
-						if(!r.data.order.isLiveActive){
+						// if(!r.data.order.isLiveActive){
 							// $(".origin-price-container").hide();
-						}else{
+						// }else{
 							// var originPrice = (r.data.order.original_price/100 / 0.6).toFixed(2);
 							// $(".price-num").text(originPrice);
-						}
+						// }
 						if(r.data.order.order_status==1){
 							$("#status_success").removeClass("hide");
 							$(".pay_time_p").css("display","");
@@ -165,7 +172,7 @@
 						}
 						if(r.data.order.order_status==-2){
 							$("#status_cancelled").removeClass("hide");
-							$("#bg").addClass("greenBg").removeClass("redBg");
+							$("#bg").addClass("qxBg").removeClass("greenBg");
 						}
 						if(r.data.order.order_status==0){
 							$("#status_wait_pay").removeClass("hide");

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

@@ -1196,7 +1196,7 @@
                     listhtml += '</div></a>'
                     listhtml += '<div class="price">'
 					if(isLiveActive){
-                        var activeDiscount = {{Msg "seo" "activeDiscount"}};
+                        var activeDiscount = {{.T.activeDiscount}};
 						var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
 						listhtml += '<span class="origin-price-container">'
 						+ '<span>原价：￥</span>'
@@ -1235,7 +1235,7 @@
                     listhtml += '</div></a>'
                     listhtml += '<div class="price">'
                     if(isLiveActive){
-						var activeDiscount = {{Msg "seo" "activeDiscount"}};
+						var activeDiscount = {{.T.activeDiscount}};
 						var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
                       listhtml += '<span class="origin-price-container">'
                     	+ '<span>原价：￥</span>'

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

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

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

@@ -219,8 +219,8 @@ try{
 	    });
     }
     $(".orderCode").text(orderCode);
-    var liveActiveStartTime = {{Msg "seo" "liveActiveStartTime"}};
-    var liveActiveEndTime = {{Msg "seo" "liveActiveEndTime"}};
+    var liveActiveStartTime = {{.T.liveActiveStartTime}};
+    var liveActiveEndTime = {{.T.liveActiveEndTime}};
     $DoPost("/subscribepay/orderListDetails/getOrderPayAllMsg",{"orderCode":orderCode},function(r){
       $("body").css("visibility","");
       if(r.success){
@@ -247,7 +247,7 @@ try{
 		if(!r.data.order.isLiveActive){
 			$(".origin-price-container").hide();
 		}else{
-            var activeDiscount = {{Msg "seo" "activeDiscount"}};
+            var activeDiscount = {{.T.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

@@ -345,9 +345,9 @@
             }
         });
 		var live20200707 = {
-			startTime: {{Msg "seo" "liveActiveStartTime"}},
-			endTime: {{Msg "seo" "liveActiveEndTime"}},
-            activeDiscount: {{Msg "seo" "activeDiscount"}}
+			startTime: {{.T.liveActiveStartTime}},
+			endTime: {{.T.liveActiveEndTime}},
+		    activeDiscount: {{.T.activeDiscount}}
 		}
         //微信支付start
         {{if not .T.isTrial }}

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

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