Home Explore Help
Sign In
qmx
/
jy
14
0
Fork 0
Files Issues 2 Pull Requests 0 Wiki
Browse Source

修改缺陷

zhangxinlei1996 5 years ago
parent
9c324982da
commit
0e56c1ad1f
14 changed files with 190 additions and 56 deletions
Split View Show Diff Stats
  1. 11 1
      src/jfw/modules/app/src/app/front/dataExport.go
  2. 5 0
      src/jfw/modules/app/src/app/front/ws_dataExport.go
  3. 15 5
      src/jfw/modules/app/src/web/staticres/jyapp/css/myorder/order_list.css
  4. 2 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
  5. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_invoiceSuccess.html
  6. 44 14
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html
  7. 4 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html
  8. 17 14
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html
  9. 27 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
  10. 14 5
      src/web/staticres/wx_dataExport/css/order_list.css
  11. 21 9
      src/web/templates/weixin/dataExport/dataExport_payOrder.html
  12. 3 0
      src/web/templates/weixin/dataExport/dataExport_previewData.html
  13. 6 5
      src/web/templates/weixin/dataExport/dataExport_toMyOrder.html
  14. 20 1
      src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

+ 11 - 1
src/jfw/modules/app/src/app/front/dataExport.go
View File 

@@ -51,8 +51,9 @@ func (w *WxDataExport) ToSieve() error {
 
 			"user_id":    myUserId,
 
 		}
 
 		if orderCode != "" {
 
-			orderDetail = *public.Mysql.FindOne("dataexport_order", queryMap, "filter", "")
 
+			orderDetail = *public.Mysql.FindOne("dataexport_order", queryMap, "filter,pay_way", "")
 
 		}
 
+		log.Println("-:", orderDetail)
 
 		if orderDetail["filter"] != nil {
 
 			err := json.Unmarshal([]byte(orderDetail["filter"].(string)), &filter)
 
 			if err == nil {
 
@@ -61,6 +62,15 @@ func (w *WxDataExport) ToSieve() error {
 
 				log.Println("筛选条件-关键词-结构体反序列化-错误", err)
 
 			}
 
 		}
 
+		//纪录用户上次支付方式
 
+		if orderDetail["pay_way"] != nil {
 
+			if orderDetail["pay_way"] == "wx_pc" || orderDetail["pay_way"] == "wx_app" || orderDetail["pay_way"] == "wx_js" {
 
+				orderDetail["pay_way"] = "wx"
 
+			}
 
+			if orderDetail["pay_way"] == "ali_pc" || orderDetail["pay_way"] == "ali_app" {
 
+				orderDetail["pay_way"] = "ali"
 
+			}
 
+		}
 
 		w.T["orderDetail"] = orderDetail
 
 	}
 
 	if myUserId == "" {

+ 5 - 0
src/jfw/modules/app/src/app/front/ws_dataExport.go
View File 

@@ -300,6 +300,11 @@ func (w *WsDataExport) ToCreateOrderPage() error {
 
 		}
 
 		w.T["phone"] = phone
 
 	}
 
+	//支付方式
 
+	payway := w.GetString("payway")
 
+	if payway != "" {
 
+		w.T["payway"] = payway
 
+	}
 
 	w.T["_id"] = w.GetString("id")
 
 	w.T["msgCount"] = msgCount                                                                                      //信息总量
 
 	w.T["msgMaxCount"] = public.ExConf.MsgMaxCount                                                                  //规定信息最大总量

+ 15 - 5
src/jfw/modules/app/src/web/staticres/jyapp/css/myorder/order_list.css
View File 

@@ -1,13 +1,22 @@
 
 .main {
 
-  width: 100%;
 
-  overflow: scroll;
 
+  flex: 1;
 
+  overflow-y: scroll;
 
+}
 
+
 
+#order_list{
 
+	width: 100%;
 
+	height: 100%;
 
+	display: flex;
 
+	flex-direction: column;
 
+	justify-content: space-between;
 
+	overflow: hidden;
 
 }
 
 
 .main::-webkit-scrollbar {
 
   display: none;
 
 }
 
 
