计价清单

src/jfw/front/wxMyOrder.go

@@ -13,7 +13,6 @@ import (
 	"qfw/util"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/go-xweb/xweb"
 	"gopkg.in/mgo.v2/bson"
@@ -21,21 +20,15 @@ import (
 
 type WxMyOrder struct {
 	*xweb.Action
-	myMenu     xweb.Mapper `xweb:"/front/wxMyOrder/myMenu"`     //微信我的目录
-	myEmail    xweb.Mapper `xweb:"/front/wxMyOrder/myEmail"`    //微信我的邮箱
-	myOrder    xweb.Mapper `xweb:"/front/wxMyOrder/myOrder"`    //查询订单
-	setSuccess xweb.Mapper `xweb:"/front/wxMyOrder/setSuccess"` //查询订单
-
-	myOrderPaging  xweb.Mapper `xweb:"/front/wxMyOrder/myOrder/myOrderPaging"` //查询订单--分页
+	myMenu         xweb.Mapper `xweb:"/front/wxMyOrder/myMenu"`                //微信我的目录
+	myEmail        xweb.Mapper `xweb:"/front/wxMyOrder/myEmail"`               //微信我的邮箱
+	setSuccess     xweb.Mapper `xweb:"/front/wxMyOrder/setSuccess"`            //查询订单
 	wxGetOrderCode xweb.Mapper `xweb:"/front/wxMyOrder/wxGetOrderCode/(\\w+)"` //申请发票获取订单编号
 	wxPaySuccess   xweb.Mapper `xweb:"/front/wxMyorder/wxPaySuccess/(\\w+)"`
-	wxDeleteOrder  xweb.Mapper `xweb:"/front/wxMyorder/wxDeleteOrder"` //删除订单
-	getOneMore     xweb.Mapper `xweb:"/front/wxMyorder/getOneMore"`    //获取额外一条数据
 	//需要调用微信支付接口的页面
-	toMyWxOrder     xweb.Mapper `xweb:"/weixin/pay/toMyWxOrder"`     //微信我的订单
-	wxToOrderDetail xweb.Mapper `xweb:"/weixin/pay/wxToOrderDetail"` //订单详情
-	//测试
-	testPay xweb.Mapper `xweb:"/weixin/pay/testPay"` //模拟去支付
+	toMyWxOrder      xweb.Mapper `xweb:"/weixin/pay/toMyWxOrder"`                  //微信我的订单
+	wxToOrderDetail  xweb.Mapper `xweb:"/weixin/pay/wxToOrderDetail"`              //订单详情
+	getValuationList xweb.Mapper `xweb:"/front/wxMyOrder/getValuationList/(\\w+)"` //计价清单
 }
 
 func init() {
@@ -44,98 +37,8 @@ func init() {
 
 var (
 	pagesize_max int = 10
-
-//	haveNextPage bool = false
-//	res          []map[string]interface{}
 )
 
-func (w *WxMyOrder) TestPay() error {
-	userId := w.Session().Get("userId")
-	order_code := w.GetString("orderCode")
-	testBl := false
-	queryMap := map[string]interface{}{}
-	if userId != nil {
-		queryMap["order_code"] = order_code
-		queryMap["user_id"] = userId
-		now := time.Now()
-		testBl = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{
-			"pay_money":    1 * 100,
-			"order_status": 1,
-			"pay_time":     util.FormatDate(&now, util.Date_Full_Layout),
-			"download_url": "download_url",
-			"service_time": util.FormatDate(&now, util.Date_Full_Layout),
-		})
-	} else {
-		log.Println("userid为空")
-	}
-	w.ServeJson(map[string]interface{}{
-		"testBl": testBl,
-	})
-	return nil
-}
-
-//
-func (w *WxMyOrder) GetOneMore() error {
-	defer util.Catch()
-	pageNum, _ := w.GetInteger("pageNum")
-	tabType := w.GetString("tabType")
-	userId := w.Session().Get("userId")
-	openid := w.Session().Get("s_m_openid")
-	queryM := map[string]interface{}{}
-	nextPage := false
-	if userId == nil || openid == nil {
-		return errors.New("未登录")
-	} else {
-		queryM["user_id"] = userId
-	}
-	var status string
-	if tabType == "1" {
-		status = orderStatus_unPaid
-	} else if tabType == "2" {
-		status = orderStatus_paid
-	}
-	queryM["order_status"] = status
-
-	_, resData, _ := w.Datas(queryM, (pageNum - 1))
-	//和取消支付不同  支付完成 获取最后一条订单 获取的是当前页面的最后一条 （不是下一页第一条
-	if len(resData) > 0 {
-		resData = resData[(len(resData) - 1):len(resData)]
-		//用于删除订单后 判断新增的订单之后 是否有下一页
-		nextPage = true
-	}
-
-	//start := (pageNum - 1) * pagesize_max
-	//resData := *public.Mysql.Find(tableName_order, queryM, "id,order_code,filter_publishtime,create_time,data_spec,filter_id,filter_keys,order_money,data_count,order_status", "create_time desc", start, 1)
-	if resData != nil {
-		for _, v := range resData {
-			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)
-					}
-				}
-			}
-			v["filter_id"] = util.SE.Encode2Hex(v["filter_id"].(string))
-			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))
-			}
-		}
-	}
-	w.ServeJson(map[string]interface{}{
-		"res":      resData,
-		"nextPage": nextPage,
-	})
-	return nil
-}
-
 //
 func (w *WxMyOrder) MyMenu() error {
 	if w.Session().Get("userId") == nil {
@@ -290,122 +193,6 @@ func (w *WxMyOrder) ToMyWxOrder() error {
 	return w.Render("/weixin/dataExport/dataExport_toMyOrder.html", &w.T)
 }
 
-func (w *WxMyOrder) MyOrder() error {
-	//每页显示数
-	userId := w.Session().Get("userId")
-	openid := w.Session().Get("s_m_openid")
-	queryM := map[string]interface{}{}
-	if userId == nil || openid == nil {
-		return errors.New("未登录")
-	} else {
-		queryM["user_id"] = userId
-	}
-	// 0全部 1未支付 2已支付
-	typ := w.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}
-	}
-	//总数
-	haveNextPage, res, _ := w.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)
-					}
-				}
-			}
-			v["filter_id"] = util.SE.Encode2Hex(v["filter_id"].(string))
-			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))
-			}
-		}
-	}
-	w.ServeJson(map[string]interface{}{
-		"res":         res,
-		"count":       count,
-		"pageSize":    order_pageSize,
-		"hasNextPage": haveNextPage,
-	})
-	return nil
-}
-
-func (w *WxMyOrder) MyOrderPaging() error {
-	userId := w.Session().Get("userId")
-	openid := w.Session().Get("s_m_openid")
-	queryM := map[string]interface{}{}
-	if userId == nil || openid == nil {
-		return errors.New("未登录")
-	} else {
-		queryM["user_id"] = userId
-	}
-	// 0全部 1未支付 2已支付
-	typ := w.GetString("type")
-	pageNum, _ := w.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}
-	}
-	haveNextPage, res, _ := w.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)
-					}
-				}
-			}
-			v["filter_id"] = util.SE.Encode2Hex(v["filter_id"].(string))
-			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))
-			}
-		}
-	}
-	w.ServeJson(map[string]interface{}{
-		"hasNextPage": haveNextPage,
-		"res":         res,
-	})
-	return nil
-}
-
 func (w *WxMyOrder) WxToOrderDetail() error {
 	myOpenid := ""
 	if openid := w.GetSession("s_m_openid"); openid != nil {
@@ -586,79 +373,10 @@ func (w *WxMyOrder) WxPaySuccess(order_code string) error {
 	return w.Render("/weixin/dataExport/dataExport_invoiceSuccess.html", &w.T)
 }
 
-func (w *WxMyOrder) WxDeleteOrder() error {
-	if userId := w.GetSession("userId"); userId != nil {
-		queryMap := map[string]interface{}{
-			"id":      w.GetString("id"),
-			"user_id": userId.(string),
-		}
-		queryM := map[string]interface{}{}
-		queryM["user_id"] = userId
-		nextPage := false
-		// 0全部 1未支付 2已支付
-		typ := w.GetString("type")
-		cancel := w.GetString("cancel")
-		pageNum, _ := w.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}
-		}
-		haveNextPage, res, _ := w.Datas(queryM, pageNum)
-		if len(res) > 0 {
-			res = res[0:1]
-			//用于删除订单后 判断新增的订单之后 是否有下一页
-			nextPage = true
-		}
-		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)
-						}
-					}
-				}
-				v["filter_id"] = util.SE.Encode2Hex(v["filter_id"].(string))
-				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))
-				}
-			}
-		}
-		var boo = false
-		if cancel == "cancel" {
-			//取消订单
-			boo = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -2})
-		} else {
-			//删除订单
-			boo = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -1})
-		}
-		w.ServeJson(map[string]interface{}{
-			"success":     boo,
-			"res":         res,
-			"hasNextPage": haveNextPage,
-			"nextPage":    nextPage,
-		})
-	}
-	return nil
+func (w *WxMyOrder) GetValuationList(order_code string) error {
+	w.T["order_code"] = order_code
+	return w.Render("/weixin/vipsubscribe/valuation_list.html", &w.T)
 }
