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

src/jfw/front/vipsubscribe.go

@@ -35,6 +35,8 @@ type Subscribepay struct {
 	renewPage    xweb.Mapper `xweb:"/front/vipsubscribe/renewPage/(.*)"` //订阅到期(will：即将到期，exprie：已到期)
 	renewPayPage xweb.Mapper `xweb:"/front/vipsubscribe/renewPayPage"`   //订阅到期续费
 
+	//发票
+	openInvoice xweb.Mapper `xweb:"/front/vipsubscribe/openInvoice/(\\w+)"` //开发票
 }
 
 func init() {
@@ -143,3 +145,9 @@ func (s *Subscribepay) RenewPage(sign string) {
 func (s *Subscribepay) RenewPayPage() {
 	s.Render("/weixin/vipsubscribe/renew_pay.html")
 }
+
+//开发票
+func (s *Subscribepay) OpenInvoice(order_code string) {
+	s.T["order_code"] = order_code
+	s.Render("/weixin/dataExport/dataExport_applyInvoice.html", &s.T)
+}

src/jfw/front/wxMyOrder.go

@@ -275,7 +275,6 @@ func (w *WxMyOrder) MyOrder() error {
 			}
 		}
 	}
-	log.Println("------", len(res), "---------", count)
 	w.ServeJson(map[string]interface{}{
 		"res":         res,
 		"count":       count,

src/jfw/modules/app/src/web/templates/me/index.html

@@ -48,9 +48,6 @@
 			    position: relative;
 			    font-size: 15px;
 			    border-top: 1px solid #E6E6E6;
-			}
-			.email{
-				
 			}
 			#main .order, #main .vip {
 			    margin-top: 13px;
@@ -382,7 +379,6 @@
 		$(".myEmail").click(function(){
 			window.location.href = "#";
 		})
-		vip_
 		//vip订阅入口
 		$(".vip_").click(function(){
 			window.location.href = "#";

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

@@ -6,9 +6,19 @@
     "webport": "86",
     "weixinrpc": "127.0.0.1:8083",
     "cassandra": {
-        "host": ["192.168.3.207"],
-        "size": 5,
-        "port": 9043
+        "log": {
+            "host": [
+                "192.168.3.207"
+            ],
+            "size": 5,
+            "port": 9042
+        },
+        "push": {
+            "host": [
+                "192.168.3.207"
+            ],
+            "size": 5
+        }
     },
     "mysql": {
         "dbName": "jianyu",

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

@@ -2,8 +2,12 @@ package service
 
 import (
 	"errors"
+	"jfw/config"
+	"jfw/public"
 	"log"
+	"strconv"
 	"strings"
+	"time"
 	"util"
 
 	qutil "qfw/util"
@@ -16,9 +20,25 @@ type Order struct {
 	*xweb.Action
 	buyStatus         xweb.Mapper `xweb:"/order/buyStatus"`         //获取用户已购买
 	getOrderPayMsg    xweb.Mapper `xweb:"/order/getOrderPayMsg"`    //订单数据展示（支付成功页面）
-	getOrderPayAllMsg xweb.Mapper `xweb:"/order/getOrderPayAllMsg"` //订单数据展示（订单详情页面）
+	getOrderPayAllMsg xweb.Mapper `xweb:"/order/getOrderPayAllMsg"` //订单数据展示（订单详情页面）vip
+	//
+	myOrder       xweb.Mapper `xweb:"/order/myOrder"`       //查询订单首页
+	myOrderPaging xweb.Mapper `xweb:"/order/myOrderPaging"` //查询订单分页
+	deleteOrder   xweb.Mapper `xweb:"/order/deleteOrder"`   //删除订单
+	applyInvoice  xweb.Mapper `xweb:"/order/applyInvoice"`  //开发票
 }
 
+var (
+	layout_date             = "2006.01.02"
+	orderStatus_unPaid      = "0"                //订单状态-待支付
+	orderStatus_paid        = "1"                //订单状态-已完成
+	orderStatus_deleted     = "-1"               //订单状态-已删除
+	orderStatus_cancel      = "-2"               //订单状态-已取消
+	tableName_order         = "dataexport_order" //订单表
+	order_pageSize          = 10
+	pagesize_max        int = 10
+)
+
 type orderResult struct {
 	Success bool  //是否成功
 	Err     error //错误
@@ -69,25 +89,28 @@ func (this *Order) GetOrderPayAllMsg() {
 			return &orderResult{false, errors.New("订单号不能为空"), nil}
 		}
 		query := map[string]interface{}{
-			"user_id":    userId,
+			"user_id":    "5db11594f4e498161c85fcf2",
 			"order_code": orderCode,
 			//"order_status": 1,
 		}
-		oData := util.Mysql.FindOne("dataexport_order", query, "prepay_time,pay_time,pay_way,original_price,applybill_status,out_trade_no,filter,product_type,order_status", "")
+		oData := util.Mysql.FindOne("dataexport_order", query, "prepay_time,pay_time,pay_way,original_price,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company", "")
+		log.Println("odata:", oData)
 		//查询订单信息
 		if oData == nil || len(*oData) == 0 {
 			return &orderResult{false, errors.New("未找到此订单"), nil}
 		}
+		//已支付订单查询有效时间   -已取消的也查看有效时间 用于判断再次购买
+		uData, ok := util.MQFW.FindById("user", userId, `{"l_vip_starttime":1,"l_vip_endtime":1}`)
+		if uData == nil || len(*uData) == 0 || !ok {
+			return &orderResult{false, errors.New("数据库查询异常"), nil}
+		}
+		//
 		if qutil.IntAll((*oData)["order_status"]) != 1 {
 			return &orderResult{true, nil, map[string]interface{}{
 				"order": oData,
+				"time":  uData,
 			}}
 		}
-		//已支付订单查询有效时间
-		uData, ok := util.MQFW.FindById("user", userId, `{"l_vip_starttime":1,"l_vip_endtime":1}`)
-		if uData == nil || len(*uData) == 0 || !ok {
-			return &orderResult{false, errors.New("数据库查询异常"), nil}
-		}
 		delete(*uData, "_id")
 		return &orderResult{true, nil, map[string]interface{}{
 			"order":          oData,
@@ -101,6 +124,220 @@ func (this *Order) GetOrderPayAllMsg() {
 	this.ServeJson(r.Format())
 }
 
+//订单列表首页
+func (o *Order) MyOrder() error {
+	//每页显示数
+	userId := o.Session().Get("userId")
+	openid := o.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 := 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}
+	}
+	//总数
+	haveNextPage, res, _ := o.Datas(queryM, 1)
+	if res != nil {
+		o.SetRes(res, queryM)
+	}
+	o.ServeJson(map[string]interface{}{
+		"res":         res,
+		"pageSize":    order_pageSize,
+		"hasNextPage": haveNextPage,
+	})
+	return nil
+}
+
+//订单列表分页
+func (o *Order) MyOrderPaging() error {
+	userId := o.Session().Get("userId")
+	openid := o.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 := o.GetString("type")
+	pageNum, _ := o.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, _ := o.Datas(queryM, pageNum)
+	if res != nil {
+		o.SetRes(res, queryM)
+	}
+	o.ServeJson(map[string]interface{}{
+		"hasNextPage": haveNextPage,
+		"res":         res,
+	})
+	return nil
+}
+
+//删除或取消订单
+func (o *Order) DeleteOrder() error {
+	if userId := o.GetSession("userId"); userId != nil {
+		queryMap := map[string]interface{}{
+			"id":      o.GetString("id"),
+			"user_id": userId.(string),
+		}
+		queryM := map[string]interface{}{}
+		queryM["user_id"] = userId
+		nextPage := false
+		// 0全部 1未支付 2已支付
+		typ := o.GetString("type")
+		cancel := o.GetString("cancel")
+		pageNum, _ := o.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, _ := o.Datas(queryM, pageNum)
+		if len(res) > 0 {
+			res = res[0:1]
+			//用于删除订单后 判断新增的订单之后 是否有下一页
+			nextPage = true
+		}
+		if res != nil {
+			o.SetRes(res, queryM)
+		}
+		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})
+		}
+		o.ServeJson(map[string]interface{}{
+			"success":     boo,
+			"res":         res,
+			"hasNextPage": haveNextPage,
+			"nextPage":    nextPage,
+		})
+	}
+	return nil
+}
+
+//开发票
+func (o *Order) ApplyInvoice() error {
+	var applyBill_status int
+	var order_code, applyBill_company, applyBill_taxnum, applyBill_type string
+	var updateBl bool = false
+	order_code = o.GetString("order_code")
+	//获取数据
+	applyBill_type = o.GetString("demo-radio") //个人 单位
+	queryMap := map[string]interface{}{
+		"order_code": order_code,
+	}
+	if applyBill_type == "个人" {
+		applyBill_status = 1
+		updateBl = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"applyBill_status": applyBill_status})
+
+	} else if applyBill_type == "单位" {
+		applyBill_status = 1                                 //状态
+		applyBill_company = o.GetString("applyBill_company") //公司名
+		applyBill_taxnum = o.GetString("applyBill_taxnum")   //纳税人识别号
+		updateBl = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{
+			"applyBill_company": applyBill_company,
+			"applyBill_taxnum":  applyBill_taxnum,
+			"applyBill_status":  applyBill_status,
+			"applyBill_type":    1,
+		}) //修改操作
+	}
+	//判断条件
+	if updateBl {
+		go func() {
+			orderdata := public.Mysql.FindOne(tableName_order, map[string]interface{}{
+				"order_code": order_code,
+			}, "id,filter,user_mail,user_phone,product_type,data_spec,filter_id,order_code,data_count,order_status,order_money,out_trade_no,applybill_type,applybill_company,applybill_taxnum,user_openid,create_time,pay_time,pay_way", "")
+			tt := time.Now()
+			pay_time := qutil.FormatDate(&tt, qutil.Date_Full_Layout)
+			public.SendMailToBJFinance(orderdata, pay_time, "", 2, config.GmailAuth)
+		}()
+	}
+	o.ServeJson(map[string]interface{}{
+		"flag": updateBl,
+	})
+	return nil
+}
+
+func (o *Order) SetRes(res []map[string]interface{}, queryM map[string]interface{}) {
+	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"] = qutil.FormatDateByInt64(&start, layout_date) + "-" + qutil.FormatDateByInt64(&end, layout_date)
+				}
+			}
+		}
+		v["filter_id"] = qutil.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))
+		}
+	}
+}
+
+//查询数据
+func (o *Order) 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 {
+		start := (pageNum - 1) * pagesize_max
+		end := pageNum * pagesize_max
+		if end > len(res) {
+			end = len(res)
+		}
+		if start < len(res) {
+			result = res[start:end]
+		}
+	}
+	haveNextPage = len(result) >= pagesize_max
+	return
+}
+
 //获取支付单号
 func getPayTransactionId(payWay, tradeNo string) (transaction_id string) {
 	if payWay == "" || tradeNo == "" {

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

@@ -327,13 +327,7 @@
 					}
 				}
 				if (submitBl){
-					$.ajax({
-						type:'post',
-						url:'/front/wxMyOrder/wxApplyInvoice',
-						data:formParam+"&demo-radio="+$(".type").html(),
-						cache:false,
-						dataType:'json', 
-					 	success:function(data){ 
+					$.post('/front/wxMyOrder/wxApplyInvoice',formParam+"&demo-radio="+$(".type").html(),function(data){ 
 										if(data.flag){
 											//window.location.href="/front/wxMyorder/wxPaySuccess/" + {{.T.order_code}}
 											sessionStorage.applysuccess="1";
@@ -354,7 +348,7 @@
 											}, 2000);
 										}
 								}
-					})
+					)
 				}
 			}
             

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

