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/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/search/mainSearch.html

@@ -19,7 +19,7 @@
 <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);
 				}