瀏覽代碼

订单分页

wangshan 6 年之前
父節點
當前提交
ea75bdce46
共有 2 個文件被更改,包括 28 次插入62 次删除
  1. 11 29
      src/jfw/front/dataExport.go
  2. 17 33
      src/web/templates/pc/myOrder.html

+ 11 - 29
src/jfw/front/dataExport.go

@@ -158,6 +158,8 @@ func (d *DataExport) ToMyOrder() error {
 	return nil
 }
 
+var order_pageSize = 3
+
 func (d *DataExport) QueryOrder() error {
 	typ := d.GetString("type") //0-全部 1-待支付 2-已支付
 	query := map[string]interface{}{}
@@ -180,22 +182,16 @@ func (d *DataExport) QueryOrder() error {
 		query["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
 	}
 
-	var pageSize = 3
-	var count, totalPage int64
 	//总数
-	count = public.Mysql.Count(tableName_order, map[string]interface{}{"user_openid": d.GetSession("s_m_openid")})
-	log.Println("count:", count)
+	countData := public.Mysql.Find(tableName_order, query, "", "", -1, 0)
+	count := len(*countData)
 	//当前页
 	pageNum, _ := d.GetInteger("pageNum")
-	log.Println("pageNum:", pageNum)
 	//开始下标索引
-	var start = (pageNum - 1) * pageSize
-	log.Println("start:", start)
+	var start = (pageNum - 1) * order_pageSize
 	//总页数
-	totalPage = (count + int64(pageSize) - 1) / int64(pageSize)
-
-	list := public.Mysql.Find(tableName_order, query, "", "create_time desc", start, pageSize)
-	log.Println("count:", count, "totalPage:", totalPage, "list:", list)
+	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"]
@@ -216,10 +212,12 @@ func (d *DataExport) QueryOrder() error {
 			if v["id"] != nil && orderMoney != nil && v["order_code"] != nil {
 				v["token"] = public.GetWaitPayToken(v["id"].(int64), int(orderMoney.(int64)), v["order_code"].(string), query["user_openid"].(string))
 			}
-			v["totalPage"] = totalPage
 		}
 	}
-	d.ServeJson(list)
+	d.ServeJson(map[string]interface{}{
+		"list":      list,
+		"totalPage": totalPage,
+	})
 	return nil
 }
 
@@ -755,19 +753,3 @@ func (d *DataExport) Paysuccess() error {
 	d.T["order_code"] = code
 	return d.Render("/pc/paysuccess.html")
 }
-
-func getMyOrderList(query map[string]interface{}, start, pageSize int) (count, totalPage int64, list *[]map[string]interface{}) {
-	log.Println("query:", query)
-	log.Println("tableName_order:", tableName_order)
-	count = public.Mysql.Count(tableName_order, query)
-	var repl *[]map[string]interface{}
-	if count > 0 {
-		repl = public.Mysql.Find(tableName_order, query, "", "create_time desc", start, pageSize)
-	}
-	if repl != nil && *repl != nil && len(*repl) > 0 {
-		list = repl
-	}
-	log.Println("count---", count, "---list:", list)
-	totalPage = (count + int64(pageSize) - 1) / int64(pageSize)
-	return
-}

+ 17 - 33
src/web/templates/pc/myOrder.html

@@ -112,19 +112,8 @@
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}
 <script>
-		var totalPage;
-		$.ajax({
-				type: "post",
-           		url: "/front/dataExport/queryOrder",
-				dataType:'json', 
-		 		success:function(data){ 
-					if (data && data.length>0){
-                        totalPage = data[0].totalPage;
-						console.log(totalPage)
-						}
-					}
-			});
-	
+	var totalPage = 1;
+	var pageNum =1;
     $(function () {
         selcetIndexNav(4);
         haslogin({{.T.logid}});
@@ -142,7 +131,6 @@
             i.style.height = ($h/$l)+'px';
             i.style.lineHeight = ($h/$l)+'px';
         });
-		var pageNum =1;
         //获取全部订单
         queryOrder(0,$(".list .item").eq(0),pageNum);
 
@@ -151,21 +139,14 @@
             $(this).addClass("active").siblings().removeClass("active");
             var $list = $(".list .item");
             $list.eq($Index).show().siblings().hide();
-
-            queryOrder($Index,$list);
-        });
-		
-		    $(".tab-bar .tab li").on("click",function () {
-            var $Index = $(this).index();
-            $(this).addClass("active").siblings().removeClass("active");
-            var $list = $(".list .item");
-            $list.eq($Index).show().siblings().hide();
-
-            queryOrder($Index,$list);
+			pageNum = 1;
+			$("#previousPage").addClass("disabled");
+			$("#nextPage").removeClass("disabled");
+            queryOrder($Index,$list,pageNum);
         });
 		//点击上下页
 		$("#previousPage").on("click",function () {
-			var $Index = $(".tab-bar .tab li").index();
+			var $Index = $(".tab-bar .tab li.active").index();
 			var $list = $(".list .item");
 			pageNum--;
 			if (pageNum<=0){
@@ -175,12 +156,11 @@
 				$("#previousPage").addClass("disabled");
 			}
 			$("#nextPage").removeClass("disabled");
-			$(".page").html(pageNum)
             queryOrder($Index,$list,pageNum);
         });
 		
 		$("#nextPage").on("click",function () {
-			var $Index = $(".tab-bar .tab li").index();
+			var $Index = $(".tab-bar .tab li.active").index();
 			var $list = $(".list .item");
 			pageNum++;
 			if(pageNum>=totalPage){
@@ -188,8 +168,6 @@
 				$("#nextPage").addClass("disabled");
 			}
 			$("#previousPage").removeClass("disabled");
-			
-			$(".page").html(pageNum)
             queryOrder($Index,$list,pageNum);
         });
 
@@ -215,9 +193,15 @@
             dataType: 'json',
             success: function(data){
                 var temp = "";
-                if (data && data.length>0){
-                    for (var i=0;i<data.length;i++){
-                        var obj = data[i];
+				totalPage = data.totalPage;
+				if(totalPage==1){
+					$("#nextPage").addClass("disabled");
+				}
+				$(".page").html(pageNum)
+                if (data.list && data.list.length>0){
+					$(".backTop").click();
+                    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;