@@ -53,16 +53,6 @@
 			 
 			}
 			
-//			//禁止手机物理返回键
-//			$(document).ready(function() {
-//		　　if (window.history && window.history.pushState) {
-//		　　　　$(window).on('popstate', function () {
-//		　　　　　　 window.history.pushState('forward', null, '#');
-//		　　　　　　 window.history.forward(1); });
-//		　　　　 }
-//	　　　　　　 window.history.pushState('forward', null, '#'); //在IE中必须得有这两行
-//	　　　　　　 window.history.forward(1);
-//		　　 });
         </script>
 	{{include "/common/baiducc.html"}}
     </body>

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

@@ -462,18 +462,13 @@
 			                    text: '确定',
 			                    btnClass: 'btn-primary-0',
 			                    action: function() {
-			                        $.ajax({
-			                            type: "post",
-			                            url: "/front/wxMyorder/wxDeleteOrder",
-			                            data: {"id":id,"pageNum":pageIndex,"type":typ},
-			                            dataType: 'json',
-			                            success: function(data){
+			                        $.post("/subscribepay/order/deleteOrder", {"id":id,"pageNum":pageIndex,"type":typ},function(data){
 			                                if(data && data["success"]){
 			                                    var self = $(obj).parent().parent();
 			                                    var parent = self.parent();
 			                                	deleteIndex=self.index();
 			                                	//删除索引存入缓存
-			                                	sessionStorage.setItem("deleteIndex",deleteIndex);
+			                                	//sessionStorage.setItem("deleteIndex",deleteIndex);
 			                                	dataCache.splice(deleteIndex,1)
 			                                	if(data.res!=null){
 			                                		dataCache.push(data.res[0])
@@ -489,13 +484,9 @@
 			                                                text: '确定',
 			                                                btnClass: 'btn-primary-2',
 			                                                action: function() {
-			                                                	if(parent.children("div").length<10){
-			                                                		$(".dropload-refresh").text("没有更多了");
-			                                                	}
 			                                                    if(parent.children("div").length==0){
 			                                                    	nodataHtml=""
 																	nodataHtml+='<div style="text-align:center;">';
-																	//nodataHtml+='<div style="display:flex;justify-content:center;align-items: 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);
@@ -527,8 +518,6 @@
 											                        	 		publishTime=timestampToTime(publishtime_);
 											                        	 		publishTime=publishTime+"前全部";
 											                        	 	}
-											                        	 }else{
-											                        	 	 //publishTime= publishTime.replace(/\./g,"/")
 											                        	 }
 																	}
 											                        //1标准字段包 2高级字段包
@@ -558,7 +547,6 @@
 											                        	iconHtml=""
 											                        	iconHtml+='<div class="card-footer">'
 																					+'<a onclick="onceMore(this)" class="btn cancle">再次购买</a>'
-																					//+'<a href="/front/wxMyOrder/wxToOrderDetail/'+orderCode+'" class="btn cancle">查看详情</a>'
 																				+'</div>'
 											                        }
 											                        //订单总数
@@ -583,9 +571,6 @@
 												                        var keysLen = keysArr.length;for(var j=0;j<keysLen;j++){
 												                            keysHtml += "<span>" + keysArr[j] + "&nbsp</span>";
 												                        }
-//												                        if(keysArr.length>2){
-//												                            keysHtml += "<span>...</span>";
-//												                        }
 												                 	}else{
 												                 		keysHtml=""
 												                 	}
@@ -596,8 +581,6 @@
 																						+orderHtml
 																					+'</div>'
 																					+'<div class="card-content">'
-																						//+'<a href="javascript:;" class="media">'
-																						//+'<a href="/front/wxMyOrder/wxToOrderDetail/'+orderCode+'" eid='+orderCode+' class="media">'
 																						+'<a  eid='+orderCode+' class="media">'
 																							+'<div class="media-img">'
 																								+'<img src="/dataExport/image/historical_data.png">'
@@ -617,11 +600,12 @@
 																				+'</div>'
 																	
 																		}
-																		//$(".card_lists").append(listhtml);
 																		//删除完成后补的订单仍可点击
 																		appendList($(listhtml))
 			                                                    	}
-			                                                   
+				                                                    if(parent.children("div").length<10){
+				                                                		$(".dropload-refresh").text("没有更多了");
+				                                                	}
 			                                                }
 			                                            }
 			                                        }
