Merge branch 'dev2.8.7_new' into release

src/jfw/modules/subscribepay/src/report/report.go

@@ -339,7 +339,7 @@ func getDateSection(start, end int64) string {
 	s := time.Unix(start, 0)
 	e := time.Unix(end, 0)
 	for {
-		if !s.Before(e) {
+		if s.After(e) {
 			break
 		}
 		array = append(array, qutil.FormatDate(&s, qutil.Date_Short_Layout))

src/web/templates/weixin/historypush.html

@@ -915,7 +915,7 @@
 			</div>
 			<div class="tab_right">
 				<div class="vip_report" style="display: none;">
-					<span><a></a><img src="/vipsubscribe/image/vipreport/report.png"></span><font>报告</font>
+					<span><a></a><img src="{{Msg "seo" "cdn"}}/vipsubscribe/image/vipreport/report.png"></span><font>报告</font>
 				</div>
                 <div class="normal_set" style="display: none;" id="normal_set">
                   	<div class="normal_set_box">
@@ -1012,12 +1012,12 @@
 		<div class="weui-mask weui-animate-fade-in"></div>
 		<div class="weui-dialog weui-animate-fade-in">
 			<div class="my-dialog__hd">
-				<img src="/vipsubscribe/image/vipreport/dialog-image.png" alt="">
+				<img src="{{Msg "seo" "cdn"}}/vipsubscribe/image/vipreport/dialog-image.png" alt="">
 				<div class="jy_title">剑鱼标讯</div>
 				<h2 class="weekly">每<span></span>订阅报告来啦</h2>
 				<div class="term"></div>
 				<a href="javascript:void(0)" class="vip_report_todetail">点击查看</a>
-				<img src="/vipsubscribe/image/vipreport/close.svg" class="vip_report_tip_close">
+				<img src="{{Msg "seo" "cdn"}}/vipsubscribe/image/vipreport/close.svg" class="vip_report_tip_close">
 			</div>
 		</div>
 	</div>