Procházet zdrojové kódy

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

zhangxinlei1996 před 6 roky
rodič
revize
4e1e7f9c35

+ 1 - 0
src/jfw/modules/app/src/app/front/login.go

@@ -845,6 +845,7 @@ func createSession(s *httpsession.Session, person map[string]interface{}, loginI
 	s.Set("s_headimageurl", person["s_headimageurl"])
 	if qutil.ObjToString(person["s_phone"]) != "" {
 		phone := person["s_phone"].(string)
+		s.Set("s_phone", phone)
 		phone = string(phone[0:3]) + "****" + string(phone[len(phone)-4:])
 		s.Set("s_nickname", phone)
 	} else {

+ 113 - 9
src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -24,12 +24,120 @@ type WsDataExport struct {
 	paySuccessPage    xweb.Mapper `xweb:"/jyapp/front/wx_dataExport/paySuccessPage"`    //微信数据导出-支付成功页面
 	getPayParm        xweb.Mapper `xweb:"/jyapp/front/wx_dataExport/getPayParm"`        //微信数据导出-获取微信支付参数
 	toCreateOrderPage xweb.Mapper `xweb:"/jyapp/front/wx_dataExport/toCreateOrderPage"` //微信数据导出-订单微信支付
+	sendMailVerify    xweb.Mapper `xweb:"/jyapp/front/dataExport/sendMailVerify"`       //发送邮箱验证码
+	checkMailVerify   xweb.Mapper `xweb:"/jyapp/front/dataExport/checkMailVerify"`      //验证邮箱验证码
+	checkPhoneVerify  xweb.Mapper `xweb:"/jyapp/front/dataExport/checkPhoneVerify"`     //验证手机号
 }
 
 func init() {
 	xweb.AddAction(&WsDataExport{})
 }
 
+//发送邮件
+func (w *WsDataExport) SendMailVerify() {
+	email := w.GetString("email")
+	if isEmail(email) {
+		var email_used = true
+		if email != w.GetSession("DataExportVerifyEmail") {
+			w.DelSession("CreatEVerifyTime")
+			//			openid := util.ObjToString(w.GetSession("s_m_openid"))
+			userId := util.ObjToString(w.GetSession("userId"))
+			emails := public.Mysql.FindOne("dataexport_order", map[string]interface{}{
+				"user_mail": email,
+				"user_id":   userId,
+			}, "user_mail", "")
+			if emails != nil && util.ObjToString((*emails)["user_mail"]) != "" {
+				email_used = false
+				w.T["success"] = true
+				w.T["errCode"] = 4
+				w.T["errMsg"] = "此邮箱已被验证"
+				w.SetSession("DataExportVerifyEmail_val", email)
+				w.SetSession("EMVerifySucess", true)
+			}
+		}
+		if email_used {
+			lastSendDEVerify := util.Int64All(w.GetSession("CreatEVerifyTime"))
+			timeSpaceing := lastSendDEVerify - time.Now().Unix() + 60*5
+			incurKey := fmt.Sprintf("SendEmail_%s_%d", w.GetSession("userId"), time.Now().Day())
+			//log.Println(incurKey)
+			if lastSendDEVerify == 0 || timeSpaceing < 0 {
+				//每日限制10次
+				times := util.IntAll(redis.Get("other", incurKey))
+				if times < 10 {
+					if times == 0 {
+						redis.Put("other", incurKey, 1, 24*60*60)
+					} else {
+						redis.Incr("other", incurKey)
+					}
+					//生成随机数
+					verifyStr := strings.ToUpper(util.GetComplexRandom(6, 3, 3))
+					w.SetSession("EMVerifySucess", false)
+					w.SetSession("DataExportVerifyEmail", email)
+					w.SetSession("DataExportVerify", verifyStr)
+					w.SetSession("CreatEVerifyTime", time.Now().Unix())
+					log.Println("====================", verifyStr, "====================", w.GetSession("DataExportVerify"))
+					//发送邮箱验证码
+					go public.SendMailIdentCode(email, verifyStr, config.GmailAuth)
+					w.T["success"] = true
+				} else {
+					w.T["success"] = false
+					w.T["errCode"] = 3
+					w.T["time"] = timeSpaceing
+					w.T["errMsg"] = "验证码发送次数已达到今日上限"
+				}
+
+			} else {
+				w.T["success"] = false
+				w.T["errCode"] = 2
+				w.T["time"] = timeSpaceing
+				w.T["errMsg"] = "已发送,5分钟后再尝试"
+			}
+		}
+	} else {
+		w.T["success"] = false
+		w.T["errCode"] = 1
+		w.T["errMsg"] = "邮箱格式不正确"
+	}
+	w.ServeJson(&w.T)
+}
+
+//验证手机号
+func (w *WsDataExport) CheckPhoneVerify() {
+	phone := w.GetString("phone")
+	verityResult := false
+	if isPhone(phone) {
+		verityResult = true
+		w.SetSession("DataExportVerifyPhone", phone)
+	}
+	w.T["success"] = verityResult
+	w.ServeJson(&w.T)
+}
+
+//验证邮箱
+func (w *WsDataExport) CheckMailVerify() {
+	email := w.GetString("email")
+	emailVerity := w.GetString("emailVerity")
+
+	DataExportEmail := w.GetSession("DataExportVerifyEmail")
+	DataExportVerify := w.GetSession("DataExportVerify")
+	log.Println(email, emailVerity, "---", DataExportEmail, DataExportVerify)
+	verityResult := false
+	if emailVerity != "" && emailVerity == DataExportVerify && email != "" && email == DataExportEmail {
+		verityResult = true
+		w.DelSession("DataExportVerify")
+		w.DelSession("CreatEVerifyTime")
+		w.SetSession("EMVerifySucess", true)
+		w.SetSession("DataExportVerifyEmail_val", DataExportEmail)
+	}
+	w.T["success"] = verityResult
+	w.ServeJson(&w.T)
+}
+
+func isEmail(value string) bool {
+	var emailPattern = regexp.MustCompile("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$")
+	return emailPattern.MatchString(value)
+}
+
 //
 func (w *WsDataExport) GetPayParm() error {
 	defer util.Catch()
@@ -133,7 +241,7 @@ func (w *WsDataExport) ToPreview(_id string) error {
 func (w *WsDataExport) ToCreateOrderPage() error {
 	defer util.Catch()
 	id := util.SE.Decode4Hex(w.GetString("id"))
-	openid := util.ObjToString(w.GetSession("s_m_openid"))
+	s_phone := util.ObjToString(w.GetSession("s_phone"))
 	userId := util.ObjToString(w.GetSession("userId"))
 	if userId == "" {
 		return errors.New("未登录")
@@ -146,11 +254,6 @@ func (w *WsDataExport) ToCreateOrderPage() error {
 		w.Render("/dataExport/404.html", &w.T)
 		return nil
 	}
-	//订单数据存入session中
-	w.SetSession("dataexport_waitcreateorder", map[string]interface{}{
-		"id":         id,       //用户的筛选条件mongodb中的id string
-		"data_count": msgCount, //匹配到的数据总数 int
-	})
 	//邮箱验证
 	//	w.DelSession("DataExportVerifyEmail_val")
 	//	w.DelSession("DataExportVerifyPhone_val")
@@ -185,9 +288,10 @@ func (w *WsDataExport) ToCreateOrderPage() error {
 	if phone != nil && phone != "" {
 		w.T["phone"] = phone
 	} else {
-		//剑鱼助手手机号登录
-		if isPhone(openid) {
-			phone = openid
+		//app手机号登录
+		log.Println("s_phone:", s_phone)
+		if isPhone(s_phone) {
+			phone = s_phone
 		} else {
 			phone = resPhone
 		}

+ 0 - 142
src/jfw/modules/app/src/config.json

@@ -1,146 +1,4 @@
 {
-    "mongodbServers": "192.168.3.11:27080",
-    "mongodbPoolSize": "5",
-    "mongodbName": "qfw",
-    "influxaddr": "http://192.168.3.207:8086",
-    "influxdb": "jy_logs",
-    "elasticsearch": "http://192.168.3.11:9800",
-    "elasticPoolSize": 30,
-    "redisaddrs": "other=192.168.3.11:1712,push=192.168.3.11:1712,pushcache_1=192.168.3.11:2001,pushcache_2_a=192.168.3.18:2002,pushcache_2_b=192.168.3.18:2003,sso=192.168.3.18:1712,session=192.168.3.11:1712,recovery=192.168.3.11:1712",
-    "webport": "89",
-    "weixinrpc": "127.0.0.1:8083",
-    "cassandra": {
-        "log": {
-            "host": [
-                "192.168.3.207"
-            ],
-            "size": 5,
-            "port": 9043
-        },
-        "push": {
-            "host": [
-                "192.168.3.207"
-            ],
-            "size": 5
-        }
-    },
-    "cacheflag": false,
-    "mysql": {
-        "dbName": "jianyu",
-        "address": "192.168.3.11:3366",
-        "userName": "root",
-        "passWord": "Topnet123"
-    },
-    "agreement": "http",
-    "webdomain": "http://web-jydev-xzh.jianyu360.cn",
-    "redirect": {
-        "wxpushlist": "/jyapp/wxpush/bidinfo/%s",
-        "newInfoFollow": "/jyapp/followent/newInfo/%s",
-        "wxpushfollowlist": "/jyapp/follow/notice/%s/%s",
-        "followset": "/jyapp/follow/set/%s/%s",
-        "myfeedbacks": "/jyapp/swordfish/myFeedbacks",
-        "historypush": "/jyapp/swordfish/historypush?f=push",
-        "followEntDetail": "/jyapp/followent/detail/%s"
-    },
-    "followProject": 10,
-    "followentlimit": "10",
-    "followLimitDay": 30,
-    "followTipMsg": {
-        "title": "您关注的项目《%s》将于%s开标!",
-        "remark": "您收到这条信息是因为您之前设置了项目开标提醒,如果您不再需要此类提醒,可点击下方“详情”修改提醒设置。"
-    },
-    "followPushRpc": "127.0.0.1:8759",
-    "recommendThreshold": 0.5,
-    "rewardText": [
-        "憋说话!赏我!",
-        "“赏”就一个字 我只说一次",
-        "厉害了word鱼!",
-        "看官赏点银子偶会更卖力噢!",
-        "各位客官,快来赏点吧!",
-        "夸我还是含蓄点的好,赏一个吧~",
-        "爱,就供养;喜欢,就打赏!",
-        "请简单粗暴地爱我!",
-        "最喜欢你一言不合就打赏的样子了~~~么么!"
-    ],
-    "advertText": [
-        "与其一个人孤单  不如一群人狂欢   赶快加入剑鱼标讯社区",
-        "加入剑鱼标讯社区  和投标大神做朋友",
-        "来剑鱼标讯社区  找最合拍的伙伴",
-        "剑鱼标讯社区,让沟通连接你我。",
-        "剑鱼标讯社区,分享你的知识、解决问题、行业资源交换",
-        "勇敢发声,和老司机一起畅聊招投标。",
-        "春风十里,不如来剑鱼标讯社区!",
-        "只要心相通,相隔千里也能畅快交流。",
-        "弹指一挥间,剑鱼标讯因你而不同!",
-        "携手同行,认真对待每一次招投标"
-    ],
-    "advertImg": "/jyapp/images/advert.png",
-    "advertName": "广告",
-    "advertUrl": "/jyapp/free/swordfish/about",
-    "industry": "分类综合测试",
-    "recommendEntLimit": "50",
-    "update": {
-        "version": "1.0.7",
-        "mustupdate": false,
-        "tipspace": 86400,
-        "ios_version": "2.7.3",
-        "ios_mustupdate": false,
-        "ios_openUpdate": false,
-        "apkurl": "http://web-jydev-wky.jianyu360.cn/jyapp/res/%s/jianyu360.apk",
-        "channelDir": {
-            "baidu": "baiduSem",
-            "shenma": "shenmaSem",
-            "huawei": "huawei",
-            "xiaomi": "xiaomi",
-            "yingyongbao": "yingyongbao",
-            "douyin": "douyin",
-            "weixin": "jywx",
-            "topnet": "topnet",
-            "duanxin": "duanxin",
-            "default": "topnet"
-        }
-    },
-    "limitSearchText": {
-        "flag": false,
-        "count": 3,
-        "timeout": 60,
-        "totalPage": 3,
-        "userIds": [
-            "ocXeA0jceF8KRunDkwf9egT4bKI8",
-            "ocXeA0nBnaRZhKEZYhMBGvd4NvH0",
-            "ocXeA0rBxfsr_4GzysQFzF3Cf81U"
-        ],
-        "msg": "f 开关状态:%s //-2 从配置文件重置,-1 关闭,1 打开<br><br>c 并发数:%d //-2 不限制并发数,-1 无条件直接限制,>0 限制并发数<br><br>t 个人查询限制时间:%ds //-1 不限制<br><br>p 限制页数:%d"
-    },
-    "share": {
-        "forceShareEnabled": false,
-        "onlineDate": "2018-08-20 00:00:00",
-        "regDaysForNewUser": 5,
-        "shareIntervalDays": 7,
-        "startHour": 8,
-        "endHour": 17,
-        "shareTimesUpperLimitR": 4000,
-        "shareTimesUpperLimitIrr": 1000
-    },
-    "appPushServiceRpc": "127.0.0.1:5566",
-    "appPower": {
-        "grayflag": false
-    },
-    "afterSavePushId": 60,
-    "mail": [
-        {
-            "addr": "smtp.exmail.qq.com",
-            "port": 465,
-            "pwd": "ue9Rg9Sf4CVtdm5a",
-            "user": "public03@topnet.net.cn"
-        },
-        {
-            "addr": "smtp.exmail.qq.com",
-            "port": 465,
-            "pwd": "ue9Rg9Sf4CVtdm5a",
-            "user": "public03@topnet.net.cn"
-        }
-    ]
 	"mongodbServers": "192.168.3.11:27080",
 	"mongodbPoolSize": "5",
 	"mongodbName": "qfw",

+ 41 - 0
src/jfw/modules/app/src/web/staticres/jyapp/css/myorder/base.css

@@ -94,4 +94,45 @@ em,i{
 }
 .hide{
 	display: none;
+}
+body .loading_ {
+    height: 100%;
+    width: 100%;
+    position: fixed;
+    background: #382f3d;
+    z-index: 999999999990;
+	opacity: .7;
+	    margin-top: 20px;
+}
+body .loading_ > p {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    margin: auto;
+    height: 60px;
+    width: 60px;
+    text-align: center;
+    line-height: 60px;
+    font-size: 0.36rem;
+    color: rgba(44, 183, 202, 0.8);
+}
+body .loading_ p span {
+    position: absolute;
+    display: block;
+    height: 40px;
+    width: 40px;
+    margin: 10px;
+    border-radius: 50%;
+    -webkit-box-shadow: 0 2px 3px rgba(44, 183, 202, 0.8);
+    animation: loading_ ease 1s infinite;
+    left: 0;
+    top: 0;
+}
+@keyframes loading_ {
+  0% {
+    transform: rotate(0deg); }
+  100% {
+    transform: rotate(360deg); } 
 }

+ 7 - 1
src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -158,6 +158,7 @@ var SuperSearch = {
 		});
 		//提交查询
 		$("#supersearchPage .query").on("click",function(){
+			$(".loading_").show();
 			SuperSearch.formSubmit("N");
 		});
 		$("#supersearchPage .jyshxbottom .jydqsure").on("tap",function(){
@@ -168,6 +169,7 @@ var SuperSearch = {
 		            $("#supersearchPage .minMrice").val(max);
 				}
 				setTimeout(function(){
+					$(".loading_").show();
 					SuperSearch.formSubmit("N");
 				},300)
 			}
@@ -629,6 +631,7 @@ var SuperSearch = {
 						//没有数据
 						if(data["list"] == null || data["list"].length == 0){
 							SuperSearch.noMoreData();
+							$(".loading_").hide();
 							return;
 						}
 						var html = SuperSearch.getHtml(data["list"],SuperSearch.reqParam["pageNum"]);
@@ -857,6 +860,7 @@ var SuperSearch = {
 		}
 	},
 	formSubmit: function (nw){    //提交表单,获取数据
+		$(".loading_").show();
 		if(!SuperSearch.beforeSubmit()){
 			return;
 		}
@@ -949,6 +953,7 @@ var SuperSearch = {
 					SuperSearch.hasNoData();
 					SuperSearch.show();
 					$(window).scrollTop(0);
+					$(".loading_").hide();
 					return
 				}else{
 					SuperSearch.showNull = false;
@@ -1208,6 +1213,7 @@ var SuperSearch = {
 	        SuperSearch.myredirect(h,sid,sds,industry);
 	    });
 	    $('#supersearchPage #list').append(ListHtmlObj);	
+		$(".loading_").hide();
 //	    var TableHtmlobj=$(html.TableHtml);
 //	    TableHtmlobj.on("tap",function(event){
 //	        var h = $(this).attr("s");
@@ -1271,6 +1277,7 @@ var SuperSearch = {
 	  	    $("#supersearchPage #table .content").html("<tr><td><div>序号</div></td><td><div>项目名称</div></td><td><div>公告类型</div></td><td><div>预算<br>(万元)</div></td><td><div>招标单位</div></td><td><div>开标时间</div></td><td><div>中标单位</div></td><td>中标金额<br>(万元)</td><td><div>发布时间</div></td></tr>");
 	   	}
 	   	$("#supersearchPage #table .content").append(TableHtmlobj);
+		$(".loading_").hide();
 	},
 	myredirect: function (link,sid,sds,industry){  //跳转三级页
 		//保存当前页面至sessionStorage
@@ -1518,7 +1525,6 @@ var SuperSearch = {
 			}
 			sessionStorage.superSearch_shaxuanFlag=!$("#supersearchPage #super_search").hasClass("hidden");
 			sessionStorage.superSearch_searchType=$(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal');//$("#supersearchPage #selLable>.com-title>span.on").attr("id");
-			console.log("-----------"+sessionStorage.superSearch_searchType)
 			sessionStorage.superSearch_interceptWord=SuperSearch.interceptWord;
 			var hasNoData_tiptext_index = $("#supersearchPage #hasNoData_tiptext>font:visible").index();
 			if(hasNoData_tiptext_index==1){

+ 41 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/base.css

@@ -109,4 +109,45 @@ em,i{
 	max-width: 260px;
 	text-align: center;
 	display: none;
+}
+
+body .loading_ {
+    height: 100%;
+    width: 100%;
+    position: fixed;
+    background: #382f3d;
+    z-index: 999999999990;
+	opacity: .7;
+}
+body .loading_ > p {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    margin: auto;
+    height: 60px;
+    width: 60px;
+    text-align: center;
+    line-height: 60px;
+    font-size: 0.36rem;
+    color: rgba(44, 183, 202, 0.8);
+}
+body .loading_ p span {
+    position: absolute;
+    display: block;
+    height: 40px;
+    width: 40px;
+    margin: 10px;
+    border-radius: 50%;
+    -webkit-box-shadow: 0 2px 3px rgba(44, 183, 202, 0.8);
+    animation: loading_ ease 1s infinite;
+    left: 0;
+    top: 0;
+}
+@keyframes loading_ {
+  0% {
+    transform: rotate(0deg); }
+  100% {
+    transform: rotate(360deg); } 
 }

+ 0 - 1
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/pay_order.css

@@ -265,7 +265,6 @@ position: absolute;
 #pay_order .main .form .form-item .way .way-right .icon-right {
   color: #C2C2C2;
   font-size: .26rem;
-	display:none;
 }
 #pay_order .main .form .form-item.phone-number {
   margin-top: .23rem;

+ 7 - 22
src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -8,7 +8,7 @@
         <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
         <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}" />
         <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/pay_order.css?v={{Msg "seo" "version"}}2">
+        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/pay_order.css?v={{Msg "seo" "version"}}3">
         <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery-3.2.1.min.js"></script>
         <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js"></script>
 		{{include "/common/js.html"}}
@@ -335,7 +335,7 @@
 					var phone_input = $(this).val().replace(/\s*/g,"");
 					if (phone_input.length == 11) {
 						if(Verification.isPhone(phone_input)){
-							$.post("/front/dataExport/checkPhoneVerify",{"phone":phone_input},function(data){
+							$.post("/jyapp/front/dataExport/checkPhoneVerify",{"phone":phone_input},function(data){
 								if(data.success){
 									$(".phone_check_ok").show();
 									$(".phone_err_msg").hide();
@@ -435,7 +435,7 @@
 						return
 					}
 					canVerify=false;
-					$.post("/front/dataExport/sendMailVerify",{"email":email},function(data){
+					$.post("/jyapp/front/dataExport/sendMailVerify",{"email":email},function(data){
 						canVerify=true;
 						if(data.success){
 							if(data.errCode==4){
@@ -467,7 +467,8 @@
 					var verity=$(this).val()
 					var email=$(".email_input").val().replace(/\s*/g,"");
 					if(verity.length==6){
-						$.post("/front/dataExport/checkMailVerify",{"emailVerity":verity,"email":email},function(data){
+						$.post("/jyapp/front/dataExport/checkMailVerify",{"emailVerity":verity,"email":email},function(data){
+							alert(data.success)
 							if(data.success){
 								finishEmailVerity=true;
 								if(readClause&&finishPhoneVerity){
@@ -523,24 +524,8 @@
 					param.id={{.T._id}}
 					param.sourcePage="weixin"
 					//先去创建预支付订单
-					$.post("/dataExport/sacnPay/createOrder",param,function(data){
-						//alert(JSON.stringify(data))
-						if(data.status=="y"){
-							sessionStorage.setItem("order_spec"+{{.T._id}}, dataType);
-							sessionStorage.setItem("order_email"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
-							sessionStorage.setItem("order_phone"+{{.T._id}}, $(".phone_input").val().replace(/\s*/g,""));
-							//预支付订单创建成功后 调微信支付
-							if(data.res){
-								order_code=data.code;
-								//------
-							}
-						}else{
-							canpay=true;
-							EasyAlert.show("生成订单出错,请稍后尝试!","",3000);
-						}
-						$(".loading_").hide();
-					},"json");
-					
+					/*-----------------*/
+					$(".loading_").hide();
 				})
             })
 			//倒计时

+ 15 - 7
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -14,14 +14,14 @@
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}1"></script>
 <script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}"></script>
 <!--2.8-->
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/base.css">
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/iconfont.css">
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/search_tab.css">
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/weui.min.css">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/base.css?v={{Msg "seo" "version"}}">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/iconfont.css?v={{Msg "seo" "version"}}">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/search_tab.css?v={{Msg "seo" "version"}}">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/weui.min.css?v={{Msg "seo" "version"}}">
 <title>搜索</title>
 <script type="text/javascript">
 	var userId = {{session "userId"}};
@@ -133,18 +133,22 @@
         })
 		
 		//
-		$(".export").on("tap",function(){
+		$(".export").on("click",function(){
 			SuperSearch.setSessionStorage();
-
+			$(".loading_").show();
 			$.ajax({
 				type: "post",
 				url: "/jyapp/front/wx_dataExport/searchExport",
 				data: SuperSearch.reqParam,
 				dataType: "json",
 				success: function(data){
+					$(".loading_").hide();
 					if(data._id!=""){
 						window.location.href="/jyapp/front/wx_dataExport/toCreateOrderPage?id="+data._id+"&source=d"
 					}
+				},
+				error:function(e){
+					$(".loading_").hide();
 				}
 			})
 		})
@@ -241,6 +245,10 @@
 		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 		招标搜索
 	</div>
+	
+	<div class="loading_" style="display: none;">
+	    <p><span></span></p>
+	</div>
 	<div class="app-layout-content-b">
 		<form class="wxhead" action="">
 			<div class="searchhead">