搜索数据导出

src/jfw/front/ws_dataExport.go

@@ -0,0 +1,177 @@
+package front
+
+import (
+	"errors"
+	"fmt"
+	"jfw/public"
+	"qfw/util"
+	"qfw/util/redis"
+	"strings"
+	"time"
+
+	"github.com/go-xweb/xweb"
+	"gopkg.in/mgo.v2/bson"
+)
+
+type WsDataExport struct {
+	*xweb.Action
+	searchExport      xweb.Mapper `xweb:"/front/wx_dataExport/searchExport"`           //微信数据导出
+	toCreateOrderPage xweb.Mapper `xweb:"/front/wx_dataExport/toCreateOrderPage/(.*)"` //微信数据导出-订单页面
+}
+
+func init() {
+	xweb.AddAction(&WsDataExport{})
+}
+
+func (w *WsDataExport) ToCreateOrderPage(_id string) error {
+	id := util.SE.Decode4Hex(_id)
+	openid := util.ObjToString(w.GetSession("s_m_openid"))
+	userId := util.ObjToString(w.GetSession("userId"))
+	if userId == "" {
+		return errors.New("未登录")
+	}
+	msgCount := public.GetDataExportSearchCountUseId(id)
+	if msgCount > public.ExConf.MsgMaxCount {
+		msgCount = public.ExConf.MsgMaxCount
+	}
+	if msgCount < 1 {
+		w.Render("/weixin/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")
+	email := w.GetSession("DataExportVerifyEmail_val")
+	resPhone := w.GetSession("DataExportVerifyPhone_val")
+	if email != nil {
+		lastSendDEVerify := util.Int64All(w.GetSession("CreatEVerifyTime"))
+		timeSpaceing := lastSendDEVerify - time.Now().Unix() + 60*5
+		w.T["email"] = email
+		w.T["timeSpaceing"] = timeSpaceing
+	} else {
+		mail_phone := public.Mysql.FindOne("dataexport_order", map[string]interface{}{
+			"user_id": userId,
+		}, "user_mail,user_phone", "create_time desc")
+		if mail_phone != nil {
+			email = (*mail_phone)["user_mail"]
+			resPhone = (*mail_phone)["user_phone"]
+		}
+		if email == nil || email == "" {
+			userData, _ := mongodb.FindById("user", userId, `{"o_jy":1}`)
+			o_jy := util.ObjToMap((*userData)["o_jy"])
+			email = (*o_jy)["s_email"]
+		}
+		if email != nil && email != "" {
+			w.SetSession("EMVerifySucess", true)
+			w.SetSession("DataExportVerifyEmail_val", email)
+		}
+		w.T["email"] = email
+	}
+	//手机号
+	phone := w.GetSession("DataExportVerifyPhone_val")
+	if phone != nil && phone != "" {
+		w.T["phone"] = phone
+	} else {
+		//剑鱼助手手机号登录
+		if isPhone(openid) {
+			phone = openid
+		} else {
+			phone = resPhone
+		}
+		if phone != nil && phone != "" {
+			w.SetSession("DataExportVerifyPhone_val", phone)
+		}
+		w.T["phone"] = phone
+	}
+	w.T["_id"] = _id
+	w.T["msgCount"] = msgCount
+	w.T["msgMaxCount"] = public.ExConf.MsgMaxCount
+	w.T["discount"] = public.ExConf.Discount
+	w.T["discount10"] = public.ExConf.Discount * 10
+	w.T["unitPrice_normal"] = public.ExConf.UnitPrice_normal
+	w.T["unitPrice_senior"] = public.ExConf.UnitPrice_senior
+	w.T["unitPrice_normal_final"] = (public.ExConf.UnitPrice_normal * 100) * (public.ExConf.Discount * 100) / 10000
+	w.T["unitPrice_senior_final"] = (public.ExConf.UnitPrice_senior * 100) * (public.ExConf.Discount * 100) / 10000
+	w.T["orderMinPrice"] = public.ExConf.OrderMinPrice
+	incurKey := fmt.Sprintf("PreviewData_%s_%d", w.GetSession("userId"), time.Now().Day())
+	w.T["PreviewData"] = util.IntAll(redis.Get("other", incurKey))
+	w.Render("/weixin/dataExport/dataExport_payOrder.html", &w.T)
+	return nil
+}
+
+//微信数据导出
+func (w *WsDataExport) SearchExport() error {
+	openid := util.ObjToString(w.GetSession("s_m_openid"))
+	userId := util.ObjToString(w.GetSession("userId"))
+	if userId == "" {
+		return errors.New("未登录")
+	}
+	//接收超级搜索页面参数
+	keywords := w.GetString("searchvalue")                 //搜索词
+	publishtime := w.GetString("publishtime")              //发布时间
+	area := w.GetString("scope")                           //地区
+	subtype := w.GetString("subtype")                      //信息类型
+	minprice := w.GetString("minprice")                    //最低价格
+	maxprice := w.GetString("maxprice")                    //最高价格
+	industry := strings.TrimSpace(w.GetString("industry")) //选中的行业
+	selectType := w.GetString("selectType")                //标题 or 全文
+
+	//数据存库转换
+	areaSave := []string{}
+	if len(area) > 0 {
+		areaSave = strings.Split(area, ",")
+	}
+	industrySave := []string{}
+	if len(industry) > 0 {
+		industrySave = strings.Split(industry, ",")
+	}
+	//格式化keywords
+	KeyWordSave := []public.KeyWord{}
+
+	if len(keywords) > 0 {
+		isIntercept := false
+		if selectType == "all" {
+			isIntercept = true
+		}
+		_, _, keywords = public.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
+		KeyWordSave = append(KeyWordSave, public.KeyWord{Keyword: keywords})
+	}
+	//时间
+	now := time.Now()
+	if publishtime == "lately-7" { //最近7天
+		starttime := fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-7, 0, 0, 0, 0, time.Local).Unix())
+		publishtime = fmt.Sprintf("%s_%d", starttime, now.Unix())
+	} else if publishtime == "lately-30" { //最近30天
+		starttime := fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-30, 0, 0, 0, 0, time.Local).Unix())
+		publishtime = fmt.Sprintf("%s_%d", starttime, now.Unix())
+	} else if publishtime == "thisyear" { //去年
+		starttime := fmt.Sprint(time.Date(now.Year()-1, 1, 1, 0, 0, 0, 0, time.Local).Unix())
+		endtime := fmt.Sprint(time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local).Unix())
+		publishtime = fmt.Sprintf("%s_%s", starttime, endtime)
+	}
+
+	data := map[string]interface{}{
+		"keywords":    KeyWordSave,
+		"publishtime": publishtime,
+		"area":        areaSave,
+		"subtype":     subtype,
+		"minprice":    minprice,
+		"maxprice":    maxprice,
+		"industry":    industrySave,
+		"selectType":  selectType,
+		"comeintime":  now.Unix(),
+		"s_openid":    openid,
+		"comeinfrom":  "supersearchPage",
+		"s_userid":    userId,
+	}
+
+	//存入数据库
+	_id := mongodb.Save(public.ExportTable, data)
+	w.ServeJson(bson.M{"_id": util.SE.Encode2Hex(_id)})
+	return nil
+}

