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

src/jfw/front/dataExport.go

@@ -538,6 +538,7 @@ func (d *DataExport) ToCreateOrderPage(_id string) error {
 	//邮箱验证
 	email := d.GetSession("DataExportVerifyEmail_val")
 	resPhone := d.GetSession("DataExportVerifyPhone_val")
+	log.Println(util.Int64All(d.GetSession("CreatEVerifyTime")), "----", time.Now().Unix())
 	if email != nil {
 		lastSendDEVerify := util.Int64All(d.GetSession("CreatEVerifyTime"))
 		timeSpaceing := lastSendDEVerify - time.Now().Unix() + 60*5
@@ -713,7 +714,9 @@ func (d *DataExport) SendMailVerify() {
 		}
 		if email_used {
 			lastSendDEVerify := util.Int64All(d.GetSession("CreatEVerifyTime"))
+			log.Println(util.Int64All(d.GetSession("CreatEVerifyTime")), "----", time.Now().Unix())
 			timeSpaceing := lastSendDEVerify - time.Now().Unix() + 60*5
+			log.Println("--------:", timeSpaceing)
 			incurKey := fmt.Sprintf("SendEmail_%s_%d", d.GetSession("userId"), time.Now().Day())
 			//log.Println(incurKey)
 			if lastSendDEVerify == 0 || timeSpaceing < 0 {
@@ -731,7 +734,7 @@ func (d *DataExport) SendMailVerify() {
 					d.SetSession("DataExportVerifyEmail", email)
 					d.SetSession("DataExportVerify", verifyStr)
 					d.SetSession("CreatEVerifyTime", time.Now().Unix())
-					//log.Println("====================", verifyStr, "====================")
+					log.Println("====================", verifyStr, "====================", d.GetSession("CreatEVerifyTime"), "====================")
 					//发送邮箱验证码
 					go public.SendMailIdentCode(email, verifyStr, config.GmailAuth)
 					d.T["success"] = true

src/jfw/front/ws_dataExport.go

@@ -268,6 +268,7 @@ func (w *WsDataExport) ToCreateOrderPage() error {
 	//	w.DelSession("DataExportVerifyPhone_val")
 	email := w.GetSession("DataExportVerifyEmail_val")
 	resPhone := w.GetSession("DataExportVerifyPhone_val")
+	log.Println(util.Int64All(w.GetSession("CreatEVerifyTime")), "----", time.Now().Unix())
 	if email != nil {
 		lastSendDEVerify := util.Int64All(w.GetSession("CreatEVerifyTime"))
 		timeSpaceing := lastSendDEVerify - time.Now().Unix() + 60*5

src/jfw/front/wxMyOrder.go

@@ -362,11 +362,12 @@ func (w *WxMyOrder) WxToOrderDetail() error {
 			}
 		}
 		userid := util.ObjToString(w.GetSession("userId"))
+		myOpenid, _ = w.Session().Get("s_m_openid").(string)
 		if userid == "" {
 			return errors.New("未登录")
 		}
 	}
-	userid, _ := w.Session().Get("userId").(string)
+	myUserId, _ := w.Session().Get("userId").(string)
 	orderCode := w.GetString("orderCode")
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -379,8 +380,8 @@ func (w *WxMyOrder) WxToOrderDetail() error {
 	orderDetail := map[string]interface{}{}
 	filter := public.SieveCondition{}
 	queryMap := map[string]interface{}{
-		"order_code":  orderCode,
-		"user_openid": myOpenid,
+		"order_code": orderCode,
+		"user_id":    myUserId,
 	}
 	if orderCode != "" {
 		orderDetail = *public.Mysql.FindOne(tableName_order, queryMap, "", "")
@@ -438,7 +439,7 @@ func (w *WxMyOrder) WxToOrderDetail() error {
 		orderDetail["order_money"] = float64(orderMoney.(int64)) / 100
 	}
 	if orderDetail["id"] != nil && orderMoney != nil && orderDetail["order_code"] != nil {
-		orderDetail["token"] = public.GetWaitPayToken(orderDetail["id"].(int64), int(orderMoney.(int64)), orderDetail["order_code"].(string), util.ObjToString(orderDetail["pay_way"]), userid)
+		orderDetail["token"] = public.GetWaitPayToken(orderDetail["id"].(int64), int(orderMoney.(int64)), orderDetail["order_code"].(string), util.ObjToString(orderDetail["pay_way"]), myUserId)
 	}
 	//加密
 	orderDetail["filter_id"] = util.SE.Encode2Hex(orderDetail["filter_id"].(string))

src/jfw/front/wx_dataExport.go

@@ -41,6 +41,29 @@ func init() {
 //微信数据导出
 func (w *WxDataExport) ToSieve() error {
 	defer util.Catch()
+	orderCode := w.GetString("orderCode")
+	myUserId, _ := w.Session().Get("userId").(string)
+	if orderCode != "" && myUserId != "" {
+		//-----------------------
+		orderDetail := map[string]interface{}{}
+		filter := public.SieveCondition{}
+		queryMap := map[string]interface{}{
+			"order_code": orderCode,
+			"user_id":    myUserId,
+		}
+		if orderCode != "" {
+			orderDetail = *public.Mysql.FindOne("dataexport_order", queryMap, "filter", "")
+		}
+		if orderDetail["filter"] != nil {
+			err := json.Unmarshal([]byte(orderDetail["filter"].(string)), &filter)
+			if err == nil {
+				orderDetail["filter"] = filter
+			} else {
+				log.Println("筛选条件-关键词-结构体反序列化-错误", err)
+			}
+		}
+		w.T["orderDetail"] = orderDetail
+	}
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
 	myopenid, _ := w.Session().Get("s_m_openid").(string)

src/jfw/modules/app/src/app/front/dataExport.go

@@ -40,6 +40,31 @@ func init() {
 //微信数据导出
 func (w *WxDataExport) ToSieve() error {
 	defer util.Catch()
+	orderCode := w.GetString("orderCode")
+	myUserId, _ := w.Session().Get("userId").(string)
+	if orderCode != "" && myUserId != "" {
+		//-----------------------
+		orderDetail := map[string]interface{}{}
+		filter := public.SieveCondition{}
+		queryMap := map[string]interface{}{
+			"order_code": orderCode,
+			"user_id":    myUserId,
+		}
+		if orderCode != "" {
+			orderDetail = *public.Mysql.FindOne("dataexport_order", queryMap, "filter", "")
+		}
+		if orderDetail["filter"] != nil {
+			err := json.Unmarshal([]byte(orderDetail["filter"].(string)), &filter)
+			if err == nil {
+				orderDetail["filter"] = filter
+			} else {
+				log.Println("筛选条件-关键词-结构体反序列化-错误", err)
+			}
+		}
+		w.T["orderDetail"] = orderDetail
+	} else {
+		return errors.New("未登录")
+	}
 	w.Render("/dataExport/dataExport.html", &w.T)
 	return nil
 }

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -465,6 +465,99 @@
         $("#endtime").on("click",function(){
             $("#endtime").mobiscroll('show');
         });
+		var onceDetail = {{.T.orderDetail}}
+		if(onceDetail!=""){
+			var filter = onceDetail["filter"];
+	        //金额
+			localStorage.minprice = filter["minprice"]
+			localStorage.maxprice = filter["maxprice"]
+	        if((localStorage.minprice!==undefined&&localStorage.minprice!=="") || (localStorage.maxprice!==undefined&&localStorage.maxprice!=="")){
+				localStorage.price = filter["minprice"]+"万元-"+ filter["maxprice"]+"万元"
+	        }else{
+				localStorage.price = "";
+			}
+			//区域
+			if(filter["area"]!=null&&filter["area"]!=""){
+				localStorage.province = filter["area"];
+			}else{
+				localStorage.province = "";
+			}
+			if(filter["city"]!=null&&filter["city"]!=""){
+				localStorage.city = filter["city"].join(',');
+				localStorage.area = filter["city"].join(',').replace(/,/g," ");
+			}else{
+				localStorage.city = "";
+				localStorage.area = "";
+			}
+	        //行业
+			if(filter["industry"]!=null&&filter["industry"]!=""){
+				localStorage.industry = filter["industry"].join(',').replace(/,/g," ");	 
+			}else{
+				localStorage.industry = "";
+			}  
+	        //关键词
+			var keywords = JSON.stringify(filter["keywords"]);
+	        if(keywords!==""){
+	            var keyWord = JSON.parse(keywords);
+	            for(var i in keyWord){
+					keyWord[i]["keyWord"]=keyWord[i]["keyword"];
+	            }
+				localStorage.keyWord = JSON.stringify(keyWord);
+	        }else{
+				localStorage.keyWord = "";
+			}
+	        //信息类型
+			if(filter["subtype"]!=null&&filter["subtype"]!=""){
+				localStorage.subType = filter["subtype"].replace(/,/g," ");
+			}else{
+				localStorage.subType = "";
+			}
+			//采购单位
+	        if(filter["buyer"]!=null&&filter["buyer"].length>0){
+				localStorage.buyer = JSON.stringify(filter["buyer"])
+	        }else{
+				localStorage.buyer = "";
+			}
+	        //中标单位
+	        if(filter["winner"]!=null&&filter["winner"].length>0){
+				localStorage.winner = JSON.stringify(filter["winner"])
+	        }else{
+				localStorage.winner = "";
+			}
+	        //时间
+	        if(filter["publishtime"]!=""){
+				var timeflag = true;
+				$(".chooseTime ul>li").each(function(i,e){
+					var temp = $(e).find("span").attr("data-value");
+		            var start;
+		            var end;
+					if (temp.indexOf("_toNow") > 0) {
+                        start = new Date(Date.parse(temp.split("_")[0] + "-01-01 00:00:00".replace(/-/g,"/"))).getTime() / 1000;
+                        end = parseInt(new Date().getTime() / 1000);
+                    } else {
+                        start = new Date(Date.parse(temp.split("_")[0] + "-01-01 00:00:00".replace(/-/g,"/"))).getTime() / 1000;
+                        end = new Date(Date.parse(temp.split("_")[0] + "-12-31 23:59:59".replace(/-/g,"/"))).getTime() / 1000;
+                    }
+					var lasttime = start+"_"+end
+					if(filter["publishtime"]==lasttime){
+						localStorage.date = filter["publishtime"];
+			            localStorage.removeItem("export_starttime");
+			            localStorage.removeItem("export_endtime");
+						timeflag = false;
+					}
+				})
+				if(timeflag){
+					localStorage.date = "";
+					localStorage.export_starttime = filter["publishtime"].split("_")[0];
+					localStorage.export_endtime = filter["publishtime"].split("_")[1];
+				}
+	        }else{
+				localStorage.date = "";
+	            localStorage.removeItem("export_starttime");
+	            localStorage.removeItem("export_endtime");
+			}
+			window.history.replaceState({}, '数据导出', 'toSieve');
+		}
         //回显
         //金额
         if(localStorage.price!==undefined && localStorage.price!==""){

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -164,7 +164,7 @@
                         <i class="weui-icon-checked"></i>
                     </div>
                     <div class="weui-cell__bd read">
-                        <p>我已阅读，理解并接受 <a href="/jyapp/front/staticPage/dataExport_serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></p>
+                        <p>我已阅读，理解并接受 <a onclick="toRead()">《剑鱼标讯线上购买与服务条款》</a></p>
                     </div>
                 </label>
             </div>
@@ -257,6 +257,10 @@
 			var canpay = true;
 			//订单编号
 			var order_code = ""
+			//
+			var regInt = /[0-9]/;
+			var lstimes =0;
+			//
       		var pay_way="wx_app"
 			function accMul(arg1, arg2) {
 				var m = 0,
@@ -294,17 +298,28 @@
 				$(".pay_discount").text("￥" + shouldPay);
 				$(".pay_before").text("￥" + beforePay)
 			}
+			//
+			function toRead(){
+				event.preventDefault();
+				if(regInt.test($(".sendCode").text())){
+					var email_input = $(".email_input").val().replace(/\s*/g, "");
+					if (/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email_input)){
+						sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
+					}
+				}
+				window.location.href="/jyapp/front/staticPage/dataExport_serviceterms.html";
+			}
 			$(function() {     
 				//进入其他页面 验证码显示 
 				if(sessionStorage.email_sign=="1"){
 					$(".form-control").show();
 				}
 				//返回键
-					$(".app-layout-header .app-back_").unbind("tap").on("tap",function(){
-							setTimeout(function(){
-								window.history.back();
-							},300)
-					});
+				$(".app-layout-header .app-back_").unbind("tap").on("tap",function(){
+						setTimeout(function(){
+							window.history.back();
+						},300)
+				});
 				if(sessionStorage.pay_way){
 					if(sessionStorage.pay_way=="ali_app"){
 						$(".payment").text("支付宝支付");
@@ -321,6 +336,13 @@
 					readClause=true;
 					sessionStorage.readClause="true";
 					$(".toPay").removeAttr("disabled");
+					if(!$(".fixed-bottom-box .weui-check").is(":checked")){
+						$(".fixed-bottom-box .weui-check").click();
+					}
+				}else{
+					if($(".fixed-bottom-box .weui-check").is(":checked")){
+						$(".fixed-bottom-box .weui-check").click();
+					}
 				}
 				//软键盘弹起 
 				var oHeight = $(document).height(); //浏览器当前的高度
@@ -333,13 +355,18 @@
 					    $("#bottombox").css("position","fixed");
 					}
 			   	});
-				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null){
+				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 lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}))
-					//clearInterval(r)
-					//sendemailTimer(lstimes);
+					lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}));
+					$(".verity_input").removeAttr("readonly");
+					lstimes = lstimes -  Date.parse(new Date())/1000 + 60*5;
+					if (lstimes>0){
+						sendemailTimer(lstimes);
+					}
+					//sessionStorage.removeItem("send_code_"+{{.T._id}});
+					sessionStorage.removeItem("send_email_"+{{.T._id}});
 				}else {
 					if (sessionStorage.getItem("order_email"+userId+ {{.T._id}}) != null) {
 						$(".email_check_ok").show();
@@ -557,6 +584,8 @@
 								$(".verity_input").removeAttr("readonly");;
 								$(".sendCode").attr("disabled", "disabled");
 								$(".email_input").attr("readonly", true);
+								//sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
+								sessionStorage.setItem("send_code_"+{{.T._id}}, Date.parse(new Date())/1000);
 							}
 						} else {
 							EasyAlert.show(data.errMsg, "", 3000)
@@ -617,6 +646,23 @@
 				$(".dataPreview").on("tap",function(){
 					if(previewDataTime<50){
 						previewDataTime++
+						if(regInt.test($(".sendCode").text())){
+							var email_input = $(".email_input").val().replace(/\s*/g, "");
+							if (/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email_input)){
+							sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
+							}
+						}
+						if ($(".fixed-bottom-box .weui-check").is(":checked")) {
+							readClause = true;
+							sessionStorage.readClause="true";
+							if (finishEmailVerity && finishPhoneVerity) {
+								$(".toPay").removeAttr("disabled")
+							}
+						} else {
+							readClause = false;
+							sessionStorage.readClause="false";
+							$(".toPay").attr("disabled", "disabled");
+						}
 						window.location.href="/jyapp/front/dataExport/previewData/"+{{.T._id}}+"?dataType="+dataType;
 					}else{
 						EasyAlert.show("预览数据次数超出今日上限！","",3000);
@@ -643,7 +689,6 @@
 					}
 					param.data_spec = dataType == 2 ? "senior" : "standard";
 					param.id = {{.T._id}}
-					console.log(param.id)
 					param.sourcePage = "weixin"
 					//先去创建预支付订单
 					/*-----------------*/
@@ -668,9 +713,6 @@
         //支付完成跳转
         function checkPaySuccess(orderCode){
           if(interval){
-             //清除我已阅读缓存
-	        sessionStorage.removeItem("readClause");
-		    sessionStorage.removeItem("index");
             clearInterval(interval);
           }
          interval=setInterval(function() {
@@ -678,6 +720,9 @@
 							code: orderCode
 						}, function(r) {
 								if (r.success) {
+						            //清除我已阅读缓存
+							        sessionStorage.removeItem("readClause");
+								    sessionStorage.removeItem("index");
 									clearInterval(interval);
 									window.location.replace("/jyapp/front/dataExport/paySuccessPage?code=" + r.orderCode+"&email="+r.email+"&payTime="+r.payTime+"&pay_way="+r.pay_way);
 								}
@@ -689,14 +734,10 @@
 			function sendemailTimer(t) {
 				$(".sendCode").text("" + t + "s");
 				$(".sendCode").attr("disabled", "disabled");
-				sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 				r = setInterval(function() {
 					t--;
 					$(".sendCode").text("" + t + "s")
-					sessionStorage.setItem("send_code_"+{{.T._id}}, t);
 					if (t <= 0) {
-						sessionStorage.removeItem("send_code_"+{{.T._id}});
-						sessionStorage.removeItem("send_email_"+{{.T._id}});
 						clearInterval(r)
 						$(".sendCode").text("发送验证码");
 						if (!finishEmailVerity) {

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -468,9 +468,10 @@
 				}
 			}
 			
-			function onceMore(obj){
+			function onceMore(e){
 				sessionStorage.orderTabActive=$("ul .active").index();
-				window.location.href="/jyapp/front/dataExport/toSieve";
+				var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+				window.location.href="/jyapp/front/dataExport/toSieve?orderCode="+orderCode;;
 			}
 
 
@@ -1122,7 +1123,7 @@
                         	iconHtml=""
                         	iconHtml+='<div class="card-footer">'
 										//+'<a href="/jyapp/front/dataExport/toSieve" class="btn cancle">再次购买</a>'
-										+'<a onclick="onceMore()" class="btn cancle">再次购买</a>'
+										+'<a onclick="onceMore(this)" class="btn cancle">再次购买</a>'
 									+'</div>'
                         }else if(orderStatus==-2){
                         	orderStatus="已取消";
@@ -1131,9 +1132,7 @@
                         	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
                         	iconHtml="";
                         	iconHtml+='<div class="card-footer">'
-										//+'<a href="/jyapp/front/dataExport/toSieve" class="btn cancle">再次购买</a>'
-										+'<a onclick="onceMore()" class="btn cancle">再次购买</a>'
-										//+"<a onclick=\"onceMore("+objstr+")\" class=\"btn cancle\">再次购买</a>"
+										+'<a onclick="onceMore(this)" class="btn cancle">再次购买</a>'
 									+'</div>'
                         }
                         //订单总数

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -497,7 +497,7 @@
 			
 			//再次购买
 			function payAgain(){
-				window.location.href="/jyapp/front/dataExport/toSieve";
+				window.location.href="/jyapp/front/dataExport/toSieve?orderCode={{.T.o.order_code}}";
 			}
 			
 			function FormatNum(n){

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

@@ -419,6 +419,99 @@
         $("#endtime").on("click",function(){
             $("#endtime").mobiscroll('show');
         });
+		var onceDetail = {{.T.orderDetail}}
+		if(onceDetail!=""){
+			var filter = onceDetail["filter"];
+	        //金额
+			localStorage.minprice = filter["minprice"]
+			localStorage.maxprice = filter["maxprice"]
+	        if((localStorage.minprice!==undefined&&localStorage.minprice!=="") || (localStorage.maxprice!==undefined&&localStorage.maxprice!=="")){
+				localStorage.price = filter["minprice"]+"万元-"+ filter["maxprice"]+"万元"
+	        }else{
+				localStorage.price = "";
+			}
+			//区域
+			if(filter["area"]!=null&&filter["area"]!=""){
+				localStorage.province = filter["area"];
+			}else{
+				localStorage.province = "";
+			}
+			if(filter["city"]!=null&&filter["city"]!=""){
+				localStorage.city = filter["city"].join(',');
+				localStorage.area = filter["city"].join(',').replace(/,/g," ");
+			}else{
+				localStorage.city = "";
+				localStorage.area = "";
+			}
+	        //行业
+			if(filter["industry"]!=null&&filter["industry"]!=""){
+				localStorage.industry = filter["industry"].join(',').replace(/,/g," ");	 
+			}else{
+				localStorage.industry = "";
+			}  
+	        //关键词
+			var keywords = JSON.stringify(filter["keywords"]);
+	        if(keywords!==""){
+	            var keyWord = JSON.parse(keywords);
+	            for(var i in keyWord){
+					keyWord[i]["keyWord"]=keyWord[i]["keyword"];
+	            }
+				localStorage.keyWord = JSON.stringify(keyWord);
+	        }else{
+				localStorage.keyWord = "";
+			}
+	        //信息类型
+			if(filter["subtype"]!=null&&filter["subtype"]!=""){
+				localStorage.subType = filter["subtype"].replace(/,/g," ");
+			}else{
+				localStorage.subType = "";
+			}
+			//采购单位
+	        if(filter["buyer"]!=null&&filter["buyer"].length>0){
+				localStorage.buyer = JSON.stringify(filter["buyer"])
+	        }else{
+				localStorage.buyer = "";
+			}
+	        //中标单位
+	        if(filter["winner"]!=null&&filter["winner"].length>0){
+				localStorage.winner = JSON.stringify(filter["winner"])
+	        }else{
+				localStorage.winner = "";
+			}
+	        //时间
+	        if(filter["publishtime"]!=""){
+				var timeflag = true;
+				$(".chooseTime ul>li").each(function(i,e){
+					var temp = $(e).find("span").attr("data-value");
+		            var start;
+		            var end;
+					if (temp.indexOf("_toNow") > 0) {
+                        start = new Date(Date.parse(temp.split("_")[0] + "-01-01 00:00:00".replace(/-/g,"/"))).getTime() / 1000;
+                        end = parseInt(new Date().getTime() / 1000);
+                    } else {
+                        start = new Date(Date.parse(temp.split("_")[0] + "-01-01 00:00:00".replace(/-/g,"/"))).getTime() / 1000;
+                        end = new Date(Date.parse(temp.split("_")[0] + "-12-31 23:59:59".replace(/-/g,"/"))).getTime() / 1000;
+                    }
+					var lasttime = start+"_"+end
+					if(filter["publishtime"]==lasttime){
+						localStorage.date = filter["publishtime"];
+			            localStorage.removeItem("export_starttime");
+			            localStorage.removeItem("export_endtime");
+						timeflag = false;
+					}
+				})
+				if(timeflag){
+					localStorage.date = "";
+					localStorage.export_starttime = filter["publishtime"].split("_")[0];
+					localStorage.export_endtime = filter["publishtime"].split("_")[1];
+				}
+	        }else{
+				localStorage.date = "";
+	            localStorage.removeItem("export_starttime");
+	            localStorage.removeItem("export_endtime");
+			}
+			window.history.replaceState({}, '数据导出', 'toSieve');
+		}
         //回显
         //金额
         if(localStorage.price!==undefined && localStorage.price!==""){
@@ -572,7 +665,6 @@
             sessionStorage.removeItem("keyWord")
         }
         //
-
         //筛选条件发送
         $(".saveData").on('click', function () {
             var area = "";

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

@@ -163,7 +163,7 @@
                                     <i class="weui-icon-checked"></i>
                                 </div>
                                 <div class="weui-cell__bd read">
-                                    <p>我已阅读，理解并接受 <a href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></p>
+                                    <p>我已阅读，理解并接受 <a onclick="toRead()">《剑鱼标讯线上购买与服务条款》</a></p>
                                 </div>
                             </label>
                         </div>
@@ -237,6 +237,9 @@
 		</div>
 
         <script>
+			//节后待处理：
+			//用户输入邮箱验证，点击获取验证码，在没有输入验证码的情况下，1.点击预览或者条款，返回后存session的邮件缓存和剩余时间，（返回后页面不会读取后台新的剩余数量，需处理一下。）处理后清除。2.返回上一页，重新点击数据导出到此页面，之前填写的邮件缓存等已不存在，但是剩余时间还在，当下的处理是时间直接显示，存在缺陷，需要出现发送验证按钮 ，如果此次属于邮箱和上次属于邮箱一致，则剩余时间继续减少，否则，重新发送验证。
+			//记录send_code_*改为发送验证码的时间-返回后重新计算剩余时间（同后台）。
 			var msgCount={{.T.msgCount}}
 			var msgMaxCount={{.T.msgMaxCount}}
 			var discount={{.T.discount}}
@@ -255,7 +258,10 @@
 			//可以支付
 			var canpay=true;
 			//订单编号
-			var order_code = ""
+			var order_code = "";
+			//
+			var regInt = /[0-9]/;
+			var lstimes =0;
 			function accMul(arg1,arg2){  
 				 var m=0,s1=arg1.toString(),s2=arg2.toString();  
 				 try{m+=s1.split(".")[1].length}catch(e){}  
@@ -284,6 +290,18 @@
 				$(".pay_discount").text("￥"+shouldPay);
 				$(".pay_before").text("￥"+beforePay)
 			}
+			//
+			function toRead(){
+				event.preventDefault();
+				if(regInt.test($(".sendCode").text())){
+					var email_input = $(".email_input").val().replace(/\s*/g, "");
+					if (/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email_input)){
+						sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
+					}
+				}
+				window.location.href="/front/staticPage/wx-serviceterms.html";
+			}
+			//
             $(function() {			
             	//进入其他页面 验证码显示 
 				if(sessionStorage.email_sign=="1"){
@@ -299,9 +317,13 @@
 					readClause=true;
 					sessionStorage.readClause="true";
 					$(".toPay").removeAttr("disabled");
-					$(".fixed-bottom-box .weui-check").attr("checked",true);
+					if(!$(".fixed-bottom-box .weui-check").is(":checked")){
+						$(".fixed-bottom-box .weui-check").click();
+					}
 				}else{
-					$(".fixed-bottom-box .weui-check").attr("checked",false);
+					if($(".fixed-bottom-box .weui-check").is(":checked")){
+						$(".fixed-bottom-box .weui-check").click();
+					}
 				}
 				//软键盘弹起 
 				var oHeight = $(document).height(); //浏览器当前的高度
@@ -312,13 +334,18 @@
 					    $("#bottombox").css("position","fixed");
 					}
 			   	});
-				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null){
+				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 lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}))
-					//clearInterval(r)
-					//sendemailTimer(lstimes);
+					lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}));
+					$(".verity_input").removeAttr("readonly");
+					lstimes = lstimes -  Date.parse(new Date())/1000 + 60*5;
+					if (lstimes>0){
+						sendemailTimer(lstimes);
+					}
+					//sessionStorage.removeItem("send_code_"+{{.T._id}});
+					sessionStorage.removeItem("send_email_"+{{.T._id}});
 				}else {
 					if (sessionStorage.getItem("order_email"+{{.T._id}})!=null){
 						$(".email_check_ok").show();
@@ -332,6 +359,10 @@
 				}
 				if(email_lastVerity>0){
 					sendemailTimer(email_lastVerity);
+					$(".verity_input").removeAttr("readonly");
+				}else if(lstimes>0){
+					sendemailTimer(lstimes);
+					$(".verity_input").removeAttr("readonly");
 				}
 				if (sessionStorage.getItem("order_phone"+{{.T._id}})!=null){
 					$(".phone_check_ok").show();
@@ -506,6 +537,8 @@
 								$(".verity_input").removeAttr("readonly");
 								$(".sendCode").attr("disabled","disabled");
 								$(".email_input").attr("readonly",true);
+								sessionStorage.setItem("send_code_"+{{.T._id}}, Date.parse(new Date())/1000);
+
 							}
 						}else{
 							EasyAlert.show(data.errMsg,"",3000)
@@ -524,8 +557,6 @@
 					if(verity.length==6){
 						$.post("/front/dataExport/checkMailVerify",{"emailVerity":verity,"email":email},function(data){
 							if(data.success){
-								sessionStorage.removeItem("send_code_"+{{.T._id}});
-								sessionStorage.removeItem("send_email_"+{{.T._id}});
 								finishEmailVerity=true;
 								if(readClause&&finishPhoneVerity){
 									$(".toPay").removeAttr("disabled")
@@ -568,6 +599,24 @@
 					if(previewDataTime<50){
 						previewDataTime++
 						var dataType = $(".choose").find("div.active").index()+1;
+						//缓存
+						if(regInt.test($(".sendCode").text())){
+							var email_input = $(".email_input").val().replace(/\s*/g, "");
+							if (/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email_input)){
+								sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
+							}
+						}
+						if ($(".fixed-bottom-box .weui-check").is(":checked")) {
+							readClause = true;
+							sessionStorage.readClause="true";
+							if (finishEmailVerity && finishPhoneVerity) {
+								$(".toPay").removeAttr("disabled")
+							}
+						} else {
+							readClause = false;
+							sessionStorage.readClause="false";
+							$(".toPay").attr("disabled", "disabled");
+						}
 						window.open("/front/wx_dataExport/toPreview/"+{{.T._id}}+"?dataType="+dataType);
 					}else{
 						EasyAlert.show("预览数据次数超出今日上限！","",3000);
@@ -624,6 +673,9 @@
 					},
 					function(r){
 				        if(r.err_msg == "get_brand_wcpay_request:ok"){
+							//清除我已阅读缓存
+							sessionStorage.removeItem("readClause");
+							sessionStorage.removeItem("index");
 							$(".toPay").attr("disabled","disabled");
 							var email_pay = sessionStorage.getItem("order_email"+{{.T._id}})
 							window.location.replace("/front/wx_dataExport/paySuccessPage?email="+email_pay+"&orderCode="+order_code+"&payTime="+res["timestamp"])
@@ -642,14 +694,10 @@
 			function sendemailTimer(t){
 				$(".sendCode").text(""+t+"s");
 				$(".sendCode").attr("disabled","disabled");
-				sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 				r=setInterval(function(){
 					t--;
 					$(".sendCode").text(""+t+"s")
-					sessionStorage.setItem("send_code_"+{{.T._id}}, t);
 					if(t<=0){
-						sessionStorage.removeItem("send_code_"+{{.T._id}});
-						sessionStorage.removeItem("send_email_"+{{.T._id}});
 						clearInterval(r);
 						$(".sendCode").text("发送验证码");
 						if(!finishEmailVerity){

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

@@ -266,7 +266,7 @@
 							}else{
 								//typ=0 更改 显示已完成 
 								$(e).parent(".card-footer").parent(".card").children(".card-header").children(".status").html('<span class="status " style="color:#1d1d1d">已完成</span>');
-								$(e).parent(".card-footer").html('<a onclick="onceMore()" class="btn cancle">再次购买</a>');
+								$(e).parent(".card-footer").html('<a onclick="onceMore(this)" class="btn cancle">再次购买</a>');
 								//支付过的订单 存入缓存 便于 更新数据
 //								if(JSON.parse(sessionStorage.getItem("payMsg"))){
 //									var pa =JSON.parse(sessionStorage.getItem("payMsg"));
@@ -448,11 +448,11 @@
 				}
 			}
 			
-			function onceMore(){
+			function onceMore(e){
 				sessionStorage.orderTabActive=$("ul .active").index();
-				window.location.href="/front/wx_dataExport/toSieve";
+				var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+				window.location.href="/front/wx_dataExport/toSieve?orderCode="+orderCode;
 			}
-
 			function deleteOrder(id,obj) {
 			        $.confirm({
 			            title: '提示信息',
@@ -557,7 +557,7 @@
 											                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
 											                        	iconHtml=""
 											                        	iconHtml+='<div class="card-footer">'
-																					+'<a onclick="onceMore()" class="btn cancle">再次购买</a>'
+																					+'<a onclick="onceMore(this)" class="btn cancle">再次购买</a>'
 																					//+'<a href="/front/wxMyOrder/wxToOrderDetail/'+orderCode+'" class="btn cancle">查看详情</a>'
 																				+'</div>'
 											                        }
@@ -677,7 +677,7 @@
 			                                   					 var self = $(obj).parent(".card-footer").prev(".card-content").prev(".card-header").children(".notpay");
 			                                   					 self.text("已取消");
 			                                   					 self.css("color","black");
-			                                   					 $(obj).parent(".card-footer").html('<a onclick="onceMore()" class="btn cancle">再次购买</a>')
+			                                   					 $(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
 			                                                }
 			                                            }
 			                                        }
@@ -1021,7 +1021,7 @@
                         		orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
 	                        	iconHtml=""
 	                        	iconHtml+='<div class="card-footer">'
-											+'<a onclick="onceMore()" class="btn cancle">再次购买</a>'
+											+'<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>'
 										+'</div>'
 	                        }else if(orderStatus==-2){
 	                        	orderStatus="已取消";
@@ -1030,7 +1030,7 @@
 	                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
 	                        	iconHtml="";
 	                        	iconHtml+='<div class="card-footer">'
-											+'<a onclick="onceMore()" class="btn cancle">再次购买</a>'
+											+'<a onclick="onceMore(this)" class="btn cancle">再次购买</a>'
 										+'</div>'
 	                        }
 	                        //关键词

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

@@ -506,12 +506,12 @@
 					</div>
 					{{if ne .T.o.order_status -2}}
 					{{if .T.o.pay_time}}
-					<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve'">再次购买</div>
+					<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve?orderCode={{.T.o.order_code}}'">再次购买</div>
 					{{else}}
 					<div class="button align bottomButton" id="buy" onclick="goPay()">去支付</div>
 					{{end}}
 					{{else}}
-					<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve'">再次购买</div>
+					<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve?orderCode={{.T.o.order_code}}'">再次购买</div>
 					{{end}}
 				</div>
 			</main>