整合

src/jfw/front/dataExport.go

@@ -2,28 +2,68 @@ package front
 
 import (
 	"encoding/json"
+	"errors"
+	"jfw/config"
+	"jfw/tools"
 	"log"
+	"qfw/util"
+	"qfw/util/elastic"
+	qum "qfw/util/mail"
+	"regexp"
 	"strings"
-	"jfw/tools"
+	"time"
+
 	"github.com/go-xweb/xweb"
 )
 
+var (
+	ExportTable   string = "export_search"
+	ExConf        ExportConfig
+	mailConfigMap map[string]interface{}
+)
+
 type DataExport struct {
 	*xweb.Action
 	toSieve    xweb.Mapper `xweb:"/front/dataExport/toSieve"`    //数据导出-条件筛选
 	sieveData  xweb.Mapper `xweb:"/front/dataExport/sieveData"`  //筛选数据
 	toMyOrder  xweb.Mapper `xweb:"/front/dataExport/toMyOrder"`  //我的订单
 	queryOrder xweb.Mapper `xweb:"/front/dataExport/queryOrder"` //查询我的订单
+
+	superSearchExport xweb.Mapper `xweb:"/front/dataExport/superSearchExport"`      //数据导出-超级搜索
+	toCreateOrderPage xweb.Mapper `xweb:"/front/dataExport/toCreateOrderPage/(.*)"` //数据导出-订单页面
+	previewData       xweb.Mapper `xweb:"/front/dataExport/previewData/(.*)"`       //数据导出-数据预览
+	sendMailVerify    xweb.Mapper `xweb:"/front/dataExport/sendMailVerify"`         //发送邮箱验证码
+	checkMailVerify   xweb.Mapper `xweb:"/front/dataExport/checkMailVerify"`        //验证邮箱验证码
+}
+
+//价格配置文件
+type ExportConfig struct {
+	UnitPrice_normal int64   `json:"unitPrice_normal"`
+	UnitPrice_senior int64   `json:"unitPrice_senior"`
+	Discount         float64 `json:"discount"`
+	OrderMinPrice    int64   `json:"orderMinPrice"`
+	MsgMaxCount      int64   `json:"msgMaxCount"`
 }
 
 func init() {
 	xweb.AddAction(&DataExport{})
+	//读取配置文件
+	byte_conf, err := json.Marshal(config.Sysconfig["exportData"])
+	if err != nil {
+		log.Panic(err)
+	}
+	err = json.Unmarshal(byte_conf, &ExConf)
+	if err != nil {
+		log.Panic(err)
+	}
+	mailConfigMap = config.Sysconfig["mail"].(map[string]interface{})
 }
 
 func (d *DataExport) ToSieve() error {
 	industrylist, sortArray = getindustrys()
 	d.T["industrylist"] = industrylist
 	d.T["sortArray"] = sortArray
+	d.T["logid"] = config.Seoconfig["dataexport"].(string)
 	d.Render("/pc/dataExport_sieve.html", &d.T)
 	return nil
 }
@@ -75,12 +115,18 @@ func (d *DataExport) SieveData() error {
 		"publishtime": publishtime,
 		"area":        areaArr,
 		"industry":    industryArr,
-		"keyword":     keywordList,
+		"keywords":    keywordList,
 		"buyer":       buyerArr,
 		"winner":      winnerArr,
 	}
-	reS := mongodb.Save(ExportTable, sieveCondition)
-	log.Println("save ", reS)
+	_id := mongodb.Save(ExportTable, sieveCondition)
+	if _id != "" {
+		d.T["success"] = true
+		d.T["redirectUrl"] = "/front/dataExport/toCreateOrderPage/" + _id
+	} else {
+		d.T["success"] = false
+	}
+	d.ServeJson(&d.T)
 	return nil
 }
 
