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

src/jfw/front/wxMyOrder.go

@@ -18,6 +18,7 @@ type WxMyOrder struct {
 	myMenu          xweb.Mapper `xweb:"/front/wxMyOrder/myMenu"`                //微信我的目录
 	toMyWxOrder     xweb.Mapper `xweb:"/front/wxMyOrder/toMyWxOrder"`           //微信我的订单
 	myOrder         xweb.Mapper `xweb:"/front/wxMyOrder/myOrder"`               //查询订单
+	myOrderPaging   xweb.Mapper `xweb:"/front/wxMyOrder/myOrder/myOrderPaging"` //查询订单--分页
 	wxToOrderDetail xweb.Mapper `xweb:"/front/wxMyOrder/wxToOrderDetail/(.*)"`  //订单详情
 	wxGetOrderCode  xweb.Mapper `xweb:"/front/wxMyOrder/wxGetOrderCode/(\\w+)"` //申请发票获取订单编号
 	wxApplyInvoice  xweb.Mapper `xweb:"/front/wxMyOrder/wxApplyInvoice"`        //申请发票
@@ -28,6 +29,12 @@ func init() {
 	xweb.AddAction(&WxMyOrder{})
 }
 
+var (
+	pagesize_max int  = 10
+	haveNextPage bool = false
+	res          []map[string]interface{}
+)
+
 func (w *WxMyOrder) MyMenu() error {
 	if w.Session().Get("userId") == nil {
 		return w.Redirect("/swordfish/about")
@@ -41,8 +48,6 @@ func (w *WxMyOrder) ToMyWxOrder() error {
 
 func (w *WxMyOrder) MyOrder() error {
 	//每页显示数
-	pagesize_max := 10
-	var haveNextPage bool
 	userId := w.Session().Get("userId")
 	openid := w.Session().Get("s_m_openid")
 	queryM := map[string]interface{}{}
@@ -65,18 +70,15 @@ func (w *WxMyOrder) MyOrder() error {
 		queryM["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
 	}
 	//
-	res := public.Mysql.Find(tableName_order, queryM, "", "create_time desc", -1, 0)
+	//res := *public.Mysql.Find(tableName_order, queryM, "", "create_time desc", -1, 0)
 	log.Println("res:", res)
 	//总数
-	count := len(*res)
-	if count > pagesize_max {
-		haveNextPage = true
-	} else {
-		haveNextPage = false
-	}
-	log.Println("count:", count)
+	haveNextPage, res, _ = w.Datas(queryM, 1)
+	log.Println(res)
+	count := len(res)
+	log.Println("count:", len(res))
 	if res != nil {
-		for _, v := range *res {
+		for _, v := range res {
 			filter_publishtime := v["filter_publishtime"]
 			if filter_publishtime != nil || filter_publishtime != "" {
 				timeArr := strings.Split(filter_publishtime.(string), "_")
@@ -107,6 +109,38 @@ func (w *WxMyOrder) MyOrder() error {
 	return nil
 }
 
+func (w *WxMyOrder) MyOrderPaging() error {
+	log.Println("@@@")
+	userId := w.Session().Get("userId")
+	openid := w.Session().Get("s_m_openid")
+	queryM := map[string]interface{}{}
+	if userId == nil || openid == nil {
+		return w.Redirect("/swordfish/share/-1")
+	} else {
+		queryM["user_openid"] = openid
+	}
+	// 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
+		}
+		queryM["order_status"] = status
+	} else {
+		queryM["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
+	}
+	res, haveNextPage, _ := w.Datas(queryM, pageNum)
+	w.ServeJson(map[string]interface{}{
+		"haveNextPage": haveNextPage,
+		"res":          res,
+	})
+	return nil
+}
+
 func (w *WxMyOrder) WxToOrderDetail(orderCode string) error {
 	myOpenid := ""
 	if openid := w.GetSession("s_m_openid"); openid != nil {
@@ -245,3 +279,19 @@ func (w *WxMyOrder) WxPaySuccess(order_code string) error {
 	w.T["order_code"] = order_code
 	return w.Render("/weixin/dataExport/dataExport_invoiceSuccess.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, "", "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
+}

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

@@ -380,22 +380,22 @@
 				
 			})
 			$(".select-area-box ul li:not('.index')").each(function(){
-				var text = $(this).find(".province").text().trim()
+				var text = $(this).find(".province").text().trim();
 				// console.log(text)
-				var data = null
+				var data = null;
 				chinaMapJSON.some(function(v){
-					data = v
+					data = v;
 					return v.name.indexOf(text) !== -1
-				})
+				});
 				// console.log(data)
-				var box = $(this).find('div.tab_content')
-				var html = createMoreCity(data.city)
+				var box = $(this).find('div.tab_content');
+				var html = createMoreCity(data.city);
 				box.html(html)
-			})
+			});
 			function createMoreCity(arr){
 				var tempHtml = arr.map(function(v) {
 					return '<div class="city">'+v.name.replace(/市$/g,'')+'</div>'
-				}).join('')
+				}).join('');
 				return tempHtml
 			}
 			 $(function(){
@@ -411,36 +411,36 @@
 					$(this).parent().siblings().children('.tab_content').slideUp(500);
 					$(this).parent().siblings().children('.tab').removeClass('selected'); 
 					
-				})
+				});
 				$('.province .checkbox').on('click',function(){
 					// console.log($(this).is(':checked'))
-					var isCheckded = $(this).is(':checked')
+					var isCheckded = $(this).is(':checked');
 					if(isCheckded){
 						$(this).parents('.tab').siblings('.tab_content').find('.city').addClass('active')
 					}else{
 						$(this).parents('.tab').siblings('.tab_content').find('.city').removeClass('active')
 					}
-				})
+				});
 				$('.tab_content').on('click','.city',function(){
-					$(this).toggleClass('active')
-					var isActive = $(this).parent().find('.city.active').length
+					$(this).toggleClass('active');
+					var isActive = $(this).parent().find('.city.active').length;
 					// console.log(isActive,$(this).html())
 					if(isActive){
 						var input = $(this).parents('li').find('input.checkbox')
-						window.input = input
+						window.input = input;
 						// console.log(input)
 						input.prop('checked', true)
 					}else{
 						$(this).parent('div').siblings('.tab').children().children('.checkbox').prop('checked', false)
 					}
-				})
+				});
 				
 				$('.save-btn').click(function(){
-					$('.result_name').empty()
+					$('.result_name').empty();
 					var data = []
 					$(".tab_content").find(".city.active").each(function(){
 						data.push($(this).html())
-					})
+					});
 					var html='';
 					for(var i = 0;i<data.length;i++){
 						if(i != data.length -1){  
@@ -459,11 +459,22 @@
 					window.location.href = "/front/wx_dataExport/toSieve";
 				});
 				$('.reset-btn').click(function(){
-					$('input[type="checkbox"]').attr("checked",false)
-					$('.tab_content .city').removeClass('active')
+					$('input[type="checkbox"]').attr("checked",false);
+					$('.tab_content .city').removeClass('active');
 					$('.result_name').empty()
 				});
 				//