-#order_list .main .buttons-tab > ul {
 
+#order_list .buttons-tab > ul {
 
   width: 100%;
 
   height: 1rem;
 
   line-height: 1rem;
 
@@ -25,8 +34,9 @@
 
   border-bottom: 1px solid #e0e0e0;
 
   -webkit-box-sizing: border-box;
 
           box-sizing: border-box;
 
+		
 }
 
-#order_list .main .buttons-tab > ul .tab-link {
 
+#order_list  .buttons-tab > ul .tab-link {
 
   display: block;
 
   -webkit-box-flex: 1;
 
       -ms-flex: 1;
 
@@ -38,7 +48,7 @@
 
           box-sizing: border-box;
 
   height: 99%;
 
 }
 
-#order_list .main .buttons-tab > ul .active {
 
+#order_list  .buttons-tab > ul .active {
 
   color: #2cb7ca;
 
   border-bottom: 2px solid #2cb7ca;
 
   -webkit-box-sizing: border-box;

+ 2 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
View File 

@@ -531,6 +531,7 @@
 
             $("#endtime").mobiscroll('show');
 
         });
 
 		var onceDetail = {{.T.orderDetail}}
 
+		console.log(onceDetail)
 
 		if(onceDetail!=""){
 
 			var filter = onceDetail["filter"];
 
 	        //金额
 
@@ -885,7 +886,7 @@
 
                 dataType: 'json',
 
                 success: function(data){
 
                     if(data._id!==""){
 
-                        window.location.href="/jyapp/front/dataExport/toCreateOrderPage?id="+data._id+"&source=d"
 
+                        window.location.href="/jyapp/front/dataExport/toCreateOrderPage?id="+data._id+"&source=d&payway="+onceDetail["pay_way"];
 
                     }
 
                 }
 
             })

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_invoiceSuccess.html
View File 

@@ -47,7 +47,7 @@
 
     <body>
 
 	<div class="app-layout-header">
 
 			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
-			提交成功
 
+			开发票
 
 		</div>
 
         <div class="submit_success">
 
             <div class="success">

+ 44 - 14
src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html
View File 

@@ -253,6 +253,8 @@
 
 			var email_lastVerity = {{.T.timeSpaceing}}
 
 			var previewDataTime = {{.T.PreviewData}}
 
 			var phone_lastInput = {{.T.phone}}
 
+			var payway ={{.T.payway}}
 
+			console.log(payway)
 
 			//可以支付
 
 			var canpay = true;
 
 			//订单编号
 
@@ -324,6 +326,16 @@
 
 						$(".payment").text("支付宝支付");
 
 					}
 
 				}
 
+				//记录用户上次付款信息
 
+				if(payway){
 
+					if(payway=="ali"){
 
+						$("#zfb").attr("checked",true);
 
+						$(".payment").text("支付宝支付");
 
+					}else if (payway=="wx"){
 
+						$("#wx").attr("checked",true);
 
+						$(".payment").text("微信支付");
 
+					}
 
+				}
 
 				
 				if(sessionStorage.index=="1"){
 
             		$(".choose .choose-item").eq(sessionStorage.index).addClass("active").siblings().removeClass("active");
 
@@ -354,18 +366,21 @@
 
 					    $("#bottombox").css("position","fixed");
 
 					}
 
 			   	});
 
-			   	if(sessionStorage.getItem("new_email_"+userId)!=null){
 
-			   		$(".email_input").val(sessionStorage.getItem("new_email_"+userId));
 
-			   	}
 
+			   
 				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null&&sessionStorage.getItem("send_email_"+{{.T._id}})!=email_lastInput){
 
+					console.log("if")
 
 					$(".email_check_ok").hide();
 
 					$(".email_input").val(sessionStorage.getItem("send_email_"+{{.T._id}}));
 
 					var emver = sessionStorage.getItem("EmailVerity_"+{{.T._id}});
 
-					console.log(emver)
 
 					if(emver==null){
 
+						console.log("emver==null")
 
 						$(".email_input").parents('div.form-control').siblings().slideDown();
 
 					}else{
 
+						console.log("emver!=null")
 
+						$(".verity_input").val("");
 
 						$(".email_check_ok").show();
 
+						finishEmailVerity = true;
 
+						email_lastInput=sessionStorage.getItem("send_email_"+{{.T._id}});
 
 					}
 
 					lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}));
 
 					$(".verity_input").removeAttr("readonly");
 