src/jfw/modules/app/src/config.json

@@ -7,26 +7,30 @@
     "elasticsearch": "http://192.168.3.11:9800",
     "elasticPoolSize": 30,
     "redisaddrs": "other=192.168.3.18:3379,push=192.168.3.18:3379,pushcache_1=192.168.3.18:2001,pushcache_2_a=192.168.3.18:2002,pushcache_2_b=192.168.3.18:2003,sso=192.168.3.18:3379,session=192.168.3.18:3379,recovery=192.168.3.18:3379",
-    "webport": "8080",
+    "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
-		}
-	},
+        "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"
-	},
+    "mysql": {
+        "dbName": "jianyu",
+        "address": "192.168.3.11:3366",
+        "userName": "root",
+        "passWord": "Topnet123"
+    },
     "agreement": "http",
     "webdomain": "http://web-jydev-ws.jianyu360.cn",
     "redirect": {
@@ -78,23 +82,23 @@
     "update": {
         "version": "1.0.7",
         "mustupdate": false,
-		"tipspace": 86400,
-		"ios_version": "2.7.3",
+        "tipspace": 86400,
+        "ios_version": "2.7.3",
         "ios_mustupdate": false,
-        "ios_openUpdate":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"
-		}
+        "channelDir": {
+            "baidu": "baiduSem",
+            "shenma": "shenmaSem",
+            "huawei": "huawei",
+            "xiaomi": "xiaomi",
+            "yingyongbao": "yingyongbao",
+            "douyin": "douyin",
+            "weixin": "jywx",
+            "topnet": "topnet",
+            "duanxin": "duanxin",
+            "default": "topnet"
+        }
     },
     "limitSearchText": {
         "flag": false,
@@ -122,5 +126,19 @@
     "appPower": {
         "grayflag": false
     },
-    "afterSavePushId":60
+    "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"
+        }
+    ]
 }