+				 if(localStorage.area !== ""){
+					 var area = localStorage.area.split(" ");
+					 for(var i in area){
+						 $(".tab_content").find(".city").each(function(){
+							 if($(this).text() === area[i]){
+								 $(this).addClass("active");
+								 $(this).parent().slideDown();
+							 }
+						 })
+					 }
+				 }
 			})
 		</script>
 	</body>

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

@@ -16,47 +16,143 @@
             background: #2cb7ca !important;
             color: #fff;
         }
+        body .industry .list ul li dd {
+            background: #F4F4F9;
+            display: inline-block;
+            width: 2.2rem;
+            height: .7rem;
+            border-radius: 3px;
+            text-align: center;
+            line-height: .7rem;
+            margin-right: .05rem;
+            margin-bottom: 0.2rem;
+        }
     </style>
 <body>
 
     <div class="industry">
-        <div class="all"><span>全部</span> </div>
+        <div class="all"><span class="active">全部</span> </div>
         <div class="list">
             <ul>
                 <li>
                     <dl>
                         <dt>建筑工程</dt>
-                        <dd>勘察设计</dd>
-                        <dd class="active">工程施工</dd>
-                        <dd>工程监理</dd>
                         <dd>材料设备</dd>
+                        <dd>工程施工</dd>
+                        <dd>勘察设计</dd>
+                        <dd>监理咨询</dd>
+                        <dd>机电安装</dd>
                     </dl>
                 </li>
                 <li>
                     <dl>