@@ -629,11 +613,7 @@
 			                                }else{
 			                                    alertS("删除失败，请联系管理员！");
 			                                }
-			                            },
-			                            error: function(xhr, type){
-			                                console.log("delete err");
-			                            }
-			                        });
+		                            })
 			                    }
 			                },
 			                cancel: {
@@ -654,12 +634,7 @@
 			                    text: '确定',
 			                    btnClass: 'btn-primary-0',
 			                    action: function() {
-			                        $.ajax({
-			                            type: "post",
-			                            url: "/front/wxMyorder/wxDeleteOrder",
-			                            data: {"id":id,"pageNum":pageIndex,"type":typ,"cancel":"cancel"},
-			                            dataType: 'json',
-			                            success: function(data){
+			                        $.post("/subscribepay/order/deleteOrder", {"id":id,"pageNum":pageIndex,"type":typ,"cancel":"cancel"},function(data){
 			                                if(data && data["success"]){
 			                                    $.alert({
 			                                        title:"提示信息",
@@ -685,11 +660,7 @@
 			                                }else{
 			                                    alertS("删除失败，请联系管理员！");
 			                                }
-			                            },
-			                            error: function(xhr, type){
-			                                console.log("delete err");
-			                            }
-			                        });
+		                            });
 			                    }
 			                },
 			                cancel: {
@@ -712,6 +683,7 @@
 		            }
 		        });
 		    }
