p17代码提交

src/jfw/front/commonPayPc.go

@@ -2,11 +2,11 @@ package front
 
 import (
 	"fmt"
+	"github.com/go-xweb/xweb"
+	"jfw/config"
 	qutil "qfw/util"
 	"strings"
 	"time"
-
-	"github.com/go-xweb/xweb"
 )
 
 type JyOrder struct {
@@ -14,6 +14,7 @@ type JyOrder struct {
 	orderDetail xweb.Mapper `xweb:"/front/(.*)/jyOrderDetail/(.*)"` //订单详情
 	orderPay    xweb.Mapper `xweb:"/front/(\\w+)/orderPay/(.*)"`    //订单支付
 	paySuccess  xweb.Mapper `xweb:"/front/(\\w+)/paySuccess/(.*)"`  //支付完成页面
+	toMyOrder   xweb.Mapper `xweb:"/front/swordfish/toMyOrder"`    //我的订单
 }
 
 func init() {
@@ -54,3 +55,15 @@ func (this *JyOrder) PaySuccess(orderType, orderCode string) error {
 	this.T["orderCode"] = orderCode
 	return this.Render("/order/pc/paySuccess.html")
 }
+
+//我的订单
+func (this *JyOrder) ToMyOrder() error {
+	userId := qutil.ObjToString(this.GetSession("userId"))
+	if userId == "" {
+		return this.Redirect("/notin/page")
+	}
+	this.T["shareid"] = se.EncodeString("10")
+	this.T["logid"] = config.Seoconfig["dataexport"].(string)
+	this.Render("/pc/myOrder.html", &this.T)
+	return nil
+}

src/jfw/front/commonPayWx.go

@@ -2,8 +2,14 @@ package front
 
 import (
 	"errors"
+	"fmt"
 	"github.com/go-xweb/xweb"
+	"jfw/config"
+	"jfw/jyutil"
+	"jfw/public"
 	"jfw/wx"
+	"net/url"
+	"qfw/util"
 )
 
 /*
@@ -13,6 +19,7 @@ type WxPayCommon struct {
 	*xweb.Action
 	toCreateOrderPage xweb.Mapper `xweb:"/weixin/pay/checkout_(.*)"` //微信数据导出-支付页面
 	paySuccess        xweb.Mapper `xweb:"/weixin/(\\w+)/paySuccess"` //微信支付-支付完成
+	toMyWxOrder       xweb.Mapper `xweb:"/weixin/pay/toMyWxOrder"`   //微信我的订单
 }
 
 func init() {
@@ -41,3 +48,44 @@ func (w *WxPayCommon) PaySuccess(doType string) error {
 	w.T["doType"] = doType
 	return w.Render("/weixin/commonPay/paySuccess.html", &w.T)
 }
+
+func (w *WxPayCommon) ToMyWxOrder() error {
+	defer util.Catch()
+	if w.Session().Get("userId") == nil {
+		checkIsSubscribeFlag := true
+		if w.GetString("state") == "wx" {
+			//微信跳回来的
+			code := w.GetString("code")
+			if code != "" {
+				openid := jyutil.Getopenid(code)
+				if openid != "" {
+					isSubscribe := true
+					if !checkIsSubscribeFlag {
+						checkIsSubscribeFlag = true
+						isSubscribe = CheckUserIsSubscribe(openid)
+					}
+					if isSubscribe {
+						FindUserAndCreateSess(openid, w.Session())
+					}
+				}
+			}
+		} else {
+			if public.CheckWxBrowser(w.Request) {
+				//所有参数都不再使用,跳到微信验证用户
+				return w.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(w.Site()+w.Url()), "wx"), 302)
+			}
+		}
+		userid := util.ObjToString(w.GetSession("userId"))
+		if userid == "" {
+			return errors.New("未登录")
+		}
+	}
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	return w.Render("/weixin/commonPay/myOrder.html", &w.T)
+}

src/jfw/front/dataExport.go

@@ -24,8 +24,6 @@ type DataExport struct {
 	*xweb.Action
 	toSieve       xweb.Mapper `xweb:"/front/dataExport/toSieve"`             //数据导出-条件筛选
 	sieveData     xweb.Mapper `xweb:"/front/dataExport/sieveData"`           //筛选数据
-	toMyOrder     xweb.Mapper `xweb:"/front/dataExport/toMyOrder"`           //我的订单
-	queryOrder    xweb.Mapper `xweb:"/front/dataExport/queryOrder"`          //查询我的订单
 	toOrderDetail xweb.Mapper `xweb:"/front/dataExport/toOrderDetail/(.*)"`  //订单详情
 	getOrderCode  xweb.Mapper `xweb:"/front/dataExport/getOrderCode/(\\w+)"` //申请发票获取订单编号
 
@@ -173,122 +171,6 @@ func (d *DataExport) SieveData() error {
 	return nil
 }
 
-func (d *DataExport) ToMyOrder() error {
-	userId := util.ObjToString(d.GetSession("userId"))
-	if userId == "" {
-		return d.Redirect("/notin/page")
-	}
-	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
-}
-
-//
-func (d *DataExport) QueryOrder() error {
-	typ := d.GetString("type") //0-全部 1-待支付 2-已支付 3-已取消
-	query := map[string]interface{}{}
-	if userId := d.GetSession("userId"); userId != nil {
-		query["user_id"] = userId.(string)
-		log.Println("QueryOrder -- userId====================", userId)
-	} else {
-		log.Println("QueryOrder -- session userId does not exist")
-		return nil
-	}
-	if typ != "0" && typ != "" {
-		var status string
-		if typ == "1" {
-			status = orderStatus_unPaid
-		} else if typ == "2" {
-			status = orderStatus_paid
-		} else if typ == "3" {
-			status = orderStatus_cancel
-		}
-		query["order_status"] = status
-	} else {
-		query["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
-	}
-	//2.8.8  PC端 不显示vip订单
-	//query["product_type"] = "历史数据"
-	//	query["product_type"] = map[string]interface{}{"ne": "VIP订阅"}
-	// notin := []interface{}{"企业商机管理"}
-	// query["product_type"] = map[string]interface{}{"notin": notin}
-	//总数
-	countData := public.Mysql.Find(tableName_order, query, "", "", -1, 0)
-	count := len(*countData)
-	//当前页
-	pageNum, _ := d.GetInteger("pageNum")
-	//开始下标索引
-	var start = (pageNum - 1) * order_pageSize
-	//总页数
-	//totalPage := (count + int(order_pageSize) - 1) / int(order_pageSize)
-	list := public.Mysql.Find(tableName_order, query, "", "create_time desc", start, order_pageSize)
-	if list != nil {
-		for _, v := range *list {
-			filter_publishtime := v["filter_publishtime"]
-			if filter_publishtime != nil && filter_publishtime != "" {
-				timeArr := strings.Split(filter_publishtime.(string), "_")
-				if len(timeArr) == 2 {
-					start, err := strconv.ParseInt(timeArr[0], 10, 64)
-					end, erro := strconv.ParseInt(timeArr[1], 10, 64)
-					if err == nil && erro == nil {
-						v["filter_publishtime"] = util.FormatDateByInt64(&start, layout_date) + "-" + util.FormatDateByInt64(&end, layout_date)
-					}
-				}
-			}
-			orderMoney := v["order_money"]
-			if orderMoney != nil {
-				v["order_money"] = float64(orderMoney.(int64)) / 100
-			}
-			v["filter_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["filter_id"]))
-			if util.ObjToString(v["product_type"]) == "招投标课程" || util.ObjToString(v["product_type"]) == "线上课程" || util.ObjToString(v["product_type"]) == "VIP订阅" || util.ObjToString(v["product_type"]) == "企业商机管理" || util.ObjToString(v["product_type"]) == "数据报告" {
-				create_time_str := util.ObjToString(v["create_time"])
-				//创建时间戳
-				create_time, _ := time.ParseInLocation(util.Date_Full_Layout, create_time_str, time.Local)
-				var create_time_stamp int64 = 0
-				order_countdown := config.Seoconfig["orderCountdown"].(string) //配置文件读取
-				onehour, _ := time.ParseDuration(util.ObjToString(order_countdown))
-				create_time_stamp = create_time.Add(onehour).Unix()
-				//如果超过72小时 取消订单  创建72小时后的时间戳<当前时间戳
-				if create_time_stamp < time.Now().Unix() && util.IntAll(v["order_status"]) == 0 {
-					v["order_status"] = orderStatus_cancel
-					//需要把pc端获取订单和移动结合在一起。
-					var thsql = `UPDATE dataexport_order  SET order_status = -2 WHERE order_status = 0 AND order_code = '` + util.ObjToString(v["order_code"]) + `'`
-					i := public.Mysql.UpdateOrDeleteBySql(thsql)
-					if i < 1 {
-						log.Println(util.ObjToString(v["order_code"]), "订单状态处理失败")
-					}
-				}
-			}
-
-			//优惠码
-			product_type := util.ObjToString(v["product_type"])
-			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)
-				if create_time.Unix() >= liveActiveStartTime && create_time.Unix() < liveActiveEndTime {
-					v["isLiveActive"] = true
-				}
-				activeData := public.Mysql.FindOne("prefer_active", map[string]interface{}{"order_code": v["order_code"], "user_id": v["user_id"]}, "active_code", "")
-				if activeData != nil {
-					v["isUsedActiveCode"] = true
-				}
-			}
-		}
-	}
-	d.ServeJson(map[string]interface{}{
-		"list":     list,
-		"count":    count,
-		"pageSize": order_pageSize,
-	})
-	return nil
-}
-
 /**
 
 根据 id+openid 取消订单

src/jfw/front/wxMyOrder.go

@@ -21,10 +21,7 @@ type WxMyOrder struct {
 	setSuccess     xweb.Mapper `xweb:"/front/wxMyOrder/setSuccess"`            //查询订单
 	wxGetOrderCode xweb.Mapper `xweb:"/front/wxMyOrder/wxGetOrderCode/(\\w+)"` //申请发票获取订单编号
 	wxPaySuccess   xweb.Mapper `xweb:"/front/wxMyorder/wxPaySuccess/(\\w+)"`
-	//需要调用微信支付接口的页面
-	toMyWxOrder     xweb.Mapper `xweb:"/weixin/pay/toMyWxOrder"`     //微信我的订单
 
-	//
 	getValuationList xweb.Mapper `xweb:"/front/wxMyOrder/getValuationList/(\\w+)"` //计价清单
 	myset            xweb.Mapper `xweb:"/front/wxMyOrder/myset"`                   //设置页面
 
@@ -154,51 +151,6 @@ func (w *WxMyOrder) SetSuccess() {
 	w.Render("/weixin/email/bind_success.html", &w.T)
 }
 
-func (w *WxMyOrder) ToMyWxOrder() error {
-	defer util.Catch()
-	if w.Session().Get("userId") == nil {
-		checkIsSubscribeFlag := true
-		if w.GetString("state") == "wx" {
-			//微信跳回来的
-			code := w.GetString("code")
-			if code != "" {
-				openid := jyutil.Getopenid(code)
-				if openid != "" {
-					isSubscribe := true
-					if !checkIsSubscribeFlag {
-						checkIsSubscribeFlag = true
-						isSubscribe = CheckUserIsSubscribe(openid)
-					}
-					if isSubscribe {
-						FindUserAndCreateSess(openid, w.Session())
-					}
-				}
-			}
-		} else {
-			if public.CheckWxBrowser(w.Request) {
-				//所有参数都不再使用,跳到微信验证用户
-				return w.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(w.Site()+w.Url()), "wx"), 302)
-			}
-		}
-		userid := util.ObjToString(w.GetSession("userId"))
-		if userid == "" {
-			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)
-	mynickname, _ := w.Session().Get("s_nickname").(string)
-	myavatar, _ := w.Session().Get("s_avatar").(string)
-	w.T["nickname"] = mynickname
-	w.T["avatar"] = myavatar
-	return w.Render("/weixin/dataExport/dataExport_toMyOrder.html", &w.T)
-}
-
-
 func (w *WxMyOrder) WxGetOrderCode(order_code string) error {
 	myOpenid := ""
 	if openid := w.GetSession("s_m_openid"); openid != nil {

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

@@ -10,8 +10,8 @@ import (
 */
 type AppPayCommon struct {
 	*xweb.Action
-	toCreateOrderPage xweb.Mapper `xweb:"/jyapp/pay/checkout_(.*)"` //微信数据导出-支付页面
-	paySuccess        xweb.Mapper `xweb:"/jyapp/(\\w+)/paySuccess"` //微信支付-支付完成
+	toCreateOrderPage xweb.Mapper `xweb:"/jyapp/pay/checkout_(.*)"`       //微信数据导出-支付页面
+	paySuccess        xweb.Mapper `xweb:"/jyapp/(\\w+)/paySuccess"`       //微信支付-支付完成
 }
 
 func init() {

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

@@ -1,7 +1,6 @@
 package front
 
 import (
-	"encoding/json"
 	"jfw/public"
 	"log"
 	"qfw/util"
@@ -16,9 +15,6 @@ import (
 type MyOrder struct {
 	*xweb.Action
 	toMyOrder     xweb.Mapper `xweb:"/jyapp/front/myOrder/toMyOrder"`                  //我的订单
-	queryMyOrder  xweb.Mapper `xweb:"/jyapp/front/myOrder/queryMyOrder"`               //查询订单
-	myOrderPaging xweb.Mapper `xweb:"/jyapp/front/myOrder/queryMyOrder/myOrderPaging"` //查询订单--分页
-	toOrderDetail xweb.Mapper `xweb:"/jyapp/front/myOrder/toOrderDetail"`              //订单详情
 	getOrderCode  xweb.Mapper `xweb:"/jyapp/front/myOrder/getOrderCode/(\\w+)"`        //申请发票获取订单编号
 	paySuccess    xweb.Mapper `xweb:"/jyapp/front/myorder/paySuccess/(\\w+)"`          //支付成功发票
 	deleteOrder   xweb.Mapper `xweb:"/jyapp/front/myorder/deleteOrder"`                //删除订单
@@ -113,230 +109,7 @@ func (m *MyOrder) ToMyOrder() error {
 	if userId == nil || userId == "" {
 		return m.Redirect("/jyapp/free/login")
 	}
-	return m.Render("/dataExport/dataExport_toMyOrder.html")
-}
-
-func (m *MyOrder) QueryMyOrder() error {
-	//每页显示数
-	userId := m.Session().Get("userId")
-	log.Println(userId)
-	queryM := map[string]interface{}{}
-	if userId == nil || userId == "" {
-		return m.Redirect("/jyapp/free/login")
-	} else {
-		queryM["user_id"] = userId
-	}
-	// order_status  ： 0：待支付； 1：已完成；  -1：已删除； -2：已取消
-	typ := m.GetString("type")
-	if typ != "0" && typ != "" {
-		var status string
-		if typ == "1" {
-			status = orderStatus_unPaid
-		} else if typ == "2" {
-			status = orderStatus_paid
-		} else if typ == "3" {
-			status = orderStatus_cancel
-		}
-		queryM["order_status"] = status
-	} else {
-		queryM["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
-	}
-	//2.8.5 app暂时不显示 vip订单
-	queryM["product_type"] = map[string]interface{}{"ne": "VIP订阅"}
-	//总数
-	haveNextPage, res, _ := m.Datas(queryM, 1)
-	count := len(res)
-	if res != nil {
-		for _, v := range res {
-			filter_publishtime := v["filter_publishtime"]
-			if filter_publishtime != nil || filter_publishtime != "" {
-				timeArr := strings.Split(filter_publishtime.(string), "_")
-				if len(timeArr) == 2 {
-					start, err := strconv.ParseInt(timeArr[0], 10, 64)
-					end, erro := strconv.ParseInt(timeArr[1], 10, 64)
-					if err == nil && erro == nil {
-						v["filter_publishtime"] = util.FormatDateByInt64(&start, layout_date) + "-" + util.FormatDateByInt64(&end, layout_date)
-					}
-				}
-			}
-			orderMoney := v["order_money"]
-			if orderMoney != nil {
-				v["order_money"] = float64(orderMoney.(int64)) / 100
-			}
-			if v["id"] != nil && orderMoney != nil && v["order_code"] != nil {
-				v["token"] = public.GetWaitPayToken(v["id"].(int64), int(orderMoney.(int64)), v["order_code"].(string), v["pay_way"].(string), queryM["user_id"].(string))
-			}
-			if v["filter_id"] != nil {
-				v["filter_id"] = util.SE.Encode2Hex(v["filter_id"].(string))
-			}
-		}
-	}
-	m.ServeJson(map[string]interface{}{
-		"res":         res,
-		"count":       count,
-		"pageSize":    order_pageSize,
-		"hasNextPage": haveNextPage,
-	})
-	return nil
-}
-
-func (m *MyOrder) MyOrderPaging() error {
-	userId := m.Session().Get("userId")
-	queryM := map[string]interface{}{}
-	if userId == nil || userId == "" {
-		return m.Redirect("/jyapp/free/login")
-	} else {
-		queryM["user_id"] = userId
-	}
-	// 0全部 1未支付 2已支付
-	typ := m.GetString("type")
-	pageNum, _ := m.GetInteger("pageNum")
-	if typ != "0" && typ != "" {
-		var status string
-		if typ == "1" {
-			status = orderStatus_unPaid
-		} else if typ == "2" {
-			status = orderStatus_paid
-		} else if typ == "3" {
-			status = orderStatus_cancel
-		}
-		queryM["order_status"] = status
-	} else {
-		queryM["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
-	}
-	//2.8.5 app暂时不显示 vip订单
-	queryM["product_type"] = map[string]interface{}{"ne": "VIP订阅"}
-	haveNextPage, res, _ := m.Datas(queryM, pageNum)
-	if res != nil {
-		for _, v := range res {
-			filter_publishtime := v["filter_publishtime"]
-			if filter_publishtime != nil || filter_publishtime != "" {
-				timeArr := strings.Split(filter_publishtime.(string), "_")
-				if len(timeArr) == 2 {
-					start, err := strconv.ParseInt(timeArr[0], 10, 64)
-					end, erro := strconv.ParseInt(timeArr[1], 10, 64)
-					if err == nil && erro == nil {
-						v["filter_publishtime"] = util.FormatDateByInt64(&start, layout_date) + "-" + util.FormatDateByInt64(&end, layout_date)
-					}
-				}
-			}
-			orderMoney := v["order_money"]
-			if orderMoney != nil {
-				v["order_money"] = float64(orderMoney.(int64)) / 100
-			}
-			if v["id"] != nil && orderMoney != nil && v["order_code"] != nil {
-				v["token"] = public.GetWaitPayToken(v["id"].(int64), int(orderMoney.(int64)), v["order_code"].(string), v["pay_way"].(string), queryM["user_id"].(string))
-			}
-			if v["filter_id"] != nil {
-				v["filter_id"] = util.SE.Encode2Hex(v["filter_id"].(string))
-			}
-		}
-	}
-	m.ServeJson(map[string]interface{}{
-		"hasNextPage": haveNextPage,
-		"res":         res,
-	})
-	return nil
-}
-
-func (m *MyOrder) ToOrderDetail() error {
-	userId := m.Session().Get("userId")
-	if userId == nil || userId == "" {
-		return m.Redirect("/jyapp/free/login")
-	}
-	orderCode := m.GetString("orderCode")
-	orderDetail := map[string]interface{}{}
-	filter := public.SieveCondition{}
-	queryMap := map[string]interface{}{
-		"order_code": orderCode,
-		"user_id":    userId,
-	}
-	if orderCode != "" {
-		orderDetail = *public.Mysql.FindOne(tableName_order, queryMap, "", "")
-	}
-	orderDetail["order_code"] = orderCode
-	if orderDetail["pay_money"] != nil {
-		orderDetail["pay_money"] = float64(orderDetail["pay_money"].(int64)) / 100
-	}
-	if orderDetail["order_money"] != nil {
-		orderDetail["order_money"] = float64(orderDetail["order_money"].(int64)) / 100
-	}
-	if orderDetail["pay_time"] != nil {
-		pay_time := strings.Replace(orderDetail["pay_time"].(string), "-", ".", -1)
-		orderDetail["pay_time"] = pay_time
-	}
-	if orderDetail["create_time"] != nil {
-		create_time := strings.Replace(orderDetail["create_time"].(string), "-", ".", -1)
-		orderDetail["create_time"] = create_time
-	}
-	if orderDetail["filter"] != nil {
-		err := json.Unmarshal([]byte(orderDetail["filter"].(string)), &filter)
-		if err == nil {
-			publishtime := filter.PublishTime
-			if publishtime != "" {
-				timeArr := strings.Split(publishtime, "_")
-				if len(timeArr) == 2 {
-					start, err := strconv.ParseInt(timeArr[0], 10, 64)
-					end, erro := strconv.ParseInt(timeArr[1], 10, 64)
-					//可能出现只选择一个时间
-					if err == nil && erro == nil {
-						filter.PublishTime = util.FormatDateByInt64(&start, layout_date) + "-" + util.FormatDateByInt64(&end, layout_date)
-					} else if err != nil && erro == nil {
-						filter.PublishTime = "-" + util.FormatDateByInt64(&end, layout_date)
-					} else if err == nil && erro != nil {
-						filter.PublishTime = util.FormatDateByInt64(&start, layout_date) + "-"
-					}
-				}
-			}
-			filter.MinPrice = public.GetPriceDes_SieveCondition(filter.MinPrice, filter.MaxPrice)
-			orderDetail["filter"] = filter
-		} else {
-			log.Println("筛选条件-关键词-结构体反序列化-错误", err)
-		}
-	}
-	if orderDetail["applybill_type"] != nil && orderDetail["applybill_type"].(int64) == 0 {
-		orderDetail["applybill_type"] = "个人"
-	} else if orderDetail["applybill_type"] != nil && orderDetail["applybill_type"].(int64) == 1 {
-		orderDetail["applybill_type"] = "单位"
-	} else {
-		orderDetail["applybill_type"] = "-"
-	}
-	if orderDetail["applybill_status"] != nil && orderDetail["applybill_status"].(int64) == 1 {
-		orderDetail["applybill_status"] = "T" //已申请
-	} else {
-		orderDetail["applybill_status"] = "F" //未申请
-	}
-	//加密
-	if orderDetail["filter_id"] != nil {
-		orderDetail["filter_id"] = util.SE.Encode2Hex(orderDetail["filter_id"].(string))
-	}
-	orderStatus := util.IntAll((orderDetail)["order_status"])
-	orderDetail["order_status"] = orderStatus
-	log.Println((orderDetail)["order_status"], "---", orderStatus, "---", orderDetail["order_status"])
-	if orderStatus == 1 {
-		orderDetail["transaction_id"] = func() string {
-			table := ""
-			// 0微信支付 1支付宝支付
-			if util.ObjToString(orderDetail["pay_way"]) == "wx_pc" || util.ObjToString(orderDetail["pay_way"]) == "wx_js" || util.ObjToString(orderDetail["pay_way"]) == "wx_app" {
-				table = "weixin_pay"
-				orderDetail["pay_way"] = "wx"
-			} else if util.ObjToString(orderDetail["pay_way"]) == "ali_pc" || util.ObjToString(orderDetail["pay_way"]) == "ali_app" {
-				orderDetail["pay_way"] = "ali"
-				table = "ali_pay"
-			} else {
-				return ""
-			}
-			wxPayMap := map[string]interface{}{}
-			wxPayMap["out_trade_no"] = orderDetail["out_trade_no"]
-			wxpay := public.Mysql.FindOne(table, wxPayMap, "", "")
-			return util.ObjToString((*wxpay)["transaction_id"])
-		}()
-	}
-	m.T["o"] = orderDetail
-	log.Println(orderDetail)
-	error := m.Render("/dataExport/dataExport_toOrderDetail.html", &m.T)
-	log.Println(error)
-	return nil
+	return m.Render("/me/myOrder.html")
 }
 
 func (m *MyOrder) MyEmail() {

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

@@ -32,7 +32,6 @@ type Subscribepay struct {
 	toChangeArea     xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChangeArea"`     //修改区域
 	toChangeIndustry xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChangeIndustry"` //修改行业
 	toChangeTime     xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChangeTime"`     //修改时间
-	toSelectPayWay   xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSelectPayWay"`   //支付方式选择
 	toSetPushSetPage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetPushSetPage"` //订阅收费推送设置
 	//续费
 	renewPage xweb.Mapper `xweb:"/jyapp/vipsubscribe/renewPage/(.*)"` //订阅到期(will：即将到期，exprie：已到期)
@@ -89,11 +88,6 @@ func (s *Subscribepay) ToChangeTime() {
 	s.Render("/vipsubscribe/change_time.html")
 }
 
-//支付方式选择
-func (s *Subscribepay) ToSelectPayWay() {
-	s.Render("/vipsubscribe/payway_select.html")
-}
-
 //vip订阅介绍页
 func (s *Subscribepay) Introduce() error {
 	userId := util.ObjToString(s.GetSession("userId"))

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

@@ -1,5 +1,4 @@
 $(function () {
-	var isUsedActiveCode = false;
     //项目匹配开关
     var checkedflag = true;
     //其他采购单位开关
@@ -666,9 +665,6 @@ $(function () {
         } else {
             $(".vip-header .trail").show();
         }
-		if (state.isUsedActiveCode){
-			isUsedActiveCode = true;
-		}
     }
 
 
@@ -808,7 +804,6 @@ $(function () {
         $DoPost('/subscribepay/vipsubscribe/saveChange', {
             "area": reqData.area["全国"] ? '{}' : JSON.stringify(reqData.area),
             "industry": reqData.industry.join(","),
-            "payWay": "wx_app",
             "time": selectTime,
             "price": parseInt((submitPrice).toFixed(0)),
 			"activeCode": activeCodes
@@ -816,7 +811,6 @@ $(function () {
             if (r.success) {
                 if (r.data.needPay) {
                     //创建支付订单
-                    //window.location.replace("/jyapp/vipsubscribe/toSelectPayWay?orderCode=" + r.data.code + "&price=" + submitPrice);
                     clearSessionStorage()
                     history.replaceState({}, '', '/jyapp/vipsubscribe/toOrderDetailPage?orderCode='+r.data.code);
                     window.location.href="/jyapp/pay/checkout_vip?orderCode="+r.data.code
@@ -902,13 +896,6 @@ $(function () {
 			    })
 				return
 			}
-			if (isUsedActiveCode){
-				weui.toast('每个用户仅可使用一次', {
-					className: 'j-toast',
-					duration: 1500
-				})
-				return
-			}
             if (value.length === couponInfo.code.length && value.toLowerCase() === couponInfo.code) {
                 $('.coupon-code-tx .keywords-text').text(couponInfo.successTip)
 				sessionStorage.liveActiveCode_new = "jianyu360"

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

@@ -31,10 +31,6 @@ $(function () {
       }
       //价格
       $(".price").text("￥ " + r.data.order.original_price / 100);
-      //优惠码
-      if (r.data.order.isUsedActiveCode) {
-        $(".discount-container").removeClass("hide");
-      }
       if (!r.data.order.isLiveActive) {
         $(".origin-price-container").hide();
       } else {
@@ -447,42 +443,6 @@ $(function () {
       $('.pay_way').hide(200)
     });
 
-    /* 选择支付方式*/
-    $('input:radio[name="way"]').click(function () {
-      var checkValue = $('input:radio[name="way"]:checked').val();
-      if (checkValue == "微信支付") {
-        localStorage.setItem($(".order_code_vip").text(), "wx");
-        $("#wx").prop("checked", true);
-        $("#zfb").prop("checked", false);
-        pay_way = "wx_app";
-      } else {
-        localStorage.setItem($(".order_code_vip").text(), "ali");
-        $("#wx").prop("checked", false);
-        $("#zfb").prop("checked", true);
-        pay_way = "ali_app";
-      }
-    });
-
-    //确认支付
-    $("#pay").on("click", function () {
-      $(".loading_").show();
-      //vip支付；
-      if (!canpay) return
-      canpay = false;
-      $.post("/subscribepay/vipsubscribe/orderToPay", { "orderCode": orderCode, "pay_way": pay_way }, function (r) {
-        if (r.success) {
-          if (pay_way == "wx_app") {
-            JyObj.wxPay(r.data.res);
-          } else {
-            JyObj.aliPay(r.data.res);
-          }
-          $('.pay_way').hide(200)
-          canpay = true;
-          checkPaySuccess_vip(orderCode);
-        }
-      })
-    })
-
   })
 
   function formatEffectiveDate(strat, end) {
@@ -520,25 +480,6 @@ $(function () {
     });
   }
 
-  var interval_vip
-  //支付完成跳转 VIP订单
-  function checkPaySuccess_vip(order_vipcode) {
-    if (interval_vip) {
-      clearInterval(interval_vip)
-    }
-    $(".loading_").show();
-    interval_vip = setInterval(function () {
-      $.post("/jypay/isPaySuccess", { code: order_vipcode }, function (r) {
-        if (r.success) {
-          clearInterval(interval_vip);
-          $(".loading_").hide();
-          window.location.href = "/jyapp/vipsubscribe/toPaySuccessPage?orderCode=" + order_vipcode;
-        }
-      })
-    }, 3000)
-    $(".loading_").hide();
-  }
-
   function PrefixInteger(num, n) {
     return (Array(n).join(0) + num).slice(-n);
   }

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

@@ -1,4 +1,3 @@
-var isUsedActiveCode = false;
 var purchase = {
 	areaSelect: {
 		"一个省": ["一个市"]
@@ -37,10 +36,6 @@ var purchase = {
 						sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
 						sessionStorage.setItem("endTime", JSON.stringify(purchase.endTime))
 						sessionStorage.setItem("vipSub_read", true);
-						if (r.data.isUsedActiveCode){
-							isUsedActiveCode = true;
-							sessionStorage.setItem("isUsedActiveCode", true);
-						}
 					}
 				}, false)
 			} else {
@@ -58,9 +53,6 @@ var purchase = {
 			if (sessionStorage.getItem("vipSubSelectTime")) {
 				this.timeSelect = JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
 			}
-			if (sessionStorage.getItem("isUsedActiveCode")){
-				isUsedActiveCode = true;
-			}
 			if (sessionStorage.liveActiveCode_renew === "jianyu360"){
 				$('.coupon-code-tx .keywords-text').text("支付成功赠送30天订阅周期");
 				$('.coupon-picker .weui-input').val("jianyu360");
@@ -460,7 +452,6 @@ $(function() {
 			"area": JSON.stringify(area),
 			"industry": industry.join(","),
 			"time": purchase.timeValue.trim(),
-			"payWay": purchase.payWay,
 			"orderType": 5,
 		};
 		$DoPost("/subscribepay/vipsubscribe/createOrder", param, function(r) {
@@ -517,105 +508,3 @@ function pickerShow(selector, f) {
 		$(selector).hide(300);
 	}
 }
-
-//app支付 公共方法
-//查询是否支付完成
-/*
-var interval;
-
-function checkpay(orderid) {
-	if (interval) {
-		clearInterval(interval);
-	}
-	interval = setInterval(function() {
-		$.post("/jypay/isPaySuccess", {
-			code: orderid
-		}, function(r) {
-			if (r.success) {
-				clearSessionStorage();
-				window.location.replace("/jyapp/vipsubscribe/toPaySuccessPage?orderCode=" + orderid);
-			}
-		});
-		if (canpay && mySysIsIos()) {
-			clearInterval(interval);
-		}
-	}, 2000)
-}
-
-function payCallBack(status) {
-	switch (status) {
-		case "0": //支付取消
-			clearInterval(interval);
-			break;
-		case "1": //支付完成
-
-			break;
-		case "-1": //支付失败
-			clearInterval(interval);
-			break;
-	}
-}
-
-function showToast(content) {
-	weui.toast(content, {
-		duration: 2000,
-		className: 'custom-toast',
-	});
-}
-
-function toRead() {
-	sessionStorage.setItem("pay_read_cache", "0");
-	window.location.href = "/jyapp/front/staticPage/wx-serviceterms.html";
-}
-
-// 活动事件绑定
-var couponInfo = {
-	code: 'jianyu360',
-	successTip: '支付成功赠送30天订阅周期'
-}
-$('.weui-mask').on('click', function() {
-	pickerShow('.billing-list-container', false)
-	$('.coupon-picker').hide()
-})
-$('.j-picker').on('click', '.cancel', function() {
-	$('.coupon-picker').hide()
-})
-$('.coupon-code-tx').on('click', function() {
-	// 活动期间，则显示优惠码
-	if ($('.vip-renew').hasClass('live-20200707')) {
-		$('.coupon-picker').show()
-	} else {
-		return
-	}
-	var input = $('.coupon-picker .weui-input')
-	var confirmButton = $('.coupon-picker .weui-picker__btn')
-	var cancelButton = $('.coupon-picker .cancel')
-	var value = input.val()
-	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) {
-			weui.toast('优惠码输入错误', {
-				className: 'j-toast',
-				duration: 1500
-			})
-			return
-		}
-		if (isUsedActiveCode){
-			weui.toast('每个用户仅可使用一次', {
-				className: 'j-toast',
-				duration: 1500
-			})
-			return
-		}
-		if (value.length === couponInfo.code.length && value.toLowerCase() === couponInfo.code) {
-			$('.coupon-code-tx .keywords-text').text(couponInfo.successTip)
-			sessionStorage.liveActiveCode_renew = "jianyu360"
-			$('.coupon-code-tx').off('click')
-			cancelButton.trigger('click')
-		}
-	})
-})*/

src/jfw/modules/app/src/web/templates/course/optionPay.html

@@ -249,64 +249,7 @@
 						}
         				var param = {
         				}
-						if (prodoct_type=="历史数据"){
-                            param.id = filter_id
-                            param.pay_way = payWay
-                            param.data_spec = data_spec == "标准字段包" ? "standard" : "senior";
-                            $.ajax({
-                                type: 'post',
-                                url: "/jypay/dataExport/app/createOrder",
-                                data: param,
-                                async: false,
-                                dataType: 'json',
-                                success: function(r){
-                                    console.log("rr",r)
-                                    if(r.success){
-                                        try {
-                                            if (payWay === "wx_app") {
-                                                JyObj.wxPay(r.data);
-                                            } else if(payWay === "ali_app") {
-                                                JyObj.aliPay(r.data)
-                                            }
-                                            //校验是否支付完成
-                                            checkpay(orderCode,prodoct_type);
-                                        } catch (e) {
-                                            alert(e)
-                                        }
-                                    }
-                                    $(".Determine").removeAttr("disabled");
-                                }
-                            })
-
-                        }else if (prodoct_type == "VIP订阅"){
-                            param.orderCode = orderCode
-                            param.pay_way = payWay
-                            $.ajax({
-                                type: 'post',
-                                url: "/subscribepay/vipsubscribe/orderToPay",
-                                data: param,
-                                async: false,
-                                dataType: 'json',
-                                success: function(r){
-                                    console.log("rr",r)
-                                    if(r.success){
-                                        try {
-                                            if (payWay === "wx_app") {
-                                                JyObj.wxPay(r.data.res);
-                                            } else if(payWay === "ali_app") {
-                                                JyObj.aliPay(r.data.res)
-                                            }
-                                            //校验是否支付完成
-                                            checkpay(orderCode,prodoct_type);
-                                        } catch (e) {
-                                            alert(e)
-                                        }
-                                    }
-                                    $(".Determine").removeAttr("disabled");
-                                }
-                            })
-
-                        }else if (prodoct_type == "企业商机管理"){
+                        if (prodoct_type == "企业商机管理"){
                             param.ordercode = orderCode
                             param.payway = payWay
                             $.ajax({

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

@@ -838,55 +838,24 @@
             param.sourcePage = "weixin"
             //先去创建预支付订单
             /*-----------------*/
-            $.post("/jypay/dataExport/app/createOrder", param, function (data) {
-                if (data.success) {
+            $.post("/jypay/dataExport/mobile/createOrder", param, function (data) {
+                if (data.status === "y") {
+                    //清除我已阅读缓存
+                    sessionStorage.removeItem("readClause");
+                    sessionStorage.removeItem("index");
+                    sessionStorage.removeItem("pay_way");
+                    sessionStorage.removeItem("EmailVerity_" +{{.T._id}});
+                    sessionStorage.removeItem("ischecked");
+
                     localStorage.setItem("new_email_" + userId, $(".email_input").val().replace(/\s*/g, ""));
-                    history.replaceState({}, '', '/jyapp/front/myOrder/toOrderDetail?orderCode='+data.order);
-                    window.location.href="/jyapp/pay/checkout_vip?orderCode="+data.order
+                    history.replaceState({}, '', '/jyapp/front/myOrder/toOrderDetail?orderCode='+data.code);
+                    window.location.href="/jyapp/pay/checkout_vip?orderCode="+data.code
                     $(".loading_").hide();
-                    /*try {
-                        if (pay_way == "wx_app") {
-                            localStorage.setItem({{.T._id}}, "wx");
-                            JyObj.wxPay(data.data);
-                        } else {
-                            localStorage.setItem({{.T._id}}, "ali");
-                            JyObj.aliPay(data.data);
-                        }
-                        checkPaySuccess(data.order);
-                    } catch (e) {
-                        alert(e);
-                    }*/
                 }else {
                     canpay = true;
                 }
             })
         })
-        var interval
-
-        //支付完成跳转
-        function checkPaySuccess(orderCode) {
-            if (interval) {
-                clearInterval(interval);
-            }
-            interval = setInterval(function () {
-                $.post("/jypay/isPaySuccess", {
-                    code: orderCode
-                }, function (r) {
-                    if (r.success) {
-                        //清除我已阅读缓存
-                        sessionStorage.removeItem("readClause");
-                        sessionStorage.removeItem("index");
-                        sessionStorage.removeItem("pay_way");
-                        sessionStorage.removeItem("EmailVerity_" +{{.T._id}});
-                        sessionStorage.removeItem("ischecked");
-                        clearInterval(interval);
-                        setTimeout(function () {
-                            window.location.replace("/jyapp/front/dataExport/paySuccessPage?code=" + r.orderCode + "&email=" + r.email + "&payTime=" + r.payTime + "&pay_way=" + r.pay_way);
-                        }, 500)
-                    }
-                })
-            }, 1000)
-        }
     })
 
     //倒计时

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

@@ -889,29 +889,7 @@
 					let isvip_order=$(".media").attr("isviporder");
 					var order_code_vip=$(".order_code_vip").html();
 					var order_code_ent=$(".order_code_ent").html();
-					//vip支付；
-					if (order_code_vip!=""){
-						var orderCode =order_code_vip;
-					//	if(!canpay)return
-		  		    //  canpay=false;
-			            $.post("/subscribepay/vipsubscribe/orderToPay",{"orderCode":orderCode,"pay_way":pay_way},function(r){
-			            	if(r.success){
-			            		  if(pay_way=="wx_app"){
-					                	JyObj.wxPay(r.data.res);
-										$(".loading_").hide();
-					                }else{
-					                	JyObj.aliPay(r.data.res);
-										$(".loading_").hide();
-					                }
-					                $('.pay_way').hide(200)
-					                checkPaySuccess_vip(orderCode);
-			            	}/*else{
-			            		canpay=true;
-			            	}*/
-							$(".loading_").hide();
-	            		})
-						$(".loading_").hide();
-					}else if (order_code_ent!=""){
+					 if (order_code_ent!=""){
 							//企业商机管理 pay
 							var orderCode =order_code_ent;
 				            $.post("/jypay/entniche/pay",{"ordercode":orderCode,"payway":pay_way},function(r){
@@ -929,32 +907,6 @@
 								}
 		            		})
 							$(".loading_").hide();
-					}else{ //移动端数据导出支付；
-						//canpay = false;
-						var param = {};
-						var dataType=$(".param_dataType").text();
-						param.pay_way = pay_way;
-						param.data_spec = dataType == "2" ? "senior" : "standard";
-						param.id = $(".param_id").text();
-						param.sourcePage = "weixin"
-						//先去创建预支付订单
-						$.post("/jypay/dataExport/app/createOrder", param, function(data) {
-							if (data.success){
-								try {
-					                if(pay_way=="wx_app"){
-					                	JyObj.wxPay(data.data);
-					                }else{
-					                  JyObj.aliPay(data.data);
-					                }
-					                $('.pay_way').hide(200);
-					                checkPaySuccess(data.order);
-								} catch (e) {
-									alert(e);
-								}
-							}
-				            $(".loading_").hide();
-				            //canpay = true;
-						})
 					}
 				})
 
@@ -1159,7 +1111,7 @@
 					        loadDownFn : function(me){
 								$.ajax({
 									type: 'post',
-									url: '/subscribepay/orderListDetails/myOrderPaging',
+									url: '/subscribepay/orderListDetails/myOrder',
 									data: {"pageNum": pageIndex,"fromPage":"app","type":typ},
 									dataType: 'json',
 									success: function(data){
@@ -1318,14 +1270,10 @@
 						var listhtml='';
 						for(var index in object){
 					   		var obj=object[index];
-							var isUsedActiveCode = false;
 							var isLiveActive = false;
 							if(obj.isLiveActive){
 								isLiveActive = true;
 							}
-							if(obj.isUsedActiveCode){
-							    isUsedActiveCode = true;
-							}
               if(typ==1 || $(".tab-link.active").index() === 1){	//待付款订单列表页
 								if(obj.order_status==-2){
 									continue;
@@ -1836,9 +1784,6 @@
                                 }
                                 if(filter_vip.cycleunit==0&&filter_vip.cyclecount==0){
                                 	effectiveduration_vip="不延期";
-                                }
-                                if(isUsedActiveCode){
-                                    effectiveduration_vip = effectiveduration_vip+ '<span class="discount-container"><span> + </span><span class="highlight-text">赠送30天</span></span>'
                                 }
 		                        //vip状态 0不是vip 1试用 2正式
 		                        if (orderStatus_vip!="已完成"){

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

@@ -96,25 +96,6 @@
 		.pay_way .box .box_bd .weui-check:checked + .weui-icon-checked:before {
 		    color: #2cb7ca;
 		}
-		.zfje{
-			font-size: .32rem;
-		}
-		.money_pay{
-		    font-size: .50rem;
-		    text-align: center;
-		    height: 1rem;
-		    line-height: 1rem;
-		}
-		.surePay{
-			font-size: .40rem;
-		    text-align: center;
-		    height: 1rem;
-		    line-height: 1rem;
-		    background-color: #2CB7CA;
-		    color: #fff;
-		    margin-top: 0.94rem;
-		}
-
 					/*加载中*/
 		body .loading_ {
 		    height: 100%;
@@ -231,17 +212,6 @@
 		            $(".publishTime").text(publishtime);
 
 		            var regionHtml = "";
-//		            if (region && region.length>0){
-//		                for (var i=0;i<region.length;i++){
-//		                    regionHtml += "<div style=\"display:inline-block\">" + region[i] + "&nbsp</div>";
-//		                }
-//		            }else if(area && area.length>0){
-//		                for (var i=0;i<area.length;i++){
-//		                    regionHtml += "<div>" + area[i] + "&nbsp</div>";
-//		                }
-//		            }else {
-//		                regionHtml += "<li>全国</li>";
-//		            }
 		            if (region && region.length>0){
 		                for (var i=0;i<region.length;i++){
 		                	var region_i=region[i]
@@ -413,72 +383,6 @@
 					}
 				}
 
-				//离开按钮
-				$(".cancel").click(function() {
-					$('.pay_way').hide(200)
-				})
-
-				/* 选择支付方式*/
-				$('input:radio[name="way"]').click(function() {
-					var checkValue = $('input:radio[name="way"]:checked').val();
-		        	if(checkValue=="微信支付"){
-		        		localStorage.setItem($(".param_id").text(),"wx");
-		            	pay_way="wx_app";
-		        	}else{
-		        		localStorage.setItem($(".param_id").text(),"ali");
-		        		pay_way="ali_app";
-		        	}
-				});
-
-				//确认支付
-				$(".surePay").on("click", function() {
-					$(".loading_").show();
-					canpay = false;
-					var param = {};
-					var dataType=$(".param_dataType").text();
-					param.pay_way = pay_way;
-					param.data_spec = dataType == "高级字段包" ? "senior" : "standard";
-					param.id = $(".param_id").text();
-					param.sourcePage = "weixin"
-					//先去创建预支付订单
-					$.post("/jypay/dataExport/app/createOrder", param, function(data) {
-						if (data.success){
-							try {
-				                if(pay_way=="wx_app"){
-				                  JyObj.wxPay(data.data)
-				                }else{
-				                  JyObj.aliPay(data.data)
-				                }
-				                $('.pay_way').hide(200);
-				                checkPaySuccess(data.order);
-							} catch (e) {
-								alert(e)
-							}
-						}
-			            $(".loading_").hide();
-			            canpay = true;
-					})
-				})
-
-		        var interval
-		        //支付完成跳转
-		        function checkPaySuccess(orderCode){
-		        	if(interval){
-		            	clearInterval(interval);
-	        		}
-		        	interval=setInterval(function() {
-		            	$.post("/jypay/isPaySuccess", {
-									code: orderCode
-								}, function(r) {
-									if (r.success) {
-										//存缓存
-										sessionStorage.setItem("payoffId",{{.T.o.order_code}})
-										window.location.replace("/jyapp/front/dataExport/paySuccessPage?code=" + r.orderCode+"&email="+r.email+"&payTime="+r.payTime+"&pay_way="+r.pay_way);
-										clearInterval(interval);
-									}
-								})
-		         	},3000)
-		        }
 			});
 
 			function FormatNum(n){
@@ -674,50 +578,6 @@
 			</div>
 
 		</div>
-
-	<!-- 选择支付方式  -->
-	<div class="js_dialog pay_way" id="pay_way" style="display:none ;">
-		<div class="weui-mask"></div>
-		<div class="box">
-			<div class="box_hd">
-				<span  class="zfje">支付金额</span>
-				<div></div>
-				<span class="cancel">取消</span>
-			</div>
-			<div class="money_pay">
-
-			</div>
-			<div class="box_bd">
-				<div class="weui-cells weui-cells_checkbox choose-form">
-					<label class="weui-cell weui-check__label wx_label" for="wx">
-						<div class="weui-cell__bd read">
-							<p><img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/images/weixin.png?v=51430">微信支付</p>
-						</div>
-						<div class="weui-cell__hd">
-							<input type="radio" class="weui-check" name="way" value="微信支付" id="wx" checked />
-							<i class="weui-icon-checked"></i>
-						</div>
-					</label>
-					<label class="weui-cell weui-check__label zfb_label" for="zfb">
-						<div class="weui-cell__bd read">
-							<p><img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/images/zhifubao.png?v=51430">支付宝支付</p>
-						</div>
-						<div class="weui-cell__hd">
-							<input type="radio" class="weui-check" name="way" value="支付宝支付" id="zfb" />
-							<i class="weui-icon-checked"></i>
-						</div>
-					</label>
-				</div>
-				<div style="display: none;" class="param_dataType"></div>
-				<div style="display: none;" class="param_id"></div>
-				<div style="display: none;" class="this"></div>
-			</div>
-			<!--确认支付 -->
-			<div class="surePay">
-				确认支付
-			</div>
-		</div>
-	</div>
 	<script>
 		$(".icon-fanhui").on("click",function () {
 			history.go(-1)
@@ -826,7 +686,7 @@
 		}
 		//选择
 		function choosePayWay(order_code){
-			window.location.href = "/jyapp/pay/checkout_dataexport?orderCode="+order_code
+			window.location.replace("/jyapp/pay/checkout_dataexport?orderCode="+order_code)
 		}
 
 		//再次购买

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

@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>升级</title>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/rem.js"></script>
-    <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.css"/>
-    <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/payway_select.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css"/>
-    <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-</head>
-
-<body>
-<div class="app-layout-header jy-app-header">
-    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-    升级
-<span></span></div>
-<div class="app-layout-content-b">
-    <div class="vip-check-out">
-        <div class="ck-body">
-            <div class="price">￥366.50</div>
-            <div class="weui-cells weui-cells_checkbox pay-mode">
-                <label class="weui-cell weui-check__label wx_label" for="wx">
-                    <div class="weui-cell__bd">
-                        <i class="icon-wx"></i>
-                        <p>微信支付</p>
-                    </div>
-                    <div class="weui-cell__hd">
-                        <input type="radio" class="weui-check" name="way" value="wx_app" id="wx" checked>
-                        <i class="weui-icon-checked"></i>
-                    </div>
-                </label>
-                <label class="weui-cell weui-check__label zfb_label" for="zfb">
-                    <div class="weui-cell__bd">
-                        <i class="icon-zfb"></i>
-                        <p>支付宝支付</p>
-                    </div>
-                    <div class="weui-cell__hd">
-                        <input type="radio" class="weui-check" name="way" value="ali_app" id="zfb">
-                        <i class="weui-icon-checked"></i>
-                    </div>
-                </label>
-            </div>
-        </div>
-        <div class="ck-footer">
-            <div class="button-group">
-                <!-- <button class="button-l reset">取消</button> -->
-                <button class="button-r confirm">确认支付</button>
-            </div>
-        </div>
-    </div>
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-    <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>
-        $(function () {
-            var ordercode = getParam("orderCode");
-            var showPrice = getParam("price");
-            if (!ordercode || !showPrice) {
-                $(".confirm").attr("disabled", "disabled");
-                showToast('参数异常')
-            }
-            $(".price").text("￥" + formatMoney(showPrice / 100));
-
-            $('.ck-footer .confirm').on('click', function () {
-                var payway = $('input:radio[name="way"]:checked').val();
-                $.post("/subscribepay/vipsubscribe/orderToPay", {
-                    orderCode: ordercode,
-                    payway: payway
-                }, function (r) {
-                    if (r.success) {
-                        if (payway === "wx_app") {
-                            JyObj.wxPay(r.data.res)
-                        } else {
-                            JyObj.aliPay(r.data.res)
-                        }
-                        checkpay(ordercode)
-                    } else {
-                        showToast(r.errMsg)
-                    }
-                })
-            });
-
-            var interval;
-
-            function checkpay(orderid) {
-                if (interval) {
-                    clearInterval(interval);
-                }
-                interval = setInterval(function () {
-                    $.post("/jypay/isPaySuccess", {code: orderid}, function (r) {
-                        if (r.success) {
-                            clearSessionStorage();
-                            window.location.replace("/jyapp/vipsubscribe/toPaySuccessPage?orderCode=" + orderid);
-                        }
-                    });
-                    if (canpay && mySysIsIos()) {
-                        clearInterval(interval);
-                    }
-                }, 2000)
-            }
-
-            function payCallBack(status) {
-                switch (status) {
-                    case "0"://支付取消
-                        clearInterval(interval);
-                        break;
-                    case "1"://支付完成
-
-                        break;
-                    case "-1"://支付失败
-                        clearInterval(interval);
-                        break;
-                }
-            }
-
-            function showToast(content) {
-                weui.toast(content, {
-                    duration: 1500,
-                    className: 'jy-toast',
-                });
-            }
-
-            function clearSessionStorage() {
-                sessionStorage.removeItem("vipSubSelectArea");
-                sessionStorage.removeItem("vipSubSelectIndustry");
-                sessionStorage.removeItem("vipSubSelectTime");
-                sessionStorage.removeItem("vipSub_read");
-                sessionStorage.removeItem("historypushDataCache");
-                sessionStorage.removeItem("endTime");
-                sessionStorage.removeItem("payWay");
-                sessionStorage.To_introducePage = 2;
-                //订阅首页
-                sessionStorage.removeItem("sub_vip_state");
-                sessionStorage.removeItem("vip_index_read");
-                sessionStorage.removeItem("vip_change_time");
-
-                sessionStorage.removeItem("index_read_cache");
-                sessionStorage.removeItem("liveActiveCode_new");
-            }
-            sessionStorage.setItem('index_read_cache','-1');
-        })
-    </script>
-</div>
-{{include "/common/baiducc.html"}}
-</body>
-
-</html>

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

@@ -362,7 +362,6 @@
             sessionStorage.setItem("vipSubisTrial", "1");//试用界面
             //试用用户
             {{end}}
-			var isUsedActiveCode = false;
             var purchase = {
                 areaSelect: {"一个省": ["一个市"]},//已选择地区 {"一个省":["一个市"]}计算价格临时变量
                 industrySelect: ["一个行业"],// 已选择行业 一个行业(计算价格临时变量)
@@ -387,9 +386,6 @@
                                 $(".choose_way").text("支付宝支付");
                             }
                         }
-						if (sessionStorage.getItem("isUsedActiveCode")){
-							isUsedActiveCode = true;
-						}
 						if (sessionStorage.liveActiveCode_purchase === "jianyu360"){
 							$('.coupon-code-tx .info').text("支付成功赠送30天订阅周期");
 							$('.coupon-picker .weui-input').val("jianyu360");
@@ -413,10 +409,6 @@
                                     }
                                     sessionStorage.setItem("vipSubSelectArea", JSON.stringify(purchase.areaSelect));
                                     sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
-									if (r.data.isUsedActiveCode){
-										isUsedActiveCode = true;
-										sessionStorage.setItem("isUsedActiveCode",true);
-									}
 								}
                             }, false)
                         }
@@ -788,7 +780,6 @@
                         "area": JSON.stringify(area),
                         "industry": industry.join(","),
                         "time": $(".info:eq(2)").val().trim(),
-                        "payWay": purchase.payWay,
                         "orderType":{{.T.orderType}},
 						"activeCode": activeCodes
                     };
@@ -907,46 +898,6 @@
                 }
                 return items;
             };
-
-            // 活动事件绑定
-            /*var couponInfo = {
-                code: 'jianyu360',
-                successTip: '支付成功赠送30天订阅周期'
-            }
-            $('.coupon-code-tx').on('click', function () {
-                $('.coupon-picker').show()
-                var input = $('.coupon-picker .weui-input')
-                var confirmButton = $('.coupon-picker .weui-picker__btn')
-                var cancelButton = $('.coupon-picker .cancel')
-                var value = input.val()
-                input.focus().on('input', function () {
-                    value = this.value
-                    confirmButton.prop('disabled', (value === '' || value === undefined))
-                })
-
-                confirmButton.on('click', function () {
-					if (value.toLowerCase() !== couponInfo.code) {
-					    weui.toast('优惠码输入错误', {
-					        className: 'j-toast',
-					        duration: 1500
-					    })
-						return
-					}
-					if (isUsedActiveCode){
-						weui.toast('每个用户仅可使用一次', {
-							className: 'j-toast',
-							duration: 1500
-						})
-						return
-					}
-                    if (value.length === couponInfo.code.length && value.toLowerCase() === couponInfo.code) {
-                        $('.coupon-code-tx .info').text(couponInfo.successTip)
-						sessionStorage.liveActiveCode_purchase = "jianyu360"
-						$('.coupon-code-tx').off('click')
-						cancelButton.trigger('click')
-                    }
-                })
-            })*/
         </script>
     </div>
 </div>

src/jfw/modules/subscribepay/src/a/init.go

@@ -36,8 +36,7 @@ func init() {
 	xweb.AddRouter("/subscribepay", &service.IndexSearch{}) //续费&升级
 
 	//数据导出
-	xweb.AddRouter("/jypay", &service.DataExportPayMobile{})
-	xweb.AddRouter("/jypay", &service.DataExportPayPC{})
+	xweb.AddRouter("/jypay", &service.DataExportPay{})
 	xweb.AddRouter("/jypay", &service.RewardPayAction{})
 	//数据报告
 	xweb.AddRouter("/jypay", &service.DataReport{})

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

@@ -46,13 +46,9 @@ type config struct {
 		Pwd  string
 		User string
 	}
-	ExpireRemind        []int
-	WxTplExpire         string
-	OrderCountdown      interface{}
-	LiveOrderCountdown  interface{}
-	LiveActiveStartTime int64
-	LiveActiveEndTime   int64
-	ActiveDiscount      float64
+	ExpireRemind   []int
+	WxTplExpire    string
+	OrderCountdown interface{}
 }
 type timeTaskConfig struct {
 	ExpireRemind   string //到期提醒

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

@@ -2,7 +2,6 @@ package entity
 
 //vip订阅公共方法
 import (
-	. "config"
 	"encoding/json"
 	"errors"
 	"log"
@@ -158,13 +157,7 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 			redis.Del("other", "p1_indexMessage_"+userid)
 		}()
 		//支付提醒
-		liveStart := Config.LiveActiveStartTime
-		liveEnd := Config.LiveActiveEndTime
-		if now.Unix() >= liveStart && now.Unix() < liveEnd {
-			util.ActiveMsgRemind.PaySuccess(qutil.IntAll((*orderdata)["id"]), qutil.ObjToString((*orderdata)["order_code"]), qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["prepay_time"]), qutil.IntAllDef((*orderdata)["vip_type"], -1))
-		} else {
-			util.MsgRemind.PaySuccess(qutil.IntAll((*orderdata)["id"]), qutil.ObjToString((*orderdata)["order_code"]), qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["prepay_time"]), qutil.IntAllDef((*orderdata)["vip_type"], -1))
-		}
+		util.MsgRemind.PaySuccess(qutil.IntAll((*orderdata)["id"]), qutil.ObjToString((*orderdata)["order_code"]), qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["prepay_time"]), qutil.IntAllDef((*orderdata)["vip_type"], -1))
 		//其他未支付vip订阅订单 变为已取消
 		go PayCancel(userid, "VIP订阅", "")
 	}
@@ -691,7 +684,6 @@ func PayCancel(userId, product_type, entname string) bool {
 				})
 				if bl {
 					util.MsgRemind.Delete(qutil.IntAll(v["id"]))
-					util.ActiveMsgRemind.Delete(qutil.IntAll(v["id"]))
 					i++
 				}
 			}

src/jfw/modules/subscribepay/src/mailtemplate.html

@@ -35,7 +35,7 @@
         <div class="right">
             <a href="https://www.jianyu360.com">剑鱼首页</a>
             <span style="color: #fff;margin: 0 12px;">|</span>
-            <a href="https://www.jianyu360.com/front/dataExport/toMyOrder">我的订单</a>
+            <a href="https://www.jianyu360.com/front/swordfish/toMyOrder">我的订单</a>
         </div>
     </div>
     <div class="middle">

src/jfw/modules/subscribepay/src/service/dataExportPay_pc.go → src/jfw/modules/subscribepay/src/service/dataExportPay.go

@@ -17,23 +17,155 @@ import (
 	qutil "qfw/util"
 )
 
-type DataExportPayPC struct {
+type DataExportPay struct {
 	*xweb.Action
+	getPrice    xweb.Mapper `xweb:"/dataexport/getPrice"`           //获取数据导出价格
+	createOrder xweb.Mapper `xweb:"/dataExport/mobile/createOrder"` //移动端创建订单
+
 	waitPayMsg          xweb.Mapper `xweb:"/dataExport/sacnPay/waitPayMsg"`  //pc端创建订单获取二维码 前后端分离
 	sacnPay_CreateOrder xweb.Mapper `xweb:"/dataExport/sacnPay/createOrder"` //pc端生成数据导出订单
 	getOrderPayMsg      xweb.Mapper `xweb:"/dataexport/getOrderPayMsg"`      //我的订单页面获取支付二维码
-	getPrice            xweb.Mapper `xweb:"/dataexport/getPrice"`            //我的订单页面获取支付二维码
 }
 
 var reg *regexp.Regexp //匹配特殊字符
 
 func init() {
-	xweb.AddAction(&DataExportPayPC{})
 	reg, _ = regexp.Compile("[^A-Za-z0-9\u4e00-\u9fa5]")
 }
 
+//移动端创建订单
+func (p *DataExportPay) CreateOrder() {
+	defer qutil.Catch()
+	openId, _ := p.GetSession("s_m_openid").(string)
+	userId, _ := p.GetSession("userId").(string)
+	id := qutil.SE.Decode4Hex(p.GetString("id"))
+	if userId == "" || id == "" {
+		log.Println("userId,id,pay_way错误", userId, id)
+		p.ServeJson(map[string]interface{}{
+			"status": "n",
+		})
+		return
+	}
+	//
+	data_spec := p.GetString("data_spec")
+	if data_spec == "standard" {
+		data_spec = "标准字段包"
+	} else if data_spec == "senior" {
+		data_spec = "高级字段包"
+	}
+	user_mail_status := qutil.ObjToString(p.GetSession("DataExportVerifyEmail_val")) != ""
+
+	user_mail, _ := p.GetSession("DataExportVerifyEmail_val").(string)
+	user_phone, _ := p.GetSession("DataExportVerifyPhone").(string)
+	if user_phone != "" {
+		p.SetSession("DataExportVerifyPhone_val", user_phone) //提交后下次默认带出手机号
+	} else {
+		user_phone, _ = p.GetSession("DataExportVerifyPhone_val").(string)
+	}
+
+	data_count := entity.GetDataExportSearchCountUseId(id)
+	if data_count > entity.ExConf.MsgMaxCount {
+		data_count = entity.ExConf.MsgMaxCount
+	}
+	order_money_, original_price_ := float64(0), float64(0)
+	if data_spec == "标准字段包" {
+		original_price_ = float64(data_count) * entity.ExConf.UnitPrice_normal
+	} else if data_spec == "高级字段包" {
+		original_price_ = float64(data_count) * entity.ExConf.UnitPrice_senior
+	}
+	order_money_ = float64(original_price_) * entity.ExConf.Discount
+	if order_money_ < entity.ExConf.OrderMinPrice {
+		order_money_ = entity.ExConf.OrderMinPrice
+	}
+	if original_price_ < entity.ExConf.OrderMinPrice {
+		original_price_ = entity.ExConf.OrderMinPrice
+	}
+	order_money := int(order_money_ * 100)
+	original_price := int(original_price_ * 100)
+	//order_money = 1
+	//original_price = 1
+	filter_keys, filter_publishtime, filter := "", "", ""
+
+	isPass := func() bool {
+		if user_mail == "" || user_phone == "" || !user_mail_status || data_spec == "" || order_money <= 0 || data_count <= 0 || original_price <= 0 {
+			log.Println("参数不合法！ user_mail,user_phone, user_mail_status, data_spec, order_money, data_count, original_price", user_mail, user_phone, user_mail_status, data_spec, order_money, data_count, original_price)
+			return false
+		}
+		userfilter, ok := util.MQFW.FindById("export_search", id, nil)
+		if ok && userfilter != nil {
+			keywords, _ := (*userfilter)["keywords"].([]interface{})
+			var buffer bytes.Buffer
+			for _, v := range keywords {
+				vm, _ := v.(map[string]interface{})
+				if buffer.Len() > 0 {
+					buffer.WriteString(",")
+				}
+				buffer.WriteString(qutil.ObjToString(vm["keyword"]))
+			}
+			filter_keys = buffer.String()
+			filter_publishtime = qutil.ObjToString((*userfilter)["publishtime"])
+			filterByte, _ := json.Marshal(userfilter)
+			filter = string(filterByte)
+		} else {
+			log.Println("id is not find in mongodb", userId, id)
+			return false
+		}
+		return true
+	}()
+	nickname, _ := p.GetSession("s_nickname").(string)
+	result := map[string]interface{}{
+		"status": "n",
+	}
+	if isPass {
+		now := time.Now()
+		ordercode := pay.GetOrderCode(openId)
+		orderid := util.Mysql.Insert("dataexport_order", map[string]interface{}{
+			"order_money":        order_money,
+			"order_status":       0,
+			"service_status":     0,
+			"user_nickname":      nickname,
+			"user_openid":        openId,
+			"filter":             filter,
+			"order_code":         ordercode,
+			"product_type":       "历史数据",
+			"create_time":        qutil.FormatDate(&now, qutil.Date_Full_Layout),
+			"prepay_time":        qutil.FormatDate(&now, qutil.Date_Full_Layout),
+			"original_price":     original_price,
+			"data_spec":          data_spec,
+			"user_mail":          user_mail,
+			"user_phone":         user_phone,
+			"data_count":         data_count,
+			"filter_publishtime": filter_publishtime,
+			"filter_keys":        filter_keys,
+			"filter_id":          id,
+			"user_id":            userId, //20190719 移动端数据导出 生订单添加用户id
+		})
+		if orderid > 0 {
+			p.SetSession("DataExportVerifyPhone_val", user_phone)
+			result["status"] = "y"
+			result["code"] = ordercode
+			//保存结构化数据信息 记录
+			go func() {
+				if p.GetSession("Structed") != nil && p.GetSession("Structed").(bool) {
+					//姓名  手机号  邮箱
+					nickname, _ := p.GetSession("s_nickname").(string)
+					user_mail, _ := p.GetSession("DataExportVerifyEmail_val").(string)
+					user_phone, _ := p.GetSession("DataExportVerifyPhone").(string)
+					if user_phone == "" {
+						user_phone, _ = p.GetSession("DataExportVerifyPhone_val").(string)
+					}
+					util.StructedDataByExportData(nickname, user_mail, user_phone)
+					//清除存储标识
+					p.DelSession("Structed")
+				}
+			}()
+		}
+	}
+	p.ServeJson(result)
+}
+
 //获取价格
-func (p *DataExportPayPC) GetPrice() {
+func (p *DataExportPay) GetPrice() {
 	//获取数量
 	p.ServeJson(map[string]interface{}{
 		"unitPrice_normal": entity.ExConf.UnitPrice_normal,
@@ -45,7 +177,7 @@ func (p *DataExportPayPC) GetPrice() {
 }
 
 //pc端创建订单获取二维码 前后端分离
-func (p *DataExportPayPC) WaitPayMsg() {
+func (p *DataExportPay) WaitPayMsg() {
 	defer qutil.Catch()
 	openid, _ := p.GetSession("s_m_openid").(string)
 	userId, _ := p.GetSession("userId").(string)
@@ -129,7 +261,7 @@ func (p *DataExportPayPC) WaitPayMsg() {
 }
 
 //pc端生成数据导出订单
-func (p *DataExportPayPC) SacnPay_CreateOrder() {
+func (p *DataExportPay) SacnPay_CreateOrder() {
 	defer qutil.Catch()
 	openId, _ := p.GetSession("s_m_openid").(string)
 	userId, _ := p.GetSession("userId").(string)
@@ -385,7 +517,7 @@ func (p *DataExportPayPC) SacnPay_CreateOrder() {
 	p.ServeJson(result)
 }
 
-func (p *DataExportPayPC) GetOrderPayMsg() {
+func (p *DataExportPay) GetOrderPayMsg() {
 	openid := qutil.ObjToString(p.GetSession("s_m_openid"))
 	userId := qutil.ObjToString(p.GetSession("userId"))
 	code := p.GetString("orderCode")

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

@@ -1,636 +0,0 @@
-package service
-
-import (
-	"bytes"
-	"encoding/json"
-	"entity"
-	"fmt"
-
-	"pay"
-
-	"log"
-	qutil "qfw/util"
-	"time"
-	"util"
-
-	"github.com/go-xweb/xweb"
-)
-
-var local, _ = time.LoadLocation("Local")
-
-type DataExportPayMobile struct {
-	*xweb.Action
-	createOrder           xweb.Mapper `xweb:"/dataExport/app/createOrder"`    //创建订单——支付
-	wxSacnPay_CreateOrder xweb.Mapper `xweb:"/dataExport/weixin/createOrder"` //微信端-创建订单
-	getPayParm            xweb.Mapper `xweb:"/dataExport/weixin/getPayParm"`  //微信数据导出-获取微信支付参数
-}
-
-func (p *DataExportPayMobile) CreateOrder() {
-	defer qutil.Catch()
-	userId, _ := p.GetSession("userId").(string)
-	openId, _ := p.GetSession("s_m_openid").(string)
-	pay_way := p.GetString("pay_way")
-
-	payStr, ordercode, errMsg, ok := func() (string, string, string, bool) {
-		id := qutil.SE.Decode4Hex(p.GetString("id"))
-		if userId == "" || id == "" || !(pay_way == "wx_app" || pay_way == "ali_app") {
-			return "", "", fmt.Sprintf("请求出错 id：%s,pay_way：%s \n", id, pay_way), false
-		}
-		data_spec := p.GetString("data_spec")
-		if data_spec == "standard" {
-			data_spec = "标准字段包"
-		} else if data_spec == "senior" {
-			data_spec = "高级字段包"
-		}
-		user_mail_status := qutil.ObjToString(p.GetSession("DataExportVerifyEmail_val")) != ""
-		user_mail, _ := p.GetSession("DataExportVerifyEmail_val").(string)
-		user_phone, _ := p.GetSession("DataExportVerifyPhone").(string)
-		if user_phone != "" {
-			p.SetSession("DataExportVerifyPhone_val", user_phone) //提交后下次默认带出手机号
-		} else {
-			user_phone, _ = p.GetSession("DataExportVerifyPhone_val").(string)
-		}
-
-		oldOrder := util.Mysql.FindOne("dataexport_order", map[string]interface{}{
-			"user_id":   userId,
-			"filter_id": id,
-		}, "id,order_status,order_code,order_money,user_mail,user_phone,data_spec,prepay_time,prepay_id,pay_way,code_url,user_openid", "")
-
-		//非新订单
-		if oldOrder != nil {
-			if user_mail != "" && user_mail != qutil.ObjToString((*oldOrder)["user_mail"]) {
-				util.Mysql.Update("dataexport_order", map[string]interface{}{
-					"user_id":   userId,
-					"filter_id": id,
-				}, map[string]interface{}{
-					"user_mail": user_mail,
-				})
-			}
-			if user_phone != "" && user_phone != qutil.ObjToString((*oldOrder)["user_phone"]) {
-				util.Mysql.Update("dataexport_order", map[string]interface{}{
-					"user_id":   userId,
-					"filter_id": id,
-				}, map[string]interface{}{
-					"user_phone": user_phone,
-				})
-			}
-			if qutil.IntAll((*oldOrder)["order_status"]) != 0 {
-				return "", "", fmt.Sprintf("该订单已存在，订单状态不允许支付！"), false
-			}
-			//订单未超时两小时内 订单未改变
-			local, _ := time.LoadLocation("Local")
-			prepayTime, _ := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*oldOrder)["prepay_time"]), local)
-			now := time.Now()
-			if data_spec != "" && data_spec == qutil.ObjToString((*oldOrder)["data_spec"]) && qutil.ObjToString((*oldOrder)["pay_way"]) == pay_way && now.Before(prepayTime.Add(time.Hour*2)) {
-				log.Println("支付取数据库")
-				return qutil.ObjToString((*oldOrder)["code_url"]), qutil.ObjToString((*oldOrder)["order_code"]), "", true
-			} else {
-				//价格变动需重新生预支付订单 更新原来得库的信息
-				data_count := entity.GetDataExportSearchCountUseId(id)
-				if data_count > entity.ExConf.MsgMaxCount {
-					data_count = entity.ExConf.MsgMaxCount
-				}
-				order_money_, original_price_ := float64(0), float64(0)
-				if data_spec == "标准字段包" {
-					original_price_ = float64(data_count) * entity.ExConf.UnitPrice_normal
-				} else if data_spec == "高级字段包" {
-					original_price_ = float64(data_count) * entity.ExConf.UnitPrice_senior
-				}
-				order_money_ = float64(original_price_) * entity.ExConf.Discount
-				if order_money_ < entity.ExConf.OrderMinPrice {
-					order_money_ = entity.ExConf.OrderMinPrice
-				}
-				if original_price_ < entity.ExConf.OrderMinPrice {
-					original_price_ = entity.ExConf.OrderMinPrice
-				}
-				order_money := int(order_money_ * 100)
-				original_price := int(original_price_ * 100)
-				payStr, tradeno, prepayid := "", "", ""
-				if pay_way == "wx_app" {
-					var ret *map[string]string
-					tradeno, ret = pay.WxStruct.CreatePrepayOrder("C", p.IP(), "", "", order_money)
-					if ret == nil || (*ret)["status"] != "1" {
-						return "", "", fmt.Sprintf("%s生成订单出错", pay_way), false
-					}
-					prepayid = qutil.ObjToString((*ret)["prepayid"])
-					payStr = pay.WxStruct.GetAppWxPayStr(prepayid)
-					if payStr == "" {
-						return "", "", fmt.Sprintf("%s生成签名出错出错", pay_way), false
-					}
-				} else if pay_way == "ali_app" {
-					var err error
-					payStr, tradeno, err = pay.Alipay.GetOrderPayParam((qutil.Float64All(order_money)), pay.ALI_DATAEXPORT_APP)
-					if err != nil {
-						return "", "", fmt.Sprintf("支付宝订单生成出错%v"), false
-					}
-				}
-
-				//更新数据库
-				if util.Mysql.Update("dataexport_order", map[string]interface{}{
-					"user_id":   userId,
-					"filter_id": id,
-				}, map[string]interface{}{
-					"data_spec":      data_spec,
-					"order_money":    order_money,
-					"original_price": original_price,
-					"prepay_time":    qutil.FormatDate(&now, qutil.Date_Full_Layout),
-					"pay_way":        pay_way,
-					"prepay_id":      prepayid,
-					"code_url":       payStr,
-					"out_trade_no":   tradeno,
-				}) {
-					//(*oldOrder)["order_money"] = order_money
-					return payStr, qutil.ObjToString((*oldOrder)["order_code"]), "", true
-				} else {
-					return "", "", fmt.Sprintf("更新数据库状态出错"), false
-				}
-			}
-		}
-
-		data_count := entity.GetDataExportSearchCountUseId(id)
-		if data_count > entity.ExConf.MsgMaxCount {
-			data_count = entity.ExConf.MsgMaxCount
-		}
-		order_money_, original_price_ := float64(0), float64(0)
-		if data_spec == "标准字段包" {
-			original_price_ = float64(data_count) * entity.ExConf.UnitPrice_normal
-		} else if data_spec == "高级字段包" {
-			original_price_ = float64(data_count) * entity.ExConf.UnitPrice_senior
-		}
-		order_money_ = float64(original_price_) * entity.ExConf.Discount
-		if order_money_ < entity.ExConf.OrderMinPrice {
-			order_money_ = entity.ExConf.OrderMinPrice
-		}
-		if original_price_ < entity.ExConf.OrderMinPrice {
-			original_price_ = entity.ExConf.OrderMinPrice
-		}
-		order_money := int(order_money_ * 100)
-		original_price := int(original_price_ * 100)
-
-		filter_keys, filter_publishtime, filter := "", "", ""
-
-		isPass := func() bool {
-			if user_mail == "" || user_phone == "" || !user_mail_status || data_spec == "" || order_money <= 0 || data_count <= 0 || original_price <= 0 {
-				log.Println("参数不合法！ pay_way, user_mail,user_phone, user_mail_status, data_spec, order_money, data_count, original_price", pay_way, user_mail, user_phone, user_mail_status, data_spec, order_money, data_count, original_price)
-				return false
-			}
-			userfilter, ok := util.MQFW.FindById("export_search", id, nil)
-			if ok && userfilter != nil {
-				keywords, _ := (*userfilter)["keywords"].([]interface{})
-				var buffer bytes.Buffer
-				for _, v := range keywords {
-					vm, _ := v.(map[string]interface{})
-					if buffer.Len() > 0 {
-						buffer.WriteString(",")
-					}
-					buffer.WriteString(qutil.ObjToString(vm["keyword"]))
-				}
-				filter_keys = buffer.String()
-				filter_publishtime = qutil.ObjToString((*userfilter)["publishtime"])
-				filterByte, _ := json.Marshal(userfilter)
-				filter = string(filterByte)
-			} else {
-				log.Println("id is not find in mongodb", userId, id)
-				return false
-			}
-			return true
-		}()
-
-		if !isPass {
-			return "", "", "创建新订单参数异常", false
-		}
-
-		prepayid, payStr, tradeno := "", "", ""
-		if pay_way == "wx_app" {
-			var ret *map[string]string
-			tradeno, ret = pay.WxStruct.CreatePrepayOrder("C", p.IP(), "", "", order_money)
-			if ret == nil || (*ret)["status"] != "1" {
-				return "", "", fmt.Sprintf("%s创建订单出错", pay_way), false
-			}
-			prepayid = qutil.ObjToString((*ret)["prepayid"])
-			payStr = pay.WxStruct.GetAppWxPayStr(qutil.ObjToString((*ret)["prepayid"]))
-			if payStr == "" {
-				return "", "", fmt.Sprintf("%s创建订单生成签名出错", pay_way), false
-			}
-		} else if pay_way == "ali_app" {
-			var err error
-			payStr, tradeno, err = pay.Alipay.GetOrderPayParam((qutil.Float64All(order_money)), pay.ALI_DATAEXPORT_APP)
-			if err != nil {
-				return "", "", fmt.Sprintf("支付宝订单生成出错%v"), false
-			}
-		}
-		nickname, _ := p.GetSession("s_nickname").(string)
-		now := time.Now()
-		code := pay.GetOrderCode(userId)
-		orderid := util.Mysql.Insert("dataexport_order", map[string]interface{}{
-			"order_money":        order_money,
-			"order_status":       0,
-			"service_status":     0,
-			"user_nickname":      nickname,
-			"filter":             filter,
-			"prepay_id":          prepayid,
-			"code_url":           payStr,
-			"out_trade_no":       tradeno,
-			"order_code":         code,
-			"product_type":       "历史数据",
-			"create_time":        qutil.FormatDate(&now, qutil.Date_Full_Layout),
-			"prepay_time":        qutil.FormatDate(&now, qutil.Date_Full_Layout),
-			"original_price":     original_price,
-			"data_spec":          data_spec,
-			"user_mail":          user_mail,
-			"user_phone":         user_phone,
-			"data_count":         data_count,
-			"filter_publishtime": filter_publishtime,
-			"filter_keys":        filter_keys,
-			"filter_id":          id,
-			"pay_way":            pay_way,
-			"user_id":            userId, //20190719 移动端数据导出 生订单添加用户id
-			"user_openid":        openId,
-		})
-		if orderid == 0 {
-			return "", "", fmt.Sprintf("数据插入出错"), false
-		} else {
-			//保存结构化数据信息 记录
-			go func() {
-				if p.GetSession("Structed") != nil && p.GetSession("Structed").(bool) {
-					//姓名  手机号  邮箱
-					nickname, _ := p.GetSession("s_nickname").(string)
-					user_mail, _ := p.GetSession("DataExportVerifyEmail_val").(string)
-					user_phone, _ := p.GetSession("DataExportVerifyPhone").(string)
-					if user_phone == "" {
-						user_phone, _ = p.GetSession("DataExportVerifyPhone_val").(string)
-					}
-					util.StructedDataByExportData(nickname, user_mail, user_phone)
-					//清除存储标识
-					p.DelSession("Structed")
-				}
-			}()
-		}
-		return payStr, code, "", true
-	}()
-	if errMsg != "" {
-		log.Println(userId, errMsg)
-	}
-	p.ServeJson(map[string]interface{}{
-		"success": ok,
-		"data":    payStr,
-		"order":   ordercode,
-	})
-}
-
-//微信端创建订单
-func (p *DataExportPayMobile) WxSacnPay_CreateOrder() {
-	defer qutil.Catch()
-	openId, _ := p.GetSession("s_m_openid").(string)
-	userId, _ := p.GetSession("userId").(string)
-	pay_way := p.GetString("pay_way")
-	id := qutil.SE.Decode4Hex(p.GetString("id"))
-	if userId == "" || id == "" || pay_way != "wx_js" {
-		log.Println("userId,id,pay_way错误", userId, id, pay_way)
-		p.ServeJson(map[string]interface{}{
-			"status": "n",
-		})
-		return
-	}
-	//
-	data_spec := p.GetString("data_spec")
-	if data_spec == "standard" {
-		data_spec = "标准字段包"
-	} else if data_spec == "senior" {
-		data_spec = "高级字段包"
-	}
-	user_mail_status := qutil.ObjToString(p.GetSession("DataExportVerifyEmail_val")) != ""
-
-	user_mail, _ := p.GetSession("DataExportVerifyEmail_val").(string)
-	user_phone, _ := p.GetSession("DataExportVerifyPhone").(string)
-	if user_phone != "" {
-		p.SetSession("DataExportVerifyPhone_val", user_phone) //提交后下次默认带出手机号
-	} else {
-		user_phone, _ = p.GetSession("DataExportVerifyPhone_val").(string)
-	}
-	//先看有没有创建过预支付订单
-	oldOrder := util.Mysql.FindOne("dataexport_order", map[string]interface{}{
-		"user_id":   userId,
-		"filter_id": id,
-	}, "id,order_status,order_code,order_money,user_mail,user_phone,data_spec,prepay_time,prepay_id,pay_way,out_trade_no", "")
-	if oldOrder != nil {
-		if user_mail != "" && user_mail != qutil.ObjToString((*oldOrder)["user_mail"]) {
-			util.Mysql.Update("dataexport_order", map[string]interface{}{
-				"user_id":   userId,
-				"filter_id": id,
-			}, map[string]interface{}{
-				"user_mail": user_mail,
-			})
-		}
-		if user_phone != "" && user_phone != qutil.ObjToString((*oldOrder)["user_phone"]) {
-			util.Mysql.Update("dataexport_order", map[string]interface{}{
-				"user_id":   userId,
-				"filter_id": id,
-			}, map[string]interface{}{
-				"user_phone": user_phone,
-			})
-		}
-		//如果已支付,则返回
-		if qutil.IntAll((*oldOrder)["order_status"]) != 0 {
-			log.Println("该订单已存在，订单状态不允许支付！", openId)
-			p.ServeJson(map[string]interface{}{
-				"status": "n",
-			})
-			return
-		}
-		var res map[string]interface{}
-		if data_spec != "" && data_spec == qutil.ObjToString((*oldOrder)["data_spec"]) && qutil.ObjToString((*oldOrder)["pay_way"]) == "wx_js" {
-			//订单未改变
-			nonceStr := qutil.GetRandom(16) + qutil.GetLetterRandom(16)
-			timestamp := time.Now().Unix()
-			sign := qutil.WxSign(fmt.Sprintf("appId=%s&nonceStr=%s&package=%s&signType=%s&timeStamp=%d&key=%s", pay.WxStruct.Appid, nonceStr, "prepay_id="+qutil.ObjToString((*oldOrder)["prepay_id"]), "MD5", timestamp, pay.WxStruct.Key))
-			res = map[string]interface{}{
-				"appId":     pay.WxStruct.Appid,
-				"timestamp": fmt.Sprint(timestamp),
-				"signType":  "MD5",
-				"sign":      sign,
-				"nonceStr":  nonceStr,
-				"prepayId":  "prepay_id=" + qutil.ObjToString((*oldOrder)["prepay_id"]),
-			}
-		} else {
-			//在此关闭之前的订单
-			if !pay.CloseDataExportOrder(qutil.ObjToString((*oldOrder)["pay_way"]), qutil.ObjToString((*oldOrder)["out_trade_no"]), qutil.ObjToString((*oldOrder)["prepay_time"])) {
-				p.ServeJson(map[string]interface{}{
-					"status": "n",
-				})
-				return
-			}
-			//价格变动需重新生预支付订单 更新原来得库的信息
-			data_count := entity.GetDataExportSearchCountUseId(id)
-			if data_count > entity.ExConf.MsgMaxCount {
-				data_count = entity.ExConf.MsgMaxCount
-			}
-			order_money_, original_price_ := float64(0), float64(0)
-			if data_spec == "标准字段包" {
-				original_price_ = float64(data_count) * entity.ExConf.UnitPrice_normal
-			} else if data_spec == "高级字段包" {
-				original_price_ = float64(data_count) * entity.ExConf.UnitPrice_senior
-			}
-			order_money_ = float64(original_price_) * entity.ExConf.Discount
-			if order_money_ < entity.ExConf.OrderMinPrice {
-				order_money_ = entity.ExConf.OrderMinPrice
-			}
-			if original_price_ < entity.ExConf.OrderMinPrice {
-				original_price_ = entity.ExConf.OrderMinPrice
-			}
-			order_money := int(order_money_ * 100)
-			original_price := int(original_price_ * 100)
-			now := time.Now()
-			tradeno, ret := pay.WxStruct.CreatePrepayOrder("c", p.IP(), openId, "", order_money)
-			nonceStr := qutil.GetRandom(16) + qutil.GetLetterRandom(16)
-			timestamp := time.Now().Unix()
-			sign := qutil.WxSign(fmt.Sprintf("appId=%s&nonceStr=%s&package=%s&signType=%s&timeStamp=%d&key=%s", pay.WxStruct.Appid, nonceStr, "prepay_id="+qutil.ObjToString((*ret)["prepayid"]), "MD5", timestamp, pay.WxStruct.Key))
-			res = map[string]interface{}{
-				"appId":     pay.WxStruct.Appid,
-				"timestamp": fmt.Sprint(timestamp),
-				"signType":  "MD5",
-				"sign":      sign,
-				"nonceStr":  nonceStr,
-				"prepayId":  "prepay_id=" + qutil.ObjToString((*ret)["prepayid"]),
-			}
-			util.Mysql.Update("dataexport_order", map[string]interface{}{
-				"user_id":   userId,
-				"filter_id": id,
-			}, map[string]interface{}{
-				"data_spec":      data_spec,
-				"order_money":    order_money,
-				"original_price": original_price,
-				"prepay_time":    qutil.FormatDate(&now, qutil.Date_Full_Layout),
-				"pay_way":        pay_way,
-				"prepay_id":      (*ret)["prepayid"],
-				"code_url":       (*ret)["codeurl"],
-				"out_trade_no":   tradeno,
-			})
-			(*oldOrder)["order_money"] = order_money
-		}
-		p.ServeJson(map[string]interface{}{
-			"status": "y",
-			"code":   qutil.ObjToString((*oldOrder)["order_code"]),
-			"token":  entity.GetWaitPayToken(qutil.Int64All((*oldOrder)["id"]), qutil.IntAll((*oldOrder)["order_money"]), qutil.ObjToString((*oldOrder)["order_code"]), pay_way, userId),
-			"res":    res,
-		})
-		return
-	}
-	//
-	data_count := entity.GetDataExportSearchCountUseId(id)
-	if data_count > entity.ExConf.MsgMaxCount {
-		data_count = entity.ExConf.MsgMaxCount
-	}
-	order_money_, original_price_ := float64(0), float64(0)
-	if data_spec == "标准字段包" {
-		original_price_ = float64(data_count) * entity.ExConf.UnitPrice_normal
-	} else if data_spec == "高级字段包" {
-		original_price_ = float64(data_count) * entity.ExConf.UnitPrice_senior
-	}
-	order_money_ = float64(original_price_) * entity.ExConf.Discount
-	if order_money_ < entity.ExConf.OrderMinPrice {
-		order_money_ = entity.ExConf.OrderMinPrice
-	}
-	if original_price_ < entity.ExConf.OrderMinPrice {
-		original_price_ = entity.ExConf.OrderMinPrice
-	}
-	order_money := int(order_money_ * 100)
-	original_price := int(original_price_ * 100)
-	//order_money = 1
-	//original_price = 1
-	filter_keys, filter_publishtime, filter := "", "", ""
-	//
-	isPass := func() bool {
-		if pay_way == "" || user_mail == "" || user_phone == "" || !user_mail_status || data_spec == "" || order_money <= 0 || data_count <= 0 || original_price <= 0 {
-			log.Println("参数不合法！ pay_way, user_mail,user_phone, user_mail_status, data_spec, order_money, data_count, original_price", pay_way, user_mail, user_phone, user_mail_status, data_spec, order_money, data_count, original_price)
-			return false
-		}
-		userfilter, ok := util.MQFW.FindById("export_search", id, nil)
-		if ok && userfilter != nil {
-			keywords, _ := (*userfilter)["keywords"].([]interface{})
-			var buffer bytes.Buffer
-			for _, v := range keywords {
-				vm, _ := v.(map[string]interface{})
-				if buffer.Len() > 0 {
-					buffer.WriteString(",")
-				}
-				buffer.WriteString(qutil.ObjToString(vm["keyword"]))
-			}
-			filter_keys = buffer.String()
-			filter_publishtime = qutil.ObjToString((*userfilter)["publishtime"])
-			filterByte, _ := json.Marshal(userfilter)
-			filter = string(filterByte)
-		} else {
-			log.Println("id is not find in mongodb", userId, id)
-			return false
-		}
-		return true
-	}()
-	nickname, _ := p.GetSession("s_nickname").(string)
-	result := map[string]interface{}{
-		"status": "n",
-	}
-	if isPass {
-		//创建微信预支付订单,微信端支付tradeclass：c
-		tradeno, ret := pay.WxStruct.CreatePrepayOrder("c", p.IP(), openId, "", order_money)
-		log.Println("支付交易单", openId, ret)
-		if ret != nil && (*ret)["status"] == "1" {
-			now := time.Now()
-			ordercode := pay.GetOrderCode(openId)
-			orderid := util.Mysql.Insert("dataexport_order", map[string]interface{}{
-				"order_money":        order_money,
-				"order_status":       0,
-				"service_status":     0,
-				"user_nickname":      nickname,
-				"user_openid":        openId,
-				"filter":             filter,
-				"prepay_id":          (*ret)["prepayid"],
-				"code_url":           (*ret)["codeurl"],
-				"out_trade_no":       tradeno,
-				"order_code":         ordercode,
-				"product_type":       "历史数据",
-				"create_time":        qutil.FormatDate(&now, qutil.Date_Full_Layout),
-				"prepay_time":        qutil.FormatDate(&now, qutil.Date_Full_Layout),
-				"original_price":     original_price,
-				"data_spec":          data_spec,
-				"user_mail":          user_mail,
-				"user_phone":         user_phone,
-				"data_count":         data_count,
-				"filter_publishtime": filter_publishtime,
-				"filter_keys":        filter_keys,
-				"filter_id":          id,
-				"pay_way":            pay_way,
-				"user_id":            userId, //20190719 移动端数据导出 生订单添加用户id
-			})
-			if orderid > 0 {
-				var res map[string]interface{}
-				nonceStr := qutil.GetRandom(16) + qutil.GetLetterRandom(16)
-				timestamp := time.Now().Unix()
-				sign := qutil.WxSign(fmt.Sprintf("appId=%s&nonceStr=%s&package=%s&signType=%s&timeStamp=%d&key=%s", pay.WxStruct.Appid, nonceStr, "prepay_id="+qutil.ObjToString((*ret)["prepayid"]), "MD5", timestamp, pay.WxStruct.Key))
-				res = map[string]interface{}{
-					"appId":     pay.WxStruct.Appid,
-					"timestamp": fmt.Sprint(timestamp),
-					"signType":  "MD5",
-					"sign":      sign,
-					"nonceStr":  nonceStr,
-					"prepayId":  "prepay_id=" + qutil.ObjToString((*ret)["prepayid"]),
-				}
-				p.SetSession("DataExportVerifyPhone_val", user_phone)
-				result["status"] = "y"
-				result["code"] = ordercode
-				result["token"] = entity.GetWaitPayToken(orderid, order_money, ordercode, pay_way, userId)
-				result["res"] = res
-				//保存结构化数据信息 记录
-				go func() {
-					if p.GetSession("Structed") != nil && p.GetSession("Structed").(bool) {
-						//姓名  手机号  邮箱
-						nickname, _ := p.GetSession("s_nickname").(string)
-						user_mail, _ := p.GetSession("DataExportVerifyEmail_val").(string)
-						user_phone, _ := p.GetSession("DataExportVerifyPhone").(string)
-						if user_phone == "" {
-							user_phone, _ = p.GetSession("DataExportVerifyPhone_val").(string)
-						}
-						util.StructedDataByExportData(nickname, user_mail, user_phone)
-						//清除存储标识
-						p.DelSession("Structed")
-					}
-				}()
-			}
-		} else {
-			log.Println("生成微信预支付交易单失败", ret)
-		}
-	}
-	p.ServeJson(result)
-}
-
-//
-func (w *DataExportPayMobile) GetPayParm() error {
-	defer qutil.Catch()
-	userid := qutil.ObjToString(w.GetSession("userId"))
-	openid := qutil.ObjToString(w.GetSession("s_m_openid"))
-	filterid := qutil.SE.Decode4Hex(w.GetString("filterid"))
-	id := w.GetString("id")
-	if userid == "" || id == "" {
-		log.Println("userid,id 有误！")
-		w.ServeJson(map[string]interface{}{
-			"status": 0,
-		})
-		return nil
-	}
-	token := w.GetString("token")
-	//查看创建过的预支付订单
-	Order := util.Mysql.FindOne("dataexport_order", map[string]interface{}{
-		"user_id":   userid,
-		"filter_id": filterid,
-		"id":        id,
-	}, "prepay_id,order_code,order_money,id,prepay_time,pay_way,out_trade_no,user_mail", "")
-	if Order == nil {
-		log.Println("查不到订单！")
-		w.ServeJson(map[string]interface{}{
-			"status": -1,
-		})
-		return nil
-	}
-	prepayId := qutil.ObjToString((*Order)["prepay_id"])
-	//	if prepayId == "" {
-	//		log.Println("订单有误！")
-	//		w.ServeJson(map[string]interface{}{
-	//			"status": -2,
-	//		})
-	//		return nil
-	//	}
-	pay_way := qutil.ObjToString((*Order)["pay_way"])
-	order_code := qutil.ObjToString((*Order)["order_code"])
-	orderid := qutil.Int64All((*Order)["id"])
-	orderMoney := qutil.IntAll((*Order)["order_money"])
-	user_mail := qutil.ObjToString((*Order)["user_mail"])
-
-	realToken := entity.GetWaitPayToken(orderid, orderMoney, order_code, pay_way, userid)
-	if realToken != token && pay_way == "wx_js" {
-		log.Println("token错误！", userid, realToken, token, order_code, orderMoney, orderid, pay_way)
-		return nil
-	}
-	prepayTime, err := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*Order)["prepay_time"]), time.Local)
-	surplus_second := prepayTime.Unix() + 7200 - time.Now().Unix()
-	if (err == nil && surplus_second <= 0) || prepayId == "" || pay_way != "wx_js" {
-		//在此关闭之前的订单
-		if !pay.CloseDataExportOrder(qutil.ObjToString((*Order)["pay_way"]), qutil.ObjToString((*Order)["out_trade_no"]), qutil.ObjToString((*Order)["prepay_time"])) {
-			w.ServeJson(map[string]interface{}{
-				"status": "n",
-			})
-			return nil
-		}
-		log.Println("订单过期或支付pc端订单，重新生成预订单！", userid)
-		tradeno, ret := pay.WxStruct.CreatePrepayOrder("c", w.IP(), openid, "", orderMoney)
-		if ret != nil {
-			now := time.Now()
-			if util.Mysql.Update("dataexport_order", map[string]interface{}{
-				"id": orderid,
-			}, map[string]interface{}{
-				"prepay_time":  qutil.FormatDate(&now, qutil.Date_Full_Layout),
-				"prepay_id":    (*ret)["prepayid"],
-				"out_trade_no": tradeno,
-				"pay_way":      "wx_js",
-			}) {
-				prepayId = (*ret)["prepayid"]
-			}
-		}
-		realToken = entity.GetWaitPayToken(orderid, orderMoney, order_code, pay_way, userid) //刷新token
-	}
-	timestamp := time.Now().Unix()
-	nonceStr := qutil.GetRandom(16) + qutil.GetLetterRandom(16)
-	sign := qutil.WxSign(fmt.Sprintf("appId=%s&nonceStr=%s&package=%s&signType=%s&timeStamp=%d&key=%s", pay.WxStruct.Appid, nonceStr, "prepay_id="+prepayId, "MD5", timestamp, pay.WxStruct.Key))
-	w.ServeJson(map[string]interface{}{
-		"status":     1,
-		"appId":      pay.WxStruct.Appid,
-		"timestamp":  fmt.Sprint(timestamp),
-		"signType":   "MD5",
-		"sign":       sign,
-		"nonceStr":   nonceStr,
-		"prepayId":   "prepay_id=" + prepayId,
-		"order_code": order_code,
-		"user_mail":  user_mail,
-		"token":      realToken,
-	})
-	return nil
-}

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

@@ -24,7 +24,6 @@ type OrderListDetails struct {
 	*xweb.Action
 	getOrderPayAllMsg   xweb.Mapper `xweb:"/orderListDetails/getOrderPayAllMsg"`   //订单数据展示（订单详情页面）vip
 	myOrder             xweb.Mapper `xweb:"/orderListDetails/myOrder"`             //查询订单首页
-	myOrderPaging       xweb.Mapper `xweb:"/orderListDetails/myOrderPaging"`       //查询订单分页
 	deleteOrder         xweb.Mapper `xweb:"/orderListDetails/deleteOrder"`         //删除订单
 	setEmail            xweb.Mapper `xweb:"/orderListDetails/setEmail"`            //设置邮箱
 	checkMailCodeVerify xweb.Mapper `xweb:"/orderListDetails/checkMailCodeVerify"` //验证码
@@ -47,8 +46,6 @@ var (
 	order_pageSize          = 10
 	pagesize_max        int = 10
 	se                      = qutil.SE
-	liveActiveStartTime     = config.Config.LiveActiveStartTime
-	liveActiveEndTime       = config.Config.LiveActiveEndTime
 )
 
 //订单数据展示（订单详情页面）
@@ -65,28 +62,8 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 			//"order_status": 1,
 		}
 		oData := util.Mysql.FindOne(tableName_order, query, "id,order_code,prepay_time,create_time,pay_time,pay_way,original_price,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type", "")
-		orderStatus := qutil.IntAll((*oData)["order_status"])
 		//配置订单到期时间
 		order_countdown := config.Config.OrderCountdown //配置文件读取
-		//优惠码
-		nowTime := time.Now().Unix()
-		if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
-			order_countdown = config.Config.LiveOrderCountdown
-		}
-		create_time_str := qutil.ObjToString((*oData)["create_time"])
-		create_time, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time_str, time.Local)
-		if create_time.Unix() >= liveActiveStartTime && create_time.Unix() < liveActiveEndTime {
-			(*oData)["isLiveActive"] = true
-			if nowTime >= liveActiveEndTime && orderStatus == 0 {
-				if util.Mysql.Update(tableName_order, query, map[string]interface{}{"order_status": -2}) {
-					log.Println("VIP活动订单到期取消", orderCode)
-				}
-			}
-		}
-		activeData := util.Mysql.FindOne("prefer_active", map[string]interface{}{"order_code": orderCode, "user_id": userId}, "active_code", "")
-		if activeData != nil {
-			(*oData)["isUsedActiveCode"] = true
-		}
 
 		if strings.Contains(qutil.ObjToString(order_countdown), "h") {
 			(*oData)["order_countdown"] = qutil.ObjToString(order_countdown)
@@ -123,69 +100,19 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 }
 
 //订单列表首页
-func (o *OrderListDetails) MyOrder() error {
+func (o *OrderListDetails) MyOrder() {
 	//每页显示数
 	userId := o.Session().Get("userId")
-	//	openid := o.Session().Get("s_m_openid")
-	queryM := map[string]interface{}{}
-	if userId == nil {
-		return errors.New("未登录")
-	} else {
-		queryM["user_id"] = userId
-	}
-	// 0全部 1未支付 2已支付
-	typ := o.GetString("type")
-	if typ != "0" && typ != "" {
-		var status string
-		if typ == "1" {
-			status = orderStatus_unPaid
-		} else if typ == "2" {
-			status = orderStatus_paid
-		} else if typ == "3" {
-			status = orderStatus_cancel
-		}
-		queryM["order_status"] = status
-	} else {
-		queryM["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
-	}
-	// if o.GetString("fromPage") != "" && o.GetString("fromPage") == "app" { //年前紧急发版 不需要上线vip订阅 订单列表页排除vip
-	// 	//		queryM["product_type"] = map[string]interface{}{"ne": "VIP订阅"}
-	// }
-	if o.GetString("fromPage") != "" && o.GetString("fromPage") == "wx" { //微信暂无企业商机管理
-		queryM["product_type"] = map[string]interface{}{"ne": "企业商机管理"}
+	returnMap := map[string]interface{}{}
+	if userId == "" {
+		o.ServeJson(returnMap)
+		return
 	}
-	//总数
-	//queryM["product_type"] = map[string]interface{}{"ne": "企业商机管理"}
-	page_size := o.GetString("page_size")
-	i_page_size, _ := strconv.Atoi(page_size)
-	// log.Println("=========", queryM)
-	haveNextPage, res, _ := o.Datas(queryM, 1, i_page_size)
-	// log.Println("-----2------", queryM)
-	if res != nil {
-		// log.Println("-----------1", queryM)
-		o.SetRes(res, queryM)
+	queryM := map[string]interface{}{
+		"user_id": userId,
 	}
-	o.ServeJson(map[string]interface{}{
-		"res":         res,
-		"pageSize":    order_pageSize,
-		"hasNextPage": haveNextPage,
-	})
-	return nil
-}
 
-//订单列表分页
-func (o *OrderListDetails) MyOrderPaging() error {
-	userId := o.Session().Get("userId")
-	//	openid := o.Session().Get("s_m_openid")
-	queryM := map[string]interface{}{}
-	if userId == nil {
-		return errors.New("未登录")
-	} else {
-		queryM["user_id"] = userId
-	}
-	// 0全部 1未支付 2已支付
-	typ := o.GetString("type")
-	pageNum, _ := o.GetInteger("pageNum")
+	typ := o.GetString("type") // 0全部 1未支付 2已支付
 	if typ != "0" && typ != "" {
 		var status string
 		if typ == "1" {
@@ -199,22 +126,29 @@ func (o *OrderListDetails) MyOrderPaging() error {
 	} else {
 		queryM["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
 	}
-	// if o.GetString("fromPage") != "" && o.GetString("fromPage") == "app" { //年前紧急发版 不需要上线vip订阅 订单列表页排除vip
-	// 	//		queryM["product_type"] = map[string]interface{}{"ne": "VIP订阅"}
-	// }
-	if o.GetString("fromPage") != "" && o.GetString("fromPage") == "wx" { //微信暂无企业商机管理
+	fromPage := o.GetString("fromPage")
+	if fromPage == "wx" { //微信暂无企业商机管理
 		queryM["product_type"] = map[string]interface{}{"ne": "企业商机管理"}
 	}
-	// log.Println("====", queryM)
-	haveNextPage, res, _ := o.Datas(queryM, pageNum, 10)
+	//总数
+	pageNum := qutil.IntAll(o.GetString("pageNum"))
+	pageNum = qutil.If(pageNum == 0, 1, pageNum).(int)
+	i_page_size := qutil.IntAll(o.GetString("page_size"))
+	i_page_size = qutil.If(i_page_size == 0, 10, i_page_size).(int)
+	log.Println("queryM", queryM)
+
+	haveNextPage, res, _ := o.Datas(queryM, pageNum, i_page_size)
 	if res != nil {
 		o.SetRes(res, queryM)
 	}
-	o.ServeJson(map[string]interface{}{
-		"hasNextPage": haveNextPage,
-		"res":         res,
-	})
-	return nil
+	if fromPage == "pc" {
+		returnMap["count"] = util.Mysql.Count(tableName_order, queryM)
+	}
+	returnMap["res"] = res
+	returnMap["hasNextPage"] = haveNextPage
+	returnMap["pageSize"] = i_page_size
+
+	o.ServeJson(returnMap)
 }
 
 //删除或取消订单
@@ -277,7 +211,6 @@ func (o *OrderListDetails) DeleteOrder() error {
 			}
 			if boo {
 				util.MsgRemind.Delete(qutil.IntAll((*order)["id"]))
-				util.ActiveMsgRemind.Delete(qutil.IntAll((*order)["id"]))
 			}
 		}
 
@@ -587,10 +520,6 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 		//创建时间戳
 		create_time, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time_str, time.Local)
 		order_countdown := config.Config.OrderCountdown //配置文件读取
-		nowTime := time.Now().Unix()
-		if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime && v["product_type"] == "VIP订阅" {
-			order_countdown = config.Config.LiveOrderCountdown
-		}
 		if strings.Contains(qutil.ObjToString(order_countdown), "h") {
 			onehour, _ := time.ParseDuration(qutil.ObjToString(order_countdown))
 			create_time_stamp = create_time.Add(onehour).Unix()
@@ -611,21 +540,6 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 			}
 		}
 
-		if qutil.ObjToString(v["product_type"]) == "VIP订阅" {
-			//直播活动订单取消
-			if create_time.Unix() >= liveActiveStartTime && create_time.Unix() < liveActiveEndTime {
-				order_status := qutil.Int64All(v["order_status"])
-				if now_time_stamp >= liveActiveEndTime && order_status == 0 {
-					//数据库更改
-					if util.Mysql.Update(tableName_order, map[string]interface{}{"product_type": "VIP订阅", "order_code": order_code}, map[string]interface{}{"order_status": -2}) {
-						//前端传参更改
-						v["order_status"] = -2
-						log.Println("直播活动结束，取消订单", v["order_code"])
-					}
-				}
-			}
-		}
-
 		if v["filter_publishtime"] != nil {
 			filter_publishtime := v["filter_publishtime"]
 			if filter_publishtime != nil {
@@ -646,9 +560,9 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 		if orderMoney != nil {
 			v["order_money"] = float64(orderMoney.(int64)) / 100
 		}
-		if v["id"] != nil && v["order_money"] != nil && v["order_code"] != nil {
+		/*if v["id"] != nil && v["order_money"] != nil && v["order_code"] != nil {
 			v["token"] = entity.GetWaitPayToken(v["id"].(int64), int(orderMoney.(int64)), v["order_code"].(string), v["pay_way"].(string), queryM["user_id"].(string))
-		}
+		}*/
 		//最后一次够买的vip订单
 		if lastbuy_code == v["order_code"] {
 			v["lastbuy_code"] = lastbuy_code
@@ -720,18 +634,6 @@ func (o *OrderListDetails) Datas(queryM map[string]interface{}, pageNum, pagesiz
 					go FortyEightHoursCancel(qutil.ObjToString(result[i]["order_code"]), create_time_stamp, time.Now().Unix())
 				}
 			}
-			if result[i]["product_type"] == "VIP订阅" {
-				//优惠码
-				activeData := util.Mysql.FindOne("prefer_active", map[string]interface{}{"order_code": qutil.ObjToString(result[i]["order_code"])}, "active_code", "")
-				if activeData != nil {
-					result[i]["isUsedActiveCode"] = true
-				}
-				create_time_str := qutil.ObjToString(result[i]["create_time"])
-				create_time, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time_str, time.Local)
-				if create_time.Unix() >= liveActiveStartTime && create_time.Unix() < liveActiveEndTime {
-					result[i]["isLiveActive"] = true
-				}
-			}
 		}
 	}
 	haveNextPage = len(result) >= pagesize_max

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

@@ -1,7 +1,6 @@
 package service
 
 import (
-	"config"
 	"encoding/json"
 	"entity"
 	"errors"
@@ -48,29 +47,20 @@ func (this *SubscribeChange) GetSubBuyMsg() {
 		if vipStatus == 2 { //查询是否有未执行的续费订单
 			renewList, _ = util.MQFW.Find("vip_upgrade", &bson.M{"s_userid": userId, "i_isvalid": 0}, `{"l_validtime":"1"}`, `{"o_buyset":1,"l_validtime":1}`, false, -1, -1)
 		}
-		//优惠码
-		isUsedActiveCode := false
-		nowTime := time.Now().Unix()
-		liveActiveStartTime := config.Config.LiveActiveStartTime
-		liveActiveEndTime := config.Config.LiveActiveEndTime
-		if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
-			isUsedActiveCode = entity.JyVipSubStruct.GetVipLiveActive(userId)
-		}
 		return &entity.FuncResult{true, nil, map[string]interface{}{
-			"isTrial":          vipStatus == 1,
-			"area":             (*o_vipjy)["o_area"],
-			"industry":         (*o_vipjy)["a_buyerclass"],
-			"buyset":           buyset,
-			"renewList":        renewList,
-			"infotype":         (*o_vipjy)["a_infotype"],
-			"items":            (*o_vipjy)["a_items"],
-			"projectmatch":     (*o_vipjy)["i_projectmatch"],
-			"ratemode":         (*o_vipjy)["i_ratemode"],
-			"startTime":        (*rData)["l_vip_starttime"],
-			"endTime":          (*rData)["l_vip_endtime"],
-			"otherbuyerclass":  (*o_vipjy)["i_matchbuyerclass_other"],
-			"isread":           isread,
-			"isUsedActiveCode": isUsedActiveCode,
+			"isTrial":         vipStatus == 1,
+			"area":            (*o_vipjy)["o_area"],
+			"industry":        (*o_vipjy)["a_buyerclass"],
+			"buyset":          buyset,
+			"renewList":       renewList,
+			"infotype":        (*o_vipjy)["a_infotype"],
+			"items":           (*o_vipjy)["a_items"],
+			"projectmatch":    (*o_vipjy)["i_projectmatch"],
+			"ratemode":        (*o_vipjy)["i_ratemode"],
+			"startTime":       (*rData)["l_vip_starttime"],
+			"endTime":         (*rData)["l_vip_endtime"],
+			"otherbuyerclass": (*o_vipjy)["i_matchbuyerclass_other"],
+			"isread":          isread,
 		}}
 	}()
 	if r.Err != nil {
@@ -85,9 +75,7 @@ func (this *SubscribeChange) SaveChange() {
 	industry := strings.Split(this.GetString("industry"), ",")
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	timeRenew := this.GetString("time")
-	payWay := this.GetString("payWay")
 	req_price, _ := this.GetInteger("price")
-	activeCode := this.GetString("activeCode") //优惠码
 	openId := qutil.ObjToString(this.GetSession("s_m_openid"))
 	r := func() *entity.FuncResult {
 		if len(industry) == 1 && industry[0] == "" { //去掉[""]
@@ -142,7 +130,6 @@ func (this *SubscribeChange) SaveChange() {
 			0,
 		}
 		final_price := 0
-
 		var startTime, endTime time.Time
 		now := time.Now()
 		if isTrail { //试用用户购买
@@ -190,18 +177,6 @@ func (this *SubscribeChange) SaveChange() {
 		}
 		log.Printf("是否需要升级%v,是否需要续费%v\n", needUpgrade, needRenew)
 		log.Printf("price: %d \n req_price:%d filter:%+v\n", final_price, req_price, filter)
-		//活动优惠
-		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) * activeDiscount)
-			log.Println("final_price", final_price)
-		}
-		if activeCode == "jianyu360" {
-			endTime = endTime.AddDate(0, 0, 30)
-		}
 		//
 		if req_price != final_price {
 			log.Println(userId+" 前台计算", req_price, "后台计算", final_price)
@@ -218,67 +193,24 @@ func (this *SubscribeChange) SaveChange() {
 			}
 			log.Printf("进行折扣计算 折扣后金额%d\n", final_price)
 		}
-		//return &entity.FuncResult{true, nil, map[string]interface{}{"price": final_price}}
+
 		//创建订单
 		filterStr, err := json.Marshal(filter)
 		if err != nil {
 			return &entity.FuncResult{false, errors.New("订单数据生成异常"), nil}
 		}
 
-		tradeno, prepayid, payStr := "", "", ""
-		if payWay == "wx_js" { //微信js支付
-			var ret *map[string]string
-			tradeno, ret = pay.WxStruct.CreatePrepayOrder(pay.WX_SUBVIP_JSAPI, this.IP(), openId, "", final_price)
-			if ret == nil || (*ret)["status"] != "1" {
-				errMsg := "创建微信订单出错"
-				if (*ret)["errcodedes"] != "" {
-					errMsg = (*ret)["errcodedes"]
-				} else if (*ret)["errcode"] != "" {
-					errMsg = (*ret)["errcode"]
-				}
-				return &entity.FuncResult{false, errors.New(errMsg), nil}
-			}
-			prepayid = qutil.ObjToString((*ret)["prepayid"])
-			payStr = pay.GetWxJsPayStr(prepayid)
-		} else if payWay == "wx_app" { //微信app
-			var ret *map[string]string
-			tradeno, ret = pay.WxStruct.CreatePrepayOrder(pay.WX_SUBVIP_APP, this.IP(), openId, "", final_price)
-			if ret == nil || (*ret)["status"] != "1" {
-				errMsg := "创建微信订单出错"
-				if (*ret)["errcodedes"] != "" {
-					errMsg = (*ret)["errcodedes"]
-				} else if (*ret)["errcode"] != "" {
-					errMsg = (*ret)["errcode"]
-				}
-				return &entity.FuncResult{false, errors.New(errMsg), nil}
-			}
-			prepayid = qutil.ObjToString((*ret)["prepayid"])
-			payStr = pay.WxStruct.GetAppWxPayStr(prepayid)
-		} else if payWay == "ali_app" { //支付宝app支付
-			var err error
-			payStr, tradeno, err = pay.Alipay.GetOrderPayParam((qutil.Float64All(final_price)), pay.ALI_SUBVIP_APP)
-			if err != nil {
-				return &entity.FuncResult{false, errors.New("创建支付宝订单出错"), nil}
-			}
-		} else {
-			return &entity.FuncResult{false, errors.New("未知支付方式"), nil}
-		}
-
 		ordercode := pay.GetOrderCode(userId)
 		insertMap := map[string]interface{}{
 			"order_money":    final_price,
 			"order_status":   0,
 			"user_openid":    openId,
-			"prepay_id":      prepayid,
-			"code_url":       payStr,
-			"out_trade_no":   tradeno,
 			"order_code":     ordercode,
 			"product_type":   "VIP订阅",
 			"create_time":    qutil.FormatDate(&now, qutil.Date_Full_Layout),
 			"prepay_time":    qutil.FormatDate(&now, qutil.Date_Full_Layout),
 			"original_price": final_price,
 			"filter_id":      "",
-			"pay_way":        payWay,
 			"user_id":        userId,
 			"filter":         string(filterStr), //筛选
 			"vip_endtime":    qutil.FormatDate(&endTime, qutil.Date_Full_Layout),
@@ -292,27 +224,9 @@ func (this *SubscribeChange) SaveChange() {
 		if orderid == -1 {
 			return &entity.FuncResult{false, errors.New("数据库操作异常"), nil}
 		}
-		//优惠码
-		if activeCode == "jianyu360" {
-			activeInsertMap := map[string]interface{}{
-				"order_code":  ordercode,
-				"create_time": qutil.FormatDate(&now, qutil.Date_Full_Layout),
-				"active_type": "VIP订阅",
-				"user_id":     userId,
-				"active_code": activeCode,
-			}
-			activeOrderId := util.Mysql.Insert("prefer_active", activeInsertMap)
-			if activeOrderId == -1 {
-				return &entity.FuncResult{false, errors.New("优惠码存库异常"), nil}
-			}
-		}
 		//支付提醒
-		if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
-			util.ActiveMsgRemind.Add(qutil.IntAll(orderid), final_price, qutil.If(filter.OrderType == 5, 1, -1).(int), 0, ordercode, userId, now.Unix())
-		} else {
-			util.MsgRemind.Add(qutil.IntAll(orderid), final_price, qutil.If(filter.OrderType == 5, 1, -1).(int), 0, ordercode, userId, now.Unix())
-		}
-		return &entity.FuncResult{true, nil, map[string]interface{}{"code": ordercode, "res": payStr, "needPay": true}}
+		util.MsgRemind.Add(qutil.IntAll(orderid), final_price, qutil.If(filter.OrderType == 5, 1, -1).(int), 0, ordercode, userId, now.Unix())
+		return &entity.FuncResult{true, nil, map[string]interface{}{"code": ordercode, "needPay": true}}
 	}()
 	if r.Err != nil {
 		log.Printf("%s CreateOrder err:%v\n", userId, r.Err.Error())

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

@@ -1,7 +1,6 @@
 package service
 
 import (
-	"config"
 	"encoding/json"
 	"entity"
 	"errors"
@@ -23,7 +22,6 @@ type SubVipPayOrder struct {
 	*xweb.Action
 	getPrice    xweb.Mapper `xweb:"/vipsubscribe/getPrice"`    //获取价格
 	createOrder xweb.Mapper `xweb:"/vipsubscribe/createOrder"` //创建订单并支付
-	orderToPay  xweb.Mapper `xweb:"/vipsubscribe/orderToPay"`  //支付已创建订单
 }
 
 func init() {
@@ -40,7 +38,6 @@ func (this *SubVipPayOrder) CreateOrder() {
 	area := qutil.ObjToMap(this.GetString("area"))
 	industry := strings.Split(this.GetString("industry"), ",")
 	date := this.GetString("time")
-	payWay := this.GetString("payWay")
 	orderType, _ := this.GetInteger("orderType") //1 简单付费，5 升降级续费
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	openId := qutil.ObjToString(this.GetSession("s_m_openid"))
@@ -50,7 +47,7 @@ func (this *SubVipPayOrder) CreateOrder() {
 		if len(industry) == 1 && industry[0] == "" { //去掉[""]
 			industry = []string{}
 		}
-		if !(payWay == "wx_js" || payWay == "wx_app" || payWay == "ali_app") || !(orderType == 1 || orderType == 5) {
+		if !(orderType == 1 || orderType == 5) {
 			return &entity.FuncResult{false, errors.New("参数异常"), nil}
 		}
 		createOk, userData := entity.JyVipSubStruct.OrderCheck(userId, orderType)
@@ -95,55 +92,6 @@ func (this *SubVipPayOrder) CreateOrder() {
 		//计算价格
 		totalfee := entity.JyVipSubStruct.GetSubVipPrice(area, industry, date_count, date_unit)
 		log.Printf("最终选择 地区：%+v   行业：%v\n 价格%d", filter.Area, filter.Industry, totalfee)
-		//活动优惠
-		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) * activeDiscount)
-			}
-			log.Println("totalfee", totalfee)
-		}
-		//
-		//创建订单
-		tradeno, prepayid, payStr := "", "", ""
-		if payWay == "wx_js" { //微信js支付
-			var ret *map[string]string
-			tradeno, ret = pay.WxStruct.CreatePrepayOrder(pay.WX_SUBVIP_JSAPI, this.IP(), openId, "", totalfee)
-			if ret == nil || (*ret)["status"] != "1" {
-				errMsg := "创建微信订单出错"
-				if (*ret)["errcodedes"] != "" {
-					errMsg = (*ret)["errcodedes"]
-				} else if (*ret)["errcode"] != "" {
-					errMsg = (*ret)["errcode"]
-				}
-				return &entity.FuncResult{false, errors.New(errMsg), nil}
-			}
-			prepayid = qutil.ObjToString((*ret)["prepayid"])
-			payStr = pay.GetWxJsPayStr(prepayid)
-		} else if payWay == "wx_app" {
-			var ret *map[string]string
-			tradeno, ret = pay.WxStruct.CreatePrepayOrder(pay.WX_SUBVIP_APP, this.IP(), openId, "", totalfee)
-			if ret == nil || (*ret)["status"] != "1" {
-				errMsg := "创建微信订单出错"
-				if (*ret)["errcodedes"] != "" {
-					errMsg = (*ret)["errcodedes"]
-				} else if (*ret)["errcode"] != "" {
-					errMsg = (*ret)["errcode"]
-				}
-				return &entity.FuncResult{false, errors.New(errMsg), nil}
-			}
-			prepayid = qutil.ObjToString((*ret)["prepayid"])
-			payStr = pay.WxStruct.GetAppWxPayStr(prepayid)
-		} else { //支付宝支付
-			var err error
-			payStr, tradeno, err = pay.Alipay.GetOrderPayParam((qutil.Float64All(totalfee)), pay.ALI_SUBVIP_APP)
-			if err != nil {
-				return &entity.FuncResult{false, errors.New("创建支付宝订单出错"), nil}
-			}
-		}
 		filterStr, _ := json.Marshal(filter)
 		ordercode := pay.GetOrderCode(userId)
 		insertMap := map[string]interface{}{
@@ -151,16 +99,12 @@ func (this *SubVipPayOrder) CreateOrder() {
 			"order_status":   0,
 			"user_nickname":  qutil.ObjToString(this.GetSession("s_nickname")),
 			"user_openid":    openId,
-			"prepay_id":      prepayid,
-			"code_url":       payStr,
-			"out_trade_no":   tradeno,
 			"order_code":     ordercode,
 			"product_type":   "VIP订阅",
 			"create_time":    qutil.FormatDate(&now, qutil.Date_Full_Layout),
 			"prepay_time":    qutil.FormatDate(&now, qutil.Date_Full_Layout),
 			"original_price": totalfee,
 			"filter_id":      mog_id,
-			"pay_way":        payWay,
 			"user_id":        userId,
 			"filter":         string(filterStr), //筛选
 		}
@@ -177,107 +121,8 @@ func (this *SubVipPayOrder) CreateOrder() {
 			return &entity.FuncResult{false, errors.New("数据库操作异常"), nil}
 		}
 		//支付提醒
-		if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
-			util.ActiveMsgRemind.Add(qutil.IntAll(orderid), totalfee, qutil.If(orderType == 5, 1, -1).(int), 0, ordercode, userId, now.Unix())
-		} else {
-			util.MsgRemind.Add(qutil.IntAll(orderid), totalfee, qutil.If(orderType == 5, 1, -1).(int), 0, ordercode, userId, now.Unix())
-		}
-		return &entity.FuncResult{true, nil, map[string]interface{}{"code": ordercode, "res": payStr}}
-	}()
-	if r.Err != nil {
-		log.Printf("%s CreateOrder err:%v\n", userId, r.Err.Error())
-	}
-	this.ServeJson(r.Format())
-}
-
-//支付已创建订单
-func (this *SubVipPayOrder) OrderToPay() {
-	orderCode := qutil.ObjToString(this.GetString("orderCode"))
-	payway := qutil.ObjToString(this.GetString("payway"))
-	userId := qutil.ObjToString(this.GetSession("userId"))
-	r := func() *entity.FuncResult {
-		if payway == "" {
-			payway = qutil.ObjToString(this.GetString("pay_way")) //app用户
-		}
-		if payway == "" { //默认微信js支付
-			payway = "wx_js"
-		}
-		if !(payway == "wx_js" || payway == "wx_app" || payway == "ali_app") { //
-			return &entity.FuncResult{false, errors.New("参数异常"), nil}
-		}
-		//根据订单号获取订单数据
-		query := map[string]interface{}{
-			"user_id":      userId,
-			"order_code":   orderCode,
-			"order_status": 0,
-		}
-		oData := util.Mysql.FindOne("dataexport_order", query, "id,code_url,prepay_time,pay_way,order_money,vip_type", "")
-		if oData == nil || len(*oData) == 0 {
-			return &entity.FuncResult{false, errors.New("未知订单"), nil}
-		}
-		//判断订单是否超过两小时
-		prepayTime, _ := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*oData)["prepay_time"]), time.Local)
-		jsPayParam := qutil.ObjToString((*oData)["code_url"])
-		payway_db := qutil.ObjToString((*oData)["pay_way"])
-		if time.Now().Before(prepayTime.Add(time.Hour*2)) && jsPayParam != "" && payway == payway_db {
-			//未过期
-			return &entity.FuncResult{true, nil, map[string]interface{}{"res": jsPayParam}}
-		}
-		//重新生成订单
-		totalfee := qutil.IntAll((*oData)["order_money"])
-		tradeno, prepayid := "", ""
-		if payway == "wx_js" { //微信js支付
-			var ret *map[string]string
-			tradeno, ret = pay.WxStruct.CreatePrepayOrder("e", this.IP(), qutil.ObjToString(this.GetSession("s_m_openid")), "", totalfee)
-			if ret == nil || (*ret)["status"] != "1" {
-				errMsg := "创建微信订单出错"
-				if (*ret)["errcodedes"] != "" {
-					errMsg = (*ret)["errcodedes"]
-				} else if (*ret)["errcode"] != "" {
-					errMsg = (*ret)["errcode"]
-				}
-				return &entity.FuncResult{false, errors.New(errMsg), nil}
-			}
-			prepayid = qutil.ObjToString((*ret)["prepayid"])
-			jsPayParam = pay.GetWxJsPayStr(prepayid)
-		} else if payway == "wx_app" { //微信app支付
-			var ret *map[string]string
-			tradeno, ret = pay.WxStruct.CreatePrepayOrder(pay.WX_SUBVIP_APP, this.IP(), qutil.ObjToString(this.GetSession("s_m_openid")), "", totalfee)
-			if ret == nil || (*ret)["status"] != "1" {
-				errMsg := "创建微信订单出错"
-				if (*ret)["errcodedes"] != "" {
-					errMsg = (*ret)["errcodedes"]
-				} else if (*ret)["errcode"] != "" {
-					errMsg = (*ret)["errcode"]
-				}
-				return &entity.FuncResult{false, errors.New(errMsg), nil}
-			}
-			prepayid = qutil.ObjToString((*ret)["prepayid"])
-			jsPayParam = pay.WxStruct.GetAppWxPayStr(prepayid)
-		} else { //支付宝app支付
-			var err error
-			jsPayParam, tradeno, err = pay.Alipay.GetOrderPayParam((qutil.Float64All(totalfee)), pay.ALI_SUBVIP_APP)
-			if err != nil {
-				return &entity.FuncResult{false, errors.New("创建支付宝订单出错"), nil}
-			}
-		}
-		//更新订单表
-		now := time.Now()
-		ok := util.Mysql.Update("dataexport_order", query, map[string]interface{}{
-			"code_url":     jsPayParam,
-			"prepay_time":  qutil.FormatDate(&now, qutil.Date_Full_Layout),
-			"out_trade_no": tradeno,
-			"prepay_id":    prepayid,
-			"pay_way":      payway,
-		})
-		if !ok {
-			return &entity.FuncResult{false, errors.New("数据库操作异常"), nil}
-		}
-		vip_type := qutil.IntAll((*oData)["vip_type"])
-		if vip_type == 0 {
-			vip_type = -1
-		}
-		return &entity.FuncResult{true, nil, map[string]interface{}{"res": jsPayParam}}
+		util.MsgRemind.Add(qutil.IntAll(orderid), totalfee, qutil.If(orderType == 5, 1, -1).(int), 0, ordercode, userId, now.Unix())
+		return &entity.FuncResult{true, nil, map[string]interface{}{"code": ordercode}}
 	}()
 	if r.Err != nil {
 		log.Printf("%s CreateOrder err:%v\n", userId, r.Err.Error())

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

@@ -1,345 +0,0 @@
-package util
-
-import (
-	. "config"
-	"encoding/hex"
-	"fmt"
-	"log"
-	"qfw/util"
-	"qfw/util/redis"
-	qrpc "qfw/util/rpc"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-var ActiveMsgRemind = &activeMsgRemind{
-	unpaidOrders: &sync.Map{},
-}
-
-type activeMsgRemind struct {
-	unpaidOrders *sync.Map
-}
-
-type liveActiveUnpaidOrder struct {
-	orderId      int    //订单id
-	orderCode    string //订单编号
-	userId       string //用户id
-	prepayTime   int64  //下单时间
-	remindStatus int    //1-下单时间2小时提醒 2-剩余2小时自动关闭时再次提醒
-	vipType      int    //-1：直接购买 0：试用 1：续费 2：升级
-	orderMoney   int    //订单金额
-}
-
-/*新的订单存库以后，再存入内存中
- *@param orderId 订单id
- *@param orderMoney 订单金额
- *@param vipType -1：直接购买 0：试用 1：续费 2：升级
- *@param remindStatus 1-下单时间1小时提醒 2-下单时间24小时提醒 3-剩余2小时自动关闭时再次提醒
- *@param orderCode 订单编号
- *@param userId 用户id
- *@param prepayTime 购买时间
- */
-func (m *activeMsgRemind) Add(orderId, orderMoney, vipType, remindStatus int, orderCode, userId string, prepayTime int64) {
-	log.Println("直播活动未支付待提醒订单加入", orderId, orderCode, userId, prepayTime)
-	m.unpaidOrders.Store(orderId, &liveActiveUnpaidOrder{
-		orderCode:    orderCode,
-		userId:       userId,
-		prepayTime:   prepayTime,
-		orderId:      orderId,
-		orderMoney:   orderMoney,
-		vipType:      vipType,
-		remindStatus: remindStatus,
-	})
-}
-
-func (m *activeMsgRemind) PaySuccess(orderId int, orderCode, userId, prepayTime string, vipType int) {
-	go func() {
-		defer util.Catch()
-		log.Println("支付成功以后，消息提醒处理", orderId, orderCode, userId, prepayTime)
-		m.unpaidOrders.Delete(orderId)
-		user, ok := MQFW.FindById("user", userId, `{"s_m_openid":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1,"i_ispush":1,"l_vip_endtime":1}`)
-		if !ok || user == nil || len(*user) == 0 {
-			return
-		}
-		isPushWx := util.IntAllDef((*user)["i_ispush"], 1)
-		s_m_openid, _ := (*user)["s_m_openid"].(string)
-		s_jpushid, _ := (*user)["s_jpushid"].(string)
-		s_opushid, _ := (*user)["s_opushid"].(string)
-		s_appponetype, _ := (*user)["s_appponetype"].(string)
-		log.Println("支付成功，推送消息", userId, "s_m_openid", s_m_openid, "s_jpushid", s_jpushid, "s_opushid", s_opushid, "s_appponetype", s_appponetype)
-		if isPushWx == 1 && s_m_openid != "" {
-			l_vip_endtime := (*user)["l_vip_endtime"]
-			expireTime := util.FormatDateWithObj(&l_vip_endtime, util.Date_Short_Layout)
-			wxPushOk, _ := qrpc.WxSendTmplMsg(Config.Weixinrpc, &qrpc.WxTmplMsg{
-				OpenId: s_m_openid,
-				TplId:  MessageConfig.WxTpl_PaySuccess.Id,
-				TmplData: map[string]*qrpc.TmplItem{
-					"first": &qrpc.TmplItem{
-						Value: fmt.Sprintf(MessageConfig.WxTpl_PaySuccess.First.Value, orderCode),
-					},
-					"keyword1": &qrpc.TmplItem{
-						Value: fmt.Sprintf(MessageConfig.WxTpl_PaySuccess.Keyword1.Value, m.getVipType(vipType)),
-					},
-					"keyword2": &qrpc.TmplItem{
-						Value: orderCode,
-					},
-					"keyword3": &qrpc.TmplItem{
-						Value: strings.Split(prepayTime, " ")[0],
-					},
-					"keyword4": &qrpc.TmplItem{
-						Value: expireTime,
-					},
-				},
-				Url: Config.WebDomain + "/front/sess/" + Se_Topnet.EncodeString(s_m_openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",msgremind") + "__" + hex.EncodeToString([]byte(fmt.Sprintf("type=paid"))),
-			})
-			log.Println("支付成功，微信推送", userId, wxPushOk)
-		} else if s_opushid != "" || s_jpushid != "" {
-			appPushOk := qrpc.AppPush(Config.AppPushServiceRpc, map[string]interface{}{
-				"phoneType":   s_appponetype,
-				"otherPushId": s_opushid,
-				"jgPushId":    s_jpushid,
-				"url":         "/jyapp/free/sess/" + Se_Topnet.EncodeString(userId+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",msgremind") + "__" + hex.EncodeToString([]byte(fmt.Sprintf("type=paid"))),
-				"userId":      userId,
-				"type":        "vipNotice",
-				"descript":    fmt.Sprintf(MessageConfig.WxTpl_PaySuccess.First.Value, orderCode),
-				"title":       "剑鱼提醒",
-			})
-			log.Println("支付成功，app推送", userId, appPushOk)
-		}
-	}()
-}
-
-/*删除待提醒的订单
- *@param orderId 订单id
- */
-func (m *activeMsgRemind) Delete(orderId int) {
-	log.Println("直播活动删除待提醒的订单", orderId)
-	m.unpaidOrders.Delete(orderId)
-}
-
-func (m *activeMsgRemind) getExpireTime(createTime int64) int64 {
-	order_countdown := Config.LiveOrderCountdown //配置文件读取
-	liveActiveEndTime := Config.LiveActiveEndTime
-	liveActiveStartTime := Config.LiveActiveStartTime
-	if strings.Contains(util.ObjToString(order_countdown), "h") {
-		onehour, _ := time.ParseDuration(util.ObjToString(order_countdown))
-		if createTime >= liveActiveStartTime && createTime < liveActiveEndTime {
-			if liveActiveEndTime-createTime < int64(onehour.Seconds()) {
-				return liveActiveEndTime - createTime
-			}
-		}
-		return int64(onehour.Seconds())
-	} else {
-		return util.Int64All(order_countdown) * 24 * 60 * 60
-	}
-}
-
-func (m *activeMsgRemind) getVipType(vipType int) string {
-	switch vipType {
-	case 0:
-		return "（试用）"
-	case 1:
-		return "（续费）"
-	case 2:
-		return "（升级）"
-	}
-	return ""
-}
-
-func (m *activeMsgRemind) run() {
-	duration := TimeTaskConfig.UnpaidRemind.Duration
-	if duration == 0 {
-		duration = 10
-	}
-	log.Println("直播活动未支付订单定时任务run after", duration, "m")
-	time.AfterFunc(time.Duration(duration)*time.Minute, func() {
-		// time.AfterFunc(time.Duration(duration)*time.Minute, func() {
-		defer util.Catch()
-		m.unpaidOrders.Range(func(k interface{}, v interface{}) bool {
-			orderId, _ := k.(int)
-			unpaidOrder, _ := v.(*liveActiveUnpaidOrder)
-			now_unix := time.Now().Unix()
-			liveActiveEndTime := Config.LiveActiveEndTime
-			remind_status := 0
-			//剩余2小时
-			if unpaidOrder.remindStatus != 3 && unpaidOrder.prepayTime+m.getExpireTime(unpaidOrder.prepayTime) > now_unix && now_unix >= unpaidOrder.prepayTime+m.getExpireTime(unpaidOrder.prepayTime)-TimeTaskConfig.UnpaidRemind.BeforeExpire {
-				if liveActiveEndTime-unpaidOrder.prepayTime > TimeTaskConfig.UnpaidRemind.BeforeExpire {
-					remind_status = 3
-				} else {
-					if liveActiveEndTime-unpaidOrder.prepayTime > TimeTaskConfig.UnpaidRemind.LiveActiveAfterOrder {
-						remind_status = 1
-					} else {
-						return true
-					}
-				}
-			} else if unpaidOrder.remindStatus == 1 && now_unix > unpaidOrder.prepayTime+TimeTaskConfig.UnpaidRemind.LiveActiveAfterOrders { //下单时间后24小时未支付
-				if liveActiveEndTime-unpaidOrder.prepayTime > TimeTaskConfig.UnpaidRemind.LiveActiveAfterOrders {
-					remind_status = 2
-				} else {
-					return true
-				}
-			} else if unpaidOrder.remindStatus == 0 && now_unix > unpaidOrder.prepayTime+TimeTaskConfig.UnpaidRemind.LiveActiveAfterOrder && liveActiveEndTime-unpaidOrder.prepayTime > TimeTaskConfig.UnpaidRemind.LiveActiveAfterOrder { //下单时间后1小时未支付
-				remind_status = 1
-			}
-			if remind_status == 0 {
-				return true
-			} else if remind_status == 1 {
-				if now_unix-unpaidOrder.prepayTime > 2*TimeTaskConfig.UnpaidRemind.LiveActiveAfterOrder {
-					return true
-				}
-			} else if remind_status == 2 {
-				if now_unix-unpaidOrder.prepayTime > 2*TimeTaskConfig.UnpaidRemind.LiveActiveAfterOrders {
-					return true
-				}
-			}
-			user, ok := MQFW.FindById("user", unpaidOrder.userId, `{"s_m_openid":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1,"i_ispush":1}`)
-			if !ok || user == nil || len(*user) == 0 {
-				return true
-			}
-			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)
-			isPushWx := util.IntAllDef((*user)["i_ispush"], 1)
-			s_m_openid, _ := (*user)["s_m_openid"].(string)
-			s_jpushid, _ := (*user)["s_jpushid"].(string)
-			s_opushid, _ := (*user)["s_opushid"].(string)
-			s_appponetype, _ := (*user)["s_appponetype"].(string)
-			log.Println("直播活动未支付订单，推送消息", unpaidOrder.userId, "remind_status", remind_status, "i_ispush", isPushWx, "s_m_openid", s_m_openid, "s_jpushid", s_jpushid, "s_opushid", s_opushid, "s_appponetype", s_appponetype)
-			wxPushOk, appPushOk := false, false
-			if isPushWx == 1 && s_m_openid != "" {
-				tmplData := map[string]*qrpc.TmplItem{
-					"first": &qrpc.TmplItem{
-						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.First.Value, unpaidOrder.orderCode),
-						Color: MessageConfig.WxTpl_Unpaid.First.Color,
-					},
-					"keyword1": &qrpc.TmplItem{
-						Value: util.FormatDateByInt64(&unpaidOrder.prepayTime, util.Date_Short_Layout),
-					},
-					"keyword2": &qrpc.TmplItem{
-						Value: unpaidOrder.orderCode,
-					},
-					"keyword3": &qrpc.TmplItem{
-						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Keyword3.Value, fmt.Sprintf("%.2f", float64(unpaidOrder.orderMoney)/100)),
-					},
-					"keyword4": &qrpc.TmplItem{
-						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Keyword4.Value, m.getVipType(unpaidOrder.vipType)),
-					},
-				}
-				if remind_status == 1 {
-					tmplData["first"] = &qrpc.TmplItem{
-						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.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.Sixth.Value, unpaidOrder.orderCode),
-						Color: MessageConfig.WxTpl_Unpaid.First.Color,
-					}
-				}
-				wxPushOk, _ = qrpc.WxSendTmplMsg(Config.Weixinrpc, &qrpc.WxTmplMsg{
-					OpenId:   s_m_openid,
-					TplId:    MessageConfig.WxTpl_Unpaid.Id,
-					TmplData: tmplData,
-					Url:      Config.WebDomain + "/front/sess/" + Se_Topnet.EncodeString(s_m_openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",msgremind") + "__" + hex.EncodeToString([]byte(fmt.Sprintf("type=unpaid&ordercode=%s", unpaidOrder.orderCode))),
-				})
-				log.Println("直播活动未支付订单，微信推送", unpaidOrder.userId, wxPushOk)
-			} else if s_opushid != "" || s_jpushid != "" {
-				tmplData := map[string]interface{}{
-					"phoneType":   s_appponetype,
-					"otherPushId": s_opushid,
-					"jgPushId":    s_jpushid,
-					"url":         "/jyapp/free/sess/" + Se_Topnet.EncodeString(unpaidOrder.userId+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",msgremind") + "__" + hex.EncodeToString([]byte(fmt.Sprintf("type=unpaid&ordercode=%s", unpaidOrder.orderCode))),
-					"userId":      unpaidOrder.userId,
-					"type":        "vipNotice",
-					"descript":    fmt.Sprintf(MessageConfig.WxTpl_Unpaid.First.Value, unpaidOrder.orderCode),
-					"title":       "剑鱼提醒",
-				}
-				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, buyCount, originPrice)
-				} else if remind_status == 3 {
-					tmplData["first"] = fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Fourth.Value, unpaidOrder.orderCode, originPrice)
-				}
-				appPushOk = qrpc.AppPush(Config.AppPushServiceRpc, tmplData)
-				log.Println("直播活动未支付订单，app推送", unpaidOrder.userId, appPushOk)
-			}
-			if wxPushOk || appPushOk {
-				if remind_status == 3 {
-					m.unpaidOrders.Delete(orderId)
-				} else {
-					unpaidOrder.remindStatus = remind_status
-					m.unpaidOrders.Store(orderId, unpaidOrder)
-				}
-				if Mysql.Update("dataexport_order", map[string]interface{}{
-					"id": orderId,
-				}, map[string]interface{}{
-					"remind_status": remind_status,
-				}) {
-					log.Println("直播活动更新提醒状态成功", unpaidOrder.userId, remind_status)
-				} else {
-					log.Println("直播活动更新提醒状态失败", unpaidOrder.userId, remind_status)
-				}
-			}
-			return true
-		})
-		m.run()
-	})
-}
-func (m *activeMsgRemind) gc() {
-	time.AfterFunc(5*time.Minute, func() {
-		defer util.Catch()
-		m.unpaidOrders.Range(func(k interface{}, v interface{}) bool {
-			unpaidOrder, _ := v.(*liveActiveUnpaidOrder)
-			if time.Now().Unix() > unpaidOrder.prepayTime+m.getExpireTime(0) {
-				m.unpaidOrders.Delete(k)
-			}
-			return true
-		})
-		m.gc()
-	})
-}
-func init() {
-	go func() {
-		defer util.Catch()
-		log.Println("开始加载72小时内直播活动的订单到内存中。。。")
-		startTime := time.Unix(time.Now().Unix()-ActiveMsgRemind.getExpireTime(0), 0)
-		startTimes := util.FormatDate(&startTime, util.Date_Full_Layout)
-		liveActiveStartTime := time.Unix(Config.LiveActiveStartTime, 0)
-		liveActiveEndTime := time.Unix(Config.LiveActiveEndTime, 0)
-		liveActiveStartTimes := util.FormatDate(&liveActiveStartTime, util.Date_Full_Layout)
-		liveActiveEndTimes := util.FormatDate(&liveActiveEndTime, util.Date_Full_Layout)
-		list := Mysql.SelectBySql("select id,order_code,order_money,user_id,prepay_time,remind_status,vip_type from dataexport_order where order_money>0 and prepay_time>=? and create_time>=? and create_time<? and product_type='VIP订阅' and order_status=0 and (remind_status<>3 or remind_status is null)", startTimes, liveActiveStartTimes, liveActiveEndTimes)
-		if list == nil {
-			log.Println("加载72小时内直播活动的订单到内存中失败")
-			return
-		}
-		for _, v := range *list {
-			order_code, _ := v["order_code"].(string)
-			user_id, _ := v["user_id"].(string)
-			prepay_time, _ := v["prepay_time"].(string)
-			if order_code == "" || user_id == "" || prepay_time == "" {
-				continue
-			}
-			prepayTime, err := time.ParseInLocation(util.Date_Full_Layout, prepay_time, time.Local)
-			if err != nil {
-				continue
-			}
-			orderId := util.IntAll(v["id"])
-			ActiveMsgRemind.Add(orderId, util.IntAll(v["order_money"]), util.IntAllDef(v["vip_type"], -1), util.IntAll(v["remind_status"]), order_code, user_id, prepayTime.Unix())
-		}
-		log.Println("直播活动未支付订单数量", len(*list))
-		log.Println("加载72小时内直播活动的订单到内存中结束。。。", len(*list))
-	}()
-	ActiveMsgRemind.run()
-	ActiveMsgRemind.gc()
-}

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

@@ -259,37 +259,32 @@ func (m *msgRemind) gc() {
 	})
 }
 func init() {
-	now_time := time.Now().Unix()
-	liveActiveStartTime := Config.LiveActiveStartTime
-	liveActiveEndTime := Config.LiveActiveEndTime
-	if now_time < liveActiveStartTime && now_time >= liveActiveEndTime {
-		go func() {
-			defer util.Catch()
-			log.Println("开始加载72小时内的订单到内存中。。。")
-			startTime := time.Unix(time.Now().Unix()-MsgRemind.getExpireTime(), 0)
-			startTimes := util.FormatDate(&startTime, util.Date_Full_Layout)
-			list := Mysql.SelectBySql("select id,order_code,order_money,user_id,prepay_time,remind_status,vip_type from dataexport_order where order_money>0 and prepay_time>=? and product_type='VIP订阅' and order_status=0 and (remind_status<>2 or remind_status is null)", startTimes)
-			if list == nil {
-				log.Println("加载72小时内的订单到内存中失败")
-				return
+	go func() {
+		defer util.Catch()
+		log.Println("开始加载72小时内的订单到内存中。。。")
+		startTime := time.Unix(time.Now().Unix()-MsgRemind.getExpireTime(), 0)
+		startTimes := util.FormatDate(&startTime, util.Date_Full_Layout)
+		list := Mysql.SelectBySql("select id,order_code,order_money,user_id,prepay_time,remind_status,vip_type from dataexport_order where order_money>0 and prepay_time>=? and product_type='VIP订阅' and order_status=0 and (remind_status<>2 or remind_status is null)", startTimes)
+		if list == nil {
+			log.Println("加载72小时内的订单到内存中失败")
+			return
+		}
+		for _, v := range *list {
+			order_code, _ := v["order_code"].(string)
+			user_id, _ := v["user_id"].(string)
+			prepay_time, _ := v["prepay_time"].(string)
+			if order_code == "" || user_id == "" || prepay_time == "" {
+				continue
 			}
-			for _, v := range *list {
-				order_code, _ := v["order_code"].(string)
-				user_id, _ := v["user_id"].(string)
-				prepay_time, _ := v["prepay_time"].(string)
-				if order_code == "" || user_id == "" || prepay_time == "" {
-					continue
-				}
-				prepayTime, err := time.ParseInLocation(util.Date_Full_Layout, prepay_time, time.Local)
-				if err != nil {
-					continue
-				}
-				orderId := util.IntAll(v["id"])
-				MsgRemind.Add(orderId, util.IntAll(v["order_money"]), util.IntAllDef(v["vip_type"], -1), util.IntAll(v["remind_status"]), order_code, user_id, prepayTime.Unix())
+			prepayTime, err := time.ParseInLocation(util.Date_Full_Layout, prepay_time, time.Local)
+			if err != nil {
+				continue
 			}
-			log.Println("加载72小时内的订单到内存中结束。。。", len(*list))
-		}()
-	}
+			orderId := util.IntAll(v["id"])
+			MsgRemind.Add(orderId, util.IntAll(v["order_money"]), util.IntAllDef(v["vip_type"], -1), util.IntAll(v["remind_status"]), order_code, user_id, prepayTime.Unix())
+		}
+		log.Println("加载72小时内的订单到内存中结束。。。", len(*list))
+	}()
 	MsgRemind.run()
 	MsgRemind.gc()
 }

src/web/staticres/dataExport/js/pageination.ie.js

@@ -1,8 +1,8 @@
 function _instanceof(left, right) {
   if (
-    right != null &&
-    typeof Symbol !== "undefined" &&
-    right[Symbol.hasInstance]
+      right != null &&
+      typeof Symbol !== "undefined" &&
+      right[Symbol.hasInstance]
   ) {
     return right[Symbol.hasInstance](left);
   } else {
@@ -37,222 +37,221 @@ function _createClass(Constructor, protoProps, staticProps) {
  * @author zhangyuhan2016 <hi_zhangyuhan@163.com>
  */
 var Page =
-  /*#__PURE__*/
-  (function() {
-    "use strict";
-
-    function Page() {
-      var _ref =
-          arguments.length > 0 && arguments[0] !== undefined
-            ? arguments[0]
-            : {},
-        _ref$el = _ref.el,
-        el = _ref$el === void 0 ? ".pagination-box" : _ref$el,
-        _ref$now = _ref.now,
-        now = _ref$now === void 0 ? 1 : _ref$now,
-        _ref$show = _ref.show,
-        show = _ref$show === void 0 ? 5 : _ref$show,
-        _ref$total = _ref.total,
-        total = _ref$total === void 0 ? 1000 : _ref$total,
-        _ref$size = _ref.size,
-        size = _ref$size === void 0 ? 10 : _ref$size,
-        _ref$click = _ref.click,
-        click = _ref$click === void 0 ? null : _ref$click;
-
-      _classCallCheck(this, Page);
-
-      this.now = now;
-      this.show = show;
-      this.total = total;
-      this.size = size;
-      this.min = 1;
-      this.max = Math.ceil(total / size);
-      this.contentArr = [];
-      this.contentDom = [];
-      this.dom = document.querySelector(el);
-      this.abDom = [];
-      this.otherDom = [];
-      this.click = click;
-    }
-
-    _createClass(Page, [
-      {
-        key: "init",
-        value: function init() {
-          var _this = this;
-
-          // dom数组
-          var cArr = ["back", "prev", "next", "cont", "min", "max"];
-          cArr.forEach(function(v) {
-            _this.otherDom.push(
-              _this.dom.querySelector('button[name="'.concat(v, '"]'))
-            );
-          });
-          this.otherDom[4].innerText = this.min;
-          this.otherDom[5].innerText = this.max;
-
-          if (this.min === this.max) {
-            this.otherDom[5].style.display = "none";
-          } // 创建dom
-
-          this.getContent(); // 点击事件
-
-          this.dom.addEventListener("click", function(e) {
-            if (e.target.nodeName === "BUTTON") {
-              var type = e.target.getAttribute("name");
-              var tempNumber = 0;
-
-              switch (type) {
-                case "back": {
-                  tempNumber = -1;
-                  break;
-                }
+    /*#__PURE__*/
+    (function() {
+      "use strict";
+
+      function Page() {
+        var _ref =
+                arguments.length > 0 && arguments[0] !== undefined
+                    ? arguments[0]
+                    : {},
+            _ref$el = _ref.el,
+            el = _ref$el === void 0 ? ".pagination-box" : _ref$el,
+            _ref$now = _ref.now,
+            now = _ref$now === void 0 ? 1 : _ref$now,
+            _ref$show = _ref.show,
+            show = _ref$show === void 0 ? 5 : _ref$show,
+            _ref$total = _ref.total,
+            total = _ref$total === void 0 ? 1000 : _ref$total,
+            _ref$size = _ref.size,
+            size = _ref$size === void 0 ? 10 : _ref$size,
+            _ref$click = _ref.click,
+            click = _ref$click === void 0 ? null : _ref$click;
+
+        _classCallCheck(this, Page);
+
+        this.now = now;
+        this.show = show;
+        this.total = total;
+        this.size = size;
+        this.min = 1;
+        this.max = Math.ceil(total / size);
+        this.contentArr = [];
+        this.contentDom = [];
+        this.dom = document.querySelector(el);
+        this.abDom = [];
+        this.otherDom = [];
+        this.click = click;
+      }
 
-                case "cont": {
-                  tempNumber = 1;
-                  break;
+      _createClass(Page, [
+        {
+          key: "init",
+          value: function init() {
+            var _this = this;
+
+            // dom数组
+            var cArr = ["back", "prev", "next", "cont", "min", "max"];
+            cArr.forEach(function(v) {
+              _this.otherDom.push(
+                  _this.dom.querySelector('button[name="'.concat(v, '"]'))
+              );
+            });
+            this.otherDom[4].innerText = this.min;
+            this.otherDom[5].innerText = this.max;
+
+            if (this.min === this.max) {
+              this.otherDom[5].style.display = "none";
+            } // 创建dom
+
+            this.getContent(); // 点击事件
+            $(this.dom).off("click").on("click", function(e) {
+              if (e.target.nodeName === "BUTTON") {
+                var type = e.target.getAttribute("name");
+                var tempNumber = 0;
+
+                switch (type) {
+                  case "back": {
+                    tempNumber = -1;
+                    break;
+                  }
+
+                  case "cont": {
+                    tempNumber = 1;
+                    break;
+                  }
+
+                  case "prev": {
+                    tempNumber = -_this.show;
+                    break;
+                  }
+
+                  case "next": {
+                    tempNumber = _this.show;
+                    break;
+                  }
+
+                  default: {
+                    tempNumber = parseInt(e.target.innerText) - _this.now;
+                  }
                 }
 
-                case "prev": {
-                  tempNumber = -_this.show;
-                  break;
-                }
+                var tempNow = _this.now + tempNumber;
 
-                case "next": {
-                  tempNumber = _this.show;
-                  break;
+                if (_this.min <= tempNow && tempNow <= _this.max) {
+                  _this.now = tempNow;
                 }
 
-                default: {
-                  tempNumber = parseInt(e.target.innerText) - _this.now;
-                }
-              }
+                typeof _this.click === "function"
+                    ? _this.click(_this.now, type)
+                    : null;
 
-              var tempNow = _this.now + tempNumber;
+                _this.getContent();
 
-              if (_this.min <= tempNow && tempNow <= _this.max) {
-                _this.now = tempNow;
+                _this.upData();
               }
+            });
+            var nextButton = this.otherDom[2];
+            this.abDom = this.otherDom.slice(-2);
+            this.contentArr.forEach(function(v) {
+              var b = document.createElement("button");
+              b.innerText = v;
+
+              _this.contentDom.push(b);
+
+              _this.dom.insertBefore(b, nextButton);
+            });
+            this.upData();
+          }
+        },
+        {
+          key: "upData",
+          value: function upData() {
+            var _this2 = this;
+
+            this.abDom.forEach(function(v) {
+              return (v.className = "");
+            });
+            this.otherDom[0].className = "";
+            this.otherDom[3].className = "";
+
+            if (this.now <= this.min) {
+              this.now = this.min;
+              this.abDom[0].className = "now";
+              this.otherDom[0].className = "stop";
+            }
 
-              typeof _this.click === "function"
-                ? _this.click(_this.now, type)
-                : null;
+            if (this.now >= this.max) {
+              this.now = this.max;
+              this.abDom[1].className = "now";
+              this.otherDom[3].className = "stop";
+            }
 
-              _this.getContent();
+            this.contentDom.forEach(function(v, i) {
+              v.className = "";
+              var n = _this2.contentArr[i];
 
-              _this.upData();
-            }
-          });
-          var nextButton = this.otherDom[2];
-          this.abDom = this.otherDom.slice(-2);
-          this.contentArr.forEach(function(v) {
-            var b = document.createElement("button");
-            b.innerText = v;
-
-            _this.contentDom.push(b);
-
-            _this.dom.insertBefore(b, nextButton);
-          });
-          this.upData();
-        }
-      },
-      {
-        key: "upData",
-        value: function upData() {
-          var _this2 = this;
-
-          this.abDom.forEach(function(v) {
-            return (v.className = "");
-          });
-          this.otherDom[0].className = "";
-          this.otherDom[3].className = "";
-
-          if (this.now <= this.min) {
-            this.now = this.min;
-            this.abDom[0].className = "now";
-            this.otherDom[0].className = "stop";
-          }
+              if (n === _this2.now) {
+                v.className = "now";
+              }
 
-          if (this.now >= this.max) {
-            this.now = this.max;
-            this.abDom[1].className = "now";
-            this.otherDom[3].className = "stop";
+              v.innerText = n;
+            });
           }
+        },
+        {
+          key: "getContent",
+          value: function getContent() {
+            var _this3 = this;
 
-          this.contentDom.forEach(function(v, i) {
-            v.className = "";
-            var n = _this2.contentArr[i];
+            var n = this.now;
+            var size = this.show;
+            var arr = [];
 
-            if (n === _this2.now) {
-              v.className = "now";
-            }
+            for (var i = 0; i < size; i++) {
+              arr[i] = i;
+            } // default
 
-            v.innerText = n;
-          });
-        }
-      },
-      {
-        key: "getContent",
-        value: function getContent() {
-          var _this3 = this;
+            var content = Math.floor(arr.length / 2);
+            var show = [true, true];
 
-          var n = this.now;
-          var size = this.show;
-          var arr = [];
+            var mapF = function mapF(v, i) {
+              var step = content - i;
+              return n - step;
+            }; // min
 
-          for (var i = 0; i < size; i++) {
-            arr[i] = i;
-          } // default
 
-          var content = Math.floor(arr.length / 2);
-          var show = [true, true];
+            if (this.max - size < n) {
+              mapF = function mapF(v, i) {
+                return _this3.max - size + i;
+              };
 
-          var mapF = function mapF(v, i) {
-            var step = content - i;
-            return n - step;
-          }; // min
+              show[1] = false;
+            }
 
+            if(n+(size-1)/2<this.max-1){
+              show[1] = true;
+            }
 
-		  if (this.max - size < n) {
-            mapF = function mapF(v, i) {
-              return _this3.max - size + i;
-            };
+            if (n <= size - this.min) {
+              mapF = function mapF(v, i) {
+                return _this3.min + 1 + i;
+              };
+              show[0] = false;
+            } // max
 
-            show[1] = false;
-          }
-        
-          if(n+(size-1)/2<this.max-1){
-        	show[1] = true;
-          }	
-        
-          if (n <= size - this.min) {
-            mapF = function mapF(v, i) {
-              return _this3.min + 1 + i;
-            };
-            show[0] = false;
-          } // max
-          
-        
-          if (this.max - this.min <= this.show) {
-            show = [false, false];
-          }
-          this.contentArr = arr.map(mapF).filter(function(v) {
-            return v > _this3.min && v < _this3.max;
-          });
-        
-          if(this.min+1==this.contentArr[0]){
-        	show[0] = false;
-          }
-          
-          if(this.max-1==this.contentArr[this.contentArr.length-1]){
-        	show[1] = false;
+
+            if (this.max - this.min <= this.show) {
+              show = [false, false];
+            }
+            this.contentArr = arr.map(mapF).filter(function(v) {
+              return v > _this3.min && v < _this3.max;
+            });
+
+            if(this.min+1==this.contentArr[0]){
+              show[0] = false;
+            }
+
+            if(this.max-1==this.contentArr[this.contentArr.length-1]){
+              show[1] = false;
+            }
+            show.forEach(function(v, i) {
+              _this3.otherDom[i + 1].style.display = v ? "inline-block" : "none";
+              _this3.otherDom[i + 1].style.pointerEvents = "none";
+            });
           }
-          show.forEach(function(v, i) {
-            _this3.otherDom[i + 1].style.display = v ? "inline-block" : "none";
-            _this3.otherDom[i + 1].style.pointerEvents = "none";
-          });
         }
-      }
-    ]);
-    return Page;
-  })();
+      ]);
+      return Page;
+    })();

src/web/staticres/js/login.js

@@ -334,7 +334,7 @@ var logic = function(data,num){
 					+"<div class='usernameDiv'>"
 						+data.s_nickname
 					+"</div>"
-					 +"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/dataExport/toMyOrder'\">"
+					 +"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/swordfish/toMyOrder'\">"
 					 	+"<span>我的订单</span>"
 					 +"</div>"
 					+"<div class='exitDiv' onclick='signout()'>"
@@ -568,7 +568,7 @@ var haslogin = function(num,kyorpn,url){
 						+"<div class='usernameDiv'>"
 							+data.s_nickname
 						+"</div>"
-						 +"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/dataExport/toMyOrder'\">"
+						 +"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/swordfish/toMyOrder'\">"
 						 	+"<span>我的订单</span>"
 						 +"</div>"
 						+"<div class='exitDiv' onclick='signout()'>"

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

@@ -1,5 +1,4 @@
 $(function () {
-	var isUsedActiveCode = false;
     //项目匹配开关
     var checkedflag = true;
 
@@ -646,9 +645,6 @@ $(function () {
         } else {
             $(".vip-header .trail").show();
         }
-		if (state.isUsedActiveCode){
-			isUsedActiveCode = true;
-		}
     }
 
 
@@ -835,7 +831,6 @@ $(function () {
         $DoPost('/subscribepay/vipsubscribe/saveChange', {
             "area": reqData.area["全国"] ? '{}' : JSON.stringify(reqData.area),
             "industry": reqData.industry.join(","),
-            "payWay": "wx_js",
             "time": selectTime,
             "price": parseInt((submitPrice).toFixed(0)),
 			"activeCode": activeCodes
@@ -843,8 +838,8 @@ $(function () {
             if (r.success) {
                 if (r.data.needPay) {
                     //创建支付订单
-                    //onBridgeReady(JSON.parse(r.data.res), r.data.code);
-                    //clearSessionStorage();
+                    clearSessionStorage();
+                    history.replaceState({}, '', '/front/vipsubscribe/toOrderDetailPage?orderCode='+r.data.code);
                     window.location.replace("/weixin/pay/checkout_vip?orderCode=" + r.data.code);
                 } else {
                     //订阅修改
@@ -894,13 +889,6 @@ $(function () {
                 })
             	return
             }
-            if (isUsedActiveCode){
-            	weui.toast('每个用户仅可使用一次', {
-            		className: 'j-toast',
-            		duration: 1500
-            	})
-            	return
-            }
             if (value.length === couponInfo.code.length && value.toLowerCase() === couponInfo.code) {
                 $('.coupon-code-tx .keywords-text').text(couponInfo.successTip)
 				sessionStorage.liveActiveCode_new = "jianyu360"

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

@@ -91,7 +91,7 @@
 	<section id="drder">
 	    <div class="invoice" id="invoice">
 	        <div class="w invoice_crumb">
-	            <a onclick="window.location.href='/front/dataExport/toMyOrder'">我的订单</a><em> > </em>
+	            <a onclick="window.location.href='/front/swordfish/toMyOrder'">我的订单</a><em> > </em>
 	            <a onclick="location.reload()" class="active">开发票</a>
 	        </div>
 	        <div class="w invoice_main">

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

@@ -106,7 +106,7 @@
 	<section id="drder">
     <div class="order_pay visib_" id="order_pay">
         <div class="w op_crumb">
-            <a onclick="window.location.href='/front/dataExport/toMyOrder'">我的订单</a><em> > </em>
+            <a onclick="window.location.href='/front/swordfish/toMyOrder'">我的订单</a><em> > </em>
             <a onclick="location.reload()" class="active">去支付</a>
         </div>
         <div class="w op_main">
@@ -285,7 +285,7 @@
             });
 			//
 			$('.cancel_btn').on('click',function(){
-				window.location.href="/front/dataExport/toMyOrder";
+				window.location.href="/front/swordfish/toMyOrder";
 			})
             // 删除图片
             $('.upload_box').on('click','.screen',function(){

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

@@ -49,7 +49,7 @@
     <!-- main  START -->
     <div class="order_detail" id="order_detail">
         <div class="w order_crumb">
-            <a href="#" onclick="window.location.href='/front/dataExport/toMyOrder'">我的订单</a><em> > </em>
+            <a href="#" onclick="window.location.href='/front/swordfish/toMyOrder'">我的订单</a><em> > </em>
             <a href="#" class="active">订单详情</a>
         </div>
         <div class="w order_main">

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

@@ -282,7 +282,7 @@
 			})
 			//
 			$('.cancel_btn').on('click',function(){
-				window.location.href="/front/dataExport/toMyOrder";
+				window.location.href="/front/swordfish/toMyOrder";
 			})
             // 删除图片
             $('.upload_box').on('click','.screen',function(){
@@ -312,7 +312,7 @@
 			                setTimeout(function () {
 			                    $('.toast').hide();
 								//跳转订单列表
-								window.location.replace("/front/dataExport/toMyOrder")
+								window.location.replace("/front/swordfish/toMyOrder")
 			                }, 2000)
 						}else{
 							alert("请求有误")

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

@@ -33,7 +33,7 @@
 	<section id="drder">
 	    <div class="refund" id="refund">
 	        <div class="w r_crumb">
-	            <a onclick="window.location.href='/front/dataExport/toMyOrder'">我的订单</a><em> > </em>
+	            <a onclick="window.location.href='/front/swordfish/toMyOrder'">我的订单</a><em> > </em>
 	            <a onclick="location.reload()" class="active">退款</a>
 	        </div>
 	        <div class="w r_main">

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

@@ -32,7 +32,7 @@
 	<section id="drder">
 	    <div class="check_invoice" id="check_invoice">
 	        <div class="w ci_crumb">
-	            <a onclick="window.location.href='/front/dataExport/toMyOrder'">我的订单</a><em> > </em>
+	            <a onclick="window.location.href='/front/swordfish/toMyOrder'">我的订单</a><em> > </em>
 	            <a onclick="location.reload()" class="active">查看发票</a>
 	        </div>
 	        <div class="w ci_main">

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

@@ -53,7 +53,7 @@
     <!-- main  START -->
     <div class="order_detail" id="order_detail">
         <div class="w order_crumb">
-            <a href="#" onclick="window.location.href='/front/dataExport/toMyOrder'">我的订单</a><em> > </em>
+            <a href="#" onclick="window.location.href='/front/swordfish/toMyOrder'">我的订单</a><em> > </em>
             <a href="#" class="active">订单详情</a>
         </div>
         <div class="w order_main">

src/web/templates/order/pc/orderPay.html

@@ -20,7 +20,7 @@
 <section id="drder">
     <div class="order_pay visib_" id="order_pay">
         <div class="w op_crumb">
-            <a onclick="window.location.href='/front/dataExport/toMyOrder'">我的订单</a><em> > </em>
+            <a onclick="window.location.href='/front/swordfish/toMyOrder'">我的订单</a><em> > </em>
             <a onclick="location.reload()" class="active">去支付</a>
         </div>
         <div class="w op_main">

src/web/templates/pc/bidsearch_static.html

@@ -746,7 +746,7 @@ function setLogin(n){
 							+"<div class='usernameDiv'>"
 								+data.s_nickname
 							+"</div>"
-							+"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/dataExport/toMyOrder'\">"
+							+"<div class=\"myorderDiv\" onclick=\"window.location.href='/front/swordfish/toMyOrder'\">"
 								+"<span>我的订单</span>"	
 							+"</div>"
 							+"<div class='exitDiv' onclick='signout()'>"

src/web/templates/pc/billing_list.html

@@ -46,7 +46,7 @@
     <!-- main  START -->
     <div class="billing_list" id="billing_list">
         <div class="w crumb">
-            <a href="/front/dataExport/toMyOrder">我的订单</a><em> > </em>
+            <a href="/front/swordfish/toMyOrder">我的订单</a><em> > </em>
             <a onclick="history.back()">订单详情</a><em> > </em>
             <a class="active">计费清单</a>
         </div>

src/web/templates/pc/check_invoice.html

@@ -5,9 +5,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>查看发票</title>
-	<script>
-		var myPageNavIsNormal = true;
+    <title>查看发票</title>
+	<script>
+		var myPageNavIsNormal = true;
 	</script>
 	{{include "/common/pnc.html"}}
 	<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
@@ -44,7 +44,7 @@
     <!-- main  START -->
     <div class="check_invoice" id="check_invoice">
         <div class="w ci_crumb">
-            <a href="/front/dataExport/toMyOrder">我的订单</a><em> > </em>
+            <a href="/front/swordfish/toMyOrder">我的订单</a><em> > </em>
             <a href="javascript:;" class="active">查看发票</a>
         </div> 
         <div class="w step clearfix">
@@ -128,7 +128,7 @@
             });
 			var order_code={{.T.order_code}};
 			$(".order_code").text(order_code)
-			viewInvoice(order_code)
+			viewInvoice(order_code)
 			checkInvoice(order_code);
 			var changed = false;
 			var interval;

src/web/templates/pc/dataExport_invoice.html

@@ -168,7 +168,7 @@
 {{include "/common/pchead.html"}}
 <section id="order_two" class="w">
     <div class="nav" style="margin-top: 80px;">
-        <a href="/front/dataExport/toMyOrder" style="text-decoration:none;">我的订单></a>
+        <a href="/front/swordfish/toMyOrder" style="text-decoration:none;">我的订单></a>
         <a href="/front/dataExport/toOrderDetail/{{.T.order_code}}" style="text-decoration:none;">订单详情></a>
         <a href="#" class="noLine" style="text-decoration:none;">申请开票</a>
     </div>

src/web/templates/pc/entniche_orderDetail.html

@@ -48,7 +48,7 @@
     <!-- main  START -->
     <div class="order_detail" id="order_detail">
         <div class="w order_crumb">
-            <a href="#" onclick="window.location.href='/front/dataExport/toMyOrder'">我的订单</a><em> > </em>
+            <a href="#" onclick="window.location.href='/front/swordfish/toMyOrder'">我的订单</a><em> > </em>
             <a href="#" class="active">订单详情</a>
         </div>
         <div class="w order_main">

src/web/templates/pc/invoice.html

@@ -5,16 +5,16 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>开发票</title>
-	<script>
-		var myPageNavIsNormal = true;
-	</script>
-	
-	{{include "/common/pnc.html"}}
-	<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-	<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-	<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}"/>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
+    <title>开发票</title>
+	<script>
+		var myPageNavIsNormal = true;
+	</script>
+	
+	{{include "/common/pnc.html"}}
+	<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}"/>
+	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
 	
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/electronic_invoice/css/bootstrap.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/electronic_invoice/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
@@ -26,9 +26,9 @@
             <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
         <![endif]-->
 </head>
-<style>
-	#invoice_title > ul >li {
-		float: none !important; 
+<style>
+	#invoice_title > ul >li {
+		float: none !important; 
 	}
 	input::-webkit-input-placeholder { /* WebKit browsers */
 	    color: #999999; 
@@ -41,15 +41,15 @@
 	} 
 	input:-ms-input-placeholder { /* Internet Explorer 10+ */ 
 	    color: #999999; 
-	}
+	}
 </style>
 <body>
-    <!-- header -->
+    <!-- header -->
 	{{include "/common/pchead.html"}}
     <!-- main  START -->
     <div class="invoice" id="invoice">
         <div class="w invoice_crumb">
-            <a href="/front/dataExport/toMyOrder">我的订单</a><em> > </em>
+            <a href="/front/swordfish/toMyOrder">我的订单</a><em> > </em>
             <a href="" class="active">开发票</a>
         </div>
         <div class="w invoice_main">
@@ -143,8 +143,8 @@
 	        </div>
 	    </div>
 	</div>
-    <!-- main END -->
-	{{include "/common/pcbottom.html"}}
+    <!-- main END -->
+	{{include "/common/pcbottom.html"}}
 	{{include "/common/baiducc.html"}}
     <!-- footer -->
     <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/jquery-2.1.4.min.js"></script>
@@ -152,8 +152,8 @@
     <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/city/city-picker.js"></script>
     <!-- custom_select.js 为封装select控件 修改原生select样式 -->
     <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/custom_select.js"></script>
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/invoice.js?v={{Msg "seo" "version"}}"></script>
-	<script>
+    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/invoice.js?v={{Msg "seo" "version"}}"></script>
+	<script>
 		  $(function(){
 			  var order_mail = {{.T.mail}};
 			  var order_phone = {{.T.phone}};
@@ -195,12 +195,12 @@
 					}
 			  	  });
 			  }
-			  checkForm();
-			  
-			  var order_code = {{.T.order_code}};
-			  $(".order_code").text(order_code);
-			  $(".cancel_btn").on("click",function(){
-					window.history.go(-1);
+			  checkForm();
+			  
+			  var order_code = {{.T.order_code}};
+			  $(".order_code").text(order_code);
+			  $(".cancel_btn").on("click",function(){
+					window.history.go(-1);
 			  })
 			  
 			  $('#ruleModal').on('show.bs.modal', function () {
@@ -217,8 +217,8 @@
 			  $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
 			  $("section[id='drder']").css("padding-top", "80px");
 			  selcetIndexNav(6);
-			  haslogin({{.T.logid}});
-		  })
+			  haslogin({{.T.logid}});
+		  })
 	</script>
 </body>
 

src/web/templates/pc/myOrder.html

@@ -1,882 +1,857 @@
 <html lang="en">
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/font_624651_bjdvktmum68.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/drder_details.css?v={{Msg "seo" "version"}}">
-
-		{{include "/common/pnc.html"}}
-		<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" />
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
-
-		<link href="{{Msg "seo" "cdn"}}/dataExport/jquery-confirm/jquery-confirm.min.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<script src="{{Msg "seo" "cdn"}}/dataExport/jquery-confirm/jquery-confirm.min.js?v={{Msg "seo" "version"}}"></script>
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/font_624651_bjdvktmum68.css?v={{Msg "seo" "version"}}">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/drder_details.css?v={{Msg "seo" "version"}}">
+
+	{{include "/common/pnc.html"}}
+	<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" />
+	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
+
+	<link href="{{Msg "seo" "cdn"}}/dataExport/jquery-confirm/jquery-confirm.min.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<script src="{{Msg "seo" "cdn"}}/dataExport/jquery-confirm/jquery-confirm.min.js?v={{Msg "seo" "version"}}"></script>
 	<!--2.8.8-->
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/course/css/order_list.css?v={{Msg "seo" "version"}}">
-		<title>我的订单</title>
-		<style type="text/css">
-			a {
-				text-decoration: none !important;
-			}
-
-			.glyphicon-question-sign:before {
-				content: "";
-			}
-
-			.inner>.err-box {
-				box-sizing: border-box;
-				padding: 67px 0 97px 0;
-				font-size: 16px;
-			}
-
-			.inner>.err-box>img {
-				width: 211px;
-				height: 169px;
-				display: block;
-				margin: 0 auto;
-			}
-
-			.inner>.err-box>span {
-				display: block;
-				text-align: center;
-				margin-top: 30px;
-			}
-
-			.pagination a {
-				float: left;
-				padding: 10px 9px;
-				border: 1px solid #EBEBEB;
-				margin-left: 0;
-				text-decoration: none;
-				/* border-bottom-left-radius: 4px; */
-				border-radius: 4px;
-			}
-
-			.pagination span {
-				float: left;
-				width: 36px;
-				height: 36px;
-				line-height: 36px;
-				text-align: center;
-				color: #ffffff;
-				background-color: #2cb7ca;
-				margin: 0 10px;
-				border-radius: 4px;
-			}
-
-			.disabled {
-				cursor: not-allowed;
-				color: #aea79f !important;
-			}
-
-			.nbprev i {
-				margin-right: 5px;
-			}
-
-			.nbnext i {
-				margin-left: 5px;
-			}
-
-			/**/
-			.pagination-box {
-				float: right;
-				margin-top: 20px;
-				user-select: none;
-			}
-
-			.pagination-box button {
-				padding: 0 4px;
-				vertical-align: top;
-				display: inline-block;
-				font-size: 14px;
-				height: 36px;
-				line-height: 36px;
-				cursor: pointer;
-				box-sizing: border-box;
-				text-align: center;
-				margin: 0 5px;
-				background-color: #fff;
-				color: #606266;
-				min-width: 36px;
-				border-radius: 4px;
-				border: none;
-				outline: none;
-				border: 1px solid #EBEBEB;
-			}
-
-			.pagination-box button.now {
-				background-color: #2cb7ca;
-				color: #fff;
-				border: 1px solid #2cb7ca !important;
-			}
-
-			.pagination-box button.stop {
-				background-color: #fff;
-				color: #aea79f;
-				cursor: not-allowed;
-			}
-
-			.pagination-box #prev {
-				width: 78px;
-				border: 1px solid #EBEBEB;
-			}
-
-			.pagination-box #prev i {
-				margin-right: 8px;
-			}
-
-			.pagination-box #next {
-				width: 78px;
-				border: 1px solid #EBEBEB;
-			}
-
-			.pagination-box #next i {
-				margin-left: 8px;
-			}
-			.bidLogin{
-				background: unset !important;
-			}
-		</style>
-	</head>
-	<body style="background-color: #fff !important;">
-		{{include "/common/pchead.html"}}
-		<section id="drder" class="w">
-			<!-- main  START -->
-		    <div class="order" id="order">
-		        <div class="w order_tab">
-		            <span class="tab_item active">全部</span>
-		            <span class="tab_item">待付款</span>
-		            <span class="tab_item">已完成</span>
-		            <span class="tab_item">已取消</span>
-		        </div>
-		        <div class="w order_content">
-		            <div class="c_thead">
-		                <span class="th_detail">订单详情</span>
-		                <span class="th_number">金额</span>
-		                <span class="th_status">订单状态</span>
-		                <span class="th_handle">订单操作</span>
-		            </div>
-		            <div class="c_tbody">
-
-		            </div>
-		            <div class="c_tbody" style="display: none;">2</div>
-		            <div class="c_tbody" style="display: none;">3</div>
-		            <div class="c_tbody" style="display: none;">4</div>
-		        </div>
-		    </div>
-		    <!-- main END -->
-			<div class="pagination clearfix w">
-				<div class="pagination-box">
-
-				</div>
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/course/css/order_list.css?v={{Msg "seo" "version"}}">
+	<title>我的订单</title>
+	<style type="text/css">
+		a {
+			text-decoration: none !important;
+		}
+
+		.glyphicon-question-sign:before {
+			content: "";
+		}
+
+		.inner>.err-box {
+			box-sizing: border-box;
+			padding: 67px 0 97px 0;
+			font-size: 16px;
+		}
+
+		.inner>.err-box>img {
+			width: 211px;
+			height: 169px;
+			display: block;
+			margin: 0 auto;
+		}
+
+		.inner>.err-box>span {
+			display: block;
+			text-align: center;
+			margin-top: 30px;
+		}
+
+		.pagination a {
+			float: left;
+			padding: 10px 9px;
+			border: 1px solid #EBEBEB;
+			margin-left: 0;
+			text-decoration: none;
+			/* border-bottom-left-radius: 4px; */
+			border-radius: 4px;
+		}
+
+		.pagination span {
+			float: left;
+			width: 36px;
+			height: 36px;
+			line-height: 36px;
+			text-align: center;
+			color: #ffffff;
+			background-color: #2cb7ca;
+			margin: 0 10px;
+			border-radius: 4px;
+		}
+
+		.disabled {
+			cursor: not-allowed;
+			color: #aea79f !important;
+		}
+
+		.nbprev i {
+			margin-right: 5px;
+		}
+
+		.nbnext i {
+			margin-left: 5px;
+		}
+
+		/**/
+		.pagination-box {
+			float: right;
+			margin-top: 20px;
+			user-select: none;
+		}
+
+		.pagination-box button {
+			padding: 0 4px;
+			vertical-align: top;
+			display: inline-block;
+			font-size: 14px;
+			height: 36px;
+			line-height: 36px;
+			cursor: pointer;
+			box-sizing: border-box;
+			text-align: center;
+			margin: 0 5px;
+			background-color: #fff;
+			color: #606266;
+			min-width: 36px;
+			border-radius: 4px;
+			border: none;
+			outline: none;
+			border: 1px solid #EBEBEB;
+		}
+
+		.pagination-box button.now {
+			background-color: #2cb7ca;
+			color: #fff;
+			border: 1px solid #2cb7ca !important;
+		}
+
+		.pagination-box button.stop {
+			background-color: #fff;
+			color: #aea79f;
+			cursor: not-allowed;
+		}
+
+		.pagination-box #prev {
+			width: 78px;
+			border: 1px solid #EBEBEB;
+		}
+
+		.pagination-box #prev i {
+			margin-right: 8px;
+		}
+
+		.pagination-box #next {
+			width: 78px;
+			border: 1px solid #EBEBEB;
+		}
+
+		.pagination-box #next i {
+			margin-left: 8px;
+		}
+		.bidLogin{
+			background: unset !important;
+		}
+	</style>
+</head>
+<body style="background-color: #fff !important;">
+{{include "/common/pchead.html"}}
+<section id="drder" class="w">
+	<!-- main  START -->
+	<div class="order" id="order">
+		<div class="w order_tab">
+			<span class="tab_item active">全部</span>
+			<span class="tab_item">待付款</span>
+			<span class="tab_item">已完成</span>
+			<span class="tab_item">已取消</span>
+		</div>
+		<div class="w order_content">
+			<div class="c_thead">
+				<span class="th_detail">订单详情</span>
+				<span class="th_number">金额</span>
+				<span class="th_status">订单状态</span>
+				<span class="th_handle">订单操作</span>
 			</div>
-		</section>
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/dataExport/js/pageination.ie.js?v={{Msg "seo" "version"}}"></script>
-		{{include "/common/pcbottom.html"}}
-		{{include "/common/baiducc.html"}}
-		<script>
-			var totalPage = 1;
-			var pageNum = 1;
-			/*
-			 * el Dom节点
-			 * show 索引数量
-			 * total 数据总数
-			 * size 每页条数
-			 * now 当前索引
-			 * click 点击事件
-			 * */
-			var pageHtml =
-				"<button name=\"back\" id=\"prev\"><i><</i>上一页</button><button name=\"min\">1</button><button name=\"prev\">...</button><button name=\"next\">...</button><button name=\"max\">100</button><button name=\"cont\" id=\"next\">下一页<i>></i></button>";
-			var show = 5;
-			var total = 20;
-			var size = 2;
-			var canUseWxpay=true;
-			var clickF = function clickF(number, type) {
-				var $Index = $(".order_tab span.tab_item.active").index();
-        		pageNum=number;
-				$(".c_tbody").html("");
-				queryOrder($Index, number);
-			};
-			var pageFlag = true;
-			var p = null;
-            var activeDiscount = {{.T.activeDiscount}}
-			$(function() {
-				selcetIndexNav(6);
-				haslogin({{.T.logid}});
-				$(document).off("keydown");
-				$("body").css("line-height", "1");
-				$(".logo img").attr("src", "/images/swordfish/sf_01_new.png");
-				$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-				$("section[id='drder']").css({"padding-top":"97px","min-height":"calc(100% - 340px)"});
-
-				/*设置关键词css*/
-				var $gjccss = $(".list .gjc");
-				$gjccss.each(function(v, i) {
-					var $l = i.children.length;
-					var $h = 66;
-					i.style.height = ($h / $l) + 'px';
-					i.style.lineHeight = ($h / $l) + 'px';
-				});
-				//获取全部订单
-				queryOrder(0,  pageNum);
-
-				$(".order_tab span.tab_item").on("click", function() {
-					var $Index = $(this).index();
-					$(this).addClass("active").siblings().removeClass("active");
-					//var $list = $(".list .item");
-					//$list.eq($Index).show().siblings().hide();
-					$(".c_tbody").html("");
-					pageNum = 1;
-					pageFlag = true;
-					p = null;
-					$("#previousPage").addClass("disabled");
-					$("#nextPage").removeClass("disabled");
-					queryOrder($Index,  pageNum);
-				});
-			})
+			<div class="c_tbody">
 
-			var noDataHtml =
-				"<div class=\"inner\">" +
-				"<div class=\"err-box\">" +
-				"<img src=\"/images/pc_12.png\" alt=\"暂无数据\">" +
-				"<span>暂无数据</span>" +
-				"</div>" +
-				"</div>";
-
-			//ind 0-全部 1-待支付 2-已支付 3-已取消
-			function queryOrder(ind, pageNum) {
-				$(".pagination-box").hide();
-				$.ajax({
-					type: "post",
-					url: "/front/dataExport/queryOrder",
-					data: {
-						"type": ind,
-						"pageNum": pageNum
-					},
-					dataType: 'json',
-					success: function(data) {
-						var temp = "";
-						if (data.list && data.list.length > 0) {
-							$(".pagination-box").show();
-							if (pageFlag) {
-				                if(p){
-				                  p.click = null;
-				                }
-								$(".pagination-box").html(pageHtml);
-								p = new Page({
-									show: show,
-									total: data.count,
-									size: data.pageSize,
-									click: clickF
-								});
-								p.init();
-								pageFlag = false;
-							}
-							for (var i = 0; i < data.list.length; i++) {
-								var obj = data.list[i];
-								var id = obj.id;
-								var orderCode = obj.order_code;
-								var publishTime = obj.filter_publishtime;
-								var spec = obj.data_spec;
-								var orderStatus = obj.order_status;
-								var course_status = obj.course_status;
-								var orderMoney = obj.order_money;
-								var token = obj.token;
-								var payway = obj.pay_way;
-								var code = obj.code_url;
-								var publishTimeHtml = "";
-								var orderStatusHtml = "";
-								var cla = "";
-								var deleteOrderHtml = "";
-								var keysHtml = "";
-								var prepaytime = obj.prepay_time;
-								var isLiveActive = obj.isLiveActive;
-                                var isUsedActiveCode = obj.isUsedActiveCode;
-								if (!obj.user_openid){
-									canUseWxpay=false;
+			</div>
+			<div class="c_tbody" style="display: none;">2</div>
+			<div class="c_tbody" style="display: none;">3</div>
+			<div class="c_tbody" style="display: none;">4</div>
+		</div>
+	</div>
+	<!-- main END -->
+	<div class="pagination clearfix w">
+		<div class="pagination-box">
+
+		</div>
+	</div>
+</section>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/dataExport/js/pageination.ie.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/pcbottom.html"}}
+{{include "/common/baiducc.html"}}
+<script>
+	var myPageNavIsNormal = true
+	var totalPage = 1;
+	var pageNum = 1;
+	/*
+     * el Dom节点
+     * show 索引数量
+     * total 数据总数
+     * size 每页条数
+     * now 当前索引
+     * click 点击事件
+     * */
+	var pageHtml =
+			"<button name=\"back\" id=\"prev\"><i><</i>上一页</button><button name=\"min\">1</button><button name=\"prev\">...</button><button name=\"next\">...</button><button name=\"max\">100</button><button name=\"cont\" id=\"next\">下一页<i>></i></button>";
+	var show = 5;
+	var total = 20;
+	var size = 2;
+	var canUseWxpay=true;
+	var clickF = function clickF(number, type) {
+		var $Index = $(".order_tab span.tab_item.active").index();
+		pageNum=number;
+		$(".c_tbody").html("");
+		queryOrder($Index, number);
+	};
+	var pageFlag = true;
+	var p = null;
+	$(function() {
+		selcetIndexNav(6);
+		haslogin({{.T.logid}});
+		$(document).off("keydown");
+		$("body").css("line-height", "1");
+		$(".logo img").attr("src", "/images/swordfish/sf_01_new.png");
+		$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
+		$("section[id='drder']").css({"padding-top":"97px","min-height":"calc(100% - 340px)"});
+
+		/*设置关键词css*/
+		var $gjccss = $(".list .gjc");
+		$gjccss.each(function(v, i) {
+			var $l = i.children.length;
+			var $h = 66;
+			i.style.height = ($h / $l) + 'px';
+			i.style.lineHeight = ($h / $l) + 'px';
+		});
+		//获取全部订单
+		queryOrder(0,  pageNum);
+
+		$(".order_tab span.tab_item").on("click", function() {
+			var $Index = $(this).index();
+			$(this).addClass("active").siblings().removeClass("active");
+			//var $list = $(".list .item");
+			//$list.eq($Index).show().siblings().hide();
+			$(".c_tbody").html("");
+			pageNum = 1;
+			pageFlag = true;
+			p = null;
+			$("#previousPage").addClass("disabled");
+			$("#nextPage").removeClass("disabled");
+			queryOrder($Index,  pageNum);
+		});
+	})
+
+	var noDataHtml =
+			"<div class=\"inner\">" +
+			"<div class=\"err-box\">" +
+			"<img src=\"/images/pc_12.png\" alt=\"暂无数据\">" +
+			"<span>暂无数据</span>" +
+			"</div>" +
+			"</div>";
+
+	//ind 0-全部 1-待支付 2-已支付 3-已取消
+	function queryOrder(ind, pageNum) {
+		$(".pagination-box").hide();
+		$.ajax({
+			type: "post",
+			url: "/subscribepay/orderListDetails/myOrder",
+			data: {
+				"type": ind,
+				"pageNum": pageNum,
+				"fromPage":"pc",
+			},
+			dataType: 'json',
+			success: function(data) {
+				var temp = "";
+				if (data.res && data.res.length > 0) {
+					$(".pagination-box").show();
+					if (pageFlag) {
+						$(".pagination-box").html(pageHtml);
+						p = new Page({
+							show: show,
+							total: data.count,
+							size: data.pageSize,
+							click: clickF
+						});
+						p.init();
+						pageFlag = false;
+					}
+					for (var i = 0; i < data.res.length; i++) {
+						var obj = data.res[i];
+						var id = obj.id;
+						var orderCode = obj.order_code;
+						var publishTime = obj.filter_publishtime;
+						var spec = obj.data_spec;
+						var orderStatus = obj.order_status;
+						var course_status = obj.course_status;
+						var orderMoney = obj.order_money;
+						var publishTimeHtml = "";
+						if (!obj.user_openid){
+							canUseWxpay=false;
+						}
+						if (!publishTime) {
+							publishTime = "全部";
+							publishTimeHtml = "<span style=\"margin-left: 118px;\">" + publishTime + "</span>";
+						} else {
+							if(publishTime.length === 11){
+								if(publishTime.slice(0,1) !== "_"){
+									publishTime=timestampToTime(publishTime.slice(0,10));
+									publishTime=publishTime+"-";
+								}else{
+									publishTime=timestampToTime(publishTime.slice(1,11))+"前全部";
 								}
-								if (!publishTime) {
-									publishTime = "全部";
-									publishTimeHtml = "<span style=\"margin-left: 118px;\">" + publishTime + "</span>";
-								} else {
-									if(publishTime.length==11){
-										if(publishTime.slice(0,1)!="_"){
-		                        	 		var publishtime_=publishTime.slice(0,10);
-		                        	 		publishTime=timestampToTime(publishtime_);
-		                        	 		publishTime=publishTime+"-";
-		                        	 	}else{
-		                        	 		var publishtime_=publishTime.slice(1,11);
-		                        	 		publishTime=timestampToTime(publishtime_)+"前全部";
-		                        	 	}
-										publishTimeHtml = "<span>" + publishTime + "</span>";
-									}else{
-										publishTimeHtml = "<span>" + publishTime + "</span>";
-									}
+								publishTimeHtml = "<span>" + publishTime + "</span>";
+							}else{
+								publishTimeHtml = "<span>" + publishTime + "</span>";
+							}
 
+						}
+						if (!orderMoney) {
+							orderMoney = 0;
+						}
+						if (!spec) {
+							spec = "";
+						}
+						var orderStatusClassOne="grayColor"
+						var orderStatusClassTwo="grayBg"
+						var shop_img_html='';//订单图片
+						var shop_main_html='';//订单详情
+						var m_status_html='';//订单状态
+						var m_handle_html='';//订单操作
+
+						if(obj.product_type==="历史数据"){
+							shop_img_html += '<img src="/electronic_invoice/image/dataOutput.png" alt="">'
+							if (obj.filter_keys && obj.filter_keys.split(",").length > 0) {
+								shop_main_html +='<p>关键词：'+obj.filter_keys.split(",")+'</p>'
+							}else{
+								shop_main_html +='<p>关键词：-</p>'
+							}
+							shop_main_html +='<p>数据量：'+obj.data_count+'条</p>'
+									+'<p>数据规格：'+spec+'</p>'
+									+'<p>筛选时间：'+publishTime+'</p>'
+
+							if (orderStatus === 0) {//待付款
+								orderStatusClassOne="blueColor"
+								orderStatusClassTwo="blueBg"
+								m_status_html +='<p class="finish_status">待付款</p>'
+								m_handle_html +='<p><a href="/front/dataexport/orderPay?code='+orderCode+'" class="go_pay">去支付</a></p>'
+										+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +
+										',this,\''+obj.filter_id+'\',0)">取消订单</a></p>'
+							}else if (orderStatus === 1) {//已完成
+								m_status_html +='<p class="finish_status">已完成</p>'
+								if(obj.applybill_status===1){
+									m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
+								}else{
+									m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
 								}
-								if (!orderMoney) {
-									orderMoney = 0;
-								}
-								if (!spec) {
-									spec = "";
+								m_handle_html +='<p><a  orderCode="' + orderCode + '" href="/front/dataExport/toSieve">再次购买</a></p>'
+							}else if (orderStatus === -2) {//已取消
+								m_status_html +='<p class="finish_status">已取消</p>'
+								m_handle_html +='<p><a  orderCode="' + orderCode + '"  href="/front/dataExport/toSieve">再次购买</a></p>'
+							}
+							m_status_html +='<p><a onclick="toDetail(\'' + orderCode + '\',0);">查看详情</a></p>'
+
+						}else if(obj.product_type ==="招投标课程"){
+							var filter_ = JSON.parse(obj.filter)
+							shop_img_html += '<img src="{{Msg "seo" "cdn"}}/course/image/lessonsOffline.png?v={{Msg "seo" "version"}}" alt="">'
+							shop_main_html +='<p>课程名称：'+filter_.courseName+'</p>'
+									+'<p>课程类型：'+filter_.courseType+'</p>'
+									+'<p>课程地点：'+filter_.courseAddress+'</p>'
+									+'<p>购买人数：'+filter_.peoleNum+'</p>'
+							if (orderStatus === 0) {//0：待付款；
+								//1:对公转账未上传凭证；2：对公转账审核中；3：对公转账审核未通过
+								orderStatusClassOne="blueColor"
+								orderStatusClassTwo="blueBg"
+								if(parseInt(course_status)===2){
+									m_status_html +='<p class="unfinished">转账审核中</p>'
+									m_handle_html +='-'
+								}else if(parseInt(course_status)===3){
+									m_status_html +='<p class="unfinished">未收到转账</p>'
+									m_handle_html +='<p><a href="/front/course/orderPay?code='+orderCode+'" class="go_pay">再次支付</a></p>'
+											+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +
+											',this,\''+obj.filter_id+'\',2)">取消订单</a></p>'
+								}else{
+									m_status_html +='<p class="finish_status">待付款</p>'
+									m_handle_html +='<p><a href="/front/course/orderPay?code='+orderCode+'" class="go_pay">去支付</a></p>'
+											+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +
+											',this,\''+obj.filter_id+'\',2)">取消订单</a></p>'
 								}
-								var orderStatusClassOne="grayColor"
-								var orderStatusClassTwo="grayBg"
-								var shop_img_html='';//订单图片
-								var shop_main_html='';//订单详情
-								var m_status_html='';//订单状态
-								var m_handle_html='';//订单操作
-
-								if(obj.product_type=="历史数据"){
-
-									shop_img_html += '<img src="/electronic_invoice/image/dataOutput.png" alt="">'
-									if (obj.filter_keys && obj.filter_keys.split(",").length > 0) {
-										shop_main_html +='<p>关键词：'+obj.filter_keys.split(",")+'</p>'
-									}else{
-										shop_main_html +='<p>关键词：-</p>'
+							}else if (orderStatus === 1) {//已完成
+								//4：对公转账审核通过（同时修改订单状态为已完成）；5：退款审核中；6：已退款；
+								if(parseInt(course_status)===5){
+									m_status_html +='<p class="unfinished">退款审核中</p>'
+									if(obj.applybill_status){
+										m_handle_html +='<p><a href="/front/course/viewInvoice?orderCode='+orderCode+'">发票信息</a></p>'
 									}
-									shop_main_html +='<p>数据量：'+obj.data_count+'条</p>'
-													+'<p>数据规格：'+spec+'</p>'
-													+'<p>筛选时间：'+publishTime+'</p>'
-
-									if (orderStatus == 0) {//待付款
-										orderStatusClassOne="blueColor"
-										orderStatusClassTwo="blueBg"
-										m_status_html +='<p class="finish_status">待付款</p>'
-										m_handle_html +='<p><a href="/front/dataexport/orderPay?code='+orderCode+'" class="go_pay">去支付</a></p>'
-													+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +
-										',this,\''+obj.filter_id+'\',0)">取消订单</a></p>'
-									}else if (orderStatus == 1) {//已完成
-										m_status_html +='<p class="finish_status">已完成</p>'
-										if(obj.applybill_status==1){
-											m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
-										}else{
-											m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
+									m_handle_html +='<p><a href="/front/course/detail?aboutFlag=true&_id='+obj.filter_id+'">再次购买</a></p>'
+								}else if(parseInt(course_status)===6){
+									m_status_html +='<p class="finish_status">已退款</p>'
+									m_handle_html +='<p><a href="/front/course/detail?aboutFlag=true&_id='+obj.filter_id+'">再次购买</a></p>'
+								}else{
+									m_status_html +='<p class="finish_status">已完成</p>'
+									try{
+										var startTime = new Date(filter_.startTime * 1000).toLocaleString().split(" ")[0];
+										var startTimes = new Date(startTime+ " 00:00:00").getTime();
+										var nowTime = new Date().getTime();
+										if(nowTime < startTimes){
+											m_handle_html +='<p><a href="/front/course/refund?orderCode='+orderCode+'">退款</a></p>'
 										}
-											m_handle_html +='<p><a  orderCode="' + orderCode + '" href="/front/dataExport/toSieve">再次购买</a></p>'
-									}else if (orderStatus == -2) {//已取消
-										m_status_html +='<p class="finish_status">已取消</p>'
-										m_handle_html +='<p><a  orderCode="' + orderCode + '"  href="/front/dataExport/toSieve">再次购买</a></p>'
+									}catch(e){}
+									if(obj.applybill_status){
+										m_handle_html +='<p><a href="/front/course/viewInvoice?orderCode='+orderCode+'">发票信息</a></p>'
+									}else{
+										m_handle_html +='<p><a href="/front/course/applyInvoice?orderCode='+orderCode+'">开发票</a></p>'
 									}
-									m_status_html +='<p><a onclick="toDetail(\'' + orderCode + '\',0);">查看详情</a></p>'
-
-								}else if(obj.product_type=="招投标课程"){
-									var filter_ = JSON.parse(obj.filter)
-									shop_img_html += '<img src="{{Msg "seo" "cdn"}}/course/image/lessonsOffline.png?v={{Msg "seo" "version"}}" alt="">'
-									shop_main_html +='<p>课程名称：'+filter_.courseName+'</p>'
-													+'<p>课程类型：'+filter_.courseType+'</p>'
-													+'<p>课程地点：'+filter_.courseAddress+'</p>'
-													+'<p>购买人数：'+filter_.peoleNum+'</p>'
-									if (orderStatus == 0) {//0：待付款；
-										//1:对公转账未上传凭证；2：对公转账审核中；3：对公转账审核未通过
-										orderStatusClassOne="blueColor"
-										orderStatusClassTwo="blueBg"
-										if(parseInt(course_status)==2){
-											m_status_html +='<p class="unfinished">转账审核中</p>'
-											m_handle_html +='-'
-										}else if(parseInt(course_status)==3){
-											m_status_html +='<p class="unfinished">未收到转账</p>'
-											m_handle_html +='<p><a href="/front/course/orderPay?code='+orderCode+'" class="go_pay">再次支付</a></p>'
-														+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +
-											',this,\''+obj.filter_id+'\',2)">取消订单</a></p>'
-										}else{
-											m_status_html +='<p class="finish_status">待付款</p>'
-											m_handle_html +='<p><a href="/front/course/orderPay?code='+orderCode+'" class="go_pay">去支付</a></p>'
-														+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +
-											',this,\''+obj.filter_id+'\',2)">取消订单</a></p>'
-										}
-									}else if (orderStatus == 1) {//已完成
-										//4：对公转账审核通过（同时修改订单状态为已完成）；5：退款审核中；6：已退款；
-										if(parseInt(course_status)==5){
-											m_status_html +='<p class="unfinished">退款审核中</p>'
-											if(obj.applybill_status){
-												m_handle_html +='<p><a href="/front/course/viewInvoice?orderCode='+orderCode+'">发票信息</a></p>'
-											}
-											m_handle_html +='<p><a href="/front/course/detail?aboutFlag=true&_id='+obj.filter_id+'">再次购买</a></p>'
-										}else if(parseInt(course_status)==6){
-											m_status_html +='<p class="finish_status">已退款</p>'
-											m_handle_html +='<p><a href="/front/course/detail?aboutFlag=true&_id='+obj.filter_id+'">再次购买</a></p>'
-										}else{
-											m_status_html +='<p class="finish_status">已完成</p>'
-											try{
-												var startTime = new Date(filter_.startTime * 1000).toLocaleString().split(" ")[0];
-												var startTimes = new Date(startTime+ " 00:00:00").getTime();
-												var nowTime = new Date().getTime();
-												if(nowTime < startTimes){
-													m_handle_html +='<p><a href="/front/course/refund?orderCode='+orderCode+'">退款</a></p>'
-												}
-											}catch(e){}
-											if(obj.applybill_status){
-												m_handle_html +='<p><a href="/front/course/viewInvoice?orderCode='+orderCode+'">发票信息</a></p>'
-											}else{
-												m_handle_html +='<p><a href="/front/course/applyInvoice?orderCode='+orderCode+'">开发票</a></p>'
-											}
-											m_handle_html +='<p><a  href="/front/course/detail?aboutFlag=true&_id='+obj.filter_id+'">再次购买</a></p>'
-										}
-									}else if (orderStatus == -2) {//已取消
-										m_status_html +='<p class="finish_status">已取消</p>'
-										m_handle_html +='<p><a  href="/front/course/detail?aboutFlag=true&_id='+obj.filter_id+'">再次购买</a></p>'
+									m_handle_html +='<p><a  href="/front/course/detail?aboutFlag=true&_id='+obj.filter_id+'">再次购买</a></p>'
+								}
+							}else if (orderStatus === -2) {//已取消
+								m_status_html +='<p class="finish_status">已取消</p>'
+								m_handle_html +='<p><a  href="/front/course/detail?aboutFlag=true&_id='+obj.filter_id+'">再次购买</a></p>'
 
+							}
+							m_status_html +='<p><a onclick="toDetail(\''+orderCode+'\',2);">查看详情</a></p>'
+						}else if (obj.product_type==="线上课程"){
+							var filter_ = JSON.parse(obj.filter)
+							var courseEndTimeStamp = filter_.l_endtime;
+							var courseEndTime = new Date(courseEndTimeStamp*1000)
+
+							shop_img_html += '<img src="{{Msg "seo" "cdn"}}/course/image/lessonsOnline.png?v={{Msg "seo" "version"}}" alt="">'
+							shop_main_html +='<p>课程名称：'+filter_.s_name+'</p>'
+									+'<p>课程类型：线上课程</p>'
+									+'<p>课程时长：'+filter_.s_courseDate+'</p>'
+									+'<p>有效日期：'+courseEndTime.getFullYear()+'/'+(courseEndTime.getMonth()+1)+'/'+courseEndTime.getDate()+' 到期</p>'
+							if (orderStatus === 0) {//0：待付款；
+								//1:对公转账未上传凭证；2：对公转账审核中；3：对公转账审核未通过
+								orderStatusClassOne="blueColor"
+								orderStatusClassTwo="blueBg"
+								m_status_html +='<p class="finish_status">待付款</p>'
+								m_handle_html +='<p><a href="/jyxspc/pay-courser?order_code='+orderCode+'&id='+filter_._id+'&type='+(obj.pay_way.indexOf("wx")>-1?0:1)+'" class="go_pay">去支付</a></p>'
+										+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +',this,\''+obj.filter_id+'\',6)">取消订单</a></p>'
+							}else if (orderStatus === 1) {//已完成
+								m_status_html +='<p class="finish_status">已完成</p>'
+								if(obj.applybill_status){
+									m_handle_html +='<p><a href="/jyxspc/checkInvoice?ids='+id+'&code='+orderCode+'">发票信息</a></p>'
+								}else{
+									m_handle_html +='<p><a href="/jyxspc/invoice?ids='+id+'&code='+orderCode+'">开发票</a></p>'
+								}
+							}else if (orderStatus === -2) {//已取消
+								m_status_html +='<p class="finish_status">已取消</p>'
+							}
+							m_status_html +='<p><a href="/jyxspc/orderDetail?orderId='+orderCode+'">查看详情</a></p>'
+						}else if (obj.product_type==="数据报告") {
+							var filter_ = JSON.parse(obj.filter)
+							var pushTimeStamp = filter_.l_pushtime;
+							var pushTime = new Date(pushTimeStamp * 1000)
+
+							shop_img_html += '<img src="{{Msg "seo" "cdn"}}/datareport/image/report_icon.png?v={{Msg "seo" "version"}}" alt="">'
+							shop_main_html += '<p style="line-height: 48px;">报告名称：' + filter_.report_name + '</p>'
+									+ '<p style="line-height: 48px;">发布日期：' + pushTime.getFullYear() + '/' + (pushTime.getMonth() + 1) + '/' + pushTime.getDate() + ' </p>'
+							if (orderStatus === 0) {//0：待付款；
+								orderStatusClassOne = "blueColor"
+								orderStatusClassTwo = "blueBg"
+								m_status_html += '<p class="finish_status">待付款</p>'
+								m_handle_html += '<p><a href="/front/datareport/orderPay?code=' + orderCode + '" class="go_pay">去支付</a></p>'
+										+ '<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id + ',this,\'' + obj.filter_id + '\',5)">取消订单</a></p>'
+							} else if (orderStatus === 1) {//已完成
+								m_status_html += '<p class="finish_status">已完成</p>'
+								if (obj.applybill_status) {
+									m_handle_html += '<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
+								} else {
+									m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
+								}
+							} else if (orderStatus === -2) {//已取消
+								m_status_html += '<p class="finish_status">已取消</p>'
+							}
+							m_status_html += '<p><a href="/front/datareport/jyOrderDetail/' + orderCode + '">查看详情</a></p>'
+						}else if(obj.product_type==="VIP订阅"){
+							var filter_ = JSON.parse(obj.filter)
+							var region_vip="";
+							var industry_vip;
+							var newbuyset=filter_.newBuyset;
+							if(!$.isEmptyObject(newbuyset)){	//不为空
+								if(newbuyset.areacount!==-1){
+									var newcitys=newbuyset.newcitys;
+									var scatter=newcitys.length ;//分布
+									var citynum=0;
+									for(var k in newcitys){
+										citynum+=newcitys[k];
 									}
-									m_status_html +='<p><a onclick="toDetail(\''+orderCode+'\',2);">查看详情</a></p>'
-								}else if (obj.product_type=="线上课程"){
-									var filter_ = JSON.parse(obj.filter)
-									var courseEndTimeStamp = filter_.l_endtime;
-									var courseEndTime = new Date(courseEndTimeStamp*1000)
-
-									shop_img_html += '<img src="{{Msg "seo" "cdn"}}/course/image/lessonsOnline.png?v={{Msg "seo" "version"}}" alt="">'
-									shop_main_html +='<p>课程名称：'+filter_.s_name+'</p>'
-											+'<p>课程类型：线上课程</p>'
-											+'<p>课程时长：'+filter_.s_courseDate+'</p>'
-											+'<p>有效日期：'+courseEndTime.getFullYear()+'/'+(courseEndTime.getMonth()+1)+'/'+courseEndTime.getDate()+' 到期</p>'
-									if (orderStatus == 0) {//0：待付款；
-										//1:对公转账未上传凭证；2：对公转账审核中；3：对公转账审核未通过
-										orderStatusClassOne="blueColor"
-										orderStatusClassTwo="blueBg"
-										m_status_html +='<p class="finish_status">待付款</p>'
-										m_handle_html +='<p><a href="/jyxspc/pay-courser?order_code='+orderCode+'&id='+filter_._id+'&type='+(obj.pay_way.indexOf("wx")>-1?0:1)+'" class="go_pay">去支付</a></p>'
-												+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +',this,\''+obj.filter_id+'\',6)">取消订单</a></p>'
-									}else if (orderStatus == 1) {//已完成
-										m_status_html +='<p class="finish_status">已完成</p>'
-										if(obj.applybill_status){
-											m_handle_html +='<p><a href="/jyxspc/checkInvoice?ids='+id+'&code='+orderCode+'">发票信息</a></p>'
-										}else{
-											m_handle_html +='<p><a href="/jyxspc/invoice?ids='+id+'&code='+orderCode+'">开发票</a></p>'
-										}
-									}else if (orderStatus == -2) {//已取消
-										m_status_html +='<p class="finish_status">已取消</p>'
-									}
-									m_status_html +='<p><a href="/jyxspc/orderDetail?orderId='+orderCode+'">查看详情</a></p>'
-								}else if (obj.product_type=="数据报告") {
-									var filter_ = JSON.parse(obj.filter)
-									var pushTimeStamp = filter_.l_pushtime;
-									var pushTime = new Date(pushTimeStamp * 1000)
-
-									shop_img_html += '<img src="{{Msg "seo" "cdn"}}/datareport/image/report_icon.png?v={{Msg "seo" "version"}}" alt="">'
-									shop_main_html += '<p style="line-height: 48px;">报告名称：' + filter_.report_name + '</p>'
-											+ '<p style="line-height: 48px;">发布日期：' + pushTime.getFullYear() + '/' + (pushTime.getMonth() + 1) + '/' + pushTime.getDate() + ' </p>'
-									if (orderStatus == 0) {//0：待付款；
-										orderStatusClassOne = "blueColor"
-										orderStatusClassTwo = "blueBg"
-										m_status_html += '<p class="finish_status">待付款</p>'
-										//m_handle_html += '<p><a href="/front/datareport/orderPay/' + orderCode + '" class="go_pay">去支付</a></p>'
-										m_handle_html += '<p><a href="/front/datareport/orderPay?code=' + orderCode + '" class="go_pay">去支付</a></p>'
-												+ '<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id + ',this,\'' + obj.filter_id + '\',5)">取消订单</a></p>'
-									} else if (orderStatus == 1) {//已完成
-										m_status_html += '<p class="finish_status">已完成</p>'
-										if (obj.applybill_status) {
-											m_handle_html += '<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
-										} else {
-											m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
+									if(newbuyset.areacount>0){
+										region_vip=newbuyset.areacount+"个省级区域";
+										if(citynum!==0){
+											region_vip+="、"+citynum+"个地市";
 										}
-									} else if (orderStatus == -2) {//已取消
-										m_status_html += '<p class="finish_status">已取消</p>'
 									}
-									m_status_html += '<p><a href="/front/datareport/jyOrderDetail/' + orderCode + '">查看详情</a></p>'
-								}else if(obj.product_type=="VIP订阅"){
-									var filter_ = JSON.parse(obj.filter)
-									var region_vip="";
-									var industry_vip;
-									var newbuyset=filter_.newBuyset;
-									if(!$.isEmptyObject(newbuyset)){	//不为空
-										if(newbuyset.areacount!=-1){
-											var newcitys=newbuyset.newcitys;
-											var scatter=newcitys.length ;//分布
-											var citynum=0;
-											for(var k in newcitys){
-												citynum+=newcitys[k];
-											}
-											if(newbuyset.areacount>0){
-												region_vip=newbuyset.areacount+"个省级区域";
-													if(citynum!=0){
-														region_vip+="、"+citynum+"个地市";
-													}
-											}
-											else{
-												region_vip+=citynum+"个地市";
-											}
-										}else{
-											region_vip="全国";
-										}
-										//行业
-										var industry_vip = newbuyset.buyerclasscount;	//数组
-										if(industry_vip==-1){
-											industry_vip="全行业";
-										}else{
-											industry_vip=industry_vip+"个行业";
-										}
-									}else{
-										var region_vipArr = filter_.area;
-										var province_length=0;
-										var city_length=0;
-										if(JSON.stringify(region_vipArr) != JSON.stringify({})){
-											for(i in region_vipArr){
-												if(region_vipArr[i].length==0){
-													province_length++;
-												}else{
-													city_length+=region_vipArr[i].length;
-												}
-											}
-										}else{
-											region_vip="全国";
-										}
-										if((province_length!=0)&&(city_length!=0)){
-										  region_vip=province_length+"个省级区域、"+city_length+"个地市";
-										}else if((province_length==0)&&(city_length!=0)){
-										  region_vip=city_length+"个地市";
-										}else if((province_length!=0)&&(city_length==0)){
-										  region_vip=province_length+"个省级区域";
-										}
-										//行业
-										industry_vip = filter_.industry.length;	//数组
-										if(industry_vip==0){
-											industry_vip="全行业";
-										}else{
-											industry_vip=industry_vip+"个行业";
-										}
+									else{
+										region_vip+=citynum+"个地市";
 									}
-									var cycleT = "-"
-									if(filter_.cyclecount!=undefined&&filter_.cyclecount!=""&&filter_.cycleunit!=undefined&&filter_.cycleunit!=""){
-										if(parseInt(filter_.cycleunit)==1){
-											cycleT=filter_.cyclecount+"年"
-										}else if(parseInt(filter_.cycleunit)==2){
-											cycleT=filter_.cyclecount+"个月"
+								}else{
+									region_vip="全国";
+								}
+								//行业
+								var industry_vip = newbuyset.buyerclasscount;	//数组
+								if(industry_vip===-1){
+									industry_vip="全行业";
+								}else{
+									industry_vip=industry_vip+"个行业";
+								}
+							}else{
+								var region_vipArr = filter_.area;
+								var province_length=0;
+								var city_length=0;
+								if(JSON.stringify(region_vipArr) !== JSON.stringify({})){
+									for(i in region_vipArr){
+										if(region_vipArr[i].length===0){
+											province_length++;
 										}else{
-											cycleT="7天"
+											city_length+=region_vipArr[i].length;
 										}
 									}
-									if(filter_.cycleunit==0&&filter_.cyclecount==0){
-										cycleT="不延期";
-									}
-                                    
-                                    if(isUsedActiveCode){
-                                        cycleT = cycleT + '<span class="discount-container"><span> + </span><span class="highlight-text" style="color: #2cb7ca;">赠送30天</span></span>'
-                                    }
-									
-									if(obj.vip_endtime!=""&&obj.vip_starttime!=""){
-										obj.vip_starttime = formatTime(obj.vip_starttime) +" - "+formatTime(obj.vip_endtime)
-									}
-									if (orderStatus !== 1){
-										obj.vip_starttime = "-"
-									}
-									shop_img_html += '<img src="/electronic_invoice/image/vipBook.png" alt="">'
-									shop_main_html +='<p>区域：'+region_vip+'</p>'
-													+'<p>行业：'+industry_vip+'</p>'
-													+'<p>订阅周期：'+cycleT+'</p>'
-													+'<p>有效时间：'+obj.vip_starttime+'</p>'
-
-									if (orderStatus == 0) {//0：待付款；
-										orderStatusClassOne="blueColor"
-										orderStatusClassTwo="blueBg"
-										
-										m_status_html +='待付款'
-										//m_handle_html +='-'
-                    					m_handle_html += '<p><a href="/front/vip/orderPay/' + orderCode + '" class="go_pay">去支付</a></p>'
-										+ '<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id + ',this,\'\',3)">取消订单</a></p>'
-                    
-									}else if (orderStatus == 1) {//已完成
-										if (filter_.cycleunit==3){	//试用用户
-											m_handle_html +='-'
-										}else{
-											m_status_html +='<p class="finish_status">已完成</p>'
-											
-											if(obj.applybill_status==1){
-												m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
-											}else{
-												m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
-											}
-										}
-									}else if (orderStatus == -2) {//已取消
-										m_status_html +='<p class="finish_status">已取消</p>'
+								}else{
+									region_vip="全国";
+								}
+								if((province_length!==0)&&(city_length!==0)){
+									region_vip=province_length+"个省级区域、"+city_length+"个地市";
+								}else if((province_length===0)&&(city_length!==0)){
+									region_vip=city_length+"个地市";
+								}else if((province_length!==0)&&(city_length===0)){
+									region_vip=province_length+"个省级区域";
+								}
+								//行业
+								industry_vip = filter_.industry.length;	//数组
+								if(industry_vip===0){
+									industry_vip="全行业";
+								}else{
+									industry_vip=industry_vip+"个行业";
+								}
+							}
+							var cycleT = "-"
+							if(filter_.cyclecount!==undefined&&filter_.cyclecount!==""&&filter_.cycleunit!==undefined&&filter_.cycleunit!==""){
+								if(parseInt(filter_.cycleunit)===1){
+									cycleT=filter_.cyclecount+"年"
+								}else if(parseInt(filter_.cycleunit)===2){
+									cycleT=filter_.cyclecount+"个月"
+								}else{
+									cycleT="7天"
+								}
+							}
+							if(filter_.cycleunit===0&&filter_.cyclecount===0){
+								cycleT="不延期";
+							}
 
-									}
-									m_status_html +='<p><a onclick="toDetail(\''+orderCode+'\',3);">查看详情</a></p>'
-								}else if (obj.product_type=="企业商机管理"){
-									var filter_ = JSON.parse(obj.filter)
-									shop_img_html += '<img src="/electronic_invoice/image/enterprise.png" alt="">'
-									shop_main_html +='<p style="line-height: 33px;">企业名称：'+filter_.entname+'</p>'
-													+'<p style="line-height: 33px;">团队人数：'+filter_.personnum+' 人</p>'
-													+'<p style="line-height: 33px;">使用周期：'+filter_.cycle+' 年</p>'
-									
-									if (orderStatus == 0) {//0：待付款；
-										orderStatusClassOne="blueColor"
-										orderStatusClassTwo="blueBg"
-										
-										m_status_html +='待付款'
-										//m_handle_html +='-'
-                    					m_handle_html += '<p><a href="/front/entniche/orderPay/' + orderCode + '" class="go_pay">去支付</a></p>'
+							if(obj.vip_endtime!==""&&obj.vip_starttime!==""){
+								obj.vip_starttime = formatTime(obj.vip_starttime) +" - "+formatTime(obj.vip_endtime)
+							}
+							if (orderStatus !== 1){
+								obj.vip_starttime = "-"
+							}
+							shop_img_html += '<img src="/electronic_invoice/image/vipBook.png" alt="">'
+							shop_main_html +='<p>区域：'+region_vip+'</p>'
+									+'<p>行业：'+industry_vip+'</p>'
+									+'<p>订阅周期：'+cycleT+'</p>'
+									+'<p>有效时间：'+obj.vip_starttime+'</p>'
+
+							if (orderStatus === 0) {//0：待付款；
+								orderStatusClassOne="blueColor"
+								orderStatusClassTwo="blueBg"
+
+								m_status_html +='待付款'
+								//m_handle_html +='-'
+								m_handle_html += '<p><a href="/front/vip/orderPay/' + orderCode + '" class="go_pay">去支付</a></p>'
 										+ '<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id + ',this,\'\',3)">取消订单</a></p>'
-                    
-									}else if (orderStatus == 1) {//已完成
-										m_status_html +='<p class="finish_status">已完成</p>'
-										if(obj.applybill_status==1){
-											m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
-										}else{
-											m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
-										}
-									}else if (orderStatus == -2) {//已取消
-										m_status_html +='<p class="finish_status">已取消</p>'
+
+							}else if (orderStatus === 1) {//已完成
+								if (filter_.cycleunit===3){	//试用用户
+									m_handle_html +='-'
+								}else{
+									m_status_html +='<p class="finish_status">已完成</p>'
+
+									if(obj.applybill_status===1){
+										m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
+									}else{
+										m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
 									}
-									m_status_html +='<p><a onclick="toDetail(\''+orderCode+'\',4);">查看详情</a></p>'
 								}
-								var priceHtml = '<div class="fl m_number '+orderStatusClassOne+'">¥' + FormatNum(orderMoney) + '</div>'
-								if(obj.product_type === "VIP订阅"){
-									if(isLiveActive){
-										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>';
-									}
+							}else if (orderStatus === -2) {//已取消
+								m_status_html +='<p class="finish_status">已取消</p>'
+
+							}
+							m_status_html +='<p><a onclick="toDetail(\''+orderCode+'\',3);">查看详情</a></p>'
+						}else if (obj.product_type==="企业商机管理"){
+							var filter_ = JSON.parse(obj.filter)
+							shop_img_html += '<img src="/electronic_invoice/image/enterprise.png" alt="">'
+							shop_main_html +='<p style="line-height: 33px;">企业名称：'+filter_.entname+'</p>'
+									+'<p style="line-height: 33px;">团队人数：'+filter_.personnum+' 人</p>'
+									+'<p style="line-height: 33px;">使用周期：'+filter_.cycle+' 年</p>'
+
+							if (orderStatus === 0) {//0：待付款；
+								orderStatusClassOne="blueColor"
+								orderStatusClassTwo="blueBg"
+
+								m_status_html +='待付款'
+								//m_handle_html +='-'
+								m_handle_html += '<p><a href="/front/entniche/orderPay/' + orderCode + '" class="go_pay">去支付</a></p>'
+										+ '<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id + ',this,\'\',3)">取消订单</a></p>'
+
+							}else if (orderStatus === 1) {//已完成
+								m_status_html +='<p class="finish_status">已完成</p>'
+								if(obj.applybill_status===1){
+									m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
+								}else{
+									m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
 								}
-								temp += '<div class="order_list '+orderStatusClassOne+'">'
-										+'<div class="clearfix o_l_top '+orderStatusClassTwo+'">'
-										+'<div class="fl">'
-										+'<span class="o_time">' + obj.create_time + '</span>'
-										+'<span class="o_number">订单号：' + orderCode + '</span>'
-										+'</div>'
-										+'<i class="iconfont icon-shanchu fr o_del" onclick="deleteOrder(\'' + id +
-										'\',this)"></i>'
-										+'</div>'
-										+'<div class="clearfix o_l_middle">'
-										+'<div class="fl m_info '+orderStatusClassOne+'">'
-										+'<div class="fl shop_img">'
-										+shop_img_html
-										+'</div>'
-										+'<div class="fl shop_main">'
-										+shop_main_html
-										+'</div>'
-										+'</div>'
-										+priceHtml
-										+'<div class="fl m_status '+orderStatusClassOne+'">'
-										+'<div class="stateBox">'
-										+m_status_html
-										+'</div>'
-										+'</div>'
-										+'<div class="fl m_handle">'
-										+'<div class="handleBox">'
-										+m_handle_html
-										+'</div>'
-										+'</div>'
-										+'</div>'
-										+'</div>'
+							}else if (orderStatus === -2) {//已取消
+								m_status_html +='<p class="finish_status">已取消</p>'
 							}
-						} else {
-							temp = noDataHtml;
-							$(".pagination-box").hide();
+							m_status_html +='<p><a onclick="toDetail(\''+orderCode+'\',4);">查看详情</a></p>'
 						}
-						$(".c_tbody").html(temp);
-						//objD.eq(ind).html(temp);
-						$(".backTop").click();
-						initHover();
-					},
-					error: function(xhr, type) {
-						console.log("query err");
-					}
-				});
-			}
-			//
-			function formatTime(t){
-				try{
-					return t.substring(0,10).replace(/\-/g,".")
-				}catch(e){
-					if(t === null){
-						t = "";
+						var priceHtml = '<div class="fl m_number '+orderStatusClassOne+'">¥' + FormatNum(orderMoney) + '</div>'
+
+						temp += '<div class="order_list '+orderStatusClassOne+'">'
+								+'<div class="clearfix o_l_top '+orderStatusClassTwo+'">'
+								+'<div class="fl">'
+								+'<span class="o_time">' + obj.create_time + '</span>'
+								+'<span class="o_number">订单号：' + orderCode + '</span>'
+								+'</div>'
+								+'<i class="iconfont icon-shanchu fr o_del" onclick="deleteOrder(\'' + id +
+								'\',this)"></i>'
+								+'</div>'
+								+'<div class="clearfix o_l_middle">'
+								+'<div class="fl m_info '+orderStatusClassOne+'">'
+								+'<div class="fl shop_img">'
+								+shop_img_html
+								+'</div>'
+								+'<div class="fl shop_main">'
+								+shop_main_html
+								+'</div>'
+								+'</div>'
+								+priceHtml
+								+'<div class="fl m_status '+orderStatusClassOne+'">'
+								+'<div class="stateBox">'
+								+m_status_html
+								+'</div>'
+								+'</div>'
+								+'<div class="fl m_handle">'
+								+'<div class="handleBox">'
+								+m_handle_html
+								+'</div>'
+								+'</div>'
+								+'</div>'
+								+'</div>'
 					}
-					return t
+				} else {
+					temp = noDataHtml;
+					$(".pagination-box").hide();
 				}
+				$(".c_tbody").html(temp);
+				//objD.eq(ind).html(temp);
+				$(".backTop").click();
+				initHover();
+			},
+			error: function(xhr, type) {
+				console.log("query err");
 			}
-			//
-			function initHover(){
-				$(".list .item").each(function(){
-					$(this).children("li").each(function(){
-						$(this).hover(function(){
-									    $(this).find(".info a").fadeIn();
-									},function(){
-									    $(this).find(".info a").fadeOut();
-									});
-					})
-				})
+		});
+	}
+	//
+	function formatTime(t){
+		try{
+			return t.substring(0,10).replace(/\-/g,".")
+		}catch(e){
+			if(t === null){
+				t = "";
 			}
-			//
-			function deleteOrder(id, obj) {
-				$.confirm({
-					title: '订单删除',
-					content: '您确定要删除该订单吗？',
-					buttons: {
-						ok: {
-							text: '确认',
-							btnClass: 'btn-primary-0',
-							action: function() {
-								$.ajax({
-									type: "post",
-									url: "/jypay/deleteOrder",
-									data: {
-										"id": id
-									},
-									dataType: 'json',
-									success: function(data) {
-										if (data && data["success"]) {
-											var self = $(obj).parent().parent();
-											var parent = self.parent();
-											self.remove();
-											$.alert({
-												title: "",
-												content: "删除成功！",
-												buttons: {
-													ok: {
-														text: '确认',
-														btnClass: 'btn-primary-0',
-														action: function() {
-								                            var $Index = $(".order_tab span.tab_item.active").index();
-								                      		//var $list = $(".list .item");
-								                            pageFlag=true;
-								                      		queryOrder($Index, 1);
-														}
-													}
+			return t
+		}
+	}
+	//
+	function initHover(){
+		$(".list .item").each(function(){
+			$(this).children("li").each(function(){
+				$(this).hover(function(){
+					$(this).find(".info a").fadeIn();
+				},function(){
+					$(this).find(".info a").fadeOut();
+				});
+			})
+		})
+	}
+	//
+	function deleteOrder(id, obj) {
+		$.confirm({
+			title: '订单删除',
+			content: '您确定要删除该订单吗？',
+			buttons: {
+				ok: {
+					text: '确认',
+					btnClass: 'btn-primary-0',
+					action: function() {
+						$.ajax({
+							type: "post",
+							url: "/jypay/deleteOrder",
+							data: {
+								"id": id
+							},
+							dataType: 'json',
+							success: function(data) {
+								if (data && data["success"]) {
+									var self = $(obj).parent().parent();
+									var parent = self.parent();
+									self.remove();
+									$.alert({
+										title: "",
+										content: "删除成功！",
+										buttons: {
+											ok: {
+												text: '确认',
+												btnClass: 'btn-primary-0',
+												action: function() {
+													var $Index = $(".order_tab span.tab_item.active").index();
+													//var $list = $(".list .item");
+													pageFlag=true;
+													queryOrder($Index, 1);
 												}
-											});
-										} else {
-											alertS("删除失败，请联系管理员！");
+											}
 										}
-									},
-									error: function(xhr, type) {
-										console.log("delete err");
-									}
-								});
+									});
+								} else {
+									alertS("删除失败，请联系管理员！");
+								}
+							},
+							error: function(xhr, type) {
+								console.log("delete err");
 							}
-						},
-						cancel: {
-							text: '取消',
-							btnClass: 'btn-primary-0'
-						}
-					}
-				});
-			}
-
-			function alertS(content) {
-				$.alert({
-					title: "",
-					content: content,
-					buttons: {
-						ok: {
-							text: '确认',
-							btnClass: 'btn-primary-0'
-						}
+						});
 					}
-				});
+				},
+				cancel: {
+					text: '取消',
+					btnClass: 'btn-primary-0'
+				}
 			}
-			function toDetail(orderCode,n) {
-				if(n==0){
-					window.open("/front/dataExport/toOrderDetail/" + orderCode);
-				}else if(n==2){
-					window.open("/front/course/orderDetail?orderId=" + orderCode);
-				}else if (n==3){
-					window.open("/front/vipOrder/vipOrderDetail?order_code="+orderCode)
-				}else if(n==4){
-					window.open("/front/entniche/entnicheOrderDetail?order_code="+orderCode)
-				}else if(n==5){
-					window.open("/front/datareport/jyOrderDetail/"+ orderCode)
-				}else if(n==6){
-					window.open("/jyxspc/orderDetail?orderId="+ orderCode);
+		});
+	}
+
+	function alertS(content) {
+		$.alert({
+			title: "",
+			content: content,
+			buttons: {
+				ok: {
+					text: '确认',
+					btnClass: 'btn-primary-0'
 				}
 			}
-			//取消订单
-			function toCancel(id, obj,fid,n) {
-				orderCode = $(obj).attr("orderCode");
-				$.confirm({
-					title: '订单取消',
-					content: '您确定要取消该订单吗？',
-					buttons: {
-						ok: {
-							text: '确认',
-							btnClass: 'btn-primary-0',
-							action: function() {
-								$.ajax({
-									type: "post",
-									url: "/front/dataExport/cancelOrder",
-									data: {
-										"id": id
-									},
-									dataType: 'json',
-									success: function(data) {
-										if (data && data["success"]) {
-											var mbuyhtml =''
-											if (n===0){
-												mbuyhtml = '<p><a  href="/front/dataExport/toSieve">再次购买</a></p>'
-											}
-											if(n==2){
-												if(fid!=""){
-												mbuyhtml = '<p><a  href="/front/course/detail?aboutFlag=true&_id='+fid+'">再次购买</a></p>'
-												}else{
-													mbuyhtml = '-'
-												}
-											}
-											var self = $(obj).parents(".m_handle").prev(".m_status");
-											if($(".tab_item.active").index() === 1){
-												$(obj).parents(".order_list").remove();
-											}
-											var chtml = '<p class="finish_status">已取消</p><p><a onclick="toDetail(\''+orderCode+'\',\''+n+'\');">查看详情</a></p>'
-											self.find(".stateBox").html(chtml)
-											$(obj).parents(".handleBox").html(mbuyhtml)
-											$.alert({
-												title: "",
-												content: "取消成功！",
-												buttons: {
-													ok: {
-														text: '确认',
-														btnClass: 'btn-primary-0'
-													}
-												}
-											});
-										} else {
-											alertS("取消失败，请联系管理员！");
+		});
+	}
+	function toDetail(orderCode,n) {
+		if(n===0){
+			window.open("/front/dataExport/toOrderDetail/" + orderCode);
+		}else if(n===2){
+			window.open("/front/course/orderDetail?orderId=" + orderCode);
+		}else if (n===3){
+			window.open("/front/vipOrder/vipOrderDetail?order_code="+orderCode)
+		}else if(n===4){
+			window.open("/front/entniche/entnicheOrderDetail?order_code="+orderCode)
+		}else if(n===5){
+			window.open("/front/datareport/jyOrderDetail/"+ orderCode)
+		}else if(n===6){
+			window.open("/jyxspc/orderDetail?orderId="+ orderCode);
+		}
+	}
+	//取消订单
+	function toCancel(id, obj,fid,n) {
+		orderCode = $(obj).attr("orderCode");
+		$.confirm({
+			title: '订单取消',
+			content: '您确定要取消该订单吗？',
+			buttons: {
+				ok: {
+					text: '确认',
+					btnClass: 'btn-primary-0',
+					action: function() {
+						$.ajax({
+							type: "post",
+							url: "/front/dataExport/cancelOrder",
+							data: {
+								"id": id
+							},
+							dataType: 'json',
+							success: function(data) {
+								if (data && data["success"]) {
+									var mbuyhtml =''
+									if (n===0){
+										mbuyhtml = '<p><a  href="/front/dataExport/toSieve">再次购买</a></p>'
+									}
+									if(n===2){
+										if(fid!==""){
+											mbuyhtml = '<p><a  href="/front/course/detail?aboutFlag=true&_id='+fid+'">再次购买</a></p>'
+										}else{
+											mbuyhtml = '-'
 										}
-									},
-									error: function(xhr, type) {
-										console.log("cancel err");
 									}
-								});
+									var self = $(obj).parents(".m_handle").prev(".m_status");
+									if($(".tab_item.active").index() === 1){
+										$(obj).parents(".order_list").remove();
+									}
+									var chtml = '<p class="finish_status">已取消</p><p><a onclick="toDetail(\''+orderCode+'\',\''+n+'\');">查看详情</a></p>'
+									self.find(".stateBox").html(chtml)
+									$(obj).parents(".handleBox").html(mbuyhtml)
+									$.alert({
+										title: "",
+										content: "取消成功！",
+										buttons: {
+											ok: {
+												text: '确认',
+												btnClass: 'btn-primary-0'
+											}
+										}
+									});
+								} else {
+									alertS("取消失败，请联系管理员！");
+								}
+							},
+							error: function(xhr, type) {
+								console.log("cancel err");
 							}
-						},
-						cancel: {
-							text: '取消',
-							btnClass: 'btn-primary-0'
-						}
+						});
 					}
-				});
-			}
-			function FormatNum(n) {
-				var isF = /^-?\d*\.\d+$/.test(n);
-				var n2 = "";
-				if (isF) {
-					var t = n + "";
-					n2 = t.substr(t.indexOf("."));
-					n = parseInt(n);
+				},
+				cancel: {
+					text: '取消',
+					btnClass: 'btn-primary-0'
 				}
-				if (n >= 1000) {
-					n = Math.floor(n / 1000) + "," + ("0000" + n % 1000).slice(-3);
-				}
-				return n + n2;
 			}
-			//时间格式化
-		    function timestampToTime(timestamp) {
-		        var date = new Date(timestamp * 1000);
-		        Y = date.getFullYear() + '.';
-		        M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '.';
-		        D = date.getDate();
-		        return Y+M+D;
-		    }
-			
-			function check_over(order_code){
-				$.post("/subscribepay/orderListDetails/isOver",{"order_code":order_code},function(r){
-					if(r.status!=1){
-						window.open("/front/order/invoicetimeOut",'_self');
-					}else{
-						window.open("/front/order/invoice/"+order_code,'_self');
-					}
-				})
+		});
+	}
+	function FormatNum(n) {
+		var isF = /^-?\d*\.\d+$/.test(n);
+		var n2 = "";
+		if (isF) {
+			var t = n + "";
+			n2 = t.substr(t.indexOf("."));
+			n = parseInt(n);
+		}
+		if (n >= 1000) {
+			n = Math.floor(n / 1000) + "," + ("0000" + n % 1000).slice(-3);
+		}
+		return n + n2;
+	}
+	//时间格式化
+	function timestampToTime(timestamp) {
+		var date = new Date(timestamp * 1000);
+		Y = date.getFullYear() + '.';
+		M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '.';
+		D = date.getDate();
+		return Y+M+D;
+	}
+
+	function check_over(order_code){
+		$.post("/subscribepay/orderListDetails/isOver",{"order_code":order_code},function(r){
+			if(r.status!==1){
+				window.open("/front/order/invoicetimeOut",'_self');
+			}else{
+				window.open("/front/order/invoice/"+order_code,'_self');
 			}
-		</script>
-	</body>
+		})
+	}
+</script>
+</body>
 </html>

src/web/templates/pc/orderDetail.html

@@ -64,13 +64,13 @@
     }
     .greenFont {
         color: #2CB7CA;
-    }
-	.redFont {
-	  color: #FE737A;
-	}
-	.redBg {
-	  border-top: 2px solid #FE737A;
-	  background-color: rgba(254, 115, 122, 0.08);
+    }
+	.redFont {
+	  color: #FE737A;
+	}
+	.redBg {
+	  border-top: 2px solid #FE737A;
+	  background-color: rgba(254, 115, 122, 0.08);
 	}
     .go_pay {
         margin-top: -10px;
@@ -83,9 +83,9 @@
         border-radius: 4px;
         color: #fff;
         text-decoration: none;
-    }
-	.go_pay:hover{
-		text-decoration: none;
+    }
+	.go_pay:hover{
+		text-decoration: none;
 	}
     .o_m_thead .order_id {
         font-size: 14px;
@@ -111,13 +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;
+    }
+    .qxBg{
+        border-top: 2px solid #999999;
+        background-color: #ececec;
+    }
+    .qxBgFont{
+        color: #686868;
     }
     </style>
     <script>
@@ -140,20 +140,20 @@
 {{include "/common/pchead.html"}}
 <section id="order_two" class="w">
     <div class="nav">
-        <a href="/front/dataExport/toMyOrder" class="a-t-d">我的订单></a>
+        <a href="/front/swordfish/toMyOrder" class="a-t-d">我的订单></a>
         <a href="#" class="a-t-d">订单详情</a>
     </div>
      <div class="o_m_thead greenBg">
             <p class="order_id">订单编号：{{.T.o.order_code}}</p>
             <p class="clearfix order_state">
-                <!--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="qxBgFont" id="status_cancelled" style="display: none;">已取消</span>
-                
-                <!-- 当状态为已完成时显示开发票 或 查看发票 -->
-				<a class="go_pay payOrder" style="display: none;">去支付</a>
-                <a class="openinvoice go_pay" style="display: none;">开发票</a>
+                <!--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="qxBgFont" id="status_cancelled" style="display: none;">已取消</span>
+                
+                <!-- 当状态为已完成时显示开发票 或 查看发票 -->
+				<a class="go_pay payOrder" style="display: none;">去支付</a>
+                <a class="openinvoice go_pay" style="display: none;">开发票</a>
                 <a class="lookinvoice go_pay" style="display: none;">查看发票</a>
                 <!-- 当订单状态为待付款时显示去支付 -->
                 <!-- 当状态为已完成时显示开发票 或 查看发票 -->
@@ -176,12 +176,12 @@
         <div class="inner">
             <div class="item">
                 <p>订单编号：{{.T.o.order_code}}</p>
-                <p>下单时间：{{.T.o.create_time}}</p>
-		{{if .T.o.transaction_id}}
-				<p>支付时间：{{.T.o.pay_time}}</p>
+                <p>下单时间：{{.T.o.create_time}}</p>
+		{{if .T.o.transaction_id}}
+				<p>支付时间：{{.T.o.pay_time}}</p>
 		{{end}}
                 <p>产品类型：数据导出</p>
-        {{if .T.o.transaction_id}}
+        {{if .T.o.transaction_id}}
 				<p>支付方式：{{.T.o.pay_way}}</p>
 				<p>支付单号：{{.T.o.transaction_id}}</p>
         {{end}}
@@ -398,44 +398,44 @@
     });
 	function invoice(){
 		window.location.href=("/front/dataExport/getOrderCode/"+{{.T.o.order_code}});
-	}
-	
-	$(function(){
-		var orderStatus = {{ .T.o.order_status }};
-		var invoiceStatus = {{ .T.o.applybill_status }}
-		var orderCode = {{.T.o.order_code}}
-		if (orderStatus === 0){
-			$("#status_wait_pay").show();
-			$(".payOrder").show();
-			$(".o_m_thead").removeClass("greenBg").addClass("redBg")
-		}else if(orderStatus === 1){
-			$("#status_success").show();
-			if(invoiceStatus === "F"){
-				$(".openinvoice").show();
-			}else{
-				$(".lookinvoice").show();
-			}
-		}else{
-			$("#status_cancelled").show();
-            $(".o_m_thead").removeClass("greenBg").addClass("qxBg")
-		}
-		
-		$(".payOrder").on("click", function(){
-			location.href = "/front/dataexport/orderPay?code="+ orderCode;
-		})
-		
-		$(".openinvoice").on("click",function(){
-			$.post("/subscribepay/orderListDetails/isOver",{"order_code":orderCode},function(r){
-				if(r.status!=1){
-					window.open("/front/order/invoicetimeOut",'_self');
-				}else{
-					window.open("/front/order/invoice/"+orderCode,'_self');
-				}
-			})
-		})
-		$(".lookinvoice").on("click",function(){
-			window.open("/front/order/check_invoice/"+orderCode,'_self');
-		})
+	}
+	
+	$(function(){
+		var orderStatus = {{ .T.o.order_status }};
+		var invoiceStatus = {{ .T.o.applybill_status }}
+		var orderCode = {{.T.o.order_code}}
+		if (orderStatus === 0){
+			$("#status_wait_pay").show();
+			$(".payOrder").show();
+			$(".o_m_thead").removeClass("greenBg").addClass("redBg")
+		}else if(orderStatus === 1){
+			$("#status_success").show();
+			if(invoiceStatus === "F"){
+				$(".openinvoice").show();
+			}else{
+				$(".lookinvoice").show();
+			}
+		}else{
+			$("#status_cancelled").show();
+            $(".o_m_thead").removeClass("greenBg").addClass("qxBg")
+		}
+		
+		$(".payOrder").on("click", function(){
+			location.href = "/front/dataexport/orderPay?code="+ orderCode;
+		})
+		
+		$(".openinvoice").on("click",function(){
+			$.post("/subscribepay/orderListDetails/isOver",{"order_code":orderCode},function(r){
+				if(r.status!=1){
+					window.open("/front/order/invoicetimeOut",'_self');
+				}else{
+					window.open("/front/order/invoice/"+orderCode,'_self');
+				}
+			})
+		})
+		$(".lookinvoice").on("click",function(){
+			window.open("/front/order/check_invoice/"+orderCode,'_self');
+		})
 	})
 	
 </script>

src/web/templates/pc/vip_orderDetail.html

@@ -48,7 +48,7 @@
     <!-- main  START -->
     <div class="order_detail" id="order_detail">
         <div class="w order_crumb">
-            <a href="#" onclick="window.location.href='/front/dataExport/toMyOrder'">我的订单</a><em> > </em>
+            <a href="#" onclick="window.location.href='/front/swordfish/toMyOrder'">我的订单</a><em> > </em>
             <a href="#" class="active">订单详情</a>
         </div>
         <div class="w order_main">
@@ -134,16 +134,7 @@
 							$(".order_time").text(r.data.order.prepay_time.replace("-",".").replace("-","."));
 						}
 						$(".price").text(r.data.order.original_price/100);
-						//优惠码
-						if(!r.data.order.isUsedActiveCode){
-							$(".discount-container").hide();
-						}
-						// if(!r.data.order.isLiveActive){
-							// $(".origin-price-container").hide();
-						// }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","");

src/web/templates/weixin/commonPay/checkout.html

@@ -145,7 +145,7 @@
                     data: {
                         orderCode: this.orderInfo.ordercode,
                         dotype: this.orderInfo.productType,
-                        payway:"wx_js",
+                        payway: "wx_js",
                     },
                     contentType: 'application/x-www-form-urlencoded',
                     success: function (res) {
@@ -204,10 +204,14 @@
                                     window.location.replace("/front/vipsubscribe/toOrderDetailPage?orderCode=" + checkout.orderInfo.ordercode)
                                     break
                                 }
-                                case "dataexport" :{
+                                case "dataexport" : {
                                     window.location.replace("/front/wx_dataExport/wxToOrderDetail?orderCode=" + checkout.orderInfo.ordercode)
                                     break
                                 }
+                                case "onlineCourse": {
+                                    window.location.replace("/weixin/pay/xs_payNow?code=" + orderCode)
+                                    break
+                                }
                             }
                         } else {
                             EasyAlert.show("系统异常，请稍微再试", "", 3000);
@@ -217,13 +221,12 @@
             // 开启定时任务，3s查询一次是否支付成功
             checkIsPaySuccess: function () {
                 var checkPaySuccessTimer = setInterval(function () {
-                    vTools.ajax({
+                    $.ajax({
                         url: '/jypay/isPaySuccess',
                         type: 'POST',
                         data: {
                             code: checkout.orderInfo.ordercode
                         },
-                        contentType: 'application/x-www-form-urlencoded',
                         success: function (res) {
                             if (res.success) {
                                 // 清除购买页面的缓存
@@ -235,30 +238,6 @@
                                     iconHide: true,
                                     duration: 1500,
                                     callback: function () {
-                                        //清楚购买缓存
-                                        switch (checkout.orderInfo.productType) {
-                                            case  "vip": {
-                                                sessionStorage.removeItem("sub_vip_state");
-                                                sessionStorage.removeItem("vip_index_read");
-                                                sessionStorage.removeItem("vip_change_time");
-                                                sessionStorage.removeItem("vip_trial_buy");
-                                                sessionStorage.removeItem("vipSubSelectArea");
-                                                sessionStorage.removeItem("vipSubSelectIndustry");
-                                                sessionStorage.removeItem("vipSubSelectTime");
-                                                sessionStorage.removeItem("endTime");
-                                                sessionStorage.removeItem("liveActiveCode_new");
-                                                sessionStorage.removeItem("liveActiveCode_renew");
-                                                break
-                                            }
-                                            case "dataexport": {
-                                                var dataexportId = checkout.getUrlParam("attach")
-                                                sessionStorage.removeItem("readClause");
-                                                sessionStorage.removeItem("index");
-                                                sessionStorage.removeItem("EmailVerity_" + dataexportId);
-                                                sessionStorage.removeItem("keyWords");
-                                                break
-                                            }
-                                        }
                                         location.replace("/weixin/{{.T.doType}}/paySuccess?orderCode=" + res.orderCode + "&email=" + res.email + "&payTime=" + res.payTime)
                                     }
                                 })

src/web/templates/weixin/commonPay/myOrder.html

@@ -0,0 +1,1553 @@
+<html>
+<head>
+    <title>我的订单</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta HTTP-EQUIV="pragma" CONTENT="no-cache">
+    <meta HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
+    <meta HTTP-EQUIV="expires" CONTENT="0">
+    <script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
+    <script src="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+    {{include "/common/weixin.html"}}
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxCommonPay/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" type="text/css"
+          href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" type="text/css"
+          href="{{Msg "seo" "cdn"}}/wxCommonPay/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/order_list.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}">
+    <link href="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.css" rel="stylesheet">
+    <!--2.8.8-->
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_course/css/order_list.css?v={{Msg "seo" "version"}}">
+    <style>
+        #order_list .main .tabs .card .card-content .price {
+            margin-bottom: 0;
+        }
+
+        /* vip订阅原价 */
+        .origin-price-container {
+            display: inline-block;
+            margin-top: .06rem;
+            margin-right: .1rem;
+            color: #9B9CA3;
+            font-size: .22rem;
+        }
+
+        .origin-price-container .origin-price {
+            text-decoration: line-through;
+        }
+    </style>
+</head>
+<body>
+<!-- 加载数据-->
+<div class="loading_">
+    <p><span></span></p>
+</div>
+<div id="order_list" class="j-container">
+    <main class="main j-body">
+        <div class="buttons-tab">
+            <ul>
+                <li class="tab-link active">全部</li>
+                <li class="tab-link ">待付款</li>
+                <li class="tab-link ">已完成</li>
+                <li class="tab-link ">已取消</li>
+            </ul>
+        </div>
+        <div class="tabs">
+            <div class="tab active">
+                <div class="card_lists">
+                </div>
+            </div>
+        </div>
+    </main>
+</div>
+<!-- 取消购买弹窗 -->
+<div class="custom-dialog cancel_dialog" style="display: none;">
+    <div class="weui-mask weui-animate-fade-in"></div>
+    <div class="weui-dialog weui-animate-fade-in">
+        <div class="weui-dialog__hd"><strong class="weui-dialog__title">确定取消订单</strong></div>
+        <div class="weui-dialog__bd">确定取消订单，取消后无法恢复</div>
+        <div class="weui-dialog__ft">
+            <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_default" id="cancel_n">取消</a>
+            <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary" id="cancel_y">确定</a>
+        </div>
+    </div>
+</div>
+<!-- 删除订单弹窗 -->
+<div class="custom-dialog delete_dialog" style="display: none;">
+    <div class="weui-mask weui-animate-fade-in"></div>
+    <div class="weui-dialog weui-animate-fade-in">
+        <div class="weui-dialog__hd"><strong class="weui-dialog__title">确定删除订单</strong></div>
+        <div class="weui-dialog__bd">确定删除订单，删除后无法恢复</div>
+        <div class="weui-dialog__ft">
+            <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_default" id="del_n">取消</a>
+            <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary" id="del_y">确定</a>
+        </div>
+    </div>
+</div>
+<!-- 客服电话弹窗 -->
+<div class="jy-alert" style="display: none;">
+    <div class="weui-mask weui-animate-fade-in"></div>
+    <div class="weui-dialog weui-animate-fade-in">
+        <div class="weui-dialog__bd">客服电话：400-108-6670</div>
+        <div class="weui-dialog__ft">
+            <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_" onclick="phoneHide()">我知道了</a>
+        </div>
+    </div>
+</div>
+<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+<script>
+    var hasNextPage = false;
+    var pageIndex = 1;
+    var wxflag = "";
+    var scrollTop = 0;
+    var dataCache = new Array();
+    var count = 0;
+    var typ = 0;
+    var deleteIndex = 0;
+    var orderTabActive = 0;
+    initShare({{.T.signature}},{{.T.openid}}, 2, "jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+
+    //时间格式化
+    function timestampToTime(timestamp) {
+        var date = new Date(timestamp * 1000);
+        Y = date.getFullYear() + '.';
+        M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '.';
+        D = date.getDate();
+        return Y + M + D;
+    }
+
+    //格式化数字
+    function toThousands(num) {
+        var num = (num || 0).toString(), result = '';
+        while (num.length > 3) {
+            result = ',' + num.slice(-3) + result;
+            num = num.slice(0, num.length - 3);
+        }
+        if (num) {
+            result = num + result;
+        }
+        return result;
+    }
+
+    function appendList(listhtml) {
+        $(".card_lists").append(listhtml);
+    }
+
+
+    function setSessionStorage() {
+        sessionStorage.orderScrollTop = $(".main")[0].scrollTop;
+        sessionStorage.orderTabActive = $("ul .active").index();
+        sessionStorage.orderPageNum = parseInt(pageIndex) - 1;
+        sessionStorage.course_order_href = "true";
+    }
+
+    function onceMore(e) {
+        setSessionStorage();
+        var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+        window.location.href = "/front/wx_dataExport/toSieve?orderCode=" + orderCode;
+    }
+
+    //续费 1 再次购买 2
+    function renewalOrBuyAgain(pattern, e) {
+        setSessionStorage();
+        var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+        if (pattern === 1) {
+            window.location.href = "/front/vipsubscribe/vipsubscribe_renew?orderCode" + orderCode;
+        } else if (pattern === 2) {
+            window.location.href = "/front/vipsubscribe/vipsubscribe_new?orderCode=" + orderCode;
+        }
+    }
+
+    function deleteOrder(id, obj) {
+        typ = $("ul .active").index()
+        $('.delete_dialog').show();
+        $('#del_y').unbind("click").click(function () {
+            $(".loading_").show();
+            $.post("/subscribepay/orderListDetails/deleteOrder", {
+                "id": id,
+                "pageNum": pageIndex,
+                "type": typ,
+                "fromPage": "wx"
+            }, function (data) {
+                $(".loading_").hide();
+                if (data && data["success"]) {
+                    var self = $(obj).parent().parent();
+                    var parent = self.parent();
+                    if (self.next().find("a").attr("courseOrder") === "true") {
+                        self.parent().remove();
+                    } else {
+                        deleteIndex = self.index();
+                        dataCache.splice(deleteIndex, 1)
+                        //删除索引存入缓存
+                        sessionStorage.setItem("deleteIndex", deleteIndex);
+                        if (data.res != null) {
+                            dataCache.push(data.res[0])
+                            //hasNextPage=data.hasNextPage;
+                            hasNextPage = data.nextPage;
+                        }
+                        self.parent().remove();
+                    }
+                    weui.toast('删除成功', {
+                        duration: 1500,
+                        className: 'j-toast',
+                        callback: function () {
+                            $(".loading_").show();
+                            if ($(".card_lists").children("div").length == 0) {
+                                nodataHtml = ""
+                                nodataHtml += '<div style="text-align:center;">';
+                                s
+                                nodataHtml += '<img src="/wx_dataExport/images/fish.png" style="width: 2.8rem;height: 2.8rem;margin-top: 45%;">'
+                                nodataHtml += '<div style="color: #888;font-size: .32rem;text-align:center;">暂无数据</div></div>'
+                                $(".card_lists").append(nodataHtml);
+                                $(".dropload-down").hide();
+                            } else {//删除一条数据 往后铺一条数据
+                                structureHtml(data.res, typ);
+                            }//铺数据 end
+                            if (parent.children("div").length < 10) {
+                                $(".dropload-refresh").text("没有更多了");
+                            }
+                            $(".loading_").hide();
+                        }
+                    })
+                } else {
+                    alertS("删除失败，请联系管理员！");
+                }
+            }) //post end
+            $('.delete_dialog').hide()
+        })
+        $('#del_n').click(function () {
+            $('.delete_dialog').hide();
+        })
+
+    }//delete end
+
+    //取消订单
+    function cancelOrder(id, obj) {
+        typ = $("ul .active").index()
+        $('.cancel_dialog').show();
+        $("#cancel_y").unbind("click").click(function () {
+            $(".loading_").show();
+            $.post("/subscribepay/orderListDetails/deleteOrder", {
+                "id": id,
+                "pageNum": pageIndex,
+                "type": typ,
+                "cancel": "cancel",
+                "fromPage": "wx"
+            }, function (data) {
+                $(".loading_").hide();
+                if (data && data["success"]) {
+                    weui.toast('取消成功', {
+                        duration: 1500,
+                        className: 'j-toast',
+                        callback: function () {
+                            $(".loading_").show();
+                            if (typ === 1) {
+                                var self = $(obj).parent().parent();
+                                self.remove();
+                            }
+                            var self = $(obj).parent(".card-footer").prev(".card-content").prev(".card-header").children(".notpay");
+                            self.css("color", "#686868");
+                            var isVipOrder = $(obj).parent(".card-footer").prev(".card-content").children(".media").attr("isvipOrder");
+                            var courseOrder = $(obj).parent(".card-footer").prev(".card-content").children(".media").attr("courseOrder");
+                            var courseOnlineOrder = $(obj).parent(".card-footer").prev(".card-content").children(".media").attr("courseOnlineOrder");
+                            var courseId = $(obj).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+                            //vip订单取消了没有再次购买
+                            if (isVipOrder !== "true") {
+                                if (courseOrder !== "true") {
+                                    self.children().remove();
+                                    self.removeClass("notpay").addClass("cancel_text").append('<span class="status-text">已取消</span><a class="delete_icon" title="删除订单" onclick="deleteOrder(' + id + ',this)"></a>');
+                                    if (courseOnlineOrder === "true") {
+                                        $(obj).parent(".card-footer").remove();
+                                    } else {
+                                        $(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
+                                    }
+                                } else {
+                                    $(obj).parent(".card-footer").html('<a href="/swordfish/course/detail/' + courseId + '" class="btn cancle">再次购买</a>')
+                                    self.children().remove()
+                                    self.removeClass("notpay").addClass("cancel_text").append('<span class="status-text">已取消</span><a class="delete_icon" title="删除订单" onclick="deleteOrder(' + id + ',this)"></a>');
+                                }
+                            } else {
+                                $(obj).parent().parent().remove();
+                                $(".card_lists").empty();
+                                queryOrder($("ul .active").index(), 10);
+                            }
+
+                            $(".loading_").hide();
+                        }
+                    })
+                } else {
+                    alertS("取消失败，请联系管理员！");
+                }
+            });
+            $('.cancel_dialog').hide()
+        })
+        $('#cancel_n').click(function () {
+            $('.cancel_dialog').hide();
+        })
+
+    }
+
+    function alertS(content) {
+        $.alert({
+            title: "",
+            content: content,
+            buttons: {
+                ok: {
+                    text: '确定',
+                    btnClass: 'btn-primary-2'
+                }
+            }
+        });
+    }
+
+    clickFlag = true;
+    $(function () {
+        sessionStorage.removeItem("applysuccess");
+        sessionStorage.removeItem("companyName");
+        sessionStorage.removeItem("taxNumer");
+
+        $(".buttons-tab .tab-link").each(function () {
+            $(".loading_").hide();
+            var index = $(this).index();
+            $(".buttons-tab .tab-link").eq(0).addClass("active");
+            //
+            $(this).click(function () {
+                $(".loading_").show();
+                $(this).addClass("active").siblings().removeClass("active");
+                $(".tabs>.tab").eq(index).show().siblings().hide();
+                typ = $("ul .active").index();
+                $(".card_lists").empty();
+                queryOrder(index, 10);
+            })
+        })
+
+
+        //解决苹果手机里面的网页返回不刷新页面的问题
+        var browserRule = /^.*((iPhone)|(iPad)|(Safari))+.*$/;
+        if (browserRule.test(navigator.userAgent)) {
+            window.onpageshow = function (event) {
+                if (event.persisted) {
+                    window.location.reload()
+                }
+            };
+        }
+        if (sessionStorage.orderTabActive) {
+            $(".buttons-tab .tab-link").eq(sessionStorage.orderTabActive).addClass("active").siblings().removeClass("active");
+            typ = Number(sessionStorage.orderTabActive);
+            var orderPageNum = parseInt(sessionStorage.orderPageNum);
+            queryOrder(sessionStorage.orderTabActive, orderPageNum * 10);
+            sessionStorage.removeItem("orderPageNum");
+            sessionStorage.removeItem("orderTabActive");
+            if (sessionStorage.orderScrollTop) {
+                setTimeout(function () {
+                    $(".main")[0].scrollTop = parseInt(sessionStorage.orderScrollTop);
+                }, 500)
+                setTimeout(function () {
+                    sessionStorage.removeItem("orderScrollTop");
+                }, 2000)
+
+            }
+        } else {
+            //后续版本用
+            var active = getParam("active");
+            if (active) {
+                $(".buttons-tab .tab-link").eq(active).addClass("active").siblings().removeClass("active");
+                $(".tabs>.tab").eq(active).show().siblings().hide();
+                $(".card_lists").empty();
+                queryOrder(active, 10);
+            } else {
+                queryOrder(0, 10);
+            }
+        }
+    })
+
+    //查询订单ajax
+    //typ  0全部 1未支付 2已支付
+    function queryOrder(typ, page_size) {
+        var result = true;
+        $.post("/subscribepay/orderListDetails/myOrder", {
+            "type": typ,
+            "page_size": page_size,
+            "fromPage": "wx"
+        }, function (data) {
+            $(".loading_").hide();
+            var list = data.res;
+            dataCache = data.res;
+            if (page_size != 10) {
+                pageIndex = parseInt(page_size / 10) + 1;
+            } else {
+                pageIndex = 2;
+            }
+            hasNextPage = data.hasNextPage;
+            if (data.res && data.res.length > 0) {
+                structureHtml(data.res, typ);
+            } else {
+                result = false;
+                nodataHtml = ""
+                nodataHtml += '<div style="text-align:center;">';
+                nodataHtml += '<img src="/wx_dataExport/images/fish.png" style="width: 2.8rem;height: 2.8rem;margin-top: 45%;">'
+                nodataHtml += '<div style="color: #888;font-size: .32rem;text-align:center;">暂无数据</div></div>'
+                $(".card_lists").append(nodataHtml);
+            }
+
+            if (!result) {
+                $(".dropload-down").hide()
+                return
+            }
+            if (hasNextPage) {
+                wxflag = $(' .main').dropload({
+                    scrollArea: $(".main"),
+                    loadDownFn: function (me) {
+                        $.post('/subscribepay/orderListDetails/myOrder', {
+                            "pageNum": pageIndex,
+                            "type": typ,
+                            "fromPage": "wx"
+                        }, function (data) {
+                            //没有数据
+                            if (data.res == null || data.res.length == 0) {
+                                noMoreData(me);
+                            } else {
+                                dataCache = dataCache.concat(data.res);
+                                pageIndex++;
+                                structureHtml(data.res, typ);
+                                if (data.hasNextPage) {
+                                    // 每次数据插入，必须重置
+                                    me.resetload();
+                                } else {
+                                    noMoreData(me);
+                                }
+                            }
+                        });
+                    }
+                });
+            } else {
+                wxflag = $('.main').dropload({
+                    scrollArea: window,
+                    loadDownFn: function (me) {
+                        if (wxflag == null) {
+                            wxflag = me;
+                        }
+                        noMoreData(me);
+                    }
+                });
+                noMoreData(wxflag);
+            }
+            //},500)
+        })
+    }
+
+    function structureHtml(object, typ) {
+        var listhtml = '';
+        var psss = 0;
+        for (var index in object) {
+            var obj = object[index];
+            var isLiveActive = false;
+            if (obj.isLiveActive) {
+                isLiveActive = true;
+            }
+            if (obj.product_type === "历史数据") {
+                count++;
+                var id = obj.id;
+                //订单编号
+                var orderCode = obj.order_code;
+                //创建时间
+                var createTime = obj.create_time;
+                createTime = createTime.replace(/-/g, ".");
+                //选择时间
+                var publishTime = obj.filter_publishtime;
+                if (!publishTime) {
+                    publishTime = "全部";
+                } else {
+                    if (publishTime.length === 11) {
+                        if (publishTime.slice(0, 1) !== "_") {
+                            publishTime = timestampToTime(publishTime.slice(0, 10));
+                            publishTime = publishTime + "-";
+                        } else {
+                            publishTime = timestampToTime(publishTime.slice(1, 11));
+                            publishTime = publishTime + "前全部";
+                        }
+                    }
+                }
+                //1标准字段包 2高级字段包
+                var spec = obj.data_spec;
+                if (spec === 1) {
+                    spec = "标准字段包";
+                } else if (spec === 2) {
+                    spec = "高级字段包";
+                }
+                //订单总数
+                var data_count = obj.data_count;
+                //订单金额
+                var orderMoney = obj.order_money;
+                //金额格式化 小数点前 1,000
+                orderMoney = orderMoney + "";
+                orderMoney_1 = toThousands(orderMoney.split(".")[0]);
+                orderMoney_2 = orderMoney.split(".")[1];
+                if (orderMoney_2) {
+                    orderMoney = orderMoney_1 + "." + orderMoney_2;
+                } else {
+                    orderMoney = orderMoney_1;
+                }
+                //
+                var token = obj.token;
+                //订单状态 0待支付 1已完成 -1删除
+                var orderStatus = obj.order_status;
+                if (sessionStorage && sessionStorage.getItem("paySuccess_" + obj.order_code) != null) {
+                    orderStatus = sessionStorage.getItem("paySuccess_" + obj.order_code);
+                    if (orderTabActive === 1 && orderStatus === 1) {
+                        gopayIndex = index;
+                        psss = obj.order_code;
+                        continue;
+                    } else {
+                        sessionStorage.removeItem("paySuccess_" + obj.order_code);
+                    }
+                }
+                if (orderStatus === 0) {
+                    orderStatus = "待付款"
+                    orderHtml = "";
+                    orderHtml += '<span class="status notpay">'
+                    orderHtml += '<span class="status-text">' + orderStatus + '</span>'
+                    orderHtml += "<span class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id + ",this)\"></span></span>";
+                    iconHtml = ""
+                    iconHtml += '<div class="card-footer">'
+                        + '<a class="btn cancle gray-btn" onclick="cancelOrder(' + id + ',this)">取消订单</a>'
+                        + '<a href="javascript:void(0)" onclick="window.location.href =\'' + "/weixin/pay/checkout_dataexport?orderCode=" + orderCode + '\'" class="btn  green-btn">去支付</a>'
+                        + '</div>'
+                } else if (orderStatus === 1) {
+                    orderStatus = "已完成";
+                    orderHtml = ""
+                    orderHtml += ' <span class="status finish">'
+                    orderHtml += '<span class="status-text">' + orderStatus + '</span>'
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id + ",this)\"></a></span>";
+
+                    iconHtml = ""
+                    iconHtml += '<div class="card-footer">'
+                    //已完成订单 开发票判断  0未申请  1已申请
+                    var applybill_status = obj.applybill_status;
+                    if (applybill_status === 0) {
+                        iconHtml += '<a  onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a>'
+                        iconHtml += '<a  onclick="onceMore(this)" class="btn cancle green-btn">再次购买</a>'
+                    } else if (applybill_status === 1) {
+                        iconHtml += '<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a>'
+                        iconHtml += '<a  onclick="onceMore(this)" class="btn cancle green-btn">再次购买</a>'
+                    }
+                    iconHtml += '</div>'
+                } else if (orderStatus === -2) {
+                    orderStatus = "已取消";
+                    orderHtml = "";
+                    orderHtml += '<span class="status cancel_text">'
+                    orderHtml += '<span class="status-text">' + orderStatus + '</span>'
+                    orderHtml += "<span class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id + ",this)\"></span></span>";
+                    iconHtml = "";
+                    iconHtml += '<div class="card-footer">'
+                        + '<a onclick="onceMore(this)" class="btn cancle green-btn">再次购买</a>'
+                        + '</div>'
+                }
+                //关键词
+                if (obj.filter_keys && obj.filter_keys.split(",").length > 0) {
+                    var keysHtml = "";
+                    var keysArr = obj.filter_keys.split(",");
+                    var keysLen = keysArr.length;
+                    for (var j = 0; j < keysLen; j++) {
+                        keysHtml += "<span>" + keysArr[j] + "&nbsp</span>";
+                    }
+                } else {
+                    keysHtml = ""
+                }
+
+                listhtml += '<div class="card">'
+                    + '<div class="card-header">'
+                    + '<span class="time" style="color:#888888">' + createTime + '</span>'
+                    + orderHtml
+                    + '</div>'
+                    + '<div class="card-content">'
+                    + '<a onclick="setSessionStorage()" eid=' + orderCode + ' href="/front/wx_dataExport/wxToOrderDetail?orderCode=' + orderCode + '" class="media">'
+                    + '<div class="media-img">'
+                    + '<img src="/dataExport/image/dataOutput.png">'
+                    + '</div>'
+                    + '<div class="media-info">'
+                    + '<p class="item-ifo ellipsis">关键词：' + keysHtml + '</p>'
+                    + '<p class="item-ifo ellipsis">数据量：' + data_count + '条</p>'
+                    + '<p class="item-ifo ellipsis">数据规格：' + spec + '</p>'
+                    + '<p class="item-ifo ellipsis">筛选日期：' + publishTime + '</p>'
+                    + '</div>'
+                    + '</a>'
+                    + '<div class="price">'
+                    + '<strong class="current">￥' + orderMoney + '</strong>'
+                    + '</div>'
+                    + '</div>'
+                    + iconHtml
+                    + '</div>'
+            } else if ((obj.product_type === "vip订阅") || (obj.product_type === "VIP订阅")) {
+                if (typ === 1) {	//待付款订单列表页
+                    if (obj.order_status === -2) {
+                        continue;
+                    }
+                }
+                count++;
+                var id_vip = obj.id;
+                //订单编号
+                var orderCode_vip = obj.order_code;
+                //创建时间
+                var createTime_vip = obj.create_time;
+                createTime_vip = createTime_vip.replace(/-/g, ".")
+                //筛选条件
+                var filter_vip = JSON.parse(obj.filter);
+                var newbuyset = filter_vip.newBuyset;
+                //判断该订单是否是升级订单
+                var vip_type = obj.vip_type;
+                var region_vip = ""
+                if ((vip_type !== 2) && (vip_type !== 1)) {
+                    //地区
+                    if (!$.isEmptyObject(newbuyset)) {	//不为空
+                        if (newbuyset.areacount !== -1) {
+                            var newcitys = newbuyset.newcitys;
+                            var scatter = newcitys.length;//分布
+                            var citynum = 0;
+                            for (var k in newcitys) {
+                                citynum += newcitys[k];
+                            }
+                            if (newbuyset.areacount > 0) {
+                                region_vip = newbuyset.areacount + "个省级区域";
+                                if (citynum !== 0) {
+                                    region_vip += "、" + citynum + "个地市";
+                                }
+                            } else {
+                                region_vip += citynum + "个地市";
+                            }
+                        } else {
+                            region_vip = "全国";
+                        }
+                        //行业
+                        var industry_vip = newbuyset.buyerclasscount;	//数组
+                        if (industry_vip === -1) {
+                            industry_vip = "全行业";
+                        } else {
+                            industry_vip = industry_vip + "个行业";
+                        }
+                    } else {
+                        var region_vipArr = filter_vip.area;
+                        var province_length = 0;
+                        var city_length = 0;
+                        if (JSON.stringify(region_vipArr) !== JSON.stringify({})) {
+                            for (i in region_vipArr) {
+                                if (region_vipArr[i].length === 0) {
+                                    province_length++;
+                                } else {
+                                    city_length += region_vipArr[i].length;
+                                }
+                            }
+                        } else {
+                            region_vip = "全国";
+                        }
+                        if ((province_length !== 0) && (city_length !== 0)) {
+                            region_vip = province_length + "个省级区域、" + city_length + "个地市";
+                        } else if ((province_length === 0) && (city_length !== 0)) {
+                            region_vip = city_length + "个地市";
+                        } else if ((province_length !== 0) && (city_length === 0)) {
+                            region_vip = province_length + "个省级区域";
+                        }
+                        //行业
+                        var industry_vip = filter_vip.industry.length;	//数组
+                        if (industry_vip === 0) {
+                            industry_vip = "全行业";
+                        } else {
+                            industry_vip = industry_vip + "个行业";
+                        }
+                    }
+                    var cyclecount_vip = filter_vip.cyclecount;	//时长
+                    var cycleunit_vip = filter_vip.cycleunit;//单位 1:年 2:月 3:天
+                    //订阅周期
+                    var effectiveduration_vip = ""
+                    if ((obj.vip_starttime) && (obj.vip_endtime)) {
+                        var start_time_vip = obj.vip_starttime;
+                        var end_time_vip = obj.vip_endtime;
+                        var start_time_arr = start_time_vip.split(" ")[0].split("-")
+                        var end_time_arr = end_time_vip.split(" ")[0].split("-")
+                        var start_year = start_time_arr[0];
+                        var start_month = start_time_arr[1];
+                        var end_year = end_time_arr[0];
+                        var end_month = end_time_arr[1];
+
+                        var year = 0;
+                        var month = 0;
+                        if (end_year > start_year) {
+                            if (end_month > start_month) {
+                                year = end_year - start_year;
+                                month = end_month - start_month;
+                            } else {
+                                year = end_year - start_year - 1;
+                                month = 12 + Number(end_month) - start_month;
+                                if (month === 12) {
+                                    year = Number(year) + 1;
+                                    month = 0;
+                                }
+                            }
+                        } else if (end_year === start_year) {
+                            month = end_month - start_month;
+                        }
+
+                        if (year !== 0 && month !== 0) {
+                            effectiveduration_vip = year + "年" + month + "个月";
+                        } else if (year !== 0 && month === 0) {
+                            effectiveduration_vip = year + "年";
+                        } else if (year === 0 && month !== 0) {
+                            effectiveduration_vip = month + "个月";
+                        }
+                        if (cycleunit_vip === 3) {
+                            effectiveduration_vip = cyclecount_vip + "天";
+                        }
+                    } else {
+                        if (cycleunit_vip === 1) {
+                            effectiveduration_vip = cyclecount_vip + "年";
+                        } else if (cycleunit_vip === 2) {
+                            effectiveduration_vip = cyclecount_vip + "个月"
+                        } else if (cycleunit_vip === 3) {
+                            effectiveduration_vip = cyclecount_vip + "天";
+                        }
+                    }
+                    //试用用户生成订单 周期
+                    if (effectiveduration_vip === "") {
+                        if (cycleunit_vip === 1) {
+                            effectiveduration_vip = cyclecount_vip + "年";
+                        } else if (cycleunit_vip === 2) {
+                            effectiveduration_vip = cyclecount_vip + "个月"
+                        } else if (cycleunit_vip === 3) {
+                            effectiveduration_vip = cyclecount_vip + "天";
+                        }
+                    }
+                } else if (vip_type === 2) {
+                    //新增全部行业:-1  新增部分行业:123   		无新增:0
+                    //新增全国{"province":0,"city":0}  无新增:{}
+                    //区域
+                    var filterObj = filter_vip;
+                    if (!$.isEmptyObject(newbuyset)) {	//不为空
+                        if (newbuyset.areacount !== -1) {
+                            var newcitys = newbuyset.newcitys;
+                            var scatter = newcitys.length;//分布
+                            var citynum = 0;
+                            for (var k in newcitys) {
+                                citynum += newcitys[k];
+                            }
+                            if (newbuyset.areacount > 0) {
+                                region_vip = newbuyset.areacount + "个省级区域";
+                                if (citynum != 0) {
+                                    region_vip += "、" + citynum + "个地市";
+                                }
+                            } else {
+                                region_vip += citynum + "个地市";
+                            }
+                        } else {
+                            region_vip = "全国";
+                        }
+                        var buyerclasscount = newbuyset.buyerclasscount;
+                        if (buyerclasscount > 3) {
+                            buyerclasscount = filterObj.industry.length;
+                            industry_vip = "全行业（" + buyerclasscount + "个行业）";
+                        } else {
+                            industry_vip = buyerclasscount + "个行业";
+                        }
+                        if (buyerclasscount === -1) {
+                            industry_vip = "全行业";
+                        }
+                    } else {
+                        if (!$.isEmptyObject(filterObj.addareacount)) {
+                            if ((filterObj.addareacount.province === 0) && (filterObj.addareacount.city === 0)) {
+                                region_vip = "全国";
+                            }
+                            if ((filterObj.addareacount.province !== 0) && (filterObj.addareacount.city === 0)) {
+                                region_vip = filterObj.addareacount.province + "个省级区域";
+                            }
+                            if ((filterObj.addareacount.province === 0) && (filterObj.addareacount.city !== 0)) {
+                                region_vip = filterObj.addareacount.city + "个地市";
+                            }
+                            if ((filterObj.addareacount.province !== 0) && (filterObj.addareacount.city !== 0)) {
+                                region_vip = filterObj.addareacount.province + "个省级区域、" + filterObj.addareacount.city + "个地市";
+                            }
+                        } else {
+                            region_vip = "无";
+                        }
+                        //行业
+                        var industry_vip = "";
+                        industry_vip = filterObj.addbuyerclasscount + "个行业";
+                        if (filterObj.addbuyerclasscount === 0) {
+                            industry_vip = "无";
+                        }
+                        if (filterObj.addbuyerclasscount === -1) {
+                            industry_vip = "全行业";
+                        }
+                    }
+                    //延长周期
+                    var effectiveduration_vip = "";
+                    if (filterObj.cycleunit === 1) {
+                        effectiveduration_vip = filterObj.cyclecount + "年";
+                    } else if (filterObj.cycleunit === 2) {
+                        effectiveduration_vip = filterObj.cyclecount + "个月";
+                    } else if (filterObj.cycleunit === 3) {
+                        effectiveduration_vip = filterObj.cyclecount + "天";
+                    } else if (filterObj.cycleunit === -1) {
+                        effectiveduration_vip = "不延期";
+                    } else {
+                        if ((obj.vip_starttime !== undefined) && (obj.vip_endtime !== undefined)) {
+                            var start_time_vip = obj.vip_starttime;
+                            var end_time_vip = obj.vip_endtime;
+                            var start_time_arr = start_time_vip.split(" ")[0].split("-")
+                            var end_time_arr = end_time_vip.split(" ")[0].split("-")
+                            var start_year = start_time_arr[0];
+                            var start_month = start_time_arr[1];
+                            var end_year = end_time_arr[0];
+                            var end_month = end_time_arr[1];
+
+                            var year = 0;
+                            var month = 0;
+                            if (end_year > start_year) {
+                                if (end_month > start_month) {
+                                    year = end_year - start_year;
+                                    month = end_month - start_month;
+                                } else {
+                                    year = end_year - start_year - 1;
+                                    month = 12 + Number(end_month) - start_month;
+                                    if (month === 12) {
+                                        year = Number(year) + 1;
+                                        month = 0;
+                                    }
+                                }
+                            } else if (end_year === start_year) {
+                                month = end_month - start_month;
+                            }
+
+                            if (year !== 0 && month !== 0) {
+                                effectiveduration_vip = year + "年" + month + "个月";
+                            } else if (year !== 0 && month === 0) {
+                                effectiveduration_vip = year + "年";
+                            } else if (year === 0 && month !== 0) {
+                                effectiveduration_vip = month + "个月";
+                            }
+                            if (cycleunit_vip === 3) {
+                                effectiveduration_vip = cyclecount_vip + "天";
+                            }
+                        } else {
+                            if (cycleunit_vip === 1) {
+                                effectiveduration_vip = cyclecount_vip + "年";
+                            } else if (cycleunit_vip === 2) {
+                                effectiveduration_vip = cyclecount_vip + "个月"
+                            } else if (cycleunit_vip === 3) {
+                                effectiveduration_vip = cyclecount_vip + "天";
+                            }
+                        }
+                    }
+                    //续费升级逻辑修改后判断是否不延期
+                    if (filterObj.cycleunit === 0 && filterObj.cyclecount === 0) {
+                        effectiveduration_vip = "不延期";
+                    }
+                } else if (vip_type === 1) {
+                    filter_vip = JSON.parse(obj.filter);
+                    var renewal_market = 0; //续费市级地区
+                    var buyset = filter_vip.buyset;
+                    if ($.isEmptyObject(newbuyset)) {
+                        //续费订单根据buyset 中ciyts判断 老订单为citys 新订单为newcitys  续费以外根据newbuyset判断
+                        if (buyset.ciyts !== undefined) {
+                            if (buyset.areacount === -1) {
+                                region_vip = "全国";
+                            } else {
+                                if (!$.isEmptyObject(buyset.citys)) {
+                                    for (var key in buyset.citys) {
+                                        renewal_market += (buyset.citys[key]);
+                                    }
+                                }
+                                //
+                                var areaText = "";
+                                if ((buyset.areacount !== 0) && (renewal_market !== 0)) {
+                                    region_vip = buyset.areacount + "个省级地区、" + renewal_market + "个地市";
+                                } else if ((buyset.areacount === 0) && (renewal_market !== 0)) {
+                                    region_vip = renewal_market + "个地市";
+                                } else if ((buyset.areacount !== 0) && (renewal_market === 0)) {
+                                    region_vip = buyset.areacount + "个省级地区";
+                                }
+                            }
+                            if (buyset.buyerclasscount === -1) {
+                                industry_vip = "全行业";
+                            } else {
+                                industry_vip = buyset.buyerclasscount + "个行业";
+                            }
+                        }
+                    } else {
+                        if (newbuyset.areacount !== -1) {
+                            var newcitys = newbuyset.newcitys;
+                            var scatter = newcitys.length;//分布
+                            var citynum = 0;
+                            for (var k in newcitys) {
+                                citynum += newcitys[k];
+                            }
+                            if (newbuyset.areacount > 0) {
+                                region_vip = newbuyset.areacount + "个省级区域";
+                                if (citynum !== 0) {
+                                    region_vip += "、" + citynum + "个地市";
+                                }
+                            } else {
+                                if (citynum !== 0) {
+                                    region_vip += citynum + "个地市";
+                                }
+                            }
+                        } else {
+                            region_vip = "全国";
+                        }
+                        if (newbuyset.buyerclasscount !== -1) {
+                            industry_vip = newbuyset.buyerclasscount + "个行业";
+                        } else {
+                            industry_vip = "全行业";
+                        }
+                    }
+                    //订阅周期
+                    var effectiveduration_vip = ""
+                    if ((obj.vip_starttime !== undefined) && (obj.vip_endtime !== undefined)) {
+                        var start_time_vip = obj.vip_starttime;
+                        var end_time_vip = obj.vip_endtime;
+                        var start_time_arr = start_time_vip.split(" ")[0].split("-")
+                        var end_time_arr = end_time_vip.split(" ")[0].split("-")
+                        var start_year = start_time_arr[0];
+                        var start_month = start_time_arr[1];
+                        var end_year = end_time_arr[0];
+                        var end_month = end_time_arr[1];
+
+                        var year = 0;
+                        var month = 0;
+                        if (end_year > start_year) {
+                            if (end_month > start_month) {
+                                year = end_year - start_year;
+                                month = end_month - start_month;
+                            } else {
+                                year = end_year - start_year - 1;
+                                month = 12 + Number(end_month) - start_month;
+                                if (month === 12) {
+                                    year = Number(year) + 1;
+                                    month = 0;
+                                }
+                            }
+                        } else if (end_year === start_year) {
+                            month = end_month - start_month;
+                        }
+
+                        if (year !== 0 && month !== 0) {
+                            effectiveduration_vip = year + "年" + month + "个月";
+                        } else if (year !== 0 && month === 0) {
+                            effectiveduration_vip = year + "年";
+                        } else if (year === 0 && month !== 0) {
+                            effectiveduration_vip = month + "个月";
+                        }
+                        if (cycleunit_vip === 3) {
+                            effectiveduration_vip = cyclecount_vip + "天";
+                        }
+                    } else {
+                        if (cycleunit_vip === 1) {
+                            effectiveduration_vip = cyclecount_vip + "年";
+                        } else if (cycleunit_vip === 2) {
+                            effectiveduration_vip = cyclecount_vip + "个月"
+                        } else if (cycleunit_vip === 3) {
+                            effectiveduration_vip = cyclecount_vip + "天";
+                        }
+                    }
+                }
+
+                var vip_status = obj.i_vip_status;	// 1:试用 2:正式 -1:试用到期 -2:正式到期
+                //订单状态 0待支付 1已完成 -1删除
+                var orderStatus_vip = obj.order_status;
+                var token_vip = obj.token;
+                if (sessionStorage && sessionStorage.getItem("paySuccess_" + obj.order_code) != null) {
+                    orderStatus = sessionStorage.getItem("paySuccess_" + obj.order_code);
+                    if (orderTabActive === 1 && orderStatus === 1) {
+                        gopayIndex = index;
+                        psss = obj.order_code;
+                        continue;
+                    } else {
+                        sessionStorage.removeItem("paySuccess_" + obj.order_code);
+                    }
+                }
+                //订单金额
+                var orderMoney_vip = obj.order_money;
+                var orginsPrices = obj.order_money;
+                //金额格式化 小数点前 1,000
+                orderMoney_vip = orderMoney_vip + "";
+                orderMoney_vip1 = toThousands(orderMoney_vip.split(".")[0]);
+                orderMoney_vip2 = orderMoney_vip.split(".")[1];
+                if (orderMoney_vip2) {
+                    orderMoney_vip = orderMoney_vip1 + "." + orderMoney_vip2;
+                } else {
+                    orderMoney_vip = orderMoney_vip1;
+                }
+                if (orderStatus_vip === 0) {
+                    orderStatus_vip = "待付款"
+                    orderHtml = ""
+                    orderHtml += '<span class="status notpay">'
+                    orderHtml += '<span class="status-text">' + orderStatus_vip + '</span>'
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip + ",this)\"></a></span>";
+                    iconHtml = ""
+                    iconHtml += '<div class="card-footer">'
+                        + '<a  class="btn cancle" onclick="cancelOrder(' + id_vip + ',this)">取消订单</a>'
+                        + '<a href="javascript:void(0)" onclick="window.location.href =\'' + "/weixin/pay/checkout_vip?orderCode=" + orderCode + '\'" class="btn  green-btn">去支付</a>'
+                        + '</div>'
+                } else if (orderStatus_vip === 1) {
+                    orderStatus_vip = "已完成";
+                    orderHtml = ""
+                    orderHtml += '<span class="status finish">'
+                    orderHtml += '<span class="status-text">' + orderStatus_vip + '</span>'
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip + ",this)\"></a></span>";
+                    iconHtml = ""
+                    //最后一次购买完 1:试用 2:正式 -1:试用到期 -2:正式到期
+                    if ((vip_status === "-2") && (obj.lastbuy_code !== undefined)) {
+                        iconHtml += '<div class="card-footer">'
+                        if (obj.applybill_status === 0) {
+                            iconHtml += '<a  onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a>'
+                        } else {
+                            iconHtml += '<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a>'
+                        }
+                        iconHtml += '<a  onclick="renewalOrBuyAgain(2,this)" class="btn  green-btn">再次购买</a></div>'
+                    } else if ((vip_status === "2") && (obj.lastbuy_code !== undefined)) {
+                        if (obj.pay_way !== "trial") {
+                            iconHtml += '<div class="card-footer">'
+                            if (obj.applybill_status === 0) {
+                                iconHtml += '<a  onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a>'
+                            } else {
+                                iconHtml += '<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a>'
+                            }
+                            iconHtml += '<a  onclick="renewalOrBuyAgain(1,this)" class="btn green-btn">续费</a></div>'
+                        }
+                    } else if ((vip_status === "-2") && (obj.lastbuy_code === undefined)) {
+                        iconHtml += '<div class="card-footer">'
+                        if (obj.applybill_status === 0) {
+                            iconHtml += '<a  onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a></div>'
+                        } else {
+                            iconHtml += '<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a></div>'
+                        }
+                    } else if ((vip_status === "2") && (obj.lastbuy_code === undefined)) {
+                        if (obj.pay_way !== "trial") {
+                            iconHtml += '<div class="card-footer">'
+                            if (obj.applybill_status === 0) {
+                                iconHtml += '<a  onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a></div>'
+                            } else {
+                                iconHtml += '<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a></div>'
+                            }
+                        }
+                    }
+                } else if (orderStatus_vip === -2) {
+                    orderStatus_vip = "已取消";
+                    orderHtml = "<span class=\"status cancel_text\">";
+                    orderHtml += '<span class="status-text">' + orderStatus_vip + '</span>'
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip + ",this)\"></a></span>";
+                    iconHtml = "";
+                    iconHtml += '<div class="card-footer">'
+                        + '</div>'
+                }
+                if (filter_vip.cyclecount !== undefined && filter_vip.cyclecount !== "" && filter_vip.cycleunit !== undefined && filter_vip.cycleunit !== "") {
+                    if (parseInt(filter_vip.cycleunit) === 1) {
+                        effectiveduration_vip = filter_vip.cyclecount + "年"
+                    } else if (parseInt(filter_vip.cycleunit) === 2) {
+                        effectiveduration_vip = filter_vip.cyclecount + "个月"
+                    } else {
+                        effectiveduration_vip = "7天"
+                    }
+                }
+                if (filter_vip.cycleunit === 0 && filter_vip.cyclecount === 0) {
+                    effectiveduration_vip = "不延期";
+                }
+                //vip状态 0不是vip 1试用 2正式
+                if (orderStatus_vip !== "已完成") {
+                    //未支付 或 已取消
+                    listhtml += '<div class="card">'
+                        + '<div class="card-header">'
+                        + '<span class="time" style="color:#888888">' + createTime_vip + '</span>'
+                        + orderHtml
+                        + '</div>'
+                        + '<div class="card-content">'
+                        + '<a onclick="setSessionStorage()" eid=' + orderCode_vip + ' href="/front/vipsubscribe/toOrderDetailPage?orderCode=' + orderCode_vip + '" class="media" isvipOrder="true">'
+                        + '<div class="media-img">'
+                        + '<img src="/vipsubscribe/image/vipBook.png">'
+                        + '</div>'
+                        + '<div class="media-info">';
+                    listhtml += '<p class="item-ifo ellipsis">区域：' + region_vip + '</p>'
+                        + '<p class="item-ifo ellipsis">行业：' + industry_vip + '</p>'
+                        + '<p class="item-ifo ellipsis">订阅周期：' + effectiveduration_vip + '</p>';
+                    //}
+                    listhtml += '</div></a>'
+                    listhtml += '<div class="price">'
+                    if (isLiveActive) {
+                        var originPrice = formatMoney(parseFloat(orginsPrices) / parseFloat(0.6));
+                        listhtml += '<span class="origin-price-container">'
+                            + '<span>原价：￥</span>'
+                            + '<span class="origin-price">' + originPrice + '</span>'
+                            + '</span>'
+                    }
+                    listhtml += '<strong class="current">￥' + orderMoney_vip + '</strong>'
+                        + '</div>'
+                        + '</div>'
+                        + iconHtml
+                        + '</div>'
+                } else {
+                    //有效时间
+                    var starttime_vip = obj.vip_starttime + "";
+                    var endtime_vip = obj.vip_endtime + "";
+                    starttime_vip = starttime_vip.split(" ")[0].replace(/-/g, ".")
+                    endtime_vip = endtime_vip.split(" ")[0].replace(/-/g, ".")
+                    var effectivetime_vip = starttime_vip + "-" + endtime_vip;
+                    //已完成
+                    listhtml += '<div class="card">'
+                        + '<div class="card-header">'
+                        + '<span class="time" style="color:#888888">' + createTime_vip + '</span>'
+                        + orderHtml
+                        + '</div>'
+                        + '<div class="card-content">'
+                        + '<a  onclick="setSessionStorage()" eid=' + orderCode_vip + ' href="/front/vipsubscribe/toOrderDetailPage?orderCode=' + orderCode_vip + '" class="media" isvipOrder="true">'
+                        + '<div class="media-img">'
+                        + '<img src="/vipsubscribe/image/vipBook.png">'
+                        + '</div>'
+                        + '<div class="media-info">';
+                    listhtml += '<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">有效日期：' + effectivetime_vip + '</p>';
+                    //}
+                    listhtml += '</div></a>'
+                    listhtml += '<div class="price">'
+                    if (isLiveActive) {
+                        var originPrice = formatMoney(parseFloat(orginsPrices) / parseFloat(0.6));
+                        listhtml += '<span class="origin-price-container">'
+                            + '<span>原价：￥</span>'
+                            + '<span class="origin-price">' + originPrice + '</span>'
+                            + '</span>'
+                    }
+                    listhtml += '<strong class="current">￥' + orderMoney_vip + '</strong>'
+                        + '</div>'
+                        + '</div>'
+                        + iconHtml
+                        + '</div>'
+                }
+
+            } else if (obj.product_type === "招投标课程") {
+                count++;
+                // console.log(obj)
+                var id = obj.id;
+                //订单编号
+                var orderCode = obj.order_code;
+                //创建时间
+                var createTime = obj.create_time;
+                createTime = createTime.replace(/-/g, ".")
+                var payWay = obj.pay_way
+                var filterObj = JSON.parse(obj.filter);
+                var courseName = filterObj.courseName;
+                var courseType = filterObj.courseType;
+                var courseAddress = filterObj.courseAddress;
+                var peopleNum = filterObj.peoleNum;
+                var orderStatus = obj.order_status;
+                var courseStatus = obj.course_status;
+                var orderStatusHtml = "";
+                var orderStatusHtmls = "";
+                var coursePrice = filterObj.coursePrice;
+                var costPrice = peopleNum * coursePrice;
+                var orderMoney = obj.order_money;
+                var courseId = filterObj.courseMgoId;
+                var lastHtml = "";
+                var orderUrl = "/swordfish/course/orderDetail?code=" + orderCode;
+                var helpHtml = "";
+
+                if (payWay !== "transferAccounts") {
+                    if (orderStatus === 0) {
+                        orderStatusHtml = "待付款";
+                        orderStatusHtmls = "notpay";
+                        lastHtml = '<div class="card-footer">'
+                            + '<a  class="btn cancle gopay_btn" onclick="cancelOrder(' + id + ',this)">取消订单</a>'
+                            + '<a onclick="setSessionStorage()" href="/weixin/pay/optionPay?code=' + orderCode + '" class="btn green-btn">去支付</a>'
+                            + '</div>';
+                    } else if (orderStatus === 1) {
+                        if (courseStatus === 5) {
+                            orderStatusHtml = "退款审核中";
+                            orderStatusHtmls = "refund";
+                            lastHtml = '<div class="card-footer">'
+                                + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle green-btn">再次购买</a>'
+                                + '</div>';
+                            orderUrl = "/swordfish/course/refundVerify?code=" + orderCode;
+                        } else if (courseStatus === 6) {
+                            orderStatusHtml = "已退款";
+                            orderStatusHtmls = "refund";
+                            lastHtml = '<div class="card-footer">'
+                                + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle green-btn">再次购买</a>'
+                                + '</div>';
+                            orderUrl = "/swordfish/course/refundVerify?code=" + orderCode + "&isrefund=true";
+                        } else {
+                            orderStatusHtml = "已完成";
+                            lastHtml = '<div class="card-footer refundable tooltip">'
+                                + '<i class="show-more" onclick="show_more(this)"></i>'
+                                + '<a onclick="setSessionStorage()" href="/swordfish/course/refund?code=' + orderCode + '" class="tooltip-text hide" data-id="订单id" style="display: none;">退款</a>'
+                                + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle green-btn">再次购买</a>'
+                                + '</div>'
+                            var endTime = "";
+                            try {
+                                var startTime = new Date(filterObj.startTime * 1000).toLocaleString().split(" ")[0];
+                                var startTimes = new Date(startTime + " 00:00:00").getTime();
+                                var nowTime = new Date().getTime();
+                                if (nowTime >= startTimes) {
+                                    lastHtml = '<div class="card-footer">'
+                                        + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle">再次购买</a>'
+                                        + '</div>'
+                                }
+                            } catch (e) {
+                            }
+                        }
+                    } else {
+                        orderStatusHtml = "已取消";
+                        lastHtml = '<div class="card-footer">'
+                            + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle green-btn">再次购买</a>'
+                            + '</div>'
+                    }
+                } else {
+                    //公对公
+                    if (orderStatus === 0) {
+                        if (courseStatus === 2) {
+                            orderStatusHtml = "转账审核中";
+                            orderUrl = "/swordfish/course/transferVerify?code=" + orderCode;
+                            orderStatusHtmls = "refund";
+                        } else if (courseStatus === 3) {
+                            orderStatusHtml = "未收到转账";
+                            lastHtml = '<div class="card-footer">'
+                                + '<a  class="btn cancle gray-btn" onclick="cancelOrder(' + id + ',this)">取消订单</a>'
+                                + '<a onclick="setSessionStorage()" href="/weixin/pay/optionPay?code=' + orderCode + '" class="btn green-btn">再次支付</a>'
+                                + '</div>';
+                            helpHtml = '<span class="doubt iconfont icon-bangzhu" onclick="phoneShow()"></span>'
+                            orderStatusHtmls = "refund";
+                        } else {
+                            orderStatusHtml = "待付款";
+                            orderStatusHtmls = "notpay";
+                            lastHtml = '<div class="card-footer">'
+                                + '<a  class="btn cancle gray-btn" onclick="cancelOrder(' + id + ',this)">取消订单</a>'
+                                + '<a onclick="setSessionStorage()" href="/weixin/pay/optionPay?code=' + orderCode + '" class="btn green-btn">去支付</a>'
+                                + '</div>';
+                        }
+                    } else if (orderStatus === 1) {
+                        if (courseStatus === 5) {
+                            orderStatusHtml = "退款审核中";
+                            orderStatusHtmls = "refund";
+                            lastHtml = '<div class="card-footer">'
+                                + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle green-btn">再次购买</a>'
+                                + '</div>';
+                            orderUrl = "/swordfish/course/refundVerify?code=" + orderCode;
+                        } else if (courseStatus === 6) {
+                            orderStatusHtml = "已退款";
+                            orderStatusHtmls = "refund";
+                            lastHtml = '<div class="card-footer">'
+                                + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle green-btn">再次购买</a>'
+                                + '</div>';
+                            orderUrl = "/swordfish/course/refundVerify?code=" + orderCode + "&isrefund=true";
+                        } else {
+                            orderStatusHtml = "已完成";
+                            lastHtml = '<div class="card-footer refundable tooltip">'
+                                + '<i class="show-more" onclick="show_more(this)"></i>'
+                                + '<a onclick="setSessionStorage()" href="/swordfish/course/refund?code=' + orderCode + '" class="tooltip-text hide" data-id="订单id" style="display: none;">退款</a>'
+                                + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle green-btn">再次购买</a>'
+                                + '</div>'
+                            var endTime = "";
+                            try {
+                                var startTime = new Date(filterObj.startTime * 1000).toLocaleString().split(" ")[0];
+                                var startTimes = new Date(startTime + " 00:00:00").getTime();
+                                var nowTime = new Date().getTime();
+                                if (nowTime >= startTimes) {
+                                    lastHtml = '<div class="card-footer">'
+                                        + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle">再次购买</a>'
+                                        + '</div>'
+                                }
+                            } catch (e) {
+                            }
+                        }
+                    } else {
+                        orderStatusHtml = "已取消";
+                        lastHtml = '<div class="card-footer">'
+                            + '<a onclick="setSessionStorage()" href="/swordfish/course/detail/' + courseId + '" class="btn cancle">再次购买</a>'
+                            + '</div>'
+                    }
+                }
+                listhtml += '<div class="card">'
+                    + '<div class="card-header">'
+                    + '<span class="time">' + createTime + '</span>'
+                    + '<span class="status ' + orderStatusHtmls + '">'
+                    + helpHtml
+                    + '<span class="status-text">' + orderStatusHtml + '</span>'
+                    + '<a class="delete_icon" title="删除订单" onclick="deleteOrder(' + id + ',this)"></a>'
+                    + '</span>'
+                    + '</div>'
+                    + '<div class="card-content">'
+                    + '<a onclick="setSessionStorage()" href="' + orderUrl + '" eid="' + courseId + '" class="media" courseOrder="true" vid="' + orderCode + '">'
+                    + '<div class="media-img">'
+                    + '<img src="/course/image/lessonsOffline.png">'
+                    + '</div>'
+                    + '<div class="media-info">'
+                    + '<p class="item-ifo ellipsis-2">' + courseName + '</p>'
+                    + '<p class="item-ifo ellipsis">课程类型：' + courseType + '</p>'
+                    + '<p class="item-ifo ellipsis">课程地点：' + courseAddress + '</p>'
+                    + '<p class="item-ifo ellipsis">购买人数：' + peopleNum + '人</p>'
+                    + '</div>'
+                    + '</a>'
+                    + '<div class="price">'
+                    + '<strong class="current">￥' + formatMoney(orderMoney) + '</strong>'
+                    + '</div>'
+                    + '</div>'
+                    + lastHtml
+                    + '</div>'
+            } else if (obj.product_type === "线上课程") {
+                count++;
+                var id = obj.id;
+                //订单编号
+                var orderCode = obj.order_code;
+                //创建时间
+                var createTime = obj.create_time;
+                createTime = createTime.replace(/-/g, ".")
+                var payWay = obj.pay_way
+                var filterObj = JSON.parse(obj.filter);
+                var courseName = filterObj.s_name;
+                var courseLength = filterObj.s_courseDate;
+                var courseEndTimeStamp = filterObj.l_endtime;
+                var courseId = filterObj._id;
+                var orderStatus = obj.order_status;
+                var orderStatusHtml = "";
+                var orderStatusHtmls = "";
+                var orderMoney = obj.order_money;
+                var applybillStatus = obj.applybill_status;
+
+                var courseEndTime = new Date(courseEndTimeStamp * 1000)
+
+                var lastHtml = "";
+                var orderUrl = "/weixin/pay/xs_payNow?code=" + orderCode;
+                var helpHtml = "";
+
+                if (orderStatus === 0) {
+                    orderStatusHtml = "待付款";
+                    orderStatusHtmls = "notpay";
+                    lastHtml = '<div class="card-footer">'
+                        + '<a class="btn cancle" onclick="cancelOrder(' + id + ',this)">取消订单</a>'
+                        + '<a onclick="window.location.href =\'' + "/weixin/pay/checkout_onlineCourse?orderCode=" + orderCode + '\'" class="btn green-btn">去支付</a>'
+                        + '</div>'
+                } else if (orderStatus === 1) {
+                    orderStatusHtml = "已完成";
+                    if (applybillStatus === 1) {
+                        lastHtml = '<div class="card-footer">'
+                            + '<a onclick="setSessionStorage()" href="/jyxsapp/invoiceDetail?code=' + orderCode + '&id=' + id + '" class="btn cancle">查看发票</a>'
+                            + '</div>'
+                    } else {
+                        lastHtml = '<div class="card-footer">'
+                            + '<a onclick="setSessionStorage()" href="/jyxsapp/invoice?code=' + orderCode + '}" class="btn cancle">开发票</a>'
+                            + '</div>'
+                    }
+                } else {
+                    orderStatusHtml = "已取消";
+                }
+
+                listhtml += '<div class="card">'
+                    + '<div class="card-header">'
+                    + '<span class="time">' + createTime + '</span>'
+                    + '<span class="status ' + orderStatusHtmls + '">'
+                    + helpHtml
+                    + '<span class="status-text">' + orderStatusHtml + '</span>'
+                    + '<a class="delete_icon" title="删除订单" onclick="deleteOrder(' + id + ',this)"></a>'
+                    + '</span>'
+                    + '</div>'
+                    + '<div class="card-content">'
+                    + '<a onclick="setSessionStorage()" href="' + orderUrl + '" eid="' + courseId + '" vid="' + orderCode + '" class="media" courseOnlineOrder="true">'
+                    + '<div class="media-img">'
+                    + '<img src="/course/image/lessonsOnline.png">'
+                    + '</div>'
+                    + '<div class="media-info">'
+                    + '<p class="item-ifo ellipsis-2">' + courseName + '</p>'
+                    + '<p class="item-ifo ellipsis">课程类型：线上课程</p>'
+                    + '<p class="item-ifo ellipsis">课程时长：' + courseLength + '</p>'
+                    + '<p class="item-ifo ellipsis">有效日期：' + (courseEndTime.getFullYear() / (courseEndTime.getMonth() + 1) / courseEndTime.getDate()) + ' 到期</p>'
+                    + '</div>'
+                    + '</a>'
+                    + '<div class="price">'
+                    + '<strong class="current">￥' + formatMoney(orderMoney) + '</strong>'
+                    + '</div>'
+                    + '</div>'
+                    + lastHtml
+                    + '</div>'
+            } else if (obj.product_type === "数据报告") {
+                if (typ === 1 || $(".tab-link.active").index() === 1) {	//待付款订单列表页
+                    if (obj.order_status === -2) {
+                        continue;
+                    }
+                }
+                count++;
+                var id = obj.id;
+                //订单编号
+                var orderCode = obj.order_code;
+                //创建时间
+                var createTime = obj.create_time;
+                createTime = createTime.replace(/-/g, ".")
+                var filterObj = JSON.parse(obj.filter);
+                var reportName = filterObj.report_name;
+                var pushTimeStamp = filterObj.l_pushtime;
+
+                var orderStatus = obj.order_status;
+                var orderStatusHtml = "";
+                var orderStatusHtmls = "";
+                var orderMoney = obj.order_money;
+                var applybillStatus = obj.applybill_status;
+
+                var pushTime = new Date(pushTimeStamp * 1000)
+
+                var lastHtml = "";
+                var orderUrl = "/datareport/page/order/detail/" + orderCode;
+                var helpHtml = "";
+
+                if (orderStatus === 0) {
+                    orderStatusHtml = "待付款";
+                    orderStatusHtmls = "notpay";
+                    lastHtml = '<div class="card-footer">'
+                        + '<a class="btn cancle" onclick="cancelOrder(' + id + ',this)">取消订单</a>'
+                        + '<a onclick="window.location.href=\'' + '/weixin/pay/datareport?ordercode =' + orderCode + '\'" class="btn green-btn">去支付</a>'
+                        + '</div>';
+                } else if (orderStatus === 1) {
+                    orderStatusHtml = "已完成";
+                    if (applybillStatus === 1) {
+                        lastHtml = '<div class="card-footer">'
+                            + '<a onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a>'
+                            + '</div>'
+                    } else {
+                        lastHtml = '<div class="card-footer">'
+                            + '<a onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a>'
+                            + '</div>'
+                    }
+                } else {
+                    orderStatusHtml = "已取消";
+                }
+
+                listhtml += '<div class="card">'
+                    + '<div class="card-header">'
+                    + '<span class="time">' + createTime + '</span>'
+                    + '<span class="status ' + orderStatusHtmls + '}">'
+                    + helpHtml
+                    + '<span class="status-text">' + orderStatusHtml + '</span>'
+                    + '<a class="delete_icon" title="删除订单" onclick="deleteOrder(\'' + id + '\',this)"></a>'
+                    + '</span>'
+                    + '</div>'
+                    + '<div class="card-content">'
+                    + '<a onclick="setSessionStorage()" href="' + orderUrl + '" eid="' + orderCode + '" class="media" datareportOrder="true">'
+                    + '<div class="media-img">'
+                    + '<img src="/datareport/image/report_icon.png">'
+                    + '</div>'
+                    + '<div class="media-info">'
+                    + '<p class="item-ifo ellipsis">报告名称：' + reportName + '</p>'
+                    + '<p class="item-ifo ellipsis">发布日期：' + (pushTime.getFullYear() / (pushTime.getMonth() + 1) / pushTime.getDate()) + '</p>'
+                    + '</div>'
+                    + '</a>'
+                    + '<div class="price">'
+                    + '<strong class="current">￥' + formatMoney(orderMoney) + '</strong>'
+                    + '</div>'
+                    + '</div>'
+                    + lastHtml
+                    + '</div>'
+            }
+        }
+        appendList($(listhtml));
+    }
+
+    function noMoreData(me) {
+        if (me == null) {
+            return;
+        }
+        wxflag = me;
+        hasNextPage = false;
+        // 锁定
+        me.lock();
+        // 无数据
+        me.noData();
+        // 即使加载出错，也得重置
+        me.resetload();
+    }
+
+    // 退款按钮
+    function show_more(e) {
+        $this = $(e)
+        $tooltip = $(e).siblings('.tooltip-text')
+        if ($tooltip.is(':hidden')) {
+            $tooltip.show()
+        } else {
+            $tooltip.hide()
+        }
+    }
+
+    // 格式化金钱的函数
+    // s: 金额(number) 必传
+    // n: 保留小数的位数(int:0-100)
+    function formatMoney(s, n) {
+        if (n === undefined) {
+            n = -1
+        } else {
+            n = n > 0 && n <= 20 ? n : 2;
+        }
+        var intS = parseInt(s)
+        var point = '.'
+        var left;
+        var right;
+        s = parseFloat((s + '').replace(/[^\d\.-]/g, ''))
+        // 没传n，默认(如果为整数，则不保留小数。如果为浮点数，则保留两位小数)
+        if (n === -1) {
+            if (s === intS) {
+                n = 0
+                right = ''
+                point = ''
+            } else {
+                n = 2
+                s = s.toFixed(n);
+                right = s.split('.')[1];
+            }
+            s = s + ''
+            left = s.split('.')[0].split("").reverse();
+        } else {
+            s = parseFloat((s + '').replace(/[^\d\.-]/g, '')).toFixed(n) + '';
+            left = s.split('.')[0].split('').reverse();
+            right = s.split('.')[1];
+        }
+
+        t = "";
+        for (i = 0; i < left.length; i++) {
+            t += left[i] + ((i + 1) % 3 == 0 && (i + 1) != left.length ? ',' : '');
+        }
+
+        var money = t.split('').reverse().join('') + point + right;
+        return money;
+    }
+
+    // 客服电话弹窗
+    function phoneShow() {
+        $('.jy-alert').show();
+    }
+
+    function phoneHide() {
+        $('.jy-alert').hide();
+    }
+
+    //开发票
+    function invoiceAdd(e) {
+        setSessionStorage()
+        var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+        $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
+            if (data.status == 1) {
+                window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+            } else {
+                window.location.href = "/front/invoice/cantInvoice";
+            }
+            ;
+        })
+    }
+
+    //查看发票
+    function checkinvoice(e) {
+        setSessionStorage()
+        var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+        window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+    }
+</script>
+{{include "/common/baiducc.html"}}
+</body>
+</html>

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

@@ -712,24 +712,22 @@
             canpay = false;
             var param = {};
             param.pay_way = "wx_js";
-            param.data_spec = dataType == 2 ? "senior" : "standard";
+            param.data_spec = dataType === 2 ? "senior" : "standard";
             param.id ={{.T._id}}
                 //先去创建预支付订单
                 $.post("/jypay/dataExport/weixin/createOrder", param, function (data) {
-                    if (data.status == "y") {
+                    if (data.status === "y") {
                         sessionStorage.setItem("order_spec" +{{.T._id}}, dataType);
                         sessionStorage.setItem("order_email" +{{.T._id}}, $(".email_input").val().replace(/\s*/g, ""));
                         sessionStorage.setItem("order_phone" +{{.T._id}}, $(".phone_input").val().replace(/\s*/g, ""));
 
-                        /*sessionStorage.removeItem("readClause");
+                        sessionStorage.removeItem("readClause");
                         sessionStorage.removeItem("index");
                         sessionStorage.removeItem("EmailVerity_" +{{.T._id}});
-                        sessionStorage.removeItem("keyWords");*/
-                        //预支付订单创建成功后 调微信支付
-                        if (data.res) {
-                            order_code = data.code;
-                            window.location.href = "/weixin/pay/checkout_dataexport?orderCode=" + data.code+"&attach="+{{.T._id}}
-                        }
+                        sessionStorage.removeItem("keyWords");
+
+                        history.replaceState({}, '', '/front/wx_dataExport/wxToOrderDetail?orderCode='+data.code);
+                        window.location.href = "/weixin/pay/checkout_dataexport?orderCode=" + data.code
                     } else {
                         canpay = true;
                         EasyAlert.show("生成订单出错，请稍后尝试！", "", 3000);

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

@@ -502,7 +502,7 @@
                 wxflag = $(' .main').dropload({
                     scrollArea: $(".main"),
                     loadDownFn: function (me) {
-                        $.post('/subscribepay/orderListDetails/myOrderPaging', {
+                        $.post('/subscribepay/orderListDetails/myOrder', {
                             "pageNum": pageIndex,
                             "type": typ,
                             "fromPage": "wx"
@@ -545,14 +545,10 @@
         var psss = 0;
         for (var index in object) {
             var obj = object[index];
-			var isUsedActiveCode = false;
             var isLiveActive = false;
 			if(obj.isLiveActive){
 				isLiveActive = true;
 			}
-            if(obj.isUsedActiveCode){
-                isUsedActiveCode = true;
-            }
             if (obj.product_type == "历史数据") {
                 count++;
                 var id = obj.id;
@@ -1175,9 +1171,6 @@
                 if(filter_vip.cycleunit==0&&filter_vip.cyclecount==0){
                 	effectiveduration_vip="不延期";
                 }
-                if(isUsedActiveCode){
-                    effectiveduration_vip = effectiveduration_vip+ '<span class="discount-container"><span> + </span><span class="highlight-text">赠送30天</span></span>'
-                }
                 //vip状态 0不是vip 1试用 2正式
                 if (orderStatus_vip != "已完成") {
                     //未支付 或 已取消

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

@@ -218,10 +218,6 @@
                 //价格
                 $(".price").text("￥ " + r.data.order.original_price / 100 + "元");
 
-                //优惠码
-                if (r.data.order.isUsedActiveCode) {
-                    $(".discount-container").removeClass("hide");
-                }
                 if (!r.data.order.isLiveActive) {
                     $(".origin-price-container").hide();
                 } else {

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

@@ -359,7 +359,6 @@
             sessionStorage.setItem("vipSubisTrial", "1");//试用界面
             //试用用户
             {{end}}
-            var isUsedActiveCode = false;
             var purchase = {
                 areaSelect: {"一个省": ["一个市"]},//已选择地区 {"一个省":["一个市"]}计算价格临时变量
                 industrySelect: ["一个行业"],// 已选择行业 一个行业(计算价格临时变量)
@@ -376,9 +375,6 @@
                         if (sessionStorage.getItem("vipSubSelectIndustry")) {
                             this.industrySelect = JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
                         }
-                        if (sessionStorage.getItem("isUsedActiveCode")) {
-                            isUsedActiveCode = true;
-                        }
                         if (sessionStorage.liveActiveCode_purchase === "jianyu360") {
                             $('.coupon-code-tx .info').text("支付成功赠送30天订阅周期");
                             $('.coupon-picker .weui-input').val("jianyu360");
@@ -402,10 +398,6 @@
                                     }
                                     sessionStorage.setItem("vipSubSelectArea", JSON.stringify(purchase.areaSelect));
                                     sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
-                                    if (r.data.isUsedActiveCode) {
-                                        isUsedActiveCode = true;
-                                        sessionStorage.setItem("isUsedActiveCode", true);
-                                    }
                                 }
                             }, false)
                         }
@@ -783,13 +775,13 @@
                         "area": JSON.stringify(area),
                         "industry": industry.join(","),
                         "time": $(".info:eq(2)").val().trim(),
-                        "payWay": "wx_js",
                         "orderType":{{.T.orderType}},
                         "activeCode": activeCodes
                     };
                     $DoPost("/subscribepay/vipsubscribe/createOrder", param, function (r) {
                         if (r.success) {
-                            //clearSessionStorage();
+                            clearSessionStorage();
+                            history.replaceState({}, '', '/front/vipsubscribe/toOrderDetailPage?orderCode='+r.data.code);
                             window.location.href = "/weixin/pay/checkout_vip?orderCode=" + r.data.code
                         }
                         $("#payHandle").removeAttr("disabled")
@@ -910,13 +902,6 @@
                         })
                         return
                     }
-                    if (isUsedActiveCode) {
-                        weui.toast('每个用户仅可使用一次', {
-                            className: 'j-toast',
-                            duration: 1500
-                        })
-                        return
-                    }
                     if (value.length === couponInfo.code.length && value.toLowerCase() === couponInfo.code) {
                         $('.coupon-code-tx .info').text(couponInfo.successTip)
                         sessionStorage.liveActiveCode_purchase = "jianyu360";

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

@@ -342,7 +342,6 @@
 	    activeDiscount: {{.T.activeDiscount}}
 	}
 
-	var isUsedActiveCode = false;
     var purchase = {
         areaSelect: {"一个省": ["一个市"]},//已选择地区 {"一个省":["一个市"]}计算价格临时变量
         industrySelect: ["一个行业"],// 已选择行业 一个行业(计算价格临时变量)
@@ -365,9 +364,6 @@
                 if (sessionStorage.getItem("endTime")) {
                     this.endTime = parseInt(sessionStorage.getItem("endTime"))
                 }
-				if (sessionStorage.getItem("isUsedActiveCode")){
-					isUsedActiveCode = true;
-				}
 				if (sessionStorage.liveActiveCode_renew === "jianyu360"){
 					$('.coupon-code-tx .keywords-text').text("支付成功赠送30天订阅周期");
 					$('.coupon-picker .weui-input').val("jianyu360");
@@ -394,10 +390,6 @@
                             sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
                             sessionStorage.setItem("endTime", JSON.stringify(purchase.endTime))
                             sessionStorage.setItem("vipSub_read", true);
-							if (r.data.isUsedActiveCode){
-								isUsedActiveCode = true;
-								sessionStorage.setItem("isUsedActiveCode", true);
-							}
                         }
                     }, false)
                 }
@@ -803,13 +795,13 @@
                 "area": JSON.stringify(area),
                 "industry": industry.join(","),
                 "time": purchase.timeValue.trim(),
-                "payWay": purchase.payWay,
                 "orderType": 5,
 				"activeCode": activeCodes
             };
             $DoPost("/subscribepay/vipsubscribe/createOrder", param, function (r) {
                 if (r.success) {
-                    //clearSessionStorage();
+                    clearSessionStorage();
+                    history.replaceState({}, '', '/front/vipsubscribe/toOrderDetailPage?orderCode='+r.data.code);
                     window.location.replace("/weixin/pay/checkout_vip?orderCode=" + r.data.code);
                 }else {
                     $('.vip-footer.renew .confirm').removeAttr("disabled");
@@ -884,13 +876,6 @@
             	})
             	return
             }
-            if (isUsedActiveCode){
-            	weui.toast('每个用户仅可使用一次', {
-            		className: 'j-toast',
-            		duration: 1500
-            	})
-            	return
-            }
             if (value.length === couponInfo.code.length && value.toLowerCase() === couponInfo.code) {
                 $('.coupon-code-tx .keywords-text').text(couponInfo.successTip)
 				sessionStorage.liveActiveCode_renew = "jianyu360";