-                        <dt class="active">水利水电</dt>
-                        <dd class="active">水电工程</dd>
-                        <dd class="active">发电工程</dd>
-                        <dd class="active">航运工程</dd>
-                        <dd class="active">其他工程</dd>
-                        <dd class="active">航运工程</dd>
-                        <dd class="active">其他工程</dd>
+                        <dt>行政办公</dt>
+                        <dd>专业设备</dd>
+                        <dd>办公用品</dd>
+                        <dd>生活用品</dd>
+                        <dd>通用办公设备</dd>
+                        <dd>办公家具</dd>
                     </dl>
                 </li>
                 <li>
                     <dl>
-                        <dt>建筑工程</dt>
-                        <dd>勘察设计</dd>
-                        <dd>工程施工</dd>
-                        <dd>工程监理</dd>
-                        <dd>材料设备</dd>
+                        <dt>医疗卫生</dt>
+                        <dd>设备</dd>
+                        <dd>耗材</dd>
+                        <dd>药品</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>服务采购</dt>
+                        <dd>仓储物流</dd>
+                        <dd>广告宣传印刷</dd>
+                        <dd>物业</dd>
+                        <dd>其他</dd>
+                        <dd>法律咨询</dd>
+                        <dd>会计</dd>
+                        <dd>审计</dd>
+                        <dd>安保</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>机械设备</dt>
+                        <dd>工程机械</dd>
+                        <dd>车辆</dd>
+                        <dd>其他机械设备</dd>
+                        <dd>机床相关</dd>
+                        <dd>机械零部件</dd>
+                        <dd>矿山机械</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>水利水电</dt>
+                        <dd>水利工程</dd>
+                        <dd>发电工程</dd>
+                        <dd>航运工程</dd>
+                        <dd>其他工程</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>能源化工</dt>
+                        <dd>仪器仪表</dd>
+                        <dd>原材料</dd>
+                        <dd>新能源</dd>
+                        <dd>设备物资</dd>
+                        <dd>化工产品</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>弱电安防</dt>
+                        <dd>综合布线</dd>
+                        <dd>智能系统</dd>
+                        <dd>智能家居</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>信息技术</dt>
+                        <dd>系统集成及安全</dd>
+                        <dd>软件开发</dd>
+                        <dd>运维服务</dd>
+                        <dd>其他</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>交通工程</dt>
+                        <dd>道路轨道</dd>
+                        <dd>桥梁</dd>
+                        <dd>隧道</dd>
+                        <dd>其他</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>市政设施</dt>
+                        <dd>道路</dd>
+                        <dd>绿化</dd>
+                        <dd>线路管网</dd>
+                        <dd>综合项目</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>农林牧渔</dt>
+                        <dd>生产物资</dd>
+                        <dd>生产设备</dd>
+                        <dd>相关服务</dd>
                     </dl>
                 </li>
             </ul>
         </div>
         
         <div class="consfirm">
-            <button>确认</button>
+            <button class="save-btn">确认</button>
         </div>
         <div class="resetOne">
             <button class="reset">重置</button>
@@ -85,7 +181,7 @@
                         }
                 })
             }
-            hasActive()
+            hasActive();
             
             $(".list ul li dl dt").on("click",function(){
                 $(".all span").removeClass("active");
@@ -152,6 +248,20 @@
                 localStorage.industry = html;
                 window.location.href = "/front/wx_dataExport/toSieve";
             });
+            //
+            if(localStorage.industry !== ""){
+                var industry = localStorage.industry.split(" ");
+                for(var i in industry){
+                    $(".list ul li").find("dd").each(function(){
+                        if($(this).text() === industry[i]){
+                            $(this).addClass("active");
+                        }
+                    })
+                }
+                $(".list ul li").find("dd.active").each(function(){
+                    $(".all span").removeClass("active")
+                })
+            }
 
     </script>
 </body>

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

@@ -50,6 +50,7 @@
 
         $(".industry .all span").on('click', function () {
             $(this).addClass("active")
+            $(".connectMain").css("background", "#f5f4f9");
         });
 
         $(".btn").on('click', function () {
@@ -64,7 +65,18 @@
             window.location.href = "/front/wx_dataExport/toSieve"
         });
         //