+	    
 			clickFlag=true;
 			$(function() {
 				sessionStorage.removeItem("applysuccess");
@@ -839,27 +811,16 @@
 				}else{
 					queryOrder();
 				}
-					
 //				}
-				
-				
-
-			/*------------------------------------------------------------------*/	
+			})
+			
 				//查询订单ajax
 				//typ  0全部 1未支付 2已支付
 				function queryOrder(typ,objD){
 //					sessionStorage.removeItem("payMsg")
 //					sessionStorage.removeItem("deleteIndex")
 					var result = true;
-					$.ajax({
-						type:"post",
-						url:"/front/wxMyOrder/myOrder",
-						data:{
-							"type":typ
-						},
-						async:false,
-						dataType: 'json',
-						success:function(data){
+					$.post("/subscribepay/order/myOrder",{"type":typ},function(data){
 							$(".loading_").hide();
 							var list=data.res;
 							dataCache =data.res;
@@ -871,72 +832,188 @@
 								result = false; 
 								nodataHtml=""
 								nodataHtml+='<div style="text-align:center;">';
-								//nodataHtml+='<div style="display:flex;justify-content:center;align-items: 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>'
-								//appendList(nodataHtml);
 								$(".card_lists").append(nodataHtml);
-//								if(!result){
-//									return
-//								}
 							}
-						},
-						error: function(xhr, type){
-			                console.log("query err");
-			            }
-					});	
+						})
 					//return 的是 暂无数据的情况noDataHtml 
 					if(!result){
 						$(".dropload-down").hide()
 						return
 					}