-
 func (w *WxMyOrder) Datas(queryM map[string]interface{}, pageNum int) (haveNextPage bool, result []map[string]interface{}, err error) {
 	res := *public.Mysql.Find(tableName_order, queryM, "id,order_code,filter_publishtime,create_time,data_spec,filter_id,filter_keys,order_money,data_count,order_status,pay_way", "create_time desc", -1, 0)
 	if len(res) > 0 {

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

@@ -30,7 +30,8 @@ type OrderListDetails struct {
 	checkMailCodeVerify xweb.Mapper `xweb:"/orderListDetails/checkMailCodeVerify"` //验证码
 	emailOperation      xweb.Mapper `xweb:"/orderListDetails/emailOperation"`      //查看邮箱
 	isVip               xweb.Mapper `xweb:"/orderListDetails/isVip"`
-	getVipOrderInfo     xweb.Mapper `xweb:"/orderListDetails/getVipOrderInfo"` //再次购买 回显
+	getVipOrderInfo     xweb.Mapper `xweb:"/orderListDetails/getVipOrderInfo"`  //再次购买 回显
+	getValuationList    xweb.Mapper `xweb:"/orderListDetails/getValuationList"` //计价清单
 }
 
 var (
@@ -354,6 +355,47 @@ func (o *OrderListDetails) EmailOperation() {
 	o.ServeJson(&o.T)
 }
 
+//计价清单
+func (o *OrderListDetails) GetValuationList() error {
+	userId := o.GetSession("userId")
+	order_code := o.GetString("order_code")
+	pageNum, _ := o.GetInteger("pageNum")
+	upgradeSubtotail := []map[string]interface{}{}
+	queryMap := map[string]interface{}{
+		"order_code": order_code,
+		"user_Id":    userId,
+	}
+	result := []map[string]interface{}{}
+	haveNextPage := false
+	filter := util.Mysql.FindOne(tableName_order, queryMap, "filter", "")
+	if filter != nil {
+		res := qutil.ObjToMap((*filter)["filter"])
+		upgradeSubtotail = qutil.ObjArrToMapArr((*res)["upgradeSubtotail"].([]interface{}))
+		for _, v := range upgradeSubtotail {
+			//续费 没有oldBuyset
+			if v["oldBuyset"] == nil {
+				v["oldBuyset"] = (*res)["newBuyset"]
+			}
+		}
+		if len(upgradeSubtotail) > 0 {
+			start := (pageNum - 1) * pagesize_max
+			end := pageNum * pagesize_max
+			if end > len(upgradeSubtotail) {
+				end = len(upgradeSubtotail)
+			}
+			if start < len(upgradeSubtotail) {
+				result = upgradeSubtotail[start:end]
+			}
+		}
+		haveNextPage = len(result) >= pagesize_max
+	}
+	o.ServeJson(map[string]interface{}{
+		"list":         upgradeSubtotail,
+		"haveNextPage": haveNextPage,
+	})
+	return nil
+}
+
 //查看是否是vip
 func (o *OrderListDetails) IsVip() {
 	//检测用户是否绑定邮箱

src/web/staticres/vipsubscribe/css/valuation_list.css

@@ -0,0 +1,117 @@
+.valuation_list {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.valuation_list .va-list-container {
+  flex: 1;
+  overflow-y: scroll;
+}
+
+.valuation_list .va-total-container {
+  height: 0.94rem;
+  background-color: #fff;
+}
+
+.va-list-container .text-title {
+  color: #1d1d1d;
+  font-size: 0.32rem;
+}
+
+.va-list-container .list-item {
+  margin-bottom: 0.2rem;
+  font-size: 0.26rem;
+  color: #686868;
+  background-color: #fff;
+}
+
+.va-list-container .list-item .item-top {
+  padding: 0 0.3rem;
+}
+
+.va-list-container .list-item .item-header {
+  display: flex;
+  align-items: center;
+  height: 0.79rem;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.va-list-container .list-item .item-header .header-content {
+  flex: 1;
+}
+
+.va-list-container .list-item .item-body {
+  position: relative;
+  padding: 0.14rem 0;
+}
+
+.va-list-container .list-item .item-body.vp-oneline {
+  padding: 0.38rem 0;
+}
+
+.va-list-container .list-item .item-body.vp-oneline .b-item .body-area-sub,
+.va-list-container .list-item .item-body.vp-oneline .b-item .body-industry-sub {
+  margin-top: 0.1rem;
+}
+
+.va-list-container .list-item .item-body .b-item {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  padding: 0.1rem 0;
+}
+
+.va-list-container .list-item .item-body .body-area-sub,
+.va-list-container .list-item .item-body .body-industry-sub {
+  margin-top: 0.08rem;
+}
+
+.va-list-container .list-item .item-body .vp-type {
+  position: absolute;
+  top: 50%;
+  right: 0;
+  width: 1.4rem;
+  height: 1.4rem;
+  background-color: transparent;
+  transform: translateY(-50%);
+  opacity: 0.5;
+  z-index: 1;
+}
+
+.va-list-container .list-item .item-body .vp-type .vp-type-text {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  color: #e6bd90;
+  font-size: 0.38rem;
+  border: 1px solid #e6bd90;
+  border-radius: 50%;
+  transform: rotate(-30deg);
+}
+
+.va-list-container .list-item .item-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 0.3rem;
+  height: 0.84rem;
+  border-top: 1px solid #e0e0e0;
+}
+
+.va-total-container {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 0.3rem;
+  font-size: 0.26rem;
+  color: #686868;
+}
+
+.va-total-container .total-price {
+  font-weight: 700;
+  font-size: 0.32rem;
+  color: #fe737a;
+}

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

@@ -0,0 +1,215 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>计价清单</title>
+    <meta name="viewport"
+        content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/valuation_list.css?v={{Msg "seo" "version"}}">
+</head>
+
+<body>
+    <div class="valuation_list">
+        <div class="va-list-container">
+            <ul class="list-content">
+                <!-- <li class="list-item">
+                    <div class="item-top">
+                        <div class="item-header">
+                            <span class="header-label">有效日期：</span>
+                            <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
+                        </div>
+                        <div class="item-body">
+                            <div class="b-item body-area">
+                                <div class="body-area-title text-title">区域</div>
+                                <div class="body-area-sub">1个省、3个市(分布在2个省内)</div>
+                            </div>
+                            <div class="b-item body-industry">
+                                <div class="body-industry-title text-title">采购单位行业</div>
+                                <div class="body-industry-sub">3个行业</div>
+                            </div>
+                            <div class="vp-type">
+                                <div class="vp-type-text">升级</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item-footer">
+                        <span class="footer-label">小计：</span>
+                        <span class="footer-content text-title">￥223.8</span>
+                    </div>
+                </li>
+                <li class="list-item">
+                    <div class="item-top">
+                        <div class="item-header">
+                            <span class="header-label">有效日期：</span>
+                            <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
+                        </div>
+                        <div class="item-body vp-oneline">
+                            <div class="b-item body-area">
+                                <div class="body-area-title text-title">区域</div>
+                                <div class="body-area-sub">1个省、3个市(分布在2个省内)</div>
+                            </div>
+                            <div class="vp-type">
+                                <div class="vp-type-text">续续费</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item-footer">
+                        <span class="footer-label">小计：</span>
+                        <span class="footer-content text-title">￥223.8</span>
+                    </div>
+                </li>
+                <li class="list-item">
+                    <div class="item-top">
+                        <div class="item-header">
+                            <span class="header-label">有效日期：</span>
+                            <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
+                        </div>
+                        <div class="item-body">
+                            <div class="b-item body-area">
+                                <div class="body-area-title text-title">区域</div>
+                                <div class="body-area-sub">1个省、3个市(分布在2个省内)</div>
+                            </div>
+                            <div class="b-item body-industry">
+                                <div class="body-industry-title text-title">采购单位行业</div>
+                                <div class="body-industry-sub">3个行业</div>
+                            </div>
+                            <div class="vp-type">
+                                <div class="vp-type-text">升级</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item-footer">
+                        <span class="footer-label">小计：</span>
+                        <span class="footer-content text-title">￥223.8</span>
+                    </div>
+                </li>
+                <li class="list-item">
+                    <div class="item-top">
+                        <div class="item-header">
+                            <span class="header-label">有效日期：</span>
+                            <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
+                        </div>
+                        <div class="item-body vp-oneline">
+                            <div class="b-item body-industry">
+                                <div class="body-industry-title text-title">采购单位行业</div>
+                                <div class="body-industry-sub">3个行业</div>
+                            </div>
+                            <div class="vp-type">
+                                <div class="vp-type-text">升级</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item-footer">
+                        <span class="footer-label">小计：</span>
+                        <span class="footer-content text-title">￥223.8</span>
+                    </div>
+                </li> -->
+            </ul>
+        </div>
+        <div class="va-total-container">
+            <span class="total-label">共计：</span>
+            <span class="total-price">￥223.8</span>
+        </div>
+    </div>
+	<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery.min.js?v={{Msg "seo" "version"}}2"></script>
+	<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/dropload.min.js?v={{Msg "seo" "version"}}2"></script>
+    <script>
+        $(function () {
+            // 定义函数区域 -------------------- >
+            function appendList(list) {
+                var str = ''
+                for (var i = 0; i < list.length; i++) {
+					var oldbuyset=list[i].oldBuyset;
+					
+                    str += '<li class="list-item"><div class="item-top"><div class="item-header"><span class="header-label" > 有效日期：</span>';
+                    str += '<span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span></div><div class="item-body">';
+                    str += '<div class="b-item body-industry"><div class="body-industry-title text-title">采购单位行业</div><div class="body-industry-sub">3个行业</div>'
+					 str += '<div class="b-item body-industry"><div class="body-industry-title text-title">采购单位行业</div><div class="body-industry-sub">3个行业</div>'
+                    str += '</div><div class="vp-type"><div class="vp-type-text">升级</div></div></div></div >'
+					
+                    str += '<div class="item-footer"><span class="footer-label">小计：</span><span class="footer-content text-title">￥223.8</span></div></li > '
+                }
+                $('.va-list-container .list-content').append(str);
+            }
+
+            function init() {
+                pageNum = 1
+                $.ajax({
+                    type: 'POST',
+                    url: '/subscribepay/orderListDetails/getValuationList',
+                    data: {
+                        pageNum: pageNum,
+						order_code:{{.T.order_code}}
+                    },
+                    dataType: 'json',
+                    success: function (data) {
+                        console.log(data);
+                        appendList(data.list)
+                        if (data.hasNextPage) {
+                            $('.va-list-container').dropload({
+                                scrollArea: $('.va-list-container'),
+                                loadDownFn: function (me) {
+                                    getMoreList(me)
+                                }
+                            });
+                        } else {
+                            console.log('没有更多了');
+                        }
+                    },
+                    error: function (xhr, type) {
+                        console.log('Ajax error!');
+                    }
+                });
+            }
+            
+            function getMoreList(me) {
+                pageNum++
+                console.log(me);
+
+                // 相当于 if me { me.lock() }。如果传me了，就执行me.lock，如果没传，则不执行
+                // 详细可以百度短路运算
+                me && me.lock()
+                $.ajax({
+                    type: 'GET',
+                    url: '/page/json/valuation_list.json',
+                    data: {
+                        pageNum: pageNum
+                    },
+                    dataType: 'json',
+                    success: function (data) {
+                        console.log(data);
+                        appendList(data.list)
+
+                        // 没数据就将其置成没数据的状态
+                        // me && me.noData()
+                        // me && me.lock()
+
+                        me && me.unlock()
+                        // 每次数据加载完，必须重置
+                        me && me.resetload();
+                    },
+                    error: function (xhr, type) {
+                        alert('Ajax error!');
+                        // 即使加载出错，也得重置
+                        me && me.resetload();
+                    }
+                });
+            }
+
+
+            // 一切从js这里开始 -------------------- >
+            var pageNum = 1;
+            var pageSize = 10;
+            init()
+        })
+    </script>
+</body>
+
+</html>

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

@@ -615,7 +615,7 @@ try{
 			if (upgradeSubtotail){	//有则显示
 				$(".valuationList").css("display","");
 				$(".valuationList").on("click",function(){
-					
+					window.location.href="/front/wxMyOrder/getValuationList/"+orderCode;
 				})
 			}