-
+        if(localStorage.price !== ""){
+            var price = localStorage.price.replace("-","").split("万元");
+            var prices = price.filter(function (e) {
+                return e !== "";
+            });
+            $("#min").val(prices[0]);
+            $("#max").val(prices[1]);
+            if($("#min").val() !== "" && $("#max").val() !== ""){
+                $(".connectMain").css("background", "#2cb7ca");
+                $(".all span").removeClass("active");
+            }
+        }
 
     })
 </script>

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

@@ -16,49 +16,69 @@
             background: #2cb7ca !important;
             color: #fff;
         }
+        body .industry .list ul li dt {
+            background: #F4F4F9;
+            display: block;
+            width: 1.88rem;
+            height: .7rem;
+            border-radius: 3px;
+            text-align: center;
+            line-height: .7rem;
+            font-weight: bold;
+            margin-bottom: 0.2rem;
+        }
     </style>
 <body>
 
     <div class="industry">
-        <div class="all"><span>全部</span> </div>
+        <div class="all"><span class="active">全部</span> </div>
         <div class="list">
             <ul>
                     <li>
                         <dl>
-                            <dt class="question">拟建项目 </dt><i class="iconfont icon-wenhao "></i>
+                            <dt class="question">拟建项目</dt><i class="iconfont icon-wenhao "></i>
                         </dl>
                     </li>
                 <li>
                     <dl>
-                        <dt>招标预告</dt>
+                        <dt class="question">招标预告</dt>
                     </dl>
                 </li>
                 <li>
                     <dl>
                         <dt>招标公告</dt>
                         <dd>招标</dd>
-                        <dd class="active">邀标</dd>
-                        <dd>询价 </dd>
+                        <dd>邀标</dd>
+                        <dd>询价</dd>
                         <dd>竞谈</dd>
                         <dd>单一</dd>
                         <dd>竞价</dd>
                         <dd>变更</dd>
+                        <dd>其他</dd>
+                    </dl>
+                </li>
+                <li>
+                    <dl>
+                        <dt>招标结果</dt>
+                        <dd>中标</dd>
+                        <dd>成交</dd>
+                        <dd>废标</dd>
+                        <dd>流标</dd>
                     </dl>
                 </li>
                 <li>
                     <dl>
-                        <dt class="active">招标结果</dt>
-                        <dd class="active">中标</dd>
-                        <dd class="active">成交</dd>
-                        <dd class="active">废标</dd>
-                        <dd class="active">流标</dd>
+                        <dt>招标信用信息</dt>
+                        <dd>合同</dd>
+                        <dd>验收</dd>
+                        <dd>违规</dd>
                     </dl>
                 </li>
             </ul>
         </div>
         
         <div class="consfirm">
-            <button>确认</button>
+            <button class="save-btn">确认</button>
         </div>
         <div class="resetOne">
             <button class="reset">重置</button>
@@ -135,6 +155,9 @@
                 $(".list ul li").find("dd.active").each(function(){
                     data.push($(this).html())
                 });
+                $(".list ul li").find("dt.question.active").each(function(){
+                    data.push($(this).html())
+                });
                 var html='';
                 for(var i = 0;i<data.length;i++){
                     if(i != data.length -1){
@@ -152,6 +175,32 @@
                 localStorage.subType = html;
                 window.location.href = "/front/wx_dataExport/toSieve";
             });
+            //
+            if(localStorage.subType !== ""){
+                var subType = localStorage.subType.split(" ");
+                // var subTypes = subType.filter(function (e) {
+                //     return e !== "";
+                // });
+                for(var i in subType){
+                    console.log(subType[i]);
+                    $(".list ul li").find("dd").each(function(){
+                        if($(this).text() === subType[i]){
+                            $(this).addClass("active");
+                        }
+                    })
+                    $(".list ul li").find("dt.question").each(function(){
+                        if($(this).text() === subType[i]){
+                            $(this).addClass("active");
+                        }
+                    })
+                }
+                $(".list ul li").find("dd.active").each(function(){
+                    $(".all span").removeClass("active")
+                })
+                $(".list ul li").find("dt.active").each(function(){
+                    $(".all span").removeClass("active")
+                })
+            }
 
     </script>
 </body>

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

