Merge branch 'feature/v4.8.83' into dev/v4.8.83_rjj

src/jfw/front/shorturl.go

@@ -1217,19 +1217,6 @@ func (s *Short) NologinArticle(stype, id string) error {
 	}
 
 	if userId != "" { //已登录用户直接跳转至正常三级页
-		if stype == "content" && !mobileReg.MatchString(s.Header("User-Agent")) {
-			if !strings.Contains(s.Request.URL.String(), "aside") && !strings.Contains(s.Request.URL.String(), "page_workDesktop") {
-				paramSuffix := ".html?aside=0"
-				replaceStr := ".html"
-				if strings.Contains(s.Request.URL.String(), "?") {
-					replaceStr = ".html?"
-					paramSuffix = ".html?aside=0&"
-				}
-				//p415 首页改版 三级页登录跳转第一版修改
-				urlStr := strings.ReplaceAll(s.Request.URL.String(), "nologin", "article")
-				return s.Redirect(strings.Replace(urlStr, replaceStr, paramSuffix, 1), 302)
-			}
-		}
 		return s.LoginCommon(sess, stype, id, mobileReg.MatchString(s.Header("User-Agent"))) //是否是移动端
 	}
 	if detailNeedMosaic == nil {

src/web/staticres/js/index/index_charts.js

@@ -116,12 +116,21 @@ var pageChartsConf = {
     }
   },
   created: function () {
-    this.initData()
+    this.getData()
   },
   methods: {
-    initData: function () {
-      this.biddingTrendList = pageData.biddingTrend
-      this.changeTab1(0)
+    getData: function () {
+      var _this = this
+      $.ajax({
+        url: '/homePage/analysisRegional',
+        method: 'GET',
+        success: function (res) {
+          if (res && $.isArray(res.data)) {
+            _this.biddingTrendList = res.data
+            _this.changeTab1(0)
+          }
+        }
+      })
     },
     changeTab1: function (index) {
       this.biddingAreaList = this.biddingTrendList[index].areaArr
@@ -182,5 +191,3 @@ $(function () {
   var pageCharts = new Vue(pageChartsConf)
   window.pageCharts = pageCharts
 })
-
-

src/web/staticres/pccss/index_pc.css

@@ -778,6 +778,7 @@
 .notice-card {
     border-radius: 8px;
     border: 1px solid #2ABED1;
+    background: linear-gradient(180deg, #FFF 0%, #F9F9F9 100%);
 }
 .notice-card-header,
 .notice-card-title {
@@ -1011,8 +1012,11 @@
     line-height: 24px;
     border-radius: 4px;
 }
-.service-desc-button:hover {
+.to-learn-more.j-s-button:hover,
+.service-desc-button.s-plain:hover {
     text-decoration: none;
+    color: #fff;
+    background: linear-gradient(90deg, #2ABED1 0%, rgba(27, 143, 250, 0.96) 99.98%);
 }
 .service-desc-button.s-main {
     color: #2ABED1;

src/web/staticres/pccss/pc-detail.css

@@ -1074,3 +1074,54 @@ a{
   line-height: 22px;
   text-align: left;
 }
+
+.biddetail-action-top-right {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 99;
+  border-radius: 4px;
+}
+.biddetail-action-top-right-content {
+  display: flex;
+}
+.page-back-btn{
+  width: 90px;
+  height: 32px;
+  background: #EAF8FA;
+  border: 1px solid #2ABED1;
+  border-radius: 4px;
+  color: #2ABED1;
+  font-size: 16px;
+  cursor: pointer;
+}
+
+.into-work-space{
+  display: flex;
+  align-items: center;
+  padding: 4px 8px;
+  background: linear-gradient(to right , #2ABED1 0%, #1B8FFAF5 96%);
+  font-size: 16px;
+  line-height: 24px;
+  color: #fff;
+  border-radius: 4px;
+  margin-left: 12px;
+  cursor: pointer;
+}
+.tooltip-help-class{
+  width: 300px;
+  padding: 16px!important;
+  background: rgba(0, 0, 0, 0.75)!important;
+  border-radius: 4px!important;
+}
+.tooltip-help-class .tooltip-slot-content{
+  line-height: 22px;
+  font-size: 14px;
+}
+.tooltip-help-btn{
+  width: 15px;
+  height: 15px;
+  margin: 0 4px;
+  cursor: pointer;
+  vertical-align: middle;
+}

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

@@ -1617,7 +1617,7 @@ function companyAdd(){
   if(s_winner){
     var winner_con = $(".winner");
     for(var i=0;i<winner_con.length;i++){
-      var top = getElementTop(winner_con[i]) - $(".public-nav")[0].offsetHeight - 30 + 10 + winner_con[i].offsetHeight;
+      var top = getElementTop(winner_con[i]) - $("#public-nav")[0].offsetHeight - 30 + 10 + winner_con[i].offsetHeight;
       var left = getElementLeft(winner_con[i])-getElementLeft($(".biddetail-content")[0])-110;
       if(left>670){
         left = 670;
@@ -2873,3 +2873,69 @@ function stripscript(s){
 	return rs;
 }
 
+function loginCallback (r) {
+  console.log(r)
+  detailActionRight.isLogin = true
+}
+
+var detailActionRight = new Vue({
+  el: '#biddetail-action-top-right',
+  delimiters: ['{', '}'],
+  mixins: [workspaceDescMixin],
+  data: function () {
+    return {
+      isLogin: false,
+      inIframe: goTemplateData.inIframe
+    }
+  },
+  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))
+    },
+    goBack () {
+      var back = function () {
+        // 判断是否在iframe，如果在iframe，则用父级返回
+        if (goTemplateData.inIframe) {
+          window.parent.history.back()
+        } else {
+          history.back()
+        }
+      }
+    
+      var referer = document.referer
+      if(referer) {
+        var inJianyuWebSite = referer.indexOf('jianyu360.cn') > 0
+        if (inJianyuWebSite) {
+          // 本站的，判断是否是新窗口打开的页面
+          // 1.window.open可以通过判断window.opener
+          // 2.a target='_black'可以通过判断history.length
+          var opener = window.opener && window.opener !== window
+          var target_blank = history.length <= 1
+          // 是否新窗口打开
+          var isNewWindow = opener || target_blank
+          if (isNewWindow) {
+            try {
+              window.parent && window.parent.close()
+            } catch (error) {
+              window.close()
+            }
+            back()
+          } else {
+            back()
+          }
+        } else {
+          location.href = '/'
+        }
+      } else {
+        location.href = '/'
+      }
+    },
+  }
+})
+

src/web/staticres/public-pc/js/pc-bottom.js

@@ -91,7 +91,12 @@ function goCustomerUrl (conf) {
 function checkCustomerService () {
   // 登录判断
   if (!loginflag) {
-    return openLoginDig()
+    if (location.pathname === '/') {
+      // 首页登陆跳转工作桌面
+      return openLoginDig(true)
+    } else {
+      return openLoginDig()
+    }
   }
   goCustomerUrl()
 }

src/web/staticres/public-pc/js/workspace-desc.js

@@ -0,0 +1,24 @@
+var workspaceDescMixin = {
+    data () {
+        return {
+            workspaceDescText: ''
+        }
+    },
+    created: function () {
+        this.getWorkspaceDesc()
+    },
+    methods: {
+        getWorkspaceDesc: function () {
+            var _this = this
+            $.ajax({
+                method: 'GET',
+                url: '/front/bootstrap/specification',
+                success: function (res) {
+                    if (res && res.data) {
+                        _this.workspaceDescText = res.data
+                    }
+                }
+            })
+        }
+    }
+}

src/web/staticres/tags/js/no-login-detail.js

@@ -1051,7 +1051,7 @@ function companyAdd(){
 //   if(s_winner){
 //     var winner_con = $(".winner");
 //     for(var i=0;i<winner_con.length;i++){
-//       var top = getElementTop(winner_con[i]) - $(".public-nav")[0].offsetHeight - 30 + 10 + winner_con[i].offsetHeight;
+//       var top = getElementTop(winner_con[i]) - $("#public-nav")[0].offsetHeight - 30 + 10 + winner_con[i].offsetHeight;
 //       var left = getElementLeft(winner_con[i])-getElementLeft($(".biddetail-content")[0])-110;
 //       if(left>670){
 //         left = 670;

src/web/templates/pc/aboutus.html

@@ -343,7 +343,7 @@ $(function(){
 	});
 	var clientHeight = document.body.clientHeight;
 	var afterScroll = function(){
-		var firstScreenH = $(".public-nav").outerHeight() + $(".j-com-1").outerHeight();
+		var firstScreenH = $("#public-nav").outerHeight() + $(".j-com-1").outerHeight();
 		var sixScreenHS = $("#axis_1").offset().top;
 		var sixScreenHE = $("#axis_3").offset().top;
 		var scrollTop = $(this).scrollTop();

src/web/templates/pc/biddetail.html

@@ -753,7 +753,7 @@ $(function(){
     if(s_winner){
         var winner_con = $(".winner");
         for(var i=0;i<winner_con.length;i++){
-			var top = getElementTop(winner_con[i]) - $(".public-nav")[0].offsetHeight - 30 + 10 + winner_con[i].offsetHeight;
+			var top = getElementTop(winner_con[i]) - $("#public-nav")[0].offsetHeight - 30 + 10 + winner_con[i].offsetHeight;
             var left = getElementLeft(winner_con[i])-getElementLeft($(".biddetail-content")[0])-110;
 			if(left>670){
 				left = 670;

src/web/templates/pc/biddetail_rec.html

@@ -365,6 +365,24 @@
             <div class="yhfb">用户发布</div>
             {{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">
+                <button class="page-back-btn" @click="goBack">返回</button>
+                <div class="into-work-space" @click="goWorkSpace">
+                  <span>进入工作台&nbsp;</span>
+                  <el-tooltip popper-class="tooltip-help-class" effect="dark" placement="bottom">
+                    <img class="tooltip-help-btn" src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon-white.png' width="15" height="15" alt="" />
+                    <template slot="content">
+                      <div class="tooltip-slot-content">
+                        工作台：
+                        <br/>
+                        {workspaceDescText}
+                      </div>
+                    </template>
+                  </el-tooltip>
+                </div>
+              </div>
+            </div>
             <h1 class="com-title" id="com-title">
                 <!--			<span style="border-bottom:1px solid #2cb7ca">{{.T.obj.title}}</span>-->
                 {{.T.obj.title}}
@@ -624,7 +642,7 @@
         <img class="icon-title-img" src="{{Msg "seo" "cdn"}}/images/biddingSearch/distribute.png">分发
       </span>
 			      </div>
-            <div class="com-statusbar-BI" id="statusbar-BI">
+            <div class="com-statusbar-BI" id="statusbar-BI" v-cloak>
               <div class="crm-action">
                 <div class="action-content" v-for="(item, i) in getList" :key="i">
                   <div @click="setActionEvent(item)" class="action-list" :class="'action-' + item.class">
@@ -1951,6 +1969,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
     </script>
 
     <script src='{{Msg "seo" "cdn"}}/common-module/mainSearch/js/third-party-verify.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/public-pc/js/workspace-desc.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/public-pc/js/article-content.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/common-module/mainSearch/js/advanced-project-table.js?v={{Msg "seo" "version"}}'></script>
     <!-- <script src='{{Msg "seo" "cdn"}}/common-module/chat/jy-chat-mini.umd.js?auto=false&v={{Msg "seo" "version"}}'></script> -->

src/web/templates/pc/supsearch.html

@@ -4088,7 +4088,7 @@ function checkTagDisabled () {
               // return toastFn('请登录', 3000)
             }
             if (r.error_code == 0) {
-              if (r.data && r.data.length) {
+              if (r.data && r.data.length > 0) {
                 r.data.forEach(function(v){
                   v.flag = false
                 })

src/web/templates/pc/tags/detail.html

@@ -338,7 +338,7 @@
     $('.reg-node').click(function(){
       location.href = '/phone/register'
     })
-    checkLogin()
+    // checkLogin()
     function checkLogin () {
       clearInterval(loginTimer)
       loginTimer = setInterval(function () {

src/web/templates/pc/template/index/data-service-module.html

@@ -25,9 +25,9 @@
         </footer>
       </section>
       <div class="service-button-list clearfix">
-        <a class="service-desc-button pointer s-plain" href="/front/dataExport/toSieve" target="_blank">数据导出</a>
-        <a class="service-desc-button button-blink pointer s-confirm" href="/front/dataMarket/customExport" target="_blank">定制服务</a>
-        <a class="service-desc-button pointer s-plain" href="/front/dataMarket/dataInterface" target="_blank">对接服务</a>
+        <a class="service-desc-button button-blink pointer s-plain" href="/front/dataExport/toSieve" target="_blank">数据导出</a>
+        <a class="service-desc-button button-blink pointer s-plain" href="/front/dataMarket/customExport" target="_blank">定制服务</a>
+        <a class="service-desc-button button-blink pointer s-plain" href="/front/dataMarket/dataInterface" target="_blank">对接服务</a>
       </div>
     </div>
     <div class="service-module-content-right">

src/web/templates/pc/template/index/hot-buyer-card.html

@@ -35,7 +35,7 @@
         <div class="buyer-list-cell-ft">
           <p class="buyer-list-cell-num-container">
             <span class="buyer-list-cell-num-container">
-              采购标讯：<i class="highlight-text">{{$v.count}}</i> 条
+              采购标讯：<i class="highlight-text">{{$v.count}}</i>&nbsp;条
             </span>
           </p>
         </div>

src/web/templates/pc/template/index/hot-industry-card.html

@@ -16,7 +16,7 @@
         </li>
         {{end}}
         <li class="fr more">
-          <a class="cms-link highlight-text" target="_blank" href="/tags/industry/all.html?expand={{$ke}}">更多 ></a>
+          <a class="cms-link highlight-text" target="_blank" title="{{$ke}}" href="/list/#{{$ke}}">更多 ></a>
         </li>
       </ul>
     </div>

src/web/templates/pc/template/index/user-info-card.html

@@ -15,7 +15,7 @@
     </div>
   </main>
   <footer class="user-info-footer">
-    <button class="j-s-button plain to-learn-more open-customer">了解详情</button>
+    <button class="j-s-button plain to-learn-more button-blink open-customer">了解详情</button>
   </footer>
 </section>
 {{else}}