Merge branch 'dev/v4.8.83_cyl' of qmx/jy into feature/v4.8.83

src/web/staticres/public-pc/js/article-content.js

@@ -2890,13 +2890,14 @@ var detailActionRight = new Vue({
   },
   methods: {
     goWorkSpace: function () {
-      var goHref = location.href
-      if (goHref.indexOf('?') > -1) {
-        goHref += '&aside=0'
-      } else {
-        goHref += '&aside=0'
-      }
-      window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref))
+      // var goHref = location.href
+      // if (goHref.indexOf('?') > -1) {
+      //   goHref += '&aside=0'
+      // } else {
+      //   goHref += '&aside=0'
+      // }
+      // window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref))
+      location.href = '/page_workDesktop/'
     },
     goBack () {
       var back = function () {

src/web/templates/pc/biddetail_rec.html

@@ -366,7 +366,7 @@
             {{end}}
             {{end}}
             <div class="biddetail-action-top-right" id="biddetail-action-top-right" v-cloak>
-              <div class="biddetail-action-top-right-content" v-show="isLogin && !inIframe">
+              <div class="biddetail-action-top-right-content" v-show="isLogin">
                 <button class="page-back-btn" @click="goBack">返回</button>
                 <div class="into-work-space" @click="goWorkSpace">
                   <span>进入工作台&nbsp;</span>

src/web/templates/pc/supsearch.html

@@ -2878,7 +2878,7 @@ function checkTagDisabled () {
     } catch (error) {}
     if(loginflag){
       checkVisited()
-      aHref += aHref.indexOf('?') > -1 ? '&aside=0' : '?aside=0'
+      // aHref += aHref.indexOf('?') > -1 ? '&aside=0' : '?aside=0'
       var targetLink = '/article/content/' + thisId + aHref
       // 在iframe里，往工作桌面跳转。不在iframe里，正常跳转
       if(goTemplateData.inIframe){