-					if(hasNextPage){
-					//setTimeout(function(){
-						wxflag = $(' .main').dropload({
-					        scrollArea : $(".main"),
-					        loadDownFn : function(me){
-								$.ajax({
-									type: 'post',
-									url: '/front/wxMyOrder/myOrder/myOrderPaging',
-									data: {"pageNum": pageIndex,"type":typ},
-									dataType: 'json',
-									success: function(data){
-										//没有数据
-										if(data.res==null||data.res.length==0){
-											noMoreData(me);
-										}else{
-											dataCache=dataCache.concat(data.res);
-											pageIndex++;
-											structureHtml(data.res);
-											if(data.hasNextPage){
-												// 每次数据插入，必须重置
-												me.resetload();
-											}else{
+					setTimeout(function(){
+						if(hasNextPage){
+							wxflag = $(' .main').dropload({
+						        scrollArea : $(".main"),
+						        loadDownFn : function(me){
+									$.post('/subscribepay/order/myOrderPaging', {"pageNum": pageIndex,"type":typ},function(data){
+											//没有数据
+											if(data.res==null||data.res.length==0){
 												noMoreData(me);
+											}else{
+												dataCache=dataCache.concat(data.res);
+												pageIndex++;
+												structureHtml(data.res);
+												if(data.hasNextPage){
+													// 每次数据插入，必须重置
+													me.resetload();
+												}else{
+													noMoreData(me);
+												}
 											}
-										}
-									},
-									error: function(xhr, type){
-										noMoreData(me);
+										});
+								}
+							});
+						}else{
+							wxflag = $('.main').dropload({
+						        scrollArea : window,
+						        loadDownFn : function(me){
+									if(wxflag == null){
+										wxflag = me;
 									}
-								});
-							}
-						});
-				//	},200);
-				}else{
-					wxflag = $('.main').dropload({
-				        scrollArea : window,
-				        loadDownFn : function(me){
-							if(wxflag == null){
-								wxflag = me;
-							}
-							noMoreData(me);
-				        }
-				    });
-					noMoreData(wxflag);
-				}
+									noMoreData(me);
+						        }
+						    });
+							noMoreData(wxflag);
+						}
+					},300)
 				}
 				
+				function structureHtml(object){
+					var listhtml='';
+					var psss = 0;
+					for(var index in object){
+					    var obj=object[index];
+				    	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)!="_"){
+                        	 		var publishtime_=publishTime.slice(0,10);
+                        	 		publishTime=timestampToTime(publishtime_);
+                        	 		publishTime=publishTime+"-";
+                        	 	}else{
+                        	 		var publishtime_=publishTime.slice(1,11);
+                        	 		publishTime=timestampToTime(publishtime_);
+                        	 		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">'+orderStatus+'</span>'
+                    		orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
+                        	iconHtml=""
+                        	iconHtml+='<div class="card-footer">'
+										+'<a  class="btn cancle" onclick="cancelOrder('+id+',this)">取消订单</a>'
+										+'<a href="javascript:void(0)" onclick="goPay(this)" class="btn pay" filterid="'+obj.filter_id+'" token="'+token+'" id="'+id+'">去支付</a>'
+									+'</div>'
+                        }else if(orderStatus==1){
+                        	orderStatus="已完成";
+                        	orderHtml=""
+                        	orderHtml+='<span class="status">'+orderStatus+'</span>'
+                    		orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
+                        	iconHtml=""
+                        	iconHtml+='<div class="card-footer">'
+										+'<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>'
+									+'</div>'
+                        }else if(orderStatus==-2){
+                        	orderStatus="已取消";
+                        	orderHtml="";
+                        	orderHtml+='<span class="status">'+orderStatus+'</span>'
+                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
+                        	iconHtml="";
+                        	iconHtml+='<div class="card-footer">'
+										+'<a onclick="onceMore(this)" class="btn cancle">再次购买</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  eid='+orderCode+' class="media">'
+												+'<div class="media-img">'
+													+'<img src="/dataExport/image/historical_data.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>'
+						}
+					appendList($(listhtml));
+//					if(sessionStorage&&sessionStorage.getItem("paySuccess_"+psss)!=null&&orderTabActive==1){
+//						sessionStorage.removeItem("paySuccess_"+psss);
+//						getOneMore(gopayIndex);
+//					}
+				}
 				
 				function noMoreData(me){
 					if(me == null){
@@ -951,155 +1028,6 @@
 					// 即使加载出错，也得重置
 					me.resetload();
 				}
-		
-				function structureHtml(object){
-						var listhtml='';
-						var psss = 0;
-						for(var index in object){
-						    var obj=object[index];
-					    	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)!="_"){
-	                        	 		var publishtime_=publishTime.slice(0,10);
-	                        	 		publishTime=timestampToTime(publishtime_);
-	                        	 		publishTime=publishTime+"-";
-	                        	 	}else{
-	                        	 		var publishtime_=publishTime.slice(1,11);
-	                        	 		publishTime=timestampToTime(publishtime_);
-	                        	 		publishTime=publishTime+"前全部";
-	                        	 	}
-	                        	 }else{
-	                        	 	 //publishTime= publishTime.replace(/\./g,"/")
-	                        	 }
-							}
-	                        //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删除
-	                        //+'<span class="status notpay">'+orderStatus+'</span>'
-	                        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">'+orderStatus+'</span>'
-                        		orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
-	                        	iconHtml=""
-	                        	iconHtml+='<div class="card-footer">'
-											+'<a  class="btn cancle" onclick="cancelOrder('+id+',this)">取消订单</a>'
-											+'<a href="javascript:void(0)" onclick="goPay(this)" class="btn pay" filterid="'+obj.filter_id+'" token="'+token+'" id="'+id+'">去支付</a>'
-										+'</div>'
-	                        }else if(orderStatus==1){
-	                        	orderStatus="已完成";
-	                        	orderHtml=""
-	                        	orderHtml+='<span class="status">'+orderStatus+'</span>'
-                        		orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
-	                        	iconHtml=""
-	                        	iconHtml+='<div class="card-footer">'
-											+'<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>'
-										+'</div>'
-	                        }else if(orderStatus==-2){
-	                        	orderStatus="已取消";
-	                        	orderHtml="";
-	                        	orderHtml+='<span class="status">'+orderStatus+'</span>'
-	                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
-	                        	iconHtml="";
-	                        	iconHtml+='<div class="card-footer">'
-											+'<a onclick="onceMore(this)" class="btn cancle">再次购买</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>";
-		                        }
-//		                        if(keysArr.length>4){
-//		                            keysHtml += "<span>...</span>";
-//		                        }
-		                 	}else{
-		                 		keysHtml=""
-		                 	}
-							
-							listhtml+='<div class="card">'
-											+'<div class="card-header">'
-												+'<span class="time" style="color:#888888">'+createTime+'</span>'
-											//	+'<span class="status notpay" style="color:#888888">'+orderStatus+'</span>'
-												+orderHtml
-											+'</div>'
-											+'<div class="card-content">'
-												//+'<a href="javascript:;" class="media">'
-												//+'<a href="/front/wxMyOrder/wxToOrderDetail/'+orderCode+'" eid='+orderCode+' class="media">'
-												+'<a  eid='+orderCode+' class="media">'
-													+'<div class="media-img">'
-														+'<img src="/dataExport/image/historical_data.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">'
-													//+'<span class="initial">原价：￥'+orderMoney+'</span>'
-													+'<strong class="current">￥'+orderMoney+'</strong>'
-												+'</div>'
-											+'</div>'
-											+iconHtml
-										+'</div>'
-							
-						}
-					//appendList($("<div>"+listhtml+"</div>"));
-					appendList($(listhtml));
-					if(sessionStorage&&sessionStorage.getItem("paySuccess_"+psss)!=null&&orderTabActive==1){
-						sessionStorage.removeItem("paySuccess_"+psss);
-						getOneMore(gopayIndex);
-					}
-				}
-				
-			})
 		</script>
 	{{include "/common/baiducc.html"}}
 	</body>

