页面调整

src/jfw/front/dataExport2.go

@@ -164,14 +164,18 @@ func (de *DataExport2) ToCreateOrderPage(_id string) error {
 	if msgCount > ExConf.MsgMaxCount {
 		msgCount = ExConf.MsgMaxCount
 	}
+	de.T["logid"] = config.Seoconfig["jybky"].(string)
 
+	if msgCount == 0 {
+		de.Render("/pc/exportData_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
 }

src/jfw/front/swordfish.go

@@ -2936,7 +2936,6 @@ func getDataExportSql(keywords []KeyWord, industry []string, minprice string, ma
 		}
 		mustquery += `]}}`
 	}
-	log.Println("query__1_____\n", mustquery)
 
 	multi_match := `{"multi_match": {"query": %s,"type": "phrase", "fields": [%s],"analyzer": "my_ngram"}}`
 	query := `{"query":{"bool":{"must":[%s],"should":[%s],"must_not":[%s],"minimum_should_match": %d}}}`
@@ -2979,18 +2978,14 @@ func getDataExportSql(keywords []KeyWord, industry []string, minprice string, ma
 		}
 
 	}
-	log.Printf("query__2_____\n %s \n %s", bools, must_not)
 	if len(industry) > 0 {
 		bools = append(bools, fmt.Sprintf(query_bool_must, "s_subscopeclass", `"`+strings.Join(industry, `","`)+`"`))
-		log.Printf("query__3_____\n %s ", fmt.Sprintf(query_bool_must, "s_subscopeclass", `"`+strings.Join(industry, `","`)+`"`))
 	}
 	if len(buyer) > 0 {
 		bools = append(bools, fmt.Sprintf(query_bool_must, "buyer", `"`+strings.Join(buyer, `","`)+`"`))
-		log.Printf("query__4_____\n %s ", fmt.Sprintf(query_bool_must, "buyer", `"`+strings.Join(buyer, `","`)+`"`))
 	}
 	if len(winner) > 0 {
 		bools = append(bools, fmt.Sprintf(query_bool_must, "s_winner", `"`+strings.Join(winner, `","`)+`"`))
-		log.Printf("query__5_____\n %s ", fmt.Sprintf(query_bool_must, "s_winner", `"`+strings.Join(winner, `","`)+`"`))
 	}
 	if minprice != "" || maxprice != "" {
 		sq := ``
@@ -3019,11 +3014,8 @@ func getDataExportSql(keywords []KeyWord, industry []string, minprice string, ma
 		}
 		query_price := fmt.Sprintf(query_bool_should, fmt.Sprintf(query_bools_must, sq, sq, sq))
 		bools = append(bools, query_price)
-		log.Printf("query__6_____\n %s ", query_price)
 	}
-	log.Println("must_not", must_not)
 	qstr := fmt.Sprintf(query, mustquery, strings.Join(bools, ","), strings.Join(must_not, ","), len(bools)+len(must_not))