src/jfw/modules/app/src/jfw/config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"qfw/util"
+	"qfw/util/mail"
 )
 
 //seo.josn 配置文件中的版本号，可以动态更新
@@ -10,6 +11,21 @@ var Seoconfig_Version string
 var Sysconfig map[string]interface{}
 var Seoconfig map[string]interface{}
 
+var GmailAuth []*mail.GmailAuth
+
 func init() {
 	util.ReadConfig(&Sysconfig)
+	mails, _ := Sysconfig["mail"].([]interface{})
+	mailConfigArrMap := util.ObjArrToMapArr(mails)
+	for _, v := range mailConfigArrMap {
+		mail := &mail.GmailAuth{
+			SmtpHost: v["addr"].(string),
+			SmtpPort: util.IntAll(v["port"]),
+			User:     v["user"].(string),
+			Pwd:      v["pwd"].(string),
+			//			PoolChan: nil,
+			//			PoolSize: 0,
+		}
+		GmailAuth = append(GmailAuth, mail)
+	}
 }

src/jfw/modules/app/src/web/staticres/jyapp/css/myorder/base.css

@@ -9,7 +9,7 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fiel
 }
 html,body {
     /* max-width: 750px; */
-    -webkit-text-size-adjust: 100%;
+/*    -webkit-text-size-adjust: 100%;
     margin: 0 auto;
     height: 100%;
     overflow-x: hidden;
@@ -17,8 +17,8 @@ html,body {
     box-sizing: border-box;
     font-size: .24rem;
     background:rgba(245,244,249,1);;
-    color: #3d3d3d;
-    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
+    color: #3d3d3d;*/
+/*    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;*/
 }
 
 ul,ol {

src/jfw/modules/app/src/web/staticres/jyapp/css/myorder/search_tab.css

@@ -0,0 +1,121 @@
+.container {
+  height: 100%;
+}
+
+.weui-mask {
+  z-index: 998 !important;
+}
+
+.selected-export-box {
+  position: relative;
+  padding: 0 .28rem 0 .34rem;
+/*  height: .8rem;*/
+/*  line-height: .8rem;*/
+  font-size: .26rem;
+  background-color: #fff;
+  z-index: 999;
+	width: 100%;
+}
+.selected-export-box .selected-export .options {
+  display: inline-block;
+}
+.selected-export-box .selected-export .options .search-title,
+.selected-export-box .selected-export .options .show-list {
+  display: inline-block;
+  position: relative;
+  height: 100%;
+}
+.selected-export-box .selected-export .options .search-title i,
+.selected-export-box .selected-export .options .show-list i {
+/*  position: absolute;*/
+  font-size: .15rem;
+/*  top: 55%;*/
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+/*  right: -0.25rem;*/
+}
+.selected-export-box .selected-export .options .search-title.active,
+.selected-export-box .selected-export .options .show-list.active {
+  color: #2CB7CA;
+}
+.selected-export-box .selected-export .options .show-list {
+  margin-left: .74rem;
+}
+.selected-export-box .selected-export .export {
+  position: absolute;
+  top: 50%;
+  right: .28rem;
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+	color: #2CB7CA;
+}
+.selected-export-box .selected-export .export span i {
+/*  position: absolute;*/
+  font-size: .2rem;
+/*	top: 51%;*/
+/*    left: -0.33rem;*/
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+/*	right: 0.1rem;*/
+}
+.selected-export-box .selected-export .export:before {
+  position: absolute;
+  content: '';
+  left: -0.66rem;
+  top: 50%;
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+  width: 1px;
+  height: 0.44rem;
+  background-color: #e0e0e0;
+}
+
+.newdialog {
+  position: absolute;
+  width: 100%;
+  left: 0;
+  bottom: 1px;
+  -webkit-transform: translateY(100%);
+          transform: translateY(100%);
+  background-color: #fff;
+  border-top: 1px solid #e0e0e0;
+}
+.newdialog .tab-box {
+  padding: 0 .14rem;
+	width:100%;
+}
+.newdialog .tab-box .sub-tab li {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  height: .9rem;
+  line-height: .9rem;
+  color: #686868;
+  font-size: .26rem;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+	width:100%;
+  padding: 0 .2rem;
+}
+.newdialog .tab-box .sub-tab li:nth-of-type(2) {
+  border-top: 1px solid #e0e0e0;
+}
+.newdialog .tab-box .sub-tab li.active {
+  color: #2CB7CA;
+}
+.newdialog .tab-box .sub-tab li.active i {
+  display: block;
+}
+.newdialog .tab-box .sub-tab li .weui-icon-success-no-circle {
+  display: none;
+  margin-top: -0.05rem;
+  font-size: .32rem;
+  color: #2CB7CA;
+}
+.weui-mask, .weui-mask_transparent {
+    top: 130px !important;
+}

src/jfw/modules/app/src/web/staticres/jyapp/css/wxsearch.css

@@ -151,6 +151,11 @@ form{
   background: url(../images/search/search-zhongqy.png) 0.3rem 0.32rem no-repeat, url(../images/search/search-lists-rightBg.png) right bottom no-repeat;
   background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 }
+
+#searchIndex .content li:nth-of-type(3) a {
+  background: url(../images/search/dataExport.png) 0.3rem 0.32rem no-repeat, url(../images/search/search-lists-rightBg.png) right bottom no-repeat;
+  background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
+}
 /*#searchIndex .content li:nth-of-type(1) a {
   background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 }
@@ -1705,7 +1710,7 @@ body{
 	height:40px;
 	line-height: 40px;
 	color:#888;
-	padding: 0 10px;
+/*	padding: 0 10px;*/
 	border-bottom: 1px solid #e0e0e0;
 }
 .selLable div{

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -105,6 +105,7 @@ var SuperSearch = {
 		});
 		//筛选菜单展示or隐藏
 		$("#supersearchPage .wxhead").find(".screen").on("tap",function(){
+			hideTab();
 			SuperSearch.inputBlur();
 			if(SuperSearch.requesting){
 				return;
@@ -140,6 +141,7 @@ var SuperSearch = {
 		
 		//是否显示提示搜索框
 		$("#supersearchPage input[name=super_searchinput]").focus(function(){
+			hideTab();
 			SuperSearch.afterFocus();
 		}).blur(function(){ 
 			setTimeout(function(){
@@ -1395,7 +1397,7 @@ var SuperSearch = {
 	//展示方式
 	//1.列表展示数据
 	showlist: function() {
-		localStorage.superSearch_showType="showList";
+		localStorage.superSearch_showType="showlist";
 	    $("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
 	    $("#supersearchPage #wrapper #table").addClass("hidden");
 	    $("#supersearchPage #wrapper #list").removeClass("hidden");
@@ -1425,7 +1427,7 @@ var SuperSearch = {
 			},1000);
 		}
 		if(localStorage.isopen_supersearch=="y"){
-			localStorage.superSearch_showType="showTable";
+			localStorage.superSearch_showType="showtable";
 		  	$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
 		  	$("#supersearchPage #wrapper #table").removeClass("hidden");
 		  	$("#supersearchPage #wrapper #list").addClass("hidden");
@@ -1463,18 +1465,21 @@ var SuperSearch = {
 			sessionStorage.searchpageName="superSearch";
 			sessionStorage.superSearch_dyDiv=SuperSearch.dyDiv;
 			sessionStorage.superSearch_advertIsClose=SuperSearch.advertIsClose;
-			if($("#supersearchPage .on").hasClass("showlist")){
-				localStorage.superSearch_showType="showList";
-			}else if($("#supersearchPage .on").hasClass("showtable")){
-				localStorage.superSearch_showType="showTable";
-			}
+//			if($("#supersearchPage .on").hasClass("showlist")){
+//				localStorage.superSearch_showType="showList";
+//			}else if($("#supersearchPage .on").hasClass("showtable")){
+//				localStorage.superSearch_showType="showTable";
+//			}			
+			sessionStorage.superSearch_showType=$(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal');
+
 			var shaxuanclass = $("#supersearchPage .jyshaxuan .shaixcl").attr("class");
 			if(shaxuanclass){
 				shaxuanclass = shaxuanclass.split(" ")[0];
 				sessionStorage.superSearch_shaxuan=shaxuanclass;
 			}
 			sessionStorage.superSearch_shaxuanFlag=!$("#supersearchPage #super_search").hasClass("hidden");
-			sessionStorage.superSearch_searchType=$("#supersearchPage #selLable>.com-title>span.on").attr("id");
+			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){
@@ -1680,18 +1685,31 @@ var SuperSearch = {
 				$("#supersearchPage .jytype-dialog").removeClass("hidden");
 			}
 		}
-		$("#supersearchPage #selLable>.com-title>span.on").removeClass("on");
-		$("#supersearchPage #selLable>.com-title>#"+sessionStorage.superSearch_searchType).addClass("on");
+		//$("#supersearchPage #selLable>.com-title>span.on").removeClass("on");
+		//$("#supersearchPage #selLable>.com-title>#"+sessionStorage.superSearch_searchType).addClass("on");
+		$(".newdialog .sub-search-title").find("li").removeClass("active");
+		$(".newdialog .sub-show-list").find("li").removeClass("active");
+		if(sessionStorage.superSearch_searchType=="searchtitle"){
+			$(".selected-export .options .search-title").find("em").text("标题搜索");
+			$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
+		}else if(sessionStorage.superSearch_searchType=="searchall"){
+			$(".selected-export .options .search-title").find("em").text("全文搜索");
+			$(".newdialog .sub-search-title").find("li[dataval='searchall']").addClass("active");
+		}
 		SuperSearch.showType();
 	    SuperSearch.beforeSubmit();
 	},
 	showType: function(){
-		if(localStorage.superSearch_showType=="showTable"){
-			$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
+		if(localStorage.superSearch_showType=="showtable"){
+			$(".selected-export .show-list").find("em").text("表格显示");
+			$(".newdialog .sub-show-list").find("li[dataval='showtable']").addClass("active");
+//			$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
 			$("#supersearchPage #wrapper #table").removeClass("hidden");
 			$("#supersearchPage #wrapper #list").addClass("hidden");
 		}else{
-			$("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
+			$(".selected-export .show-list").find("em").text("列表显示");
+			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
+//			$("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
 			$("#supersearchPage #wrapper #table").addClass("hidden");
 			$("#supersearchPage #wrapper #list").removeClass("hidden");
 		} 

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -17,6 +17,11 @@
 <script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></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">
 <title>搜索</title>
 <script type="text/javascript">
 	var userId = {{session "userId"}};
@@ -25,6 +30,108 @@
 	SuperSearch.ZBADDRESS = {{Msg "seo" "ZBADDRESS"}};
 	SuperSearch.industry = {{.T.industry}};
 	SuperSearch.sortArray = {{.T.sortArray}};
+    // 动画隐藏tab栏
+    function hideTab () {
+        $('.newdialog .tab-box .sub-search-title').slideUp('fast');
+        $('.newdialog .tab-box .sub-show-list').slideUp('fast');
+    	// 切换上下三角
+   		$('.selected-export .options .search-title').find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-zhankai');
+   		$('.selected-export .options .show-list').find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-zhankai');
+        $('.weui-mask').hide();
+    }
+	$(function(){
+
+        // 搜索选择的显示隐藏
+        $('.selected-export .options').on('tap', 'span',function(e){
+            var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
+            var $this = $(this)
+            // 如果已经显示，则判断点击的是否和上次相同
+            if ($('.weui-mask').css('display') !== 'none') {
+                // 点击按钮的时候dialog显示了,显示的如果和这次的相同，则隐藏
+                // 找到显示的sub-tab的index
+                var showArr = []
+                $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
+                    if ($(dom).css('display') !== 'none') {
+                        showArr.push($(dom).attr('index'))
+                    }
+                })
+                if (showArr.length === 1 && showArr[0] === index) {
+                    // 和上次点击的相同，则关闭tab栏
+                    hideTab()
+
+                    $(this).find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+                    return // 直接结束函数
+                }
+
+                // 如果已经显示，则tab切换不需要动画
+                $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
+                    if ($(dom).attr('index') === index) {
+                        $(dom).show().siblings().hide()
+                        
+                        // 切换上下三角
+                        $this.find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-shouqi')
+                        $this.siblings().find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+                        return false
+                    }
+                })
+                $('.weui-mask').show()
+                return
+            }
+
+            // tab切换
+            $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
+                if ($(dom).attr('index') === index) {
+                    // $(dom).show().siblings().hide()
+                    $(dom).slideDown('fast').siblings().hide()
+                    
+                    // 切换上下三角
+                    $this.find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-shouqi')
+                    $this.siblings().find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+                    return false
+                }
+            })
+            $('.weui-mask').show()
+
+        })
+
+        // tab内容的选择
+        $('.newdialog .tab-box .sub-tab').on('tap', 'li',function () {
+            var text = $(this).find('span').text();
+            var index = $(this).parent().attr('index');
+            var dataVal = $(this).attr('dataVal');
+            var $optionsDOM = $(this).parents('.newdialog').siblings().find('.options span');
+			var reqFlag = true;
+            $optionsDOM.each(function(i,dom){
+                if ($(dom).attr('index') === index) {
+					if($(dom).find('em').text()==text){
+						reqFlag = false;
+					}else{
+                    	$(dom).find('em').text(text);
+					}
+                }
+                $(dom).find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-zhankai');
+            })
+            $(this).addClass('active')
+            $(this).siblings().removeClass('active')
+            hideTab()
+			if (reqFlag){
+				if (dataVal=="searchtitle"){//标题搜索
+					SuperSearch.titleSearch();
+				}else if(dataVal=="searchall"){//全文搜索
+					SuperSearch.allSearch();
+				}else if(dataVal=="showlist"){//列表显示
+					SuperSearch.showlist();
+				}else if(dataVal=="showtable"){//表格显示
+					SuperSearch.showTable();
+				}
+			}
+        })
+
+        $('.weui-mask').on('tap', function(){
+            hideTab()
+            $('.selected-export .options').find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+        })
+	})
 </script>
 </head>
 <body>
@@ -62,6 +169,12 @@
 					<div>搜索企业的所有中标项目信息</div>
 				</a>
 			</li>
+			<li>
+				<a>
+					<div>历史数据导出</div>
+					<div>导出任意条件的招标数据，按条数付费</div>
+				</a>
+			</li>
 		</ul>
 	</section>
 </section>
@@ -93,12 +206,59 @@
 		</form>
 		<div>
 			<div class="selLable hidden" id="selLable">
-				<div class="com-title"><!--height:30px; margin-top:20px;-->
+				<div class="selected-export-box">
+	                <div class="selected-export">
+	                    <div class="options">
+	                        <span class="search-title active" index="1">
+	                            <em>标题搜索</em>
+	                            <i class="iconfont icon-zhankai"></i>
+	                        </span>
+	                        <span class="show-list active" index="2">
+	                            <em>列表显示</em>
+	                            <!-- icon-shouqi -->
+	                            <i class="iconfont icon-zhankai"></i>
+	                        </span>
+	                    </div>
+	                    <div class="export">
+	                        <span>
+	                            <i class="iconfont icon-shujudaochu"></i>
+	                            <em>数据导出</em>
+	                        </span>
+	                    </div>
+	                </div>
+	                <div class="newdialog">
+	                    <div class="tab-box">
+	                        <ul class="sub-tab sub-search-title" index="1"  style="display: none">
+	                            <li class="active" dataVal="searchtitle">
+	                                <span>标题搜索</span>
+	                                <i class="weui-icon-success-no-circle"></i>
+	                            </li>
+	                            <li dataVal="searchall">
+	                                <span>全文搜索</span>
+	                                <i class="weui-icon-success-no-circle"></i>
+	                            </li>
+	                        </ul>
+	                        <ul class="sub-tab sub-show-list" index="2" style="display: none">
+	                            <li class="active" dataVal="showlist">
+	                                <span>列表显示</span>
+	                                <i class="weui-icon-success-no-circle"></i>
+	                            </li>
+	                            <li dataVal="showtable">
+	                                <span>表格显示</span>
+	                                <i class="weui-icon-success-no-circle"></i>
+	                            </li>
+	                        </ul>
+	                    </div>
+	                </div>
+	            </div>
+	            <div class="weui-mask" style="display: none"></div>
+				
+				<div class="com-title" style="display:none;"><!--height:30px; margin-top:20px;-->
 					<span id="search_title" class="on">标题搜索</span><!--<span style="float:left;">|</span>--><span id="search_all">全文搜索</span>
 				</div>
-				<div class="line-vertical">
+				<div class="line-vertical" style="display:none;">
 				</div>
-				<div class="showType">
+				<div class="showType" style="display:none;">
 					<div class="showlist on">列表</div>
 					<div class="showtable">表格</div>
 				</div>
@@ -624,6 +784,13 @@
 		//}else if(pageType == "e"){
 		//	EntSearch.init(true,false,false);
 		//}
+		
+		//历史数据导出
+	    $(".content ul li a:eq(2)").unbind("tap").on("tap",function(){
+			setTimeout(function(){
+				window.location.href='/jyapp/front/dataExport/toSieve';
+			},100);
+	    });
 	});
 	function checkIsOpen(){
 		//点击帮助

src/web/staticres/js/dropload.js

@@ -138,7 +138,7 @@
             me._scrollTop = me.$scrollArea.scrollTop();
 
             // 滚动页面触发加载数据
-			console.log(me._scrollContentHeight +"--"+ me._threshold+"--"+me._scrollWindowHeight +"--"+ me._scrollTop)
+			//console.log(me._scrollContentHeight +"--"+ me._threshold+"--"+me._scrollWindowHeight +"--"+ me._scrollTop)
             if(me.opts.loadDownFn != '' && !me.loading && !me.isLockDown && (me._scrollContentHeight - me._threshold) <= (me._scrollWindowHeight + me._scrollTop)){
                 loadDown(me);
             }

src/web/staticres/js/wxSupersearch.js

@@ -97,6 +97,7 @@ var SuperSearch = {
 		});
 		//筛选菜单展示or隐藏
 		$("#supersearchPage .wxhead").find(".screen").on("tap",function(){
+			hideTab();
 			SuperSearch.inputBlur();
 			if(SuperSearch.requesting){
 				return;
@@ -132,6 +133,7 @@ var SuperSearch = {
 		
 		//是否显示提示搜索框
 		$("#supersearchPage input[name=super_searchinput]").focus(function(){
+			hideTab();
 			SuperSearch.afterFocus();
 		}).blur(function(){
 			setTimeout(function(){
@@ -567,7 +569,6 @@ var SuperSearch = {
 		SuperSearch.dropload = $('#supersearchPage #wrapper').dropload({
 			scrollArea: window,
 			loadDownFn: function(me){
-				console.log("+++++++++++++++++++++++++")
 				if(SuperSearch.dropload == null){
 					SuperSearch.dropload = me;
 				}

src/web/staticres/wx_dataExport/css/base.css

@@ -9,16 +9,16 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fiel
 }
 html,body {
     /* max-width: 750px; */
-    -webkit-text-size-adjust: 100%;
+/*    -webkit-text-size-adjust: 100%;*/
     margin: 0 auto;
-    height: 100%;
-    overflow-x: hidden;
-    -webkit-box-sizing: border-box;
+/*    height: 100%;*/
+/*    overflow-x: hidden;*/
+/*    -webkit-box-sizing: border-box;
     box-sizing: border-box;
     font-size: .24rem;
     background:rgba(245,244,249,1);;
-    color: #3d3d3d;
-    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
+    color: #3d3d3d;*/
+/*    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;*/
 }
 
 ul,ol {

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

@@ -5,9 +5,9 @@
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>404</title>
 		<script src="../js/rem.js"></script>
-		<link rel="stylesheet" type="text/css" href="../css/base.css"/>
-		<link rel="stylesheet" href="../css/no_result.css">
-		<link rel="stylesheet" href="../iconfont/iconfont.css">
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css"/>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/no_result.css">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css">
 	</head>
 	<body>
 		<div id="no_result">

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

@@ -6,11 +6,11 @@
         <meta name="viewport" content="initial-scale=1, maximum-scale=1">
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-status-bar-style" content="black">
-        <script src="../js/rem.js"></script>
-        <link rel="stylesheet" href="../css/weui.min.css">
-        <link rel="stylesheet" type="text/css" href="../css/base.css" />
-        <link rel="stylesheet" type="text/css" href="../iconfont/iconfont.css" />
-        <link rel="stylesheet" href="../css/pay_order.css">
+        <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
+        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
+        <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css" />
+        <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css" />
+        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/pay_order.css">
     </head>
     <body>
         <div id="pay_order">
@@ -182,8 +182,8 @@
             </div>
         </div>
 
-        <script src="../js/jquery-2.1.4.js"></script>
-        <script src="../js/weui.min.js"></script>
+        <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
+        <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
         <script>
             $(function() {
                 $('.choose .choose-item').each(function() {

src/web/templates/weixin/historypush.html

@@ -144,6 +144,7 @@ function initpage(){
 	}
 	$(window).scroll(function(){
 		scrollTop = $(this).scrollTop();
+		console.log(scrollTop)
 	});
 	//
 	if(sessionStorage.getItem("listortable")=="T"){

src/web/templates/weixin/search/mainSearch.html

@@ -20,7 +20,7 @@
 <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
 {{include "/common/weixin.html"}}
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}212"></script>
+<script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
 <!--2.8-->
@@ -38,14 +38,16 @@
 	SuperSearch.ZBADDRESS = {{Msg "seo" "ZBADDRESS"}};
 	SuperSearch.industry = {{.T.industry}};
 	SuperSearch.sortArray = {{.T.sortArray}};
+    // 动画隐藏tab栏
+    function hideTab() {
+        $('.newdialog .tab-box .sub-search-title').slideUp('fast');
+        $('.newdialog .tab-box .sub-show-list').slideUp('fast');
+        // 切换上下三角
+       $('.selected-export .options .search-title').find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-zhankai');
+       $('.selected-export .options .show-list').find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-zhankai');
+        $('.weui-mask').hide();
+    }
 	$(function(){
-        // 动画隐藏tab栏
-        function hideTab () {
-            $('.newdialog .tab-box .sub-search-title').slideUp('fast')
-            $('.newdialog .tab-box .sub-show-list').slideUp('fast')
-            $('.weui-mask').hide()
-        }
-
         // 搜索选择的显示隐藏
         $('.selected-export .options').on('tap', 'span',function(e){
             var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
@@ -119,7 +121,6 @@
             $(this).addClass('active')
             $(this).siblings().removeClass('active')
             hideTab()
-			console.log(reqFlag+"---"+dataVal)
 			if (reqFlag){
 				if (dataVal=="searchtitle"){//标题搜索
 					SuperSearch.titleSearch();
@@ -133,10 +134,29 @@
 			}
         })
 
-        $('.weui-mask').on('click', function(){
+        $('.weui-mask').on('tap', function(){
             hideTab()
             $('.selected-export .options').find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
         })
+		//
+		$(".export").on("tap",function(){
+			if(!SuperSearch.beforeSubmit()){
+				return;
+			}
+			SuperSearch.setSessionStorage();
+
+			$.ajax({
+				type: "post",
+				url: "/front/wx_dataExport/searchExport",
+				data: SuperSearch.reqParam,
+				dataType: "json",
+				success: function(data){
+					if(data._id!=""){
+						window.location.href="/front/wx_dataExport/toCreateOrderPage/"+data._id
+					}
+				}
+			})
+		})
 	})
 </script>
 	<style>
@@ -893,6 +913,7 @@
 	function checkIsOpen(){
 		$(".content ul li a:eq(0)").unbind("tap");
 		$(".content ul li a:eq(1)").unbind("tap");
+		$(".content ul li a:eq(2)").unbind("tap");
 		//查询是否开通超级搜索和中标企业搜索
 	    $.post("/jylab/supsearch/getstatus?t="+new Date().getTime(),function(result){
 			open_supersearch=result.supstatus;