src/web/templates/weixin/my.html

@@ -92,7 +92,7 @@
 			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
 			$(function(){
 				$(".vip").on("click",function(){
-		        	window.location.href="#";	//vip订阅入口
+		        	window.location.href="/front/vipsubscribe/toPurchasePage";	//vip订阅入口
 		        })
 		        $(".myorder").on("click",function(){
 		        	window.location.href="/weixin/pay/toMyWxOrder?v=01";

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

@@ -39,15 +39,15 @@
                         <p class="text ellipsis">产品类型：<span class="productType"></span></p>
                         <p class="text ellipsis">价格：￥<span class="price"></span></p>
                         <!----- 未开发票状态 ----->
-                        <p class="text ellipsis invoice">发票：<a href="invoice.html" class="invoicing" style="display:none">开发票</a></p>
+                        <p class="text ellipsis invoice">发票：<a class="invoicing" style="display:none">开发票</a></p>
                         <!----- 已开发飘状态 ----->
                         <!--  单位发票-->
                         <div class="unit" style="display: none;">
                             <p><span>发票类型：</span><span>普通发票（电子发票）</span></p>
-                            <p><span>发票内容:</span><span>明细</span></p>
+                            <p><span>发票内容：</span><span>明细</span></p>
                             <p><span>发票抬头：</span><span>单位</span></p>
-                            <p><span>单位名称：</span><span>某某网络科技有限公司某某网络科技有限公司某某网络科技有限公司某某网络科技有</span></p>
-                            <p><span>纳税人识别号：</span><span>97632813007812341T</span></p>
+                            <p><span>单位名称：</span><span class="company_name"></span></p>
+                            <p><span>纳税人识别号：</span><span class="taxpayer_number"></span></p>
                         </div>
                         <!-- 个人发票 -->
                         <div class="person" style="display: none;">
@@ -93,6 +93,7 @@
             </div>
         </main>
         <!-- 当状态为待付款时显示去支付按钮 -->
+        <!--当状态为已取消时显示再次购买按钮-->
         <a href="#" class="button align" style="display:none">去支付</a>
     </div>
 </body>
@@ -207,7 +208,7 @@ if(signature && signature.length == 4){
               }
             })
           })