@@ -14,13 +14,21 @@
 		<link rel="stylesheet" href="/wx_dataExport/css/order_list.css">
 	</head>
 	<body>
+		<style>
+			.dropload-noData{
+				border-top: 0.01rem solid #e0e0e0;
+				text-align: center;
+				line-height: 40px;
+				background: #fff;
+			}
+			.dropload-refresh{
+				border-top: 0.01rem solid #e0e0e0;
+				text-align: center;
+				line-height: 40px;
+				background: #fff;
+			}
+		</style>
 		<div id="order_list">
-			<!-- <header class="header">
-				<a href="#" class="return pull-left">
-					<i class="icon iconfont">&#xe640;</i>
-				</a>
-				<h1 class="title">我的订单</h1>
-			</header> -->
 			<main class="main">
 				<div class="buttons-tab">
 					<ul>
@@ -39,7 +47,9 @@
 		</div>
 		<script src="/wx_dataExport/js/zepto.js"></script>
 		<script>
-			var hasNextPage=false;
+			var haveNextPage=false;
+			var pageIndex=1;
+			var wxflag = "";
 			$(function() {
 				//查看全部
 				queryOrder();
@@ -67,11 +77,11 @@
 						data:{
 							"type":typ
 						},
-						async:true,
+						async:false,
 						dataType: 'json',
 						success:function(data){
 							var list=data.res;
-							var hasNextPage=data.hasNextPage;
+						    haveNextPage=data.haveNextPage;
 							if (data.res&&data.res.length>0){
 								structureHtml(data.res);	
 							}else{
@@ -87,34 +97,73 @@
 			                console.log("query err");
 			            }
 					});	
-					console.log(hasNextPage)
-//					if(hasNextPage){
-//						setTimeout(function(){
-//							wxflag = $('.listcontent').dropload({
-//						        scrollArea : window,
-//								loadUpFn : function(me){
-//									//loadDatas(me,-1);
-//				          reloadFirstPage(me);//下拉刷新更新订阅词
-//								},
-//						        loadDownFn : function(me){
-//									loadDatas(me,lasttime);
-//						        }
-//						    });
-//						},1000);
-//					}else{
-//						wxflag = $('.listcontent').dropload({
-//					        scrollArea : window,
-//							loadUpFn : function(me){
-//								loadDatas(me,-1);
-//							},
-//					        loadDownFn : function(me){
-//								loadDatas(me,lasttime);
-//					        }
-//					    });
-//						noMoreData(wxflag);
-//					}
+					console.log(haveNextPage)
+					if(haveNextPage){
+						console.log("!")
+							wxflag = $('.tabs').dropload({
+						        scrollArea : window,
+						        loadDownFn : function(me){
+						        	alert("@@")
+									if(wxflag == null){
+										alert("@")
+										wxflag = me;
+									}
+						            $.ajax({
+						                type: 'post',
+						                url: '/front/wxMyOrder/myOrder/myOrderPaging',
+										data: {"pageNum": pageIndex,"type":typ },
+						                dataType: 'json',
+						                success: function(data){
+											//没有数据
+											if(data.res.length==0){
+												noMoreData(me);
+											}else{
+												pageIndex++;
+												structureHtml(data["res"]);
+												if(data.hasNextPage){
+													// 每次数据插入，必须重置
+													me.resetload();
+												}else{
+													noMoreData(me);
+												}
+											}
+						                },
+						                error: function(xhr, type){
+											noMoreData(me);
+						                }
+						            });
+						        }
+						    });
+						}else{
+							wxflag = $('.tabs').dropload({
+						        scrollArea : window,
+						        loadDownFn : function(me){
+									if(wxflag == null){
+										wxflag = me;
+									}
+									noMoreData(me);
+						        }
+						    });
+							noMoreData(wxflag);
+						}
 				}
 				
+				
+				function noMoreData(me){
+					if(me == null){
+						return;
+					}
+					wxflag = me;
+					hasNextPage = false;
+					// 锁定
+					me.lock();
+					// 无数据
+					me.noData();
+					// 即使加载出错，也得重置
+					me.resetload();
+				}
+				
+				
 				function structureHtml(object){
 					var listhtml='';
 					for(var index in object){