@@ -373,17 +388,26 @@
 
 					if (lstimes>0){
 
 						sendemailTimer(lstimes);
 
 					}
 
-					sessionStorage.removeItem("EmailVerity_"+{{.T._id}});
 
 					sessionStorage.removeItem("send_email_"+{{.T._id}});
 
 				}else {
 
+						console.log("else")
 
 					if (sessionStorage.getItem("order_email"+userId+ {{.T._id}}) != null) {
 
+						console.log("id!=null")
 
 						$(".email_check_ok").show();
 
 						$(".email_input").val(sessionStorage.getItem("order_email"+userId + {{.T._id}}));
 
 						finishEmailVerity = true;
 
 					} else if (email_lastInput != "") {
 
-						$(".email_check_ok").show();
 
-						$(".email_input").val(email_lastInput);
 
-						finishEmailVerity = true;
 
+						console.log("email_lastInput!=null")
 
+//						if(sessionStorage.getItem("new_email_"+userId)!=null){
 
+//					   		$(".email_input").val(sessionStorage.getItem("new_email_"+userId));
 
+//					   		$(".verification").show();
 
+//					   		console.log("返回!")
 
+//							$(".verity_input").attr("readonly", false);
 
+//					   	}else{
 
+					   		$(".email_check_ok").show();
 
+							$(".email_input").val(email_lastInput);
 
+							finishEmailVerity = true;
 
+//					   	}
 
 					}
 
 				}
 
 				if (email_lastVerity > 0) {
 
@@ -519,16 +543,20 @@
 
 				//邮箱输入监控
 
 				$(".email_input").on("input propertychange", function() {
 
 					var email_input = $(this).val().replace(/\s*/g, "");
 
+					console.log("email===="+email_input);
 
 					if (email_input.indexOf("@") > 0) {
 
+						console.log(email_lastInput)
 
 						if (email_input != email_lastInput) {
 
 							$(this).parents('div.form-control').siblings().slideDown();
 
 							if (email_lastVerity > 0) {
 
 								console.log("3333")
 
 								$("#sendCode").attr("disabled", true);
 
 								//返回后验证码可输入
 
-								$(".verity_input").attr("readonly", true);
 
 								if((sessionStorage.getItem("new_email_"+userId)!=null)&&(sessionStorage.getItem("new_email_"+userId)==email_input)){
 
+									console.log("可输入")
 
 									$(".verity_input").attr("readonly", false);
 
+								}else{
 
+									$(".verity_input").attr("readonly", true);
 
 								}
 
 							}
 
 							finishEmailVerity = false;
 
@@ -606,7 +634,6 @@
 
 								finishEmailVerity = false;
 
 								//发送成功
 
 								sendemailTimer(60 * 5);
 
-								sessionStorage.email_sign="1";
 
 								$(".verity_input").removeAttr("readonly");;
 
 								$(".sendCode").attr("disabled", "disabled");
 
 								$(".email_input").attr("readonly", true);
 
@@ -639,11 +666,8 @@
 
 								}
 
 								$(".email_check_ok").show();
 
 								$(".email_err_msg").hide();
 
-								console.log("555")
 
 								$(".verity_input").attr("readonly", true);
 
 								$(".email_input").parents('div.form-control').siblings().slideUp();
 
-								//进入其他页面 验证码显示 清除缓存
 
-								sessionStorage.removeItem("email_sign");
 
 								sessionStorage.setItem("EmailVerity_"+{{.T._id}},"T");
 
 							} else {
 
 								EasyAlert.show("验证码错误", "", 3000);
 
@@ -654,11 +678,16 @@
 
 					}
 
 					//防遮挡
 
 				}).on("focus",function(){
 
-			   		  this.scrollIntoView();
 
+			   		 var target = this;
 
+			   		setTimeout(function(){
 
+			   		  	target.scrollIntoViewIfNeeded();
 
+			   		},600)
 
 				})
 
 
 				//点击阅读条款
 
 				$(".fixed-bottom-box .weui-check").on("click", function() {
 
+					console.log("finishEmailVerity:",finishEmailVerity)
 
+					console.log("finishPhoneVerity:",finishPhoneVerity)
 
 					if ($(this).is(":checked")) {
 
 						if (finishEmailVerity && finishPhoneVerity) {
 
 							readClause = true;
 
@@ -761,6 +790,7 @@
 
 								    sessionStorage.removeItem("index");
 
 									sessionStorage.removeItem("pay_way");
 
 									sessionStorage.removeItem("new_email_"+userId);
 
+									sessionStorage.removeItem("EmailVerity_"+{{.T._id}});
 
 									clearInterval(interval);
 
 									window.location.replace("/jyapp/front/dataExport/paySuccessPage?code=" + r.orderCode+"&email="+r.email+"&payTime="+r.payTime+"&pay_way="+r.pay_way);
 
 								}

+ 4 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html
View File 

@@ -11,6 +11,9 @@
 
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/previewData.css?v={{Msg "seo" "version"}}1">
 
 		<script src="https://cdn.bootcss.com/js-polyfills/0.1.42/polyfill.min.js"></script>
 
 		<style>
 
+			body{
 
+				-webkit-text-size-adjust: none;
 
+			}
 
 			body .loading_ {
 
 			    height: 100%;
 
 			    width: 100%;
 
@@ -260,6 +263,7 @@
 
 							for(var i in res){
 
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
 
 									for(var m in keys){
 
+										console.log(res[i]["detail"])
 
 										var re =new RegExp(keys[m], "g");
 
 										var index = res[i]["title"].search(re);
 
 										if(index === -1){

+ 17 - 14
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html
View File 

@@ -11,7 +11,7 @@
 
         <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/base.css?v={{Msg "seo" "version"}}5" />
 
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/iconfont.css?v={{Msg "seo" "version"}}" />
 
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/order_list.css?v={{Msg "seo" "version"}}5">
 
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/order_list.css?v={{Msg "seo" "version"}}6">
 
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/dropload.css?v={{Msg "seo" "version"}}">
 
 		<link href="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.css" rel="stylesheet">
 
 		{{include "/common/js.html"}}
 
@@ -339,7 +339,14 @@
 
 				font-size: .3rem;
 
 				margin-left: 10.5em;
 
 			}
 
-			
+			.weui-cells:after {
 
+			    bottom: 0;
 
+			    border-bottom: 0px solid #e5e5e5 !important;
 
+			    -webkit-transform-origin: 0 100%;
 
+			    transform-origin: 0 100%;
 
+			    -webkit-transform: scaleY(.5);
 
+			    transform: scaleY(.5);
 
+			}
 
 		</style>
 
 		<div class="app-layout-header">
 
 			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
@@ -350,8 +357,7 @@
 
 		    <p><span></span></p>
 
 		</div>
 
 		<div id="order_list">
 
-			<main class="main">
 
-				<div class="buttons-tab">
 
+			<div class="buttons-tab">
 
 					<ul>
 
 						<li class="tab-link active">全部</li>
 
 						<li class="tab-link ">待付款</li>
 
@@ -359,7 +365,9 @@
 
 						<li class="tab-link ">已取消</li>
 
 					</ul>
 
 				</div>
 
-				<div class="tabs">
 
+			<main class="main">
 
+				
+				<div class="tabs" >
 
 					<div class="tab active">
 
 						<div class="card_lists">
 
 						</div>
 
@@ -976,15 +984,10 @@
 
 			                console.log("query err");
 
 			            }
 
 					});	
-					//return 的是 暂无数据的情况noDataHtml 
-//					if(!result){
 
-//						console.log("#######")
 
-//						$(".dropload-down").hide()
 
-//						return
 
-//					}
 
+
 
 					if(hasNextPage){
 
-						wxflag = $('#order_list > .main > .tabs').dropload({
 
-					        scrollArea : window,
 
+						wxflag = $('.main').dropload({
 
+					        scrollArea : $(".main"),
 
 							loadUpFn:function(me){
 
 								reloadFirstPage(me,typ);
 
 							},
 
@@ -1018,7 +1021,7 @@
 
 							}
 
 						});
 
 					}else{
 
-						wxflag = $('.tabs').dropload({
 
+						wxflag = $('.main').dropload({
 
 					        scrollArea : window,
 
 					        loadDownFn : function(me){
 
 								if(wxflag == null){

+ 27 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
View File 

@@ -187,6 +187,14 @@
 
 		  100% {
 
 		    transform: rotate(360deg); } 
 		}
 
+		.weui-cells:after {
 
+		    bottom: 0;
 
+		    border-bottom: 0px solid #e5e5e5 !important;
 
+		    -webkit-transform-origin: 0 100%;
 
+		    transform-origin: 0 100%;
 
+		    -webkit-transform: scaleY(.5);
 
+		    transform: scaleY(.5);
 
+		}
 
 	</style>
 
 		<script>
 
 			var pay_way="wx_app";
 
@@ -203,6 +211,7 @@
 
 		            var subType = filter["subtype"];
 
 		            var buyer = filter["buyer"];
 
 		            var winner = filter["winner"];
 
+		            var selectType =filter["selectType"];
 
 		            
 		            if(!publishtime){
 
 		                publishtime = "全部";
 
@@ -364,6 +373,18 @@
 
 		            }
 
 		            $(".money").append(priceHtml);
 
 		            
+		            var selectTypeHtml="";
 
+		            if(selectType){
 
+		            	if(selectType=="title"){
 
+		            		selectTypeHtml+="<span>按标题匹配</span>";
 
+		            	}else if(selectType=="all"){
 
+		            		selectTypeHtml+="<span>按全文搜索</span>";
 
+		            	}
 
+		            }else{
 
+		            	selectTypeHtml+="<span></span>";
 
+		            }
 
+		            $(".selectType").append(selectTypeHtml);
 
+		            
 		            var subTypeHtml = "";
 
 		            if(subType){
 
 		                var subTypeArr = subType.split(",");
 
@@ -640,6 +661,12 @@
 
 							</div>
 
 							<div id="keywords">
 
 							</div>
 
+							<div class="item-list">
 
+								<label>关键词匹配方式：</label>
 
+								<ul class="item-list-parents">
 
+									<li class="selectType"></li>
 
+								</ul>
 
+							</div>
 
 							<div class="item-list">
 
 								<label>金额：</label>
 
 								<ul class="item-list-parents">

+ 14 - 5
src/web/staticres/wx_dataExport/css/order_list.css
View File 

@@ -1,13 +1,21 @@
 
 .main {
 
-  width: 100%;
 
-  overflow: scroll;
 
+  flex: 1;
 
+  overflow-y: scroll;
 
+}
 
+#order_list{
 
+	width: 100%;
 
+	height: 100%;
 
+	display: flex;
 
+	flex-direction: column;
 
+	justify-content: space-between;
 
+	overflow: hidden;
 
 }
 
 
 .main::-webkit-scrollbar {
 
   display: none;
 
 }
 
 
-#order_list .main .buttons-tab > ul {
 
+#order_list  .buttons-tab > ul {
 
   width: 100%;
 
   height: 1rem;
 
   line-height: 1rem;
 
@@ -25,8 +33,9 @@
 
   border-bottom: 1px solid #e0e0e0;
 
   -webkit-box-sizing: border-box;
 
           box-sizing: border-box;
 
+		
 }
 
-#order_list .main .buttons-tab > ul .tab-link {
 
+#order_list .buttons-tab > ul .tab-link {
 
   display: block;
 
   -webkit-box-flex: 1;
 
       -ms-flex: 1;
 
@@ -38,7 +47,7 @@
 
           box-sizing: border-box;
 
   height: 99%;
 
 }
 
-#order_list .main .buttons-tab > ul .active {
 
+#order_list .buttons-tab > ul .active {
 
   color: #2cb7ca;
 
   border-bottom: 2px solid #2cb7ca;
 
   -webkit-box-sizing: border-box;

+ 21 - 9
src/web/templates/weixin/dataExport/dataExport_payOrder.html
View File 

@@ -337,7 +337,15 @@
 
 				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null&&sessionStorage.getItem("send_email_"+{{.T._id}})!=email_lastInput){
 
 					$(".email_check_ok").hide();
 
 					$(".email_input").val(sessionStorage.getItem("send_email_"+{{.T._id}}));
 
-					$(".email_input").parents('div.form-control').siblings().slideDown();
 
+					var emver = sessionStorage.getItem("EmailVerity_"+{{.T._id}});
 
+					if(emver==null){
 
+						$(".email_input").parents('div.form-control').siblings().slideDown();
 
+					}else{
 
+						$(".verity_input").val("");
 
+						$(".email_check_ok").show();
 
+						email_lastInput=sessionStorage.getItem("send_email_"+{{.T._id}});
 
+						finishEmailVerity=true;
 
+					}
 
 					lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}));
 
 					$(".verity_input").removeAttr("readonly");
 
 					lstimes = lstimes -  Date.parse(new Date())/1000 + 60*5;
 
@@ -451,6 +459,8 @@
 
 						finishPhoneVerity=false;
 
 						$(".toPay").attr("disabled","disabled");
 
 					}
 
+				}).on("focus",function(){
 
+			   		  this.scrollIntoView();
 
 				});
 
 				//邮箱输入监控
 
 				$(".email_input").on("input propertychange",function() {
 
@@ -461,9 +471,10 @@
 
 							if(email_lastVerity>0){
 
 								$("#sendCode").attr("disabled", true);
 
 								//返回后验证码可输入
 
-								$(".verity_input").attr("readonly", true);
 
 								if((sessionStorage.getItem("new_email_"+userId)!=null)&&(sessionStorage.getItem("new_email_"+userId)==email_input)){
 
 									$(".verity_input").attr("readonly", false);
 
+								}else{
 
+									$(".verity_input").attr("readonly", true);
 
 								}
 
 							}
 
 							finishEmailVerity=false;
 
@@ -478,6 +489,7 @@
 
 								$(".email_err_msg").hide();
 
 							}
 
 						}else{
 
+							console.log("!!")
 
 							finishEmailVerity=true;
 
 							if(readClause&&finishPhoneVerity){
 
 								$(".toPay").removeAttr("disabled")
 
@@ -569,6 +581,7 @@
 
 								$(".email_err_msg").hide();
 
 								$(".verity_input").attr("readonly",true);
 
 								$(".email_input").parents('div.form-control').siblings().slideUp();
 
+								sessionStorage.setItem("EmailVerity_"+{{.T._id}},"T");
 
 							}else{
 
 								EasyAlert.show("验证码错误","",3000);
 
 							}
 
@@ -580,8 +593,11 @@
 
 					}
 
 					//防遮挡
 
 				}).on("focus",function(){
 
-			   		  this.scrollIntoView();
 
-				})
 
+					var target = this;
 
+			   		setTimeout(function(){
 
+			   		  	target.scrollIntoViewIfNeeded();
 
+			   		},500)
 
+				});
 
 				
 				//点击阅读条款
 
 				$(".fixed-bottom-box .weui-check").on("click", function () {
 
@@ -635,11 +651,6 @@
 
 					if(!finishEmailVerity||!readClause||!canpay||!finishPhoneVerity){
 
 						return	
 					}
 
-//					}else{
 
-//						//清除我已阅读缓存
 
-//						sessionStorage.removeItem("readClause");
 
-//						sessionStorage.removeItem("index");
 
-//					}
 
 					$(".loading_").show();
 
 					canpay=false;
 
 					
@@ -695,6 +706,7 @@
 
 					//清除我已阅读缓存
 
 					sessionStorage.removeItem("readClause");
 
 					sessionStorage.removeItem("index");
 
+					sessionStorage.removeItem("EmailVerity_"+{{.T._id}});
 
 				});
 
 			}
 
 			//倒计时

