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

src/jfw/modules/subscribepay/src/util/msgremind.go

@@ -237,8 +237,8 @@ func (m *msgRemind) gc() {
 func init() {
 	go func() {
 		log.Println("开始加载72小时内的订单到内存中。。。")
-		startTime := time.Now().Local().AddDate(0, 0, -3).Format(util.Date_Full_Layout)
-		list := Mysql.SelectBySql("select id,order_code,order_money,user_id,prepay_time,remind_status,vip_type from dataexport_order where prepay_time>=? and product_type='VIP订阅' and order_status=0 and (remind_status<>2 or remind_status is null)", startTime)
+		startTime := time.Now().Unix() - MsgRemind.getExpireTime()
+		list := Mysql.SelectBySql("select id,order_code,order_money,user_id,prepay_time,remind_status,vip_type from dataexport_order where order_money>0 prepay_time>=? and product_type='VIP订阅' and order_status=0 and (remind_status<>2 or remind_status is null)", startTime)
 		if list == nil {
 			log.Println("加载72小时内的订单到内存中失败")
 			return

src/web/staticres/css/wx/home.css

@@ -145,9 +145,11 @@ font-weight: bold;
 .home .home_data .data_list .list_title {
   display: flex;
   font-size: .32rem;
-  text-align: justify;
+/*  text-align: justify;*/
+}
+.home .home_data .data_list .list_title p{
+	word-break: break-all;
 }
-
 .home .home_data .data_list .list_info {
   display: flex;
   justify-content: space-between;

src/web/staticres/css/wxlist.css

@@ -57,6 +57,9 @@
     border:1px solid #24C0D7;
     border-radius: 3px;
     padding: 1px 3px;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .restime span.type{
 	border: 1px solid #ffba00;
@@ -66,6 +69,9 @@
 	padding: 1px 3px;
 	color: #fff;
 	font-size: 14px;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .restime span.industry{
 	border: 1px solid #25c78c;
@@ -75,6 +81,9 @@
 	padding: 1px 3px;
 	color: #fff;
 	font-size: 14px;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 
 .restime span.projectM{
@@ -85,6 +94,9 @@
     border:1px solid #B4B4B8;
     border-radius: 3px;
     padding: 1px 3px;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .filter_tab .tab_right .vip_set_box.a:visited{
 	text-decoration: none;

src/web/staticres/js/wxSupersearch.js

@@ -2017,7 +2017,7 @@ var SuperSearch = {
 				homeListHtml +='<div class="area">'+area+'</div>'
 				var industry = _list["industry"];
 				var subtype = _list["subtype"];
-				if(SuperSearch.hasSubscribe){
+				if(SuperSearch.hasSubscribe||SuperSearch.isVip){
 					industry = _list["s_subscopeclass"];
 					subtype = _list["type"];
 				}

src/web/templates/weixin/my.html

@@ -163,20 +163,20 @@
         })
 		
 		function getParam(pname) {
-			    var params = location.search.substr(1);
-			    var ArrParam = params.split('&');
-			    if (ArrParam.length == 1) { 
-			        return params.split('=')[1];
-			    }
-			    else {
-			        //多个参数参数的情况
-			        for (var i = 0; i < ArrParam.length; i++) {
-			            if (ArrParam[i].split('=')[0] == pname) {
-			                return ArrParam[i].split('=')[1];
-			            }
-			        }
-			    }
-			}
+		    var params = location.search.substr(1);
+		    var ArrParam = params.split('&');
+		    if (ArrParam.length == 1) { 
+		        return params.split('=')[1];
+		    }
+		    else {
+		        //多个参数参数的情况
+		        for (var i = 0; i < ArrParam.length; i++) {
+		            if (ArrParam[i].split('=')[0] == pname) {
+		                return ArrParam[i].split('=')[1];
+		            }
+		        }
+		    }
+		}
 			
 		// 控制手机号中间四位显示星号
 		function user_phone_encryption(user_phone){

src/web/templates/weixin/resultpreview.html

@@ -4,7 +4,7 @@
 <title>推送结果预览</title>
 {{include "/common/inc.html"}}
 <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"}}" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}1" rel="stylesheet">
 {{include "/common/weixin.html"}}
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/rem.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>

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

@@ -12,14 +12,14 @@
 <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"}}" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}1" 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>
 <script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
 {{include "/common/weixin.html"}}
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=DD279b2a90afdf0ae7a3796787a0742e"></script>
+<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=DD279b2a90afdf0ae7a3796787a0742e"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}9"></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>
@@ -310,6 +310,9 @@
 						+'<img src="'+ADTopList[i]["s_pic"]+'" alt="">'
 						+'</a></div>'
 				}
+				if(ADTopList.length==1){
+					$(".swiper-pagination").hide();
+				}
 				if(adhtml!=""){
 					$(".home_banner .swiper-wrapper").html(adhtml);
 				}

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -476,11 +476,7 @@ try{
         }else if(r.data.order.order_status==-2){
     		$("#pageTitle").text("已取消");
      		$(".invoice").css("display","none");//隐藏开发票
-//   		if(!(r.data.time.l_vip_starttime&&r.data.time.l_vip_endtime)){
-//         		$(".align").css("display","").html("再次购买");
-//        	}
         }
-       
       }
       	
       	if (r.data.order.order_status==0){

src/web/templates/weixin/vipsubscribe/vip_viewPage.html

@@ -4,7 +4,7 @@
 	<title>VIP订阅结果预览</title>
 	{{include "/common/inc.html"}}
 	<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"}}" rel="stylesheet">
+	<link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}1" rel="stylesheet">
 	{{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
 	<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
@@ -339,6 +339,9 @@
 	    padding: 1px 3px;
 	    color: #fff;
 	    font-size: 14px;
+	    height: 0.40rem;
+	    line-height: 0.40rem;
+		display: inline-block;
 	}
 	.findnull{
 		display:none;

src/web/templates/weixin/wxinfocontent.html

@@ -174,6 +174,9 @@ pre {
     border-radius: 2px;
     margin-right: 3px;
     float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .type{
     padding: 1px 3px;
@@ -182,6 +185,9 @@ pre {
 	border-radius: 2px;
 	margin-right: 3px;
 	float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .industry{
 	padding: 1px 3px;
@@ -190,6 +196,11 @@ pre {
 	border-radius: 3px;
 	margin-right: 3px;
 	float: left;
+	height: 0.42rem;
+    line-height: 0.42rem;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .guide{
 	text-align: center;
@@ -484,6 +495,9 @@ pre {
     border-radius: 3px;
     margin-right: 3px;
     float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 
 .projectMatch{
@@ -493,6 +507,9 @@ pre {
     border-radius: 3px;
     margin-right: 3px;
     float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 
 .time_label{

src/web/templates/weixin/wxinfocontent_rec.html

@@ -103,6 +103,9 @@ pre {
     border-radius: 2px;
     margin-right: 3px;
     float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .type{
     padding: 1px 3px;
@@ -111,6 +114,9 @@ pre {
 	border-radius: 2px;
 	margin-right: 3px;
 	float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .industry{
 	padding: 1px 3px;
@@ -119,6 +125,9 @@ pre {
 	border-radius: 3px;
 	margin-right: 3px;
 	float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .guide{
 	text-align: center;
@@ -414,6 +423,9 @@ pre {
     border-radius: 3px;
     margin-right: 3px;
     float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
 }
 .timebefore_vip{
 	color: #888888;
@@ -451,6 +463,19 @@ pre {
     align-items: center;
     justify-content: space-between;
 }
+
+.projectMatch{
+	padding: 1px 3px;
+    background: #B4B4B8;
+    color: #fff;
+    border-radius: 3px;
+    margin-right: 3px;
+    float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
+}
+
 </style>
 </head>
 <body>