Merge branch 'master' into hotfix/v4.8.68.1

src/jfw/modules/app/src/web/templates/frontRouter/fileRecord/sess/index.html

@@ -420,6 +420,7 @@
   <script crossorigin src="//cdn-common.jianyu360.com/cdn/lib/html2canvas/1.3.3/dist/html2canvas.min.js"></script>
   <!--E-当前页面的资源-->
   {{include "/big-member/commonjs.html"}}
+  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/file-pack/js/index.js?v={{Msg "seo" "version"}}'></script>
 <!--  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/file-pack/js/rights-box.js?v={{Msg "seo" "version"}}'></script>-->

src/web/staticres/common-module/file-pack/js/index-wx.js

@@ -158,13 +158,18 @@ var vm = new Vue({
             _this.userPower.power = resData.power
             // 客服二维码获取
             if(resData.customers && resData.customers.length > 0 ){
+              var qrImgs = {
+                vip: '',
+                default: ''
+              }
               resData.customers.forEach(function (ele) {
                 if (ele.vip) {
-                  _this.QRCode = ele.wxer
-                } else  {
-                  _this.QRCode = ele.wxer
+                  qrImgs.vip = ele.wxer
+                } else {
+                  qrImgs.default = ele.wxer
                 }
               })
+              _this.QRCode = _this.userPower.isFree ? qrImgs.default : qrImgs.vip
             }
           }
         }

src/web/staticres/common-module/file-pack/js/index.js

@@ -135,13 +135,18 @@ var vm = new Vue({
             _this.userPower.power = resData.power
             // 客服二维码获取
             if(resData.customers && resData.customers.length > 0 ){
+              var qrImgs = {
+                vip: '',
+                default: ''
+              }
               resData.customers.forEach(function (ele) {
                 if (ele.vip) {
-                  _this.QRCode = ele.wxer
-                } else  {
-                  _this.QRCode = ele.wxer
+                  qrImgs.vip = ele.wxer
+                } else {
+                  qrImgs.default = ele.wxer
                 }
               })
+              _this.QRCode = _this.userPower.isFree ? qrImgs.default : qrImgs.vip
             }
           }
         }

src/web/staticres/css/pc.css

@@ -2370,7 +2370,6 @@ form{
 .jyblog_cont,.jyb_detailouter{
 	background: #F0F0F0;
 	padding: 30px 0px;
-	padding-top:90px;
 }
 .jyblog_listall,.jyb_dcont{
 	width:1200px;
@@ -5448,7 +5447,7 @@ h6 {
 .friend-link-container.theme-light .jy_friendlink_title,
 .j-bottom.theme-light .jy_classify_l .jy_classify_column .jy_classify_column_header,
 .j-bottom.theme-light .jy_classify_l .jy_classify_column .jy_classify_column_header > a {
-	color: #1d1d1d;	
+	color: #1d1d1d;
 }
 .j-bottom.theme-light .jy_classify_r .jy_classify_kefu span {
 	color: #1d1d1d;