-	log.Println("\n", qstr)
 	return qstr
 }
 func stringMForm(s string) string {

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

@@ -35,7 +35,7 @@ button {
     margin-left: 15px; }
 
 .conditions-box {
-  padding: 30px 0;
+  padding: 106px 0px 30px 0px;
   font-family: MicrosoftYaHei;
   font-size: 16px; }
   .conditions-box .progress_ {

src/web/staticres/dataExport/css/pay_success.css

@@ -1,5 +1,3 @@
-body { background: #f5f5fb; }
-
 #pay_succ { padding: 30px 0; position: relative; }
 
 #pay_succ .progress { width: 1200px; display: inline-block; padding-left: 120px; margin-bottom: 30px; box-sizing: border-box; }

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

@@ -1,30 +1,30 @@
-body { background-color: #F5F5FB; }
+body { background-color: #F5F5FB !important; }
 
-#pay { padding: 30px 0; }
+#pay { padding: 106px 0px 30px 0px; }
 
-#pay .progress { width: 1200px; display: inline-block; padding-left: 120px; margin-bottom: 30px; box-sizing: border-box; }
+#pay .progress_createOrder { width: 1200px; display: inline-block; padding-left: 120px; margin-bottom: 30px; box-sizing: border-box; }
 
-#pay .progress div { width: 300px; height: 38px; line-height: 38px; text-align: center; background-color: #BFBFBF; float: left; margin-right: 8px; }
+#pay .progress_createOrder div { width: 300px; height: 38px; line-height: 38px; text-align: center; background-color: #BFBFBF; float: left; margin-right: 8px; }
 
-#pay .progress div.a1 { background-color: #BFBFBF; color: #fff; }
+#pay .progress_createOrder div.a1 { background-color: #BFBFBF; color: #fff; }
 
-#pay .progress div.b2 { background-color: #72DAE8; color: #fff; }
+#pay .progress_createOrder div.b2 { background-color: #72DAE8; color: #fff; }
 
-#pay .progress div.c3 { background-color: #2CB7CA; color: #fff; }
+#pay .progress_createOrder div.c3 { background-color: #2CB7CA; color: #fff; }
 
-#pay .progress .l { position: relative; z-index: 3; }
+#pay .progress_createOrder .l { position: relative; z-index: 3; }
 
-#pay .progress .l:after { content: ""; position: absolute; right: -23px; top: 0; width: 0; height: 0; border-top: 19px solid transparent; border-left: 23px solid #2CB7CA; border-bottom: 19px solid transparent; }
+#pay .progress_createOrder .l:after { content: ""; position: absolute; right: -23px; top: 0; width: 0; height: 0; border-top: 19px solid transparent; border-left: 23px solid #2CB7CA; border-bottom: 19px solid transparent; }
 
-#pay .progress .c { z-index: 2; position: relative; }
+#pay .progress_createOrder .c { z-index: 2; position: relative; }
 
-#pay .progress .c:before { content: ""; position: absolute; left: 0; top: 0; width: 0; height: 0; border-top: 19px solid transparent; border-left: 23px solid #fff; border-bottom: 19px solid transparent; }
+#pay .progress_createOrder .c:before { content: ""; position: absolute; left: 0; top: 0; width: 0; height: 0; border-top: 19px solid transparent; border-left: 23px solid #fff; border-bottom: 19px solid transparent; }
 
-#pay .progress .c:after { content: ""; position: absolute; right: -23px; top: 0; width: 0; height: 0; border-top: 19px solid transparent; border-left: 23px solid #72DAE8; border-bottom: 19px solid transparent; }
+#pay .progress_createOrder .c:after { content: ""; position: absolute; right: -23px; top: 0; width: 0; height: 0; border-top: 19px solid transparent; border-left: 23px solid #72DAE8; border-bottom: 19px solid transparent; }
 
-#pay .progress .r { position: relative; }
+#pay .progress_createOrder .r { position: relative; }
 
-#pay .progress .r:before { content: ""; position: absolute; left: 0; top: 0; width: 0; height: 0; border-top: 19px solid transparent; border-left: 23px solid #fff; border-bottom: 19px solid transparent; }
+#pay .progress_createOrder .r:before { content: ""; position: absolute; left: 0; top: 0; width: 0; height: 0; border-top: 19px solid transparent; border-left: 23px solid #fff; border-bottom: 19px solid transparent; }
 
 #pay .inner { background-color: #fff; border-top: 2px solid #2CB7CA; padding: 30px; }
 
@@ -92,6 +92,8 @@ body { background-color: #F5F5FB; }
 
 #pay .inner .money > div:nth-of-type(1) { margin: 18px 0 11px 0; color: #1d1d1d; }
 
+#pay .inner .money > div:nth-of-type(1) p{ height:24px}
+
 #pay .inner .money > div:nth-of-type(1) span { font-size: 24px; font-weight: bold; color: #ff3a20; }
 
 #pay .inner .money > div:nth-of-type(2) { color: #1d1d1d; }
@@ -104,19 +106,19 @@ body { background-color: #F5F5FB; }
 
 #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.hideBf:before { content: "\e62d"; position: absolute; left: -2px; top: -2px; width: 14px; height: 14px; font-size: 16px; color: #2CB7CA; }
+#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; }
 
 #pay .inner .info .right .t i { color: #888888; }
 
 #pay .inner .info .right .t i a { color: #0987FF; font-size: 14px; }
 
-#pay .inner .info .right .btn { margin-top: 40px; }
+#pay .inner .info .right .btn_createOrder { margin-top: 40px; }
 
-#pay .inner .info .right .btn button { display: inline-block; width: 180px; height: 46px; line-height: 46px; text-align: center; font-size: 16px; border-radius: 6px; cursor: pointer; }
+#pay .inner .info .right .btn_createOrder button { display: inline-block; width: 180px; height: 46px; line-height: 46px; text-align: center; font-size: 16px; border-radius: 6px; cursor: pointer; }
 
-#pay .inner .info .right .btn button:nth-of-type(1) { background-color: #fff; margin-right: 15px; border: 1px solid #ccc; }
+#pay .inner .info .right .btn_createOrder button:nth-of-type(1) { background-color: #fff; margin-right: 15px; border: 1px solid #ccc; }
 
-#pay .inner .info .right .btn button:nth-of-type(2) { color: #fff; }
+#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 */

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

@@ -21,6 +21,7 @@ vertical-align: baseline;
 outline: 0; 
 } 
 body { 
+background-color: #F5F5FB !important;
 line-height: 1; 
 /*color: black; 
 background: white; */
@@ -110,3 +111,85 @@ address,caption,cite,code,dfn,em,th,b,i {font-weight: normal;font-style: normal;
 .fl {float:left; }
 .fr {float: right; }
 .w {width: 1200px; margin: 0 auto;}
+/*登录二维码*/
+.j-wx-code{
+	width: 335px;
+	height: 355px;
+	background-color: #fff;
+	-webkit-border-radius: 6px;
+	   -moz-border-radius: 6px;
+	        border-radius: 6px;
+	position: relative;
+	 
+}
+.j-wx-code>.code-close{
+	width: 40px;
+	height: 40px;
+	position: absolute;
+	right: -20px;
+	top: -20px;
+	cursor: pointer;
+	-webkit-transition: all 1s;
+	-o-transition: all 1s;
+	-moz-transition: all 1s;
+	transition: all 1s;
+}
+.j-wx-code>.code-close:hover{
+	-webkit-transform: scale(1.2);
+	   -moz-transform: scale(1.2);
+	    -ms-transform: scale(1.2);
+	     -o-transform: scale(1.2);
+	        transform: scale(1.2);
+}
+.j-wx-code>.code-title{
+	height: 82px;
+	background:url(/images/j-wx-code-title.png) center center no-repeat;
+	-webkit-animation: moveYun 15s infinite linear both;
+	   -moz-animation: moveYun 15s infinite linear both;
+	     -o-animation: moveYun 15s infinite linear both;
+	        animation: moveYun 15s infinite linear both;
+}
+.j-wx-code>.code-wxm{
+	text-align: center;
+	margin-bottom: -6px;
+	margin-top: -16px;
+	
+}
+.j-wx-code>.code-wxm>img{
+	width: 200px;
+	height: 200px;
+	margin-top: -5px;
+}
+.j-wx-code>.code-text{
+	font: 16px "microsoft yahei";
+	text-align: center;
+	color: #252627;
+}
+.j-wx-code>.code-bottom{
+	width: 470px;
+	height: 211px;
+	position: absolute;
+	bottom: -113px;
+	left: -73px;
+	background: url(/images/j-wx-code-bottom.png) 0 0 no-repeat;
+}
+.j-wx-code>.code-bottom>img{
+	position: absolute;
+	left: 280px;
+	top: 88px;
+	-webkit-animation: codeWxMove 10s linear both;
+	   -moz-animation: codeWxMove 10s linear both;
+	     -o-animation: codeWxMove 10s linear both;
+	        animation: codeWxMove 10s linear both;
+	-webkit-animation-fill-mode:forwards;
+	   -moz-animation-fill-mode:forwards;
+	     -o-animation-fill-mode:forwards;
+	        animation-fill-mode:forwards;
+}
+.tabTitle a,.control-tabBtn a,.pagination a,.left-content a{
+	text-decoration: none !important;
+}
+.disabled{
+	cursor: not-allowed;
+    color: #aea79f !important
+}

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){
+		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){
 			$navLi.find("a").css({"color":"#252627"});
 		}else{
 			$navLi.find("a").css({"color":"#fff"});

src/web/templates/common/pchead.html

@@ -15,6 +15,9 @@
 				<li>
 					<a href="/jylab/supsearch/index.html">招标搜索</a>
 				</li>
+				<li>
+					<a href="/front/dataExport/toSieve">数据导出</a>
+				</li>
 				<li>
 					<a target="_blank" href="https://open.jianyu360.com">开放平台</a>
 				</li>

src/web/templates/pc/createOrderPage.html

@@ -8,11 +8,18 @@
     <link rel="stylesheet" href="//at.alicdn.com/t/font_624651_bjdvktmum68.css">
     <link rel="stylesheet" href="/dataExport/css/reset_pc.css">
     <link rel="stylesheet" href="/dataExport/css/payment_order.css">
+	
+	{{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>
 </head>
 <body>
+{{include "/common/pchead.html"}}
 <section id="pay" class="w">
-    <div class="progress">
+    <div class="progress_createOrder">
         <div class="l c3">
             1.条件筛选
         </div>
@@ -87,7 +94,7 @@
                     <i>已阅读并同意<a href="#">《剑鱼服务条款》</a></i>
 
                 </p>
-                <p class="btn">
+                <p class="btn_createOrder">
                     <button class="dataPreview">预览数据</button>
                     <button class="toPay" disabled="disabled">确认支付</button>
                 </p>
@@ -96,7 +103,6 @@
     </div>
 </section>
 
-<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
 <script>
 	var msgCount={{.T.msgCount}}
 	var msgMaxCount={{.T.msgMaxCount}}
@@ -108,6 +114,10 @@
 	var finishEmailVerity=false;
 	var dataType=2;
 	$(function () {
+		haslogin({{.T.logid}});
+		//样式
+		$(".public-nav").css("background","#fff")
+		$(".logo img").attr("src","/images/swordfish/sf_01.png");
 		//数据展示
 		var showCount=FormatNum(msgCount);
 		$(".msgCount").text(showCount);
@@ -158,7 +168,7 @@
 		})
 		
 		//是否显示最大条数
-		if(msgCount=msgMaxCount){
+		if(msgCount==msgMaxCount){
 			$(".infotitle em").text("最大限额"+showCount+"条");
 			$(".infotitle em").css("display","");
 		} 
@@ -207,6 +217,7 @@
 	
 	function ChangePayMoney(){
 		var shouldPay;beforePay=0;0;
+		console.log(msgCount)
 		if(dataType==1){
 			beforePay=unitPrice_normal*msgCount
 			shouldPay=beforePay*discount;	
@@ -249,5 +260,6 @@
 		},1000)
 	}
 </script>
+{{include "/common/pcbottom.html"}}
 </body>
 </html>

src/web/templates/pc/exportData_noDataErr.html

@@ -0,0 +1,55 @@
+<!doctype html>
+<html lang="zh-Hans">
+<head>
+    <meta charset="UTF-8">
+    <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">
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_624651_bjdvktmum68.css">
+    <link rel="stylesheet" href="/dataExport/css/reset_pc.css">
+    <link rel="stylesheet" href="/dataExport/css/conditions.css">
+	
+	{{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>
+</head>
+<body>
+{{include "/common/pchead.html"}}
+<section class="conditions-box w">
+    <div class="progress_">
+        <div class="l c3">
+            1.条件筛选
+        </div>
+        <div class="c">
+            2.订单支付
+        </div>
+        <div class="r a1">
+            3.数据导出
+        </div>
+    </div>
+    <div class="inner">
+        <div class="err-box">
+            <img src="https://www.jianyu360.com/images/pc_12.png" alt="根据您的筛选条件，未匹配到数据">
+            <span>根据您的筛选条件，未匹配到数据</span>
+            <button class="goback">返回筛选</button>
+        </div>
+    </div>
+</section>
+{{include "/common/pcbottom.html"}}
+<script>
+$(function(){
+	haslogin({{.T.logid}});
+	//样式
+	$(".public-nav").css("background","#fff")
+	$(".logo img").attr("src","/images/swordfish/sf_01.png");
+	
+	$(".goback").on("click",function(){
+		window.location.href="/front/dataExport/toSieve";
+	});
+})
+</script>
+</body>
+</html>