-        }else{
+        }else if (r.data.order.order_status==1){
           $("#pageTitle").text("已完成");
           //支付时间
           $(".line_paytime").css("display","");
@@ -230,9 +231,22 @@ if(signature && signature.length == 4){
           if(r.data.order.applybill_status==0){ 
             //已支付未申请发票
             $(".invoice .invoicing").css("display","");
+            $(".invoicing").on("click",function(){
+            	window.location.href="/front/vipsubscribe/openInvoice/"+orderCode;
+            });
           }else{
             //已支付已申请发票
-            alert("铺发票信息")
+			$(".invoice").css("display","none");
+            switch (r.data.order.applybill_type){
+            	case 0:
+            	$(".person").css("display","");
+            	break;
+            	case 1:
+            	$(".unit").css("display","");
+            	$(".company_name").html(r.data.order.applybill_company);
+            	$(".taxpayer_number").html(r.data.order.applybill_taxnum);
+            	break;
+            }
           } 
           
           //有效周期
@@ -241,6 +255,12 @@ if(signature && signature.length == 4){
           if(r.data.time.l_vip_starttime&&r.data.time.l_vip_endtime){
             $(".serviceTime").text(formatEffectiveDate(r.data.time.l_vip_starttime,r.data.time.l_vip_endtime))
           }
+        }else if(r.data.order.order_status==-2){
+    		$("#pageTitle").text("已取消");
+     		$(".invoice").css("display","none");//隐藏开发票
+     		if(!(r.data.time.l_vip_starttime&&r.data.time.l_vip_endtime)){
+           		$(".align").css("display","").html("再次购买");
+          	}
         }
                 
       }
@@ -261,18 +281,18 @@ if(signature && signature.length == 4){
   						},500)
   					}else if(r.err_msg == "get_brand_wcpay_request:cancel"){
   						//取消支付 可以再次支付
-              canpay=true;
-              alert("开发环境【支付跳转完成】")
-              try{
-  							window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
-              }catch(e){
-                alert(e)
-              }
+			            canpay=true;
+			            alert("开发环境【支付跳转完成】")
+			            try{
+			  				window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
+		            	}catch(e){
+			                alert(e)
+		                }
   					}else{
-              weui.toast("系统异常，请稍微再试",{
-                duration: 2000,
-                className: 'custom-toast',
-              });
+		                weui.toast("系统异常，请稍微再试",{
+		               		duration: 2000,
+		                	className: 'custom-toast',
+		              	});
   				  }
   			});
   		}