Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
qmx
/
jy
14
0
Салаа 0
Файлууд Асуудлууд 2 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

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

xuzhiheng 5 жил өмнө
parent
81463ecfe5 0343ea58ff
commit
18ba2d1faf
5 өөрчлөгдсөн 21 нэмэгдсэн , 9 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 1 1
      src/jfw/modules/subscribepay/src/util/msgremind.go
  2. 2 2
      src/web/staticres/css/wx/home.css
  3. 7 3
      src/web/templates/weixin/historypush.html
  4. 4 0
      src/web/templates/weixin/resultpreview.html
  5. 7 3
      src/web/templates/weixin/search/mainSearch.html

+ 1 - 1
src/jfw/modules/subscribepay/src/util/msgremind.go
Файл харах 

@@ -238,7 +238,7 @@ func init() {
 
 	go func() {
 
 		log.Println("开始加载72小时内的订单到内存中。。。")
 
 		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)
 
+		list := Mysql.SelectBySql("select id,order_code,order_money,user_id,prepay_time,remind_status,vip_type from dataexport_order where order_money>0 and 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

+ 2 - 2
src/web/staticres/css/wx/home.css
Файл харах 

@@ -51,8 +51,8 @@ width: 100%;
 
 }
 
 
 .home .top .home_search .icon_search, .home .top .home_search .icon_question {
 
-  width: .48rem;
 
-  height: .48rem;
 
+  width: .58rem;
 
+/*  height: .48rem;*/
 
 }
 
 
 .home .top .home_banner {

+ 7 - 3
src/web/templates/weixin/historypush.html
Файл харах 

@@ -533,7 +533,7 @@
 
 			if(!vis){
 
 				for(var i=0;i<dataCache.length;i++){
 
 					if(dataCache[i]._id==eid&&dataCache[i].ca_date==pd){
 
-						dataCache[i].ca_visit=1;
 
+						dataCache[i].ca_isvisit=1;
 
 						break
 
 					}
 
 				}
 
@@ -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>

+ 7 - 3
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>
 
@@ -23,9 +23,9 @@
 
 <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>
 
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}9"></script>
 
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
 
 <!--2.8-->
 
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}1">
 
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}">
 
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/search_tab.css?v={{Msg "seo" "version"}}">
 
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
 
@@ -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;">