Merge branch 'feature/v4.8.91' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.8.91

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

@@ -2372,7 +2372,6 @@ form{
 .jyblog_cont,.jyb_detailouter{
 	background: #F0F0F0;
 	padding: 30px 0px;
-	padding-top:90px;
 }
 .jyblog_listall,.jyb_dcont{
 	width:1200px;
@@ -5451,7 +5450,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;

src/web/staticres/public-pc/js/sub-page.js

@@ -85,6 +85,32 @@ function openWorkBenchLink (options) {
   }
 }
 
+/**
+ * 工作桌面内打开某个url
+ * inWorkspace: 当前是否在工作桌面内打开某个url
+ * conf.url: 将要打开的url
+ * conf.newTab: 是否新窗口打开
+ */
+function openLinkInWorkspace (inWorkspace, conf) {
+  var url = conf.url
+  var newTab = conf.newTab
+  var withoutDomain = url.indexOf('http://') === -1 && url.indexOf('https://') === -1
+  var targetLink = ''
+  if (withoutDomain) {
+    targetLink = location.origin + url
+  }
+  if (inWorkspace) {
+    targetLink = '/page_workDesktop/work-bench/page?link=' + encodeURIComponent(targetLink)
+  } else {
+    targetLink = url
+  }
+  if (newTab) {
+    window.open(targetLink)
+  } else {
+    location.href = targetLink
+  }
+}
+
 /**
  * 注入全局事件链接跳转
  */

src/web/templates/pc/supsearch.html

@@ -2894,16 +2894,13 @@ function checkTagDisabled () {
     if(loginflag){
       checkVisited()
       // aHref += aHref.indexOf('?') > -1 ? '&aside=0' : '?aside=0'
-      var targetLink = '/article/content/' + thisId + aHref
+      var prefix = goTemplateData.inIframe ? '/article/content/' : '/nologin/content/'
+      var targetLink = prefix + thisId + aHref
       // 在iframe里，往工作桌面跳转。不在iframe里，正常跳转
-      // if(goTemplateData.inIframe){
-      //   var workspaceTargetLink = location.origin + targetLink
-      //   var wordspcePage = '/page_workDesktop/work-bench/page?link=' + encodeURIComponent(workspaceTargetLink)
-      //   window.open(wordspcePage)
-      // } else {
-      //   window.open(targetLink)
-      // }
-      window.open(targetLink)
+      openLinkInWorkspace(goTemplateData.inIframe, {
+        url: targetLink,
+        newTab: true,
+      })
     }else{//没有登录跳转新的详情
       checkVisited('nologin')
       // 渠道合作页,未登录跳转需要弹出登录，重置到已登录后的详情页