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

src/jfw/front/swordfish.go

@@ -1483,7 +1483,7 @@ func getWxpushViewData(myopenid string, pageNum int) (keys []interface{}, list *
 	findf := `"title"`
 	if i_smartset == 1 {
 		//开启智能订阅
-		findf = `"title","projectscope"`
+		findf = `"title","detail"`
 	}
 	for _, v := range a_key {
 		keyMap, _ := v.(map[string]interface{})

src/web/staticres/css/dev2/biddingSearch.css

@@ -233,7 +233,7 @@ border-radius:2px;
   padding: 0 14px;
   box-sizing: border-box;
   border: 1px solid #e0e0e0;
-  margin-top: 26px;
+  margin-top: 25px;
   font-size: 14px;
 /*  overflow: hidden;*/
 }
@@ -875,12 +875,17 @@ display: block;
   margin: 0 10px;
 }
 #intercept{
-	margin-top: 20px;
-	padding-left: 15px;
-	font-size: 15px;
+	margin-top: 25px;
+	font-size: 14px;
+	margin-bottom: -10px;
+}
+#intercept>font{
+	margin-right: -5px;
 }
-#intercept>i{
-	color: #2CB7CA;
-	font-size: 18px;
+#intercept>img{
 	vertical-align: middle;
+	width: 15px;
+	margin-right: 5px;
+	position: relative;
+	top: -2px;
 }

src/web/staticres/css/wxsearch.css

@@ -293,7 +293,7 @@ form{
 	padding: 10px 0px 10px 10px;
 }
 .dialog-content{
-	padding: 0 10px 10px 10px;
+	padding: 0 15px 10px 15px;
 	overflow-y: auto;
 	width: 100%;
 }
@@ -938,27 +938,26 @@ form{
 	color: #1d1d1d;
 	font-size: 14px;
 	margin-right: 10px;
-	margin-bottom: 12px;
+	margin-bottom: 9px;
 	width: 21%;
 	float: left;
 	border-radius: 3px;
 	height: 34px;
 }
 .wxsearch .industry-dialog .btn{
-	padding: 5px 10px;
+	padding: 0px 12px;
 	background-color: #F4F4F9;
 	color: #1d1d1d;
 	font-size: 14px;
-	margin-right: 10px;
-	margin-bottom: 12px;
+	margin-right: 8px;
+	margin-bottom: 10px;
 	float: left;
 	border-radius: 3px;
-	height: 34px;
-	min-width: 21%;
+	height: 35px;
 }
 .wxsearch .jydq-dialog li,.wxsearch .jytype-dialog li, .wxsearch .industry-dialog li {
-	border-bottom: 1px solid #d9d6d6;
-	padding: 18px 0px 6px;
+	border-bottom: 1px solid #e0e0e0;
+	padding: 15px 0px 6px;
 	float: left;
 	width: 100%;
 }
@@ -1030,7 +1029,7 @@ form{
 	color: #1d1d1d;
 	font-size: 15px;
 	margin-right: 10px;
-	margin-bottom: 14px;
+	margin-bottom: 10px;
 	height:36px;
 	border-radius: 3px;
 	font-weight: 600;
@@ -1594,7 +1593,7 @@ form{
 	color: #1d1d1d !important;
 	font-size: 14px;
 	margin-right: 10px;
-	margin-bottom: 12px;
+	margin-bottom: 9px;
 	width: 21%;
 	float: left;
 	border-radius: 3px;
@@ -1962,7 +1961,7 @@ body{
 	padding:10px;
 }
 #entsearchPage .area ul li{
-	border-bottom: 1px solid #d9d6d6;
+	border-bottom: 1px solid #e0e0e0;
     padding: 15px 0px 16px;
     float: left;
     width: 100%;
@@ -1975,6 +1974,8 @@ body{
     width: 100%;
 	height:40px;
 	line-height:40px;
+	font-size: 16px;
+	color: #888;
 }
 #entsearchPage .money-inp{
 	background-color:#f5f4fa;
@@ -2170,23 +2171,22 @@ body{
 	right: -8px;
 }
 #supersearchPage .jydq-dialog ul>li,#entsearchPage .jydq-dialog ul>li{
-	padding-left: 18px;
+	padding-left: 15px;
 	position: relative;
 }
 #supersearchPage .jydq-dialog ul>li>span,#entsearchPage .jydq-dialog ul>li>span{
 	position: absolute;
     left: 0px;
-	top: 24px;
+	top: 22px;
     font-size: 14px;
 }
 #supersearchPage #intercept{
 	padding: 17px 20px 0px 20px;
 	font-size: 14px;
 }
-#supersearchPage #intercept>span{
-	color: #2CB7CA;
-	font-size: 18px;
-	vertical-align: middle;
+#supersearchPage #intercept>img{
+	width: 15px;
+	margin-right: 5px;
 }
 #supersearchPage #intercept>font{
 	margin: 0px 5px;
@@ -2197,4 +2197,13 @@ body{
 }
 #entsearchPage .wxsearch{
 	margin-top: 0px;
+}
+.wxsearch .jydq-dialog .btn{
+	width: 58px;
+	height: 35px;
+	padding: 0px;
+	margin-right: 8px;
+}
+.wxsearch .industry-dialog li{
+	padding: 15px 0px 6px;
 }

src/web/templates/pc/supsearch.html

@@ -611,6 +611,9 @@ $(function(){
 
 	<!--招标搜索页面 START-->
 	<div class="searchControl">
+		<div id="intercept" class="hidden w">
+			<img src="/images/tip.png"/>“<span></span><font>”</font>及其后面的字词均被忽略，因为剑鱼的查询限制在20个汉字以内。
+		</div>
 		<!--头部功能-->
 		<div class="searchTender w">
 			<!--行业-->
@@ -766,7 +769,6 @@ $(function(){
 				</span>
 			</div>
 		</div>
-		<div id="intercept" class="hidden w"><i class="bootstrap-glyphicon glyphicon-info-sign"></i>“<span></span>”及其后面的字词均被忽略，因为剑鱼的查询限制在20个汉字以内。</div>
 		<!--招标搜索列表内容-->
 		<div class="seaTender-inner w">
 			<!--招标tab切换-->

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

@@ -101,7 +101,9 @@
 				<div class="showtable" onclick="SuperSearch.showTable()">表格</div>
 			</div>
 		</div>		
-		<div id="intercept" class="hidden"><span class="bootstrap-glyphicon glyphicon-info-sign"></span><font>“的方式”</font>及其后面的字词均被忽略，因为剑鱼的查询限制在20个汉字以内。</div>
+		<div id="intercept" class="hidden">
+			<img src="/images/tip.png"><font>“的方式”</font>及其后面的字词均被忽略，因为剑鱼的查询限制在20个汉字以内。
+		</div>
 		<div class="wxsearch hidden" id="super_search">
 			<div class="jysstj">
 				<div class="jyshaxuan">