@@ -110,3 +156,268 @@ func (d *DataExport) QueryOrder() error {
 
 type Order struct {
 }
+
+//---------------------------生成订单预览----------------------------------
+func (de *DataExport) SuperSearchExport() error {
+	openid := util.ObjToString(de.GetSession("s_m_openid"))
+	if openid == "" {
+		return errors.New("未登录")
+	}
+	//接收超级搜索页面参数
+	keywords := de.GetString("keywords")                    //搜索词
+	publishtime := de.GetString("publishtime")              //发布时间
+	area := de.GetString("area")                            //地区
+	subtype := de.GetString("subtype")                      //信息类型
+	minprice := de.GetString("minprice")                    //最低价格
+	maxprice := de.GetString("maxprice")                    //最高价格
+	industry := strings.TrimSpace(de.GetString("industry")) //选中的行业
+	selectType := de.GetString("selectType")                //标题 or 全文
+
+	//格式化keywords
+	KeyWordSave := []KeyWord{}
+	if len(keywords) > 0 {
+		keywordArr := strings.Split(keywords, " ")
+		if len(keywordArr) > 0 {
+			oneKw := KeyWord{}
+			if len(keywordArr) > 1 {
+				kwAppended := []string{}
+				for k, v := range keywordArr {
+					if k == 0 {
+						oneKw.Keyword = v
+					} else {
+						kwAppended = append(kwAppended, v)
+					}
+				}
+				oneKw.Appended = kwAppended
+			} else {
+				oneKw.Keyword = keywordArr[0]
+			}
+			KeyWordSave = append(KeyWordSave, oneKw)
+
+		}
+	}
+
+	areaSave := []string{}
+	if len(area) > 0 {
+		areaSave = strings.Split(area, ",")
+	}
+	industrySave := []string{}
+	if len(industry) > 0 {
+		industrySave = strings.Split(industry, ",")
+	}
+
+	data := map[string]interface{}{
+		"keywords":    KeyWordSave,
+		"publishtime": publishtime,
+		"area":        areaSave,
+		"subtype":     subtype,
+		"minprice":    minprice,
+		"maxprice":    maxprice,
+		"industry":    industrySave,
+		"selectType":  selectType,
+		"comeintime":  time.Now().Unix(),
+		"s_openid":    openid,
+	}
+	//存入数据库
+	_id := mongodb.Save(ExportTable, data)
+	//携带id跳转订单生成页面
+	de.Redirect("/front/dataExport/toCreateOrderPage/" + _id)
+	return nil
+}
+func (de *DataExport) ToCreateOrderPage(_id string) error {
+	var (
+		query    *map[string]interface{}
+		ok       bool
+		msgCount int64
+		//查询字段
+		keywords    []KeyWord
+		industry    []string
+		minprice    string
+		maxprice    string
+		selectType  string
+		area        []string
+		publishtime string
+		subtype     string
+		buyer       []string //招标单位
+		winner      []string //中标单位
+	)
+	openid := util.ObjToString(de.GetSession("s_m_openid"))
+	if openid == "" {
+		return errors.New("未登录")
+	}
+
+	if query, ok = mongodb.FindById(ExportTable, _id, nil); !ok {
+		return errors.New("未找到搜索记录")
+	}
+
+	keywords = getKeyWordArrFromDbResult((*query)["keywords"])
+	industry = getStringArrFromDbResult((*query)["industry"])
+	minprice = util.ObjToString((*query)["minprice"])
+	maxprice = util.ObjToString((*query)["maxprice"])
+	subtype = util.ObjToString((*query)["subtype"])
+	area = getStringArrFromDbResult((*query)["area"])
+	selectType = util.ObjToString((*query)["selectType"])
+	publishtime = util.ObjToString((*query)["publishtime"])
+	subtype = util.ObjToString((*query)["subtype"])
+	buyer = getStringArrFromDbResult((*query)["buyer"])
+	winner = getStringArrFromDbResult((*query)["winner"])
+
+	//qstr := getSearchQuery(keywords, industry, minprice, maxprice, selectType, getBidSearchQuery(area, publishtime, subtype))
+	qstr := getDataExportSql(keywords, industry, minprice, maxprice, subtype, area, selectType, publishtime, buyer, winner)
+	msgCount = elastic.Count(INDEX, TYPE, qstr)
+
+	if msgCount > ExConf.MsgMaxCount {
+		msgCount = ExConf.MsgMaxCount
+	}
+	de.T["logid"] = config.Seoconfig["dataexport"].(string)
+
+	if msgCount == 0 {
+		de.Render("/pc/dataExport_noDataErr.html", &de.T)
+		return nil
+	}
+	de.T["msgCount"] = msgCount
+	de.T["msgMaxCount"] = ExConf.MsgMaxCount
+	de.T["discount"] = ExConf.Discount
+	de.T["unitPrice_normal"] = ExConf.UnitPrice_normal
+	de.T["unitPrice_senior"] = ExConf.UnitPrice_senior
+	de.T["orderMinPrice"] = ExConf.OrderMinPrice
+	de.Render("/pc/createOrderPage.html", &de.T)
+	return nil
+}
+func getKeyWordArrFromDbResult(k interface{}) (arr []KeyWord) {
+	if k == nil {
+		return
+	}
+	kArr := k.([]interface{})
+	for _, v := range kArr {
+		kw := KeyWord{}
+		b, e := json.Marshal(v)
+		if e != nil {
+			log.Println(e.Error())
+		}
+		json.Unmarshal(b, &kw)
+		arr = append(arr, kw)
+	}
+	return
+}
+func getStringArrFromDbResult(c interface{}) (arr []string) {
+	if c != nil {
+		cArr := c.([]interface{})
+		arr = util.ObjArrToStringArr(cArr)
+	}
+	return
+}
+func (de *DataExport) PreviewData(_id string) error {
+	var (
+		query *map[string]interface{}
+		ok    bool
+		//查询字段
+		keywords    []KeyWord
+		industry    []string
+		minprice    string
+		maxprice    string
+		selectType  string
+		area        []string
+		publishtime string
+		subtype     string
+		buyer       []string //招标单位
+		winner      []string //中标单位
+	)
+	dataType := de.GetString("dataType")
+	openid := util.ObjToString(de.GetSession("s_m_openid"))
+	if openid == "" {
+		return errors.New("未登录")
+	}
+
+	if query, ok = mongodb.FindById(ExportTable, _id, nil); !ok {
+		return errors.New("未找到搜索记录")
+	}
+
+	keywords = getKeyWordArrFromDbResult((*query)["keywords"])
+	industry = getStringArrFromDbResult((*query)["industry"])
+	minprice = util.ObjToString((*query)["minprice"])
+	maxprice = util.ObjToString((*query)["maxprice"])
+	subtype = util.ObjToString((*query)["subtype"])
+	area = getStringArrFromDbResult((*query)["area"])
+	selectType = util.ObjToString((*query)["selectType"])
+	publishtime = util.ObjToString((*query)["publishtime"])
+	subtype = util.ObjToString((*query)["subtype"])
+	buyer = getStringArrFromDbResult((*query)["buyer"])
+	winner = getStringArrFromDbResult((*query)["winner"])
+
+	dataexport_field := `"_id","title","description","area","city","publishtime","projectname","buyer","winner","bidamount","subtype"`
+	if dataType == "2" {
+		dataexport_field += `,"href","projectcode","buyerperson","buyertel","budget","bidopentime","agency"`
+	}
+
+	//查询
+	qstr := getDataExportSql(keywords, industry, minprice, maxprice, subtype, area, selectType, publishtime, buyer, winner)
+	res := elastic.GetAllByIk(INDEX, TYPE, qstr, "", bidSearch_sort, dataexport_field, 0, 5, 5, false)
+	//格式化输出
+	for k, v := range *res {
+		v["index"] = k + 1
+		if v["bidamount"] != nil {
+			v["bidamount"] = v["bidamount"].(float64) / 10000
+		}
+		if v["publishtime"] != nil {
+			date := v["publishtime"]
+			v["publishtime"] = util.FormatDateWithObj(&date, util.Date_Short_Layout)
+		}
+		if v["_id"] != nil {
+			v["url"] = config.Sysconfig["webdomain"].(string) + "/article/content/" + util.CommonEncodeArticle("content", v["_id"].(string)) + ".html"
+		}
+	}
+	de.T["data"] = res
+	de.T["dataType"] = dataType
+	de.Render("/pc/previewData.html", &de.T)
+	return nil
+}
+
+func (de *DataExport) SendMailVerify() {
+	email := de.GetString("email")
+	if isEmail(email) {
+		lastSendDEVerify := util.Int64All(de.GetSession("CreatEVerifyTime"))
+		timeSpaceing := lastSendDEVerify - time.Now().Unix() + 60*5
+
+		log.Println("~~~~", lastSendDEVerify, timeSpaceing)
+		if lastSendDEVerify == 0 || timeSpaceing < 0 {
+			//生成随机数
+			verifyStr := strings.ToUpper(util.GetComplexRandom(6, 3, 3))
+			de.SetSession("DataExportVerify", verifyStr)
+			de.SetSession("CreatEVerifyTime", time.Now().Unix())
+			log.Println("====================", verifyStr, "====================")
+			//发送邮箱验证码
+			qum.SendMail(&qum.MailAuth{mailConfigMap["addr"].(string), mailConfigMap["port"].(int), mailConfigMap["user"].(string), mailConfigMap["pwd"].(string)}, &qum.Message{"剑鱼招标订阅邮箱校验", "剑鱼招标订阅", []string{email}, "您可以使用此验证码来验证您是该电子邮件地址的所有者。<font size=3>" + verifyStr + "</font>；如果这不是您本人所为，则可能是有人误输了您的电子邮件地址。请勿将此验证码泄露给他人，并且您目前无需执行任何其它操作。"})
+			de.T["success"] = true
+		} else {
+			de.T["success"] = false
+			de.T["errCode"] = 2
+			de.T["time"] = timeSpaceing
+			de.T["errMsg"] = "已发送，5分钟后再尝试"
+		}
+	} else {
+		de.T["success"] = false
+		de.T["errCode"] = 1
+		de.T["errMsg"] = "验证码校验失败"
+	}
+	de.ServeJson(&de.T)
+}
+
+func (de *DataExport) CheckMailVerify() {
+	emailVerity := de.GetString("emailVerity")
+	DataExportVerify := de.GetSession("DataExportVerify")
+	verityResult := false
+	if emailVerity != "" && emailVerity == DataExportVerify {
+		verityResult = true
+		de.DelSession("DataExportVerify")
+		de.DelSession("CreatEVerifyTime")
+		de.SetSession("EMVerifySucess", true)
+	}
+	de.T["success"] = verityResult
+	de.ServeJson(&de.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)
+}

src/jfw/front/dataExport2.go

@@ -1,5 +1,6 @@
 package front
 
+/*
 import (
 	"encoding/json"
 	"errors"
@@ -114,7 +115,6 @@ func (de *DataExport2) SuperSearchExport() error {
 	}
 	//存入数据库
 	_id := mongodb.Save(ExportTable, data)
-	log.Println("_id-------", _id)
 	//携带id跳转订单生成页面
 	de.Redirect("/front/dataExport/toCreateOrderPage/" + _id)
 	return nil
@@ -164,7 +164,7 @@ func (de *DataExport2) ToCreateOrderPage(_id string) error {
 	if msgCount > ExConf.MsgMaxCount {
 		msgCount = ExConf.MsgMaxCount
 	}
-	de.T["logid"] = config.Seoconfig["jybky"].(string)
+	de.T["logid"] = config.Seoconfig["dataexport"].(string)
 
 	if msgCount == 0 {
 		de.Render("/pc/exportData_noDataErr.html", &de.T)
@@ -316,3 +316,4 @@ 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)
 }
+*/

src/seo.json

@@ -341,6 +341,7 @@
 	"jyswhzy":"20",
 	"jyggfwy":"21",
 	"jyldy":"22",
+	"dataexport":"23",
 	"module":{
 		"subscribe":"订阅页",
 		"/list/":"标签页",

src/web/staticres/dataExport/css/conditions.css

@@ -138,7 +138,7 @@ button {
       line-height: 36px;
       text-align: right;
       color: #1D1D1D;
-      padding-right: 8px; }
+      }
       .conditions-box .line-box .left > i {
         margin-left: -4px;
         font-size: 20px;
@@ -235,7 +235,6 @@ button {
     float: left; }
   .float-box > div, .float-box > button, .float-box > sapn {
     float: left; }
-
 input {
   width: 100%;
   height: 36px;
@@ -484,3 +483,9 @@ input {
       border-left: 14px solid transparent;
       border-right: 14px solid transparent;
       border-bottom: 12px solid rgba(0, 0, 0, 0.05); }
+.float-box button{
+	margin-right:10px !important;
+}	
+#reset{
+	border: 1px solid #e0e0e0;
+}

src/web/staticres/dataExport/css/payment_order.css

@@ -40,7 +40,7 @@ body { background-color: #F5F5FB !important; }
 
 #pay .inner .infotitle a span { color: #2CB7CA; }
 
-#pay .inner .email { padding-bottom: 18px; border-bottom: 1px solid #ccc; margin-bottom: 20px; }
+#pay .inner .email { padding-bottom: 18px; border-bottom: 1px solid #ccc; margin-bottom: 20px; font-size:13.3px}
 
 #pay .inner .email .title { font-size: 16px; color: #1d1d1d; margin-bottom: 16px; }
 
@@ -68,7 +68,7 @@ body { background-color: #F5F5FB !important; }
 
 #pay .inner .guige .inner div.bz p, #pay .inner .guige .inner div.gj p, #pay .inner .wxpay .inner div.bz p, #pay .inner .wxpay .inner div.gj p { width: 100%; text-align: center; }
 
-#pay .inner .guige .inner div.bz p:nth-of-type(1), #pay .inner .guige .inner div.gj p:nth-of-type(1), #pay .inner .wxpay .inner div.bz p:nth-of-type(1), #pay .inner .wxpay .inner div.gj p:nth-of-type(1) { font-size: 14px; color: #1D1D1D; margin-bottom: 6px; }
+#pay .inner .guige .inner div.bz p:nth-of-type(1), #pay .inner .guige .inner div.gj p:nth-of-type(1), #pay .inner .wxpay .inner div.bz p:nth-of-type(1), #pay .inner .wxpay .inner div.gj p:nth-of-type(1) { font-size: 14px; color: #1D1D1D; margin-bottom: 1px; }
 
 #pay .inner .guige .inner div.bz p:nth-of-type(2), #pay .inner .guige .inner div.gj p:nth-of-type(2), #pay .inner .wxpay .inner div.bz p:nth-of-type(2), #pay .inner .wxpay .inner div.gj p:nth-of-type(2) { font-size: 12px; color: #888; }
 
@@ -104,7 +104,7 @@ body { background-color: #F5F5FB !important; }
 
 #pay .inner .info .right .t { position: relative; padding-left: 20px; }
 
-#pay .inner .info .right .t span { position: absolute; left: 0; top: 0; padding: 0; display: inline-block; width: 14px; height: 14px; cursor: pointer; box-sizing: border-box; border: 1px solid #ccc; }
+#pay .inner .info .right .t span { position: absolute; left: 0; top: 3px; padding: 0; display: inline-block; width: 14px; height: 14px; cursor: pointer; box-sizing: border-box; border: 1px solid #ccc; }
 
 #pay .inner .info .right .t span.hideBf:before { content: "\e62d"; position: absolute; left: -2px; top: -4.5px; width: 14px; height: 14px; font-size: 16px; color: #2CB7CA; }
 
@@ -121,4 +121,7 @@ body { background-color: #F5F5FB !important; }
 #pay .inner .info .right .btn_createOrder button:nth-of-type(2) { color: #fff; }
 
 #pay .no-select{-webkit-user-select:none; -moz-user-select:none; -ms-user-select:none; user-select:none;}
-/*# sourceMappingURL=payment_order.css.map */
+/*# sourceMappingURL=payment_order.css.map */
+button{
+	font-family: -webkit-pictograph !important;
+}

src/web/staticres/dataExport/css/reset_pc.css

@@ -193,3 +193,21 @@ address,caption,cite,code,dfn,em,th,b,i {font-weight: normal;font-style: normal;
 	cursor: not-allowed;
     color: #aea79f !important
 }
+input::-webkit-input-placeholder {
+   color: rgba(84, 84, 84, 0.5)!important;
+}
+
+input::-moz-placeholder {
+  /* Mozilla Firefox 19+ */
+  color: rgba(84, 84, 84, 0.5)!important;
+}
+
+input:-moz-placeholder {
+  /* Mozilla Firefox 4 to 18 */
+  color: rgba(84, 84, 84, 0.5)!important;
+}
+
+input:-ms-input-placeholder {
+  /* Internet Explorer 10-11 */
+  color: rgba(84, 84, 84, 0.5)!important;
+}

src/web/staticres/js/login.js

@@ -264,6 +264,8 @@ var getNewShareId = function(num){
 					$(".ewm2").attr("src","/front/share/"+kopshareid);
 					$("#kwewm").attr("src","/front/share/"+kopshareid);
 					break;
+				case "23"://数据导出
+					break;	
 			}
 			if(num=="13"&&!kzyflag){
 				return false;

src/web/staticres/js/public-nav.js

@@ -9,7 +9,7 @@ $(function () {
 		    $thisWidth = $(this).width(),
 		    //当前宽度
 		$thisIndex = $(this).index();
-		if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("jyblog")>-1||$href.indexOf("dataExport/toSieve")>-1||$href.indexOf("toCreateOrderPage")>-1){
+		if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("jyblog")>-1||$href.indexOf("dataExport")>-1){
 			$navLi.find("a").css({"color":"#252627"});
 		}else{
 			$navLi.find("a").css({"color":"#fff"});
@@ -39,7 +39,7 @@ function seclectNavLi(el, $index) {
 	var $slider = $(".public-nav .jynav .slider");
 	/*获取当前这个元素的css*/
 	var $thisCss = el.eq($index).width();
-	if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("jyblog")>-1){
+	if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("jyblog")>-1||$href.indexOf("dataExport")>-1){
 		el.find("a").css({"color":"#252627"});
 	}else{
 		el.find("a").css({"color":"#fff"});

src/web/templates/pc/createOrderPage.html

@@ -116,6 +116,7 @@
 	$(function () {
 		haslogin({{.T.logid}});
 		//样式
+		selcetIndexNav(4);
 		$(".public-nav").css("background","#fff")
 		$(".logo img").attr("src","/images/swordfish/sf_01.png");
 		//数据展示
@@ -134,7 +135,6 @@
 			}
 			showEmailErr("");
 			$.post("/front/dataExport/sendMailVerify",{"email":email},function(data){
-				console.log(data)
 				if(data.success){
 					//发送成功
 					sendemailTimer(60*5);
@@ -217,7 +217,6 @@
 	
 	function ChangePayMoney(){
 		var shouldPay;beforePay=0;0;
-		console.log(msgCount)
 		if(dataType==1){
 			beforePay=unitPrice_normal*msgCount
 			shouldPay=beforePay*discount;	
@@ -247,7 +246,6 @@
 		r=setInterval(function(){
 			t--;
 			$(".sendEmail").text("再次尝试("+t+"s)")
-			console.log("sss")
 			if(t==0){
 				clearInterval(r)
 				$(".sendEmail").text("获取验证码").css("background","#2CB7CA");

src/web/templates/pc/exportData_noDataErr.html → src/web/templates/pc/dataExport_noDataErr.html

@@ -42,6 +42,7 @@
 <script>
 $(function(){
 	haslogin({{.T.logid}});
+	selcetIndexNav(4);
 	//样式
 	$(".public-nav").css("background","#fff")
 	$(".logo img").attr("src","/images/swordfish/sf_01.png");

src/web/templates/pc/dataExport_sieve.html

@@ -5,16 +5,16 @@
     <meta name="viewport"
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    {{include "/common/pnc.html"}}
-    <link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-    <link href="/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" />
-    <script type="text/javascript" src="/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
-
     <link rel="stylesheet" href="//at.alicdn.com/t/font_624651_c3e1rnkx3cn.css">
     <link rel="stylesheet" href="/dataExport/css/reset_pc.css">
     <link rel="stylesheet" href="/dataExport/css/conditions.css">
     <script language="javascript" type="text/javascript" src="/My97DatePicker/WdatePicker.js"></script>
+	
+	{{include "/common/pnc.html"}}
+	<link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<link href="/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<link rel="stylesheet" type="text/css" href="/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" />
+	<script type="text/javascript" src="/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
     <title>条件筛选</title>
     <style>
         .select-date.select {
@@ -168,7 +168,6 @@
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}
 <script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>
-<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
 <script src="/dataExport/js/mapJSON.js"></script>
 <script src="/dataExport/js/conditions_order.js"></script>
 </body>
@@ -176,6 +175,9 @@
     var industrylist = {{.T.industrylist}};
     var sortArray = {{.T.sortArray}};
     $(function () {
+		selcetIndexNav(4);
+		haslogin({{.T.logid}});
+		
         $(".logo img").attr("src","/images/swordfish/sf_01.png");
         $(".public-nav").css("background-color","#fff");
         $(".public-nav").css("border-bottom","1px solid #e0e0e0");
@@ -353,7 +355,9 @@
         };
         console.log(param);
         $.post("/front/dataExport/sieveData", param, function (data) {
-
+			if (data.success){
+				window.location.href=data.redirectUrl
+			}
         }, 'json');
     });