+ 3 - 0
src/web/templates/weixin/dataExport/dataExport_previewData.html
View File 

@@ -16,6 +16,9 @@
 
     			src: url('/fonts/ttf/{{.T.ttf}}.eot?#iefix') format('embedded-opentype'), /* IE Fix for IE 6-8*/
 
 				url("/fonts/ttf/{{.T.ttf}}.ttf") format("truetype");  /* chrome、firefox、opera、Safari, Android, iOS 4.2+ */
 
 			}
 
+			body{
 
+				-webkit-text-size-adjust: none;
 
+			}
 
 			body .loading_ {
 
 			    height: 100%;
 
 			    width: 100%;

+ 6 - 5
src/web/templates/weixin/dataExport/dataExport_toMyOrder.html
View File 

@@ -294,6 +294,7 @@
 
 			var gopayIndex = 0;
 
 			function goPay(e){
 
 				var filterid = $(e).attr("filterid");
 
+				console.log(filterid)
 
 				var token = $(e).attr("token");
 
 				var testid=$(e).parent().parent().children(".card-content").children(".media").attr("eid");
 
 				var id = $(e).attr("id");
 
@@ -369,8 +370,7 @@
 
 		    <p><span></span></p>
 
 		</div>
 
 		<div id="order_list">
 
-			<main class="main">
 
-				<div class="buttons-tab">
 
+			<div class="buttons-tab">
 
 					<ul>
 
 						<li class="tab-link active">全部</li>
 
 						<li class="tab-link ">待付款</li>
 
@@ -378,6 +378,7 @@
 
 						<li class="tab-link ">已取消</li>
 
 					</ul>
 
 				</div>
 
+			<main class="main">
 
 				<div class="tabs">
 
 					<div class="tab active">
 
 						<div class="card_lists">
 
@@ -887,8 +888,8 @@
 
 					}
 
 					if(hasNextPage){
 
 					//setTimeout(function(){
 
-						wxflag = $('#order_list > .main > .tabs').dropload({
 
-					        scrollArea : window,
 
+						wxflag = $(' .main').dropload({
 
+					        scrollArea : $(".main"),
 
 					        loadDownFn : function(me){
 
 								$.ajax({
 
 									type: 'post',
 
@@ -919,7 +920,7 @@
 
 						});
 
 				//	},200);
 
 				}else{
 
-					wxflag = $('.tabs').dropload({
 
+					wxflag = $('.main').dropload({
 
 				        scrollArea : window,
 
 				        loadDownFn : function(me){
 
 							if(wxflag == null){

+ 20 - 1
src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html
View File 

@@ -146,6 +146,7 @@
 
 					var subType = filter["subtype"];
 
 					var buyer = filter["buyer"];
 
 					var winner = filter["winner"];
 
+					var selectType=filter["selectType"];
 
 					if(!publishtime) {
 
 						publishtime = "全部";
 
 					} else {
 
@@ -257,7 +258,19 @@
 
 						priceHtml += "<span>全部</span>";
 
 					}
 
 					$(".money").append(priceHtml);
 
-
 
+					
+ 					var selectTypeHtml="";
 
+		            if(selectType){
 
+		            	if(selectType=="title"){
 
+		            		selectTypeHtml+="<span>按标题匹配</span>";
 
+		            	}else if(selectType=="all"){
 
+		            		selectTypeHtml+="<span>按全文搜索</span>";
 
+		            	}
 
+		            }else{
 
+		            	selectTypeHtml+="<span></span>";
 
+		            }
 
+		            $(".selectType").append(selectTypeHtml);
 
+		            
 					var subTypeHtml = "";
 
 					if(subType) {
 
 						var subTypeArr = subType.split(",");
 
@@ -421,6 +434,12 @@
 
 							</div>
 
 							<div id="keywords">
 
 							</div>
 
+							<div class="item-list">
 
+								<label>关键词匹配方式：</label>
 
+								<ul class="item-list-parents">
 
+									<li class="selectType"></li>
 
+								</ul>
 
+							</div>
 
 							<div class="item-list">
 
 								<label>金额：</label>
 
 								<ul class="item-list-parents">