Merge remote-tracking branch 'origin/feature/v4.9.33' into feature/v4.9.33

src/jfw/filter/pcfilter.go

@@ -33,7 +33,7 @@ func (this *pcFilter) Do() bool {
 	if this.R.Method == "POST" {
 		return true
 	}
-	if userAgent := this.R.UserAgent(); mobileReg.MatchString(userAgent) || public.CheckWxBrowser(this.R) {
+	if userAgent := this.R.UserAgent(); mobileReg.MatchString(userAgent) || public.CheckWxBrowser(this.R) || strings.Contains(userAgent, "JianyuDebug") {
 		//wx
 		return true
 	}

src/web/staticres/common-module/portrait/css/downloadpopup.css

@@ -56,7 +56,7 @@
 }
 
 .download-popup .download-content {
-  padding: 0 0.32rem;
+  padding: 0 0.32rem 0.14rem 0.32rem;
   max-height: 8.5rem;
   overflow-y: scroll;
 }
@@ -167,7 +167,7 @@ color: #5F5E64;
   justify-content: space-between;
   padding: 0.16rem 0.32rem;
   box-sizing: border-box;
-  margin-top: 0.14rem;
+  /* margin-top: 0.14rem; */
 }
 .download_footbox .footbox_left{
 }

src/web/staticres/common-module/report-analysis/css/downloadpopup.css

@@ -56,7 +56,7 @@
 }
 
 .download-popup .download-content {
-  padding: 0 0.32rem;
+  padding: 0 0.32rem 0.14rem 0;
 }
 
 .download-popup .download-content .titleconent {
@@ -165,7 +165,7 @@ color: #5F5E64;
   justify-content: space-between;
   padding: 0.16rem 0.32rem;
   box-sizing: border-box;
-  margin-top: 0.14rem;
+  /* margin-top: 0.14rem; */
 }
 .download_footbox .footbox_left{
 }

src/web/staticres/common-module/report-analysis/js/report_analysis.js

@@ -648,7 +648,11 @@ var vm = new Vue({
     },
     calcStickyOffset: function () {
       setTimeout(function () {
-        var headerHeight = $('.jy-app-header')[0].clientHeight
+        try{
+           var headerHeight = $('.jy-app-header')[0].clientHeight // 微信端没有header
+        }catch(e){
+          headerHeight = 0
+        }
         var tabHeight = $('.analysis-tab')[0].clientHeight
         this.stickyOffset = headerHeight + tabHeight - 5
       }.bind(this), 1000)