Browse Source

Merge branch 'dev2.8.5' of ssh://192.168.3.207:10022/qmx/jy into dev2.8.5

wcj 5 years ago
parent
commit
df3639cdbe

+ 6 - 2
src/web/templates/weixin/historypush.html

@@ -805,12 +805,16 @@
 		    background: #CFAD89;
 		    border-radius: 3px;
 		    margin: 0px 5px;
-		    padding: 1px 3px;
 		    color: #fff;
 			font-size: 14px;
 		    height: 0.40rem;
-		    line-height: 0.40rem;
 			display: inline-block;
+    		padding: 0 3px;
+   			line-height: .39rem;
+		}
+		.restime span.location,.restime span.type,.restime span.industry {
+		    padding: 0 3px;
+		    line-height: .39rem;
 		}
 		._header{
 			position: fixed;

+ 4 - 0
src/web/templates/weixin/resultpreview.html

@@ -418,6 +418,10 @@ a{
 	max-height: 45px;
     overflow: hidden;
 }
+.restime span.location,.restime span.type,.restime span.industry {
+    padding: 0 3px;
+    line-height: .39rem;
+}
 </style>
 </head>
 <body>

+ 5 - 1
src/web/templates/weixin/search/mainSearch.html

@@ -12,7 +12,7 @@
 <link href="{{Msg "seo" "cdn"}}/css/wxsearch.css?v={{Msg "seo" "version"}}11" rel="stylesheet" type="text/css" >
 <link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}1" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}12" rel="stylesheet">
 <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jy.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
@@ -272,6 +272,10 @@
 	#dqbtn{
 		width: 5.5em !important;
 	}
+	.restime span.location,.restime span.type,.restime span.industry {
+	    padding: 0 3px;
+	    line-height: .39rem;
+	}
 	</style>
 </head>
 <body  style="min-height:100vh;">