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

src/jfw/front/index.go

@@ -64,6 +64,10 @@ func init() {
 			true:  fmt.Sprintf("/page_workDesktop/work-bench/page?link=%s/succbi/nzbg/app/nzbg.app/nzbg_entrance_pc.spg", config.Sysconfig["webdomain"].(string)),
 			false: "/swordfish/frontPage/AnnualReport/free/index",
 		},
+		"xxfb": map[bool]string{ //【年终报告】根据code判断是否有权限
+			true:  fmt.Sprintf("/page_workDesktop/work-bench/page?link=%s/swordfish/page_web_pc/issued/info", config.Sysconfig["webdomain"].(string)),
+			false: "/swordfish/frontPage/InformationDistribution/free/index",
+		},
 	}
 }
 
@@ -179,7 +183,7 @@ func (nIndex *NewIndex) EntServerTransfer(code string) {
 		if accountId <= 0 { //未登录
 			return entServerTransferMap[code][false]
 		}
-		if code == "nzbg" {
+		if code == "nzbg" || code == "xxfb" {
 			return entServerTransferMap[code][true]
 		}
 		entAccountId := common.Int64All(sessVal["entAccountId"])

src/jfw/modules/subscribepay/src/entity/basePack.go

@@ -26,6 +26,18 @@ func (this *UseBalanceStruct) defaultConsume() (r map[string]interface{}, m stri
 	return
 }
 
+// KeyAccountConsume 大客户平台 无权限限制
+func (this *UseBalanceStruct) KeyAccountConsume() (r map[string]interface{}, m string, c int) {
+	_fileName := this.Remarks["fileName"].(string)
+	_id := this.Remarks["id"].(string)
+	if this.Remarks["infoType"] != nil && this.Remarks["infoType"].(string) == "S" {
+		r = SupplyInfoFile(_fileName, _id)
+	} else {
+		r = fileAttachRpc(_fileName, _id)
+	}
+	return
+}
+
 // 附件下载消费 fui：免费赠送已使用次数；pui：付费权限已使用次数
 func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string, c int) {
 	_fileName := this.Remarks["fileName"].(string)
@@ -240,6 +252,8 @@ func JyConsumePack(userId, product, platform string, remarks map[string]interfac
 	switch product {
 	case "附件下载包":
 		r, m, c = CStruct.fileConsume()
+	case "大客户平台":
+		r, m, c = CStruct.KeyAccountConsume()
 	default:
 		r, m, c = CStruct.defaultConsume()
 	}

src/jfw/modules/subscribepay/src/service/basePack.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"jy/src/jfw/modules/subscribepay/src/entity"
 	"log"
+	"strings"
 	"time"
 
 	. "app.yhyue.com/moapp/jybase/api"
@@ -49,11 +50,16 @@ func (this *ResourcePack) ConsumePack() {
 			return nil, "参数有误"
 		}
 		remarks := map[string]interface{}{
-			"title":    this.GetString("title"),                                                                                                                              //详情页标题
-			"fileName": this.GetString("fileName"),                                                                                                                           //附件名称
-			"id":       qutil.If(infoType != "" && infoType == "S", encrypt.SE.DecodeString(this.GetString("id")), encrypt.DecodeArticleId2ByCheck(this.GetString("id"))[0]), //详情页id
+			"title":    this.GetString("title"),                                                                                                            //详情页标题
+			"fileName": this.GetString("fileName"),                                                                                                         //附件名称
+			"id":       qutil.If(infoType == "S", encrypt.SE.DecodeString(this.GetString("id")), encrypt.DecodeArticleId2ByCheck(this.GetString("id"))[0]), //详情页id
 			"infoType": infoType,
 		}
+		//是否是大客户平台的请求  P449
+		log.Println("-----------:", strings.Contains(this.Request.Referer(), "article/entservice"))
+		if strings.Contains(this.Request.Referer(), "article/entservice") {
+			productName = "大客户平台"
+		}
 		log.Println(infoType, "----", remarks)
 		Ret, Msg, Code := entity.JyConsumePack(userId, productName, platform, remarks, this.Session())
 		if Msg != "" && Code == 0 {

src/jfw/modules/subscribepay/src/service/resourcePack.go

@@ -10,6 +10,7 @@ import (
 	"jy/src/jfw/modules/subscribepay/src/util"
 	"log"
 	"strconv"
+	"strings"
 	"time"
 
 	. "app.yhyue.com/moapp/jybase/api"
@@ -167,18 +168,22 @@ func (this *ResourcePack) Account() {
 		this.ServeJson(Result{Error_msg: "参数错误"})
 		return
 	}
-	vipMsg := jy.GetBigVipUserBaseMsg(this.Session(), *config.Middleground)
-	dbs := &entity.FindBalanceStruct{
-		AccountId:    userId,
-		ResourceType: config.ResConf.Product[product],
-		VipState:     vipMsg.VipStatus,
-	}
-	data, err := dbs.FindBalance()
-	if err != nil {
-		this.ServeJson(Result{Error_msg: "获取失败"})
-		return
-	}
-	this.ServeJson(Result{Data: data})
+	//非大客户平台访问 P449
+	if !strings.Contains(this.Request.Referer(), "article/entservice") {
+		vipMsg := jy.GetBigVipUserBaseMsg(this.Session(), *config.Middleground)
+		dbs := &entity.FindBalanceStruct{
+			AccountId:    userId,
+			ResourceType: config.ResConf.Product[product],
+			VipState:     vipMsg.VipStatus,
+		}
+		data, err := dbs.FindBalance()
+		if err != nil {
+			this.ServeJson(Result{Error_msg: "获取失败"})
+			return
+		}
+		this.ServeJson(Result{Data: data})
+	}
+	this.ServeJson(Result{Data: map[string]interface{}{"code": 1}})
 }
 
 func (this *ResourcePack) Price() {

src/web/staticres/brand/css/brand.css

@@ -1,6 +1,6 @@
 .brand_box {
     width: 100%;
-    background: #FFF;
+     background: #FFF;
     /* padding-bottom: 438px; */
     padding-bottom: 111px;
     overflow: hidden;
@@ -30,13 +30,14 @@
 }
 
 .tabs_content {
+    display: flex;
     width: 1000px;
     height: 64px;
     margin: auto;
 }
 
 .tabs_item {
-    width: 20%;
+    flex: 1;
     height: 64px;
     cursor: pointer;
 }

src/web/staticres/css/pc.css

@@ -1995,9 +1995,7 @@ form{
 	display: flex;
 	flex-shrink: 0;
 	flex-direction: column;
-	padding: 0 40px;
-	border-right: 1px solid #E0E0E0;
-	/* flex: 1; */
+	margin-right: 40px;
 }
 .jy_classify_l .jy_classify_column .jy_classify_column_header,
 .jy_classify_l .jy_classify_column .jy_classify_column_header > a{
@@ -2015,16 +2013,9 @@ form{
 .jy_classify_l .jy_classify_column_content {
 	display: flex;
 	flex-direction: column;
-	flex-wrap: wrap;
-	max-height: 130px;
 }
 .jy_classify_l .jy_classify_column .jy_classify_column_content_item{
 	position: relative;
-	margin-left: 32px;
-}
-/* 前六个无左边距 */
-.jy_classify_l .jy_classify_column .jy_classify_column_content_item:nth-of-type(-n+6) {
-    margin-left: 0;
 }
 
 .jy_classify_l .jy_classify_column .jy_classify_column_content_item a{
@@ -2171,7 +2162,28 @@ form{
 	left: 13px;
 }
 
-
+.main-station-theme .jy_classify {
+	padding: 0;
+}
+.main-station-theme .jy_classify_l .jy_classify_column{
+	margin-right: 0;
+	padding: 0 40px;
+	border-right: 1px solid #E0E0E0;
+}
+.main-station-theme .jy_classify_l .jy_classify_column_content {
+	flex-wrap: wrap;
+	max-height: 130px;
+}
+.main-station-theme .jy_classify_l .jy_classify_column .jy_classify_column_content_item{
+	margin-left: 32px;
+}
+/* 前六个无左边距 */
+.main-station-theme .jy_classify_l .jy_classify_column .jy_classify_column_content_item:nth-of-type(-n+6) {
+    margin-left: 0;
+}
+.main-station-theme .jy_classify_column:first-of-type .jy_classify_column_content  {
+    min-width: 180px;
+}
 
 .jy_proandcify{
 	text-align:left;

src/web/staticres/dataSmt/css/index.css

@@ -4,9 +4,6 @@ a:active,
 a:focus{
   text-decoration: none;
 }
-.page--datamarket-index{
-  padding-top: 72px;
-}
 .page--datamarket-index .market-banner{
   width: 100%;
   height: 480px;

src/web/staticres/js/header-message.js

@@ -0,0 +1,41 @@
+// 消息列表获取未读消息
+function Message() {
+  // 初始化
+  this.init = function () {
+    if (!loginflag) return
+    $('#noticed').show()
+    this.getMessageList()
+  }
+  // 悬浮窗列表数据请求
+  this.getMessageList = function () {
+    var params =  {
+      isColumn: false, // 是否需要栏目（消息中心需要)
+      isColumnNewMsg: false,
+      isMsgList: false, // 是否需要列表数据
+      isContainLetter: false, // 是否包含私信数
+      msgType: -1, // 消息类型，-1为全部
+      isRead: 0, // 是否已读
+      offset: 1,
+      size: 0
+    }
+    $.ajax({
+      url: '/jyapi/messageCenter/MessageList',
+      type: 'POST',
+      data: JSON.stringify(params),
+      dataType: 'json',
+      headers: {'Content-Type': 'application/json'},
+      success:function (res) {
+        if (res.unread) {
+          var unreadNum = res.unread;
+          $('#tips').show();
+          $('#tips').html(unreadNum > 99 ? '99+' : unreadNum);
+        } else {
+          $('#tips').hide();
+        }
+      },
+      error:function () {}
+    })
+  }
+  this.init()
+}
+

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

@@ -2409,48 +2409,58 @@ function cjdyDownload (fname) {
     title:goTemplateData.params.obj.title
 },
   success:function(data){
+      //P449 大客户附件下载无限制
     if(data){
-      if (data.r&&data.r.code&&data.r.code<0&&window.vipStatus>0){
-        // 次数用完提醒去充值
-        bidVue.$confirm('您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。', {
-          showClose:false,
-          center: true,
-          confirmButtonText: '立即充值',
-          customClass: 'custom-alert',
-          showCancelButton: true,
-          confirmButtonClass: 'custom-confirm-btn',
-          cancelButtonClass: 'custom-cancel-btn',
-          cancelButtonText: '取消'
-        }).then(function(data){
-          location.href = '/swordfish/page_big_pc/free/filePack/buy'
-        }).catch(function(){
-          //$('.open-customer').trigger('click')
-          //$('body').trigger('click')
-        });
-      }else if ((data.m && data.m!="")||data.r["downUrl"]==undefined||data.r["downUrl"]==""){
-        bidVue.$confirm('附件下载异常，请前往联系客服。', {
-          showClose:false,
-          center: true,
-          confirmButtonText: '取消',
-          customClass: 'custom-alert',
-          showCancelButton: true,
-          confirmButtonClass: 'custom-cancel-btn',
-          cancelButtonClass: 'custom-confirm-btn',
-          cancelButtonText: '联系客服'
-        }).then(function(data){
+      if (!entService){
+        if (data.r&&data.r.code&&data.r.code<0&&window.vipStatus>0){
+          // 次数用完提醒去充值
+          bidVue.$confirm('您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。', {
+            showClose:false,
+            center: true,
+            confirmButtonText: '立即充值',
+            customClass: 'custom-alert',
+            showCancelButton: true,
+            confirmButtonClass: 'custom-confirm-btn',
+            cancelButtonClass: 'custom-cancel-btn',
+            cancelButtonText: '取消'
+          }).then(function(data){
+            location.href = '/swordfish/page_big_pc/free/filePack/buy'
+          }).catch(function(){
+            //$('.open-customer').trigger('click')
+            //$('body').trigger('click')
+          });
+        }else if ((data.m && data.m!=="")||data.r["downUrl"]===undefined||data.r["downUrl"]===""){
+          bidVue.$confirm('附件下载异常，请前往联系客服。', {
+            showClose:false,
+            center: true,
+            confirmButtonText: '取消',
+            customClass: 'custom-alert',
+            showCancelButton: true,
+            confirmButtonClass: 'custom-cancel-btn',
+            cancelButtonClass: 'custom-confirm-btn',
+            cancelButtonText: '联系客服'
+          }).then(function(data){
 
-        }).catch(function(){
-          $('.open-customer').trigger('click')
-          $('body').trigger('click')
-        });
+          }).catch(function(){
+            $('.open-customer').trigger('click')
+            $('body').trigger('click')
+          });
+        }else{
+          if(data.r&&fname == data.r["fileName"]){
+            if (!data.r["isExists"]){
+              $(".file-count").text($(".file-count").text()-1);
+            }
+            getFilePackLastCount()
+            location.href = data.r["downUrl"] + '?response-content-type=application/octet-stream'
+            //goDownload(data.r["downUrl"])
+          }
+        }
       }else{
         if(data.r&&fname == data.r["fileName"]){
           if (!data.r["isExists"]){
             $(".file-count").text($(".file-count").text()-1);
           }
-          getFilePackLastCount()
           location.href = data.r["downUrl"] + '?response-content-type=application/octet-stream'
-          //goDownload(data.r["downUrl"])
         }
       }
     }
@@ -2486,8 +2496,12 @@ function getFileData () {
         $(".downs").click(function (){
           var name = $(this).find('a').text()
           var fname = name.replace(/^\d+./, '')
-          if(window.isFree){
-            if(window.freeFile == 0){
+          //P449
+          if(location.pathname.indexOf('entservice') !== -1){
+            // 大客户来源 进入附件下载页面
+            cjdyDownload(fname)
+          }else if(window.isFree){
+            if(window.freeFile === 0){
               // 判断有无留过资 且未体验过 - 去留资
               // 弹窗留资弹框，第一个参数为source，第二个是留资成功后是否需要刷新页面 可不传，不传即为不刷新
               // 不需要再调是否留资接口 只要isAdd接口里返回得对应参数值为0 即为需要留资 直接调noCallApiFn方法弹出弹框即可
@@ -2614,35 +2628,38 @@ function getFilePackLastCount () {
 
 // 根据isAdd接口 展示附件部分dom
 function showFileSomeDom () {
-  // 免费用户展示可下载一次提示(免费用户且没有体验过附件下载权益的展示)
-  $('.free-download .text').text(window.filePackAccount.number)
-  if (window.isFree) {
-    // 免费用户未留过资。次数为0，则值置为1，点击按钮引导留资
-    if (window.freeFile == 0 && window.filePackAccount.number == 0) {
-      $('.free-download .text').text(1)
-    }
-    if (window.freeFile == 0 || window.filePackAccount.number > 0) {
-      // 展示按钮
-      $('.free-download').css('display', 'inline-block')
-      $('.free-go-open').hide()
-    } else {
-      // 展示引导超级订阅
-      $('.free-go-open').css('display', 'inline-block')
-      $('.free-download').hide()
-    }
-  }
-  // 新超级订阅用户
-  if (window.vipStatus > 0 && window.viper) {
-    $('.super-vip-show').show()
-    $('.super-vip-show .file-count').html(window.filePackAccount.number)
-    $('.recharge-new').unbind("click").bind("click",function(){
-      //超级订阅附件下载立即充值页面
-      window.open("/swordfish/page_big_pc/free/filePack/buy")
-    })
-  }
-  // 大会员隐藏次数
-  if(window.memberStatus >0 && window.memberPower.indexOf(3) >= 0){
-    $('.super-vip-show').hide()
+  //非大客户来源 P449
+  if(location.pathname.indexOf('entservice') <0) {
+    // 免费用户展示可下载一次提示(免费用户且没有体验过附件下载权益的展示)
+    $('.free-download .text').text(window.filePackAccount.number)
+    if (window.isFree) {
+      // 免费用户未留过资。次数为0，则值置为1，点击按钮引导留资
+      if (window.freeFile == 0 && window.filePackAccount.number == 0) {
+        $('.free-download .text').text(1)
+      }
+      if (window.freeFile == 0 || window.filePackAccount.number > 0) {
+        // 展示按钮
+        $('.free-download').css('display', 'inline-block')
+        $('.free-go-open').hide()
+      } else {
+        // 展示引导超级订阅
+        $('.free-go-open').css('display', 'inline-block')
+        $('.free-download').hide()
+      }
+    }
+    // 新超级订阅用户
+    if (window.vipStatus > 0 && window.viper) {
+      $('.super-vip-show').show()
+      $('.super-vip-show .file-count').html(window.filePackAccount.number)
+      $('.recharge-new').unbind("click").bind("click", function () {
+        //超级订阅附件下载立即充值页面
+        window.open("/swordfish/page_big_pc/free/filePack/buy")
+      })
+    }
+    // 大会员隐藏次数
+    if (window.memberStatus > 0 && window.memberPower.indexOf(3) >= 0) {
+      $('.super-vip-show').hide()
+    }
   }
 }
 var isEntnicheNew = goTemplateData.params.isEntnicheNew

src/web/staticres/public-pc/js/header-nav-mini.js

@@ -1,45 +1,3 @@
-// 消息列表获取未读消息
-function Message() {
-  // 初始化
-  this.init = function () {
-    if (!loginflag) return
-    $('#noticed').show()
-    this.getMessageList()
-  }
-  // 悬浮窗列表数据请求
-  this.getMessageList = function () {
-    var params =  {
-      isColumn: false, // 是否需要栏目（消息中心需要)
-      isColumnNewMsg: false,
-      isMsgList: false, // 是否需要列表数据
-      isContainLetter: false, // 是否包含私信数
-      msgType: -1, // 消息类型，-1为全部
-      isRead: 0, // 是否已读
-      offset: 1,
-      size: 0
-    }
-    $.ajax({
-      url: '/jyapi/messageCenter/MessageList',
-      type: 'POST',
-      data: JSON.stringify(params),
-      dataType: 'json',
-      headers: {'Content-Type': 'application/json'},
-      success:function (res) {
-        if (res.unread) {
-          var unreadNum = res.unread;
-          $('#tips').show();
-          $('#tips').html(unreadNum > 99 ? '99+' : unreadNum);
-        } else {
-          $('#tips').hide();
-        }
-      },
-      error:function () {}
-    })
-  }
-  this.init()
-}
-
-
 var headerNavMini = {
   headerNavContainer: $('#header-nav-container'),
   headerNav: $('#public-nav'),

src/web/staticres/public-pc/js/header-nav.js

@@ -44,8 +44,8 @@ function index(el) {
 
 var firstTheme = '',firstPage = true;
 function setNavTheme (type) {
-  type = 'dark'
   var el = document.getElementById("public-nav")
+  if (!el) return
   el.setAttribute('data-theme', type || 'light')
   if(firstPage){
     firstPage = false;
@@ -54,6 +54,7 @@ function setNavTheme (type) {
 }
 function getNavTheme () {
   var el = document.getElementById("public-nav")
+  if (!el) return
   var theme = el.getAttribute('data-theme')
   return theme
 }

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

@@ -29,8 +29,31 @@ function getNowUserInfo () {
     typeof window.getUserInfoCallback === 'function' ? getUserInfoCallback() : null
   })
 }
+
+// 根据 window.__headerSiteType 判断是否是子站或者资讯站
+// 0:剑鱼标讯官网  1:品牌网站  2:资讯站  3其他(即未定义，此处未定义可以默认看作是主站)
+function calcBottomTheme () {
+  var siteType = window.__headerSiteType
+  if (siteType === 1 || siteType === 2) {
+    changeBottomTheme(true)
+  } else {
+    changeBottomTheme(false)
+  }
+}
+function changeBottomTheme (type) {
+  var $bottom = $('.j-bottom')
+  if (type) {
+    // do something
+    $bottom.removeClass('theme-light').removeClass('main-station-theme')
+  } else {
+    // 默认为主站
+    $bottom.addClass('theme-light').addClass('main-station-theme')
+  }
+}
+
 $(function () {
   getNowUserInfo()
+  calcBottomTheme()
 })
 
 var customerUrl = ''

src/web/templates/common/pc-header-nav-brand.html

@@ -0,0 +1,148 @@
+<!-- 品牌网站头部 -->
+{{$TopMenu := JyTopMenu .Request.URL.Path}}
+<section class="public-nav" id="public-nav" style="display: none">
+  <div class="advertising_position">
+    {{if eq $TopMenu.Site 1}}
+    <div class="advertising_position_index">
+      <a class="one" href="/" title="标讯主站">
+        <img src="{{Msg "seo" "cdn"}}/images/index/new/index_bg.png?v={{Msg "seo" "version"}}" alt="">
+      </a>
+      <a class="two" href="{{Msg "seo" "sites.cms"}}" title="资讯站群">
+        <img src="{{Msg "seo" "cdn"}}/images/index/new/xyzx_bg.png?v={{Msg "seo" "version"}}" alt="">
+      </a>
+    </div>
+    {{end}}
+    {{if eq $TopMenu.Site 0}}
+    <div class="advertising_position_brand">
+      <a class="one" href="{{Msg "seo" "sites.brand"}}" title="品牌官网">
+        <img src="{{Msg "seo" "cdn"}}/images/index/new/brand_bg.png?v={{Msg "seo" "version"}}" alt="">
+      </a>
+      <a class="two" href="{{Msg "seo" "sites.cms"}}" title="资讯站群">
+        <img src="{{Msg "seo" "cdn"}}/images/index/new/xyzx_bg.png?v={{Msg "seo" "version"}}" alt="">
+      </a>
+    </div>
+    {{end}}
+
+  </div>
+    <div class="iner">
+      <div class="logo_box">
+        {{if eq $TopMenu.Site 2}}
+          <a class="logo" href="{{Msg "seo" "sites.cms"}}" title="资讯站群">
+          {{ else if eq $TopMenu.Site 1 }}
+          <a class="logo" href="{{Msg "seo" "sites.brand"}}" title="品牌官网">
+          {{ else }}
+          <a class="logo" href="/" title="标讯主站">
+        {{end}}
+            <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/index/logo_white.png?v={{Msg "seo" "version"}}' alt="剑鱼标讯" />
+            <img data-theme="light" src='{{Msg "seo" "cdn"}}/images/index/logo_main.png?v={{Msg "seo" "version"}}' alt="剑鱼标讯" />
+        </a>
+        <div class="logo_desc">
+          <div class="nav-logo-line"></div>
+          {{if eq $TopMenu.Site 0}}
+          <p class="index">标讯主站</p>
+          {{end}}
+          {{if eq $TopMenu.Site 1}}
+          <p class="brand">品牌官网</p>
+          {{end}}
+          {{if eq $TopMenu.Site 2}}
+          <p class="brand">资讯站群</p>
+          {{end}}
+          <div class="nav-logo-line"></div>
+        </div>
+        <div class="btn_box">
+          {{if ne $TopMenu.Site 0}}
+          <a href="/" title="标讯主站" class="nav-badge-box index">
+            <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/index/new/book.png?v={{Msg "seo" "version"}}' alt="标讯主站" />
+            <img data-theme="light" src='{{Msg "seo" "cdn"}}/images/index/new/book1.png?v={{Msg "seo" "version"}}' alt="标讯主站" />
+            <span>标讯主站</span>
+          </a>
+          {{end}}
+          {{if ne $TopMenu.Site 1}}
+          <a href="{{Msg "seo" "sites.brand"}}" title="品牌官网" class="nav-badge-box brand">
+            <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/index/new/king.png?v={{Msg "seo" "version"}}' alt="品牌官网" />
+            <img data-theme="light" src='{{Msg "seo" "cdn"}}/images/index/new/king1.png?v={{Msg "seo" "version"}}' alt="品牌官网" />
+            <span>品牌官网</span>
+          </a>
+          {{end}}
+          {{if ne $TopMenu.Site 2}}
+          <a class="nav-badge-box zx" href="{{Msg "seo" "sites.cms"}}" title="资讯站群">
+            <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/index/new{{Msg "seo" "sites.brand"}}.png?v={{Msg "seo" "version"}}' alt="资讯站群" />
+            <img data-theme="light" src='{{Msg "seo" "cdn"}}/images/index/new/brand1.png?v={{Msg "seo" "version"}}' alt="资讯站群" />
+            <span>资讯站群</span>
+          </a>
+          {{end}}
+        </div>
+      </div>
+        <div class="header-right-box fr">
+          <ul class="jynav">
+          {{range $i, $v := $TopMenu.MenuList }}
+          <li name="{{$v.Title}}">
+              <a class="nav-text" {{ParseHtmlAttr $v.Tag}} {{if $v.Link}} href="{{$v.Link}}"{{else}} href="javascript:;"{{end}}  {{ParseHtmlAttr $v.Attr}}
+                 {{if $v.Style }} style="{{ParseHtmlCss $v.Style}}" {{end}}>{{$v.Title}}</a>
+              {{if $v.Child }}
+                  <!--子菜单竖展示-->
+                  {{if eq $v.Flex "" "column"}}
+                  <div class="jynav-list jy-rember">
+                      {{range $ii,$c := $v.Child }}
+                      <span name="{{$c.Title}}">
+                          <a {{if $v.Link}} href="{{$c.Link}}"{{else}} href="javascript:;"{{end}}  {{ParseHtmlAttr $c.Attr}}
+                             {{if $c.Style }} style="{{ParseHtmlCss $c.Style}}" {{end}}>
+                            {{$c.Title}}
+                            {{if $c.Tag}}
+                              <div class="time-free">{{$c.Tag}}</div>
+                            {{end}}
+                          </a>
+                      </span>
+                      {{end}}
+                  </div>
+                  {{else if eq $v.Flex "row"}}
+                  <!--子菜单横展示-->
+                  <div class="jynav-list jy-rember case-row-group">
+                      {{range $ii,$c := $v.Child }}
+                          <a class="case-item" name="{{$c.Title}}" {{if $v.Link}} href="{{$c.Link}}"{{else}} href="javascript:;"{{end}}  {{ParseHtmlAttr $c.Attr}}
+                            {{if $c.Style }} style="{{ParseHtmlCss $c.Style}}" {{end}}>
+                            <img src='{{$c.Icon}}' alt="{{$c.Title}}">
+                            <strong>{{$c.Title}}</strong>
+                          </a>
+                      {{end}}
+                  </div>
+                  {{end}}
+              {{end}}
+          </li>
+          {{end}}
+          <li name="消息" id="noticed" style="display: none;margin-left: 11px">
+            <a href="/swordfish/frontPage/messageCenter/sess/index">
+              <div class="img-flex">
+                <img data-theme="light"
+                     src='{{Msg "seo" "cdn"}}/images/index/message.png?v={{Msg "seo" "version"}}'
+                     class="jy-nav-msg msg-img1" alt=""/>
+                <img data-theme="dark"
+                     src='{{Msg "seo" "cdn"}}/images/index/message-fff.png?v={{Msg "seo" "version"}}'
+                     class="jy-nav-msg msg-img1" alt=""/>
+              </div>
+              <img src='{{Msg "seo" "cdn"}}/images/index/message-active.png?v={{Msg "seo" "version"}}'
+                   class="jy-nav-msg msg-img2" alt=""/>
+              <span class="tips" id="tips"></span>
+            </a>
+          </li>
+          <li class="slider"></li>
+        </ul>
+            <div class='useronline' id="login" style="float:left;">
+              <button  clle="display: none" class='loginBtn' data-toggle='modal' onclick='openLoginDig(true)'>登录/注册</button>
+              <img style="display: none" class="nav-avatar user-avatar" data-user-avatar alt="头像">
+              <div class="work-user-info" style="display: none">
+                <div class="info-group">
+                  <img  class="user-avatar" data-user-avatar>
+                  <span data-user-name></span>
+                  <span data-user-phone></span>
+                </div>
+                <div class="out-button" onclick='signout()'>退出登录</div>
+              </div>
+            </div>
+            <a href="/page_workDesktop/" class="work-link" style="float:left; display: none;">立即使用</a>
+        </div>
+    </div>
+</section>
+<script>
+  window.message = new Message()
+</script>

src/web/templates/common/pc-header-nav-mini.html

@@ -1,3 +1,4 @@
+<!-- 标讯主站头部 -->
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/public-pc/css/page-img-icons.css?v={{Msg "seo" "version"}}' />
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/public-pc/css/header-nav-mini.css?v={{Msg "seo" "version"}}' />
 <section class="header-nav-container" id="header-nav-container">

src/web/templates/common/pcbottom.html

@@ -1,5 +1,6 @@
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/public-pc/css/pc-bottom.css?v={{Msg "seo" "version"}}'>
-<div class="j-bottom theme-light" style="display: none">
+<!-- 亮色主题+主站样式: theme-light main-station-theme -->
+<div class="j-bottom" style="display: none">
 	<div>
 		<div class="jy_proandcify">
       <!-- 友情链接已移到common文件friend-link.html -->

src/web/templates/common/pchead.html

@@ -1,58 +1,27 @@
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/public-pc/css/header-nav.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/common-module/message-tip/css/index.css?v={{Msg "seo" "version"}}">
+<script src='{{Msg "seo" "cdn"}}/js/header-message.js?v={{Msg "seo" "version"}}'></script>
+{{$TopMenu := JyTopMenu .Request.URL.Path}}
 
-{{include "/common/pc-header-nav-mini.html"}}
+{{if eq $TopMenu.Site 0}}
+  {{include "/common/pc-header-nav-mini.html"}}
+{{else if eq $TopMenu.Site 1 }}
+  {{include "/common/pc-header-nav-brand.html"}}
+{{else if eq $TopMenu.Site 2 }}
+  {{include "/common/pc-header-nav-brand.html"}}
+{{else}}
+  {{include "/common/pc-header-nav-mini.html"}}
+{{end}}
+<script>
+  // headerSiteType(Number类型) ->  0:剑鱼标讯官网  1:品牌网站  2:资讯站  3其他(即未定义，此处未定义可以默认看作是主站)
+  window.__headerSiteType = {{$TopMenu.Site}}
+</script>
 
 <!-- pc登录弹窗html结构 -->
 {{include "/common/pc-login-dialog.html"}}
 
 <script src='{{Msg "seo" "cdn"}}/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
 <!--<script src='{{Msg "seo" "cdn"}}/js/message.js?v={{Msg "seo" "version"}}'></script>-->
-<!-- <script>
-  // 消息列表获取未读消息
-  function Message() {
-    // 初始化
-    this.init = function () {
-      if (!loginflag) return
-      $('#noticed').show()
-      this.getMessageList()
-    }
-    // 悬浮窗列表数据请求
-    this.getMessageList = function () {
-
-      var params =  {
-        isColumn: false, // 是否需要栏目（消息中心需要)
-        isColumnNewMsg: false,
-        isMsgList: false, // 是否需要列表数据
-        isContainLetter: false, // 是否包含私信数
-        msgType: -1, // 消息类型，-1为全部
-        isRead: 0, // 是否已读
-        offset: 1,
-        size: 0
-      }
-      $.ajax({
-        url: '/jyapi/messageCenter/MessageList',
-        type: 'POST',
-        data: JSON.stringify(params),
-        dataType: 'json',
-        headers: {'Content-Type': 'application/json'},
-        success:function (res) {
-          if (res.unread) {
-            var unreadNum = res.unread;
-            $('#tips').show();
-            $('#tips').html(unreadNum > 99 ? '99+' : unreadNum);
-          } else {
-            $('#tips').hide();
-          }
-        },
-        error:function () {}
-      })
-    }
-
-    this.init()
-  }
-  var message = new Message()
-</script> -->
 <script src='{{Msg "seo" "cdn"}}/public-pc/js/header-nav.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}'></script>
 

src/web/templates/frontRouter/pc/brand/free/index.html

@@ -39,6 +39,9 @@
         <li class="tabs_item">
           <p class="text active">公司介绍</p>
         </li>
+        <li class="tabs_item">
+          <p class="text">企业愿景</p>
+        </li>
         <li class="tabs_item">
           <p class="text">发展历程</p>
         </li>
@@ -156,7 +159,7 @@
       <div class="img_box"><img src="{{Msg "seo" "cdn"}}/brand/img/zzq9.png?v={{Msg "seo" "version"}}" alt=""></div>
     </div>
   </div>
-  <div class="enterprise_culture" >
+  <div class="enterprise_culture" id="ent_culture">
     <p class="title">企业文化</p>
     <div class="middle">
       <div class="item">
@@ -536,21 +539,27 @@
           $('.tabs_box').removeClass('fixed')
           $('#public-nav').show()
         }
-        if($(window).scrollTop()>=0&&$(window).scrollTop()<=$(".history").offset().top-140){
+
+
+        
+        if($(window).scrollTop()>=0&&$(window).scrollTop()<=$("#ent_culture").offset().top-140){
           $('.tabs_item').find('p').removeClass('active')
           $('.tabs_item').eq(0).find('p').addClass('active')
-        }else if($(window).scrollTop()>=$(".history").offset().top-140&&$(window).scrollTop()<=$(".Company_Dynamic").offset().top-140){
+        } else if ($(window).scrollTop()>=$("#ent_culture").offset().top-140&&$(window).scrollTop()<=$(".history").offset().top-140) {
           $('.tabs_item').find('p').removeClass('active')
           $('.tabs_item').eq(1).find('p').addClass('active')
-        }else if($(window).scrollTop()>=$(".Company_Dynamic").offset().top-140&&$(window).scrollTop()<=$(".join_us").offset().top-140){
+        } else if($(window).scrollTop()>=$(".history").offset().top-140&&$(window).scrollTop()<=$(".Company_Dynamic").offset().top-140){
           $('.tabs_item').find('p').removeClass('active')
           $('.tabs_item').eq(2).find('p').addClass('active')
-        }else if($(window).scrollTop()>=$(".join_us").offset().top-140&&$(window).scrollTop()<=$(".contact_us").offset().top-140){
+        }else if($(window).scrollTop()>=$(".Company_Dynamic").offset().top-140&&$(window).scrollTop()<=$(".join_us").offset().top-140){
           $('.tabs_item').find('p').removeClass('active')
           $('.tabs_item').eq(3).find('p').addClass('active')
-        }else if($(window).scrollTop()>=$(".contact_us").offset().top-140){
+        }else if($(window).scrollTop()>=$(".join_us").offset().top-140&&$(window).scrollTop()<=$(".contact_us").offset().top-140){
           $('.tabs_item').find('p').removeClass('active')
           $('.tabs_item').eq(4).find('p').addClass('active')
+        }else if($(window).scrollTop()>=$(".contact_us").offset().top-140){
+          $('.tabs_item').find('p').removeClass('active')
+          $('.tabs_item').eq(5).find('p').addClass('active')
         }
       });
 
@@ -588,20 +597,25 @@
 
       }else if($(this).index()==1){
         $("html,body").stop().animate({
-          scrollTop: $(".history").offset().top-70
+          scrollTop: $("#ent_culture").offset().top-20
         }, 500);
 
       }else if($(this).index()==2){
         $("html,body").stop().animate({
-          scrollTop: $(".Company_Dynamic").offset().top-70
+          scrollTop: $(".history").offset().top-70
         }, 500);
 
       }else if($(this).index()==3){
         $("html,body").stop().animate({
-          scrollTop: $(".join_us").offset().top-70
+          scrollTop: $(".Company_Dynamic").offset().top-70
         }, 500);
 
       }else if($(this).index()==4){
+        $("html,body").stop().animate({
+          scrollTop: $(".join_us").offset().top-70
+        }, 500);
+
+      }else if($(this).index()==5){
         $("html,body").stop().animate({
           scrollTop: $(".contact_us").offset().top-70
         }, 500);

src/web/templates/pc/biddetail_rec.html

@@ -1886,6 +1886,10 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
           $('.tabfat').show()
           $(".recoveryfat").show()
           $('.free-download').hide()
+          //P449
+          $(".download-list").show()
+          $('.super-vip-show').hide()
+          $('.free-go-open').hide()
           getFileData()
           return
         }

src/web/templates/pc/newIndex.html

@@ -19,14 +19,16 @@
   <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/index_swiper.css?v={{Msg "seo" "version"}}' />
   <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/css/pc/index.css?v={{Msg "seo" "version"}}' />
   <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/index_pc.css?v={{Msg "seo" "version"}}' />
+  <!-- 登陆弹窗依赖 -->
+  <!-- <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' /> -->
+  <link href='{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}' rel="stylesheet">
 </head>
 
-{{include "/common/pc-login.html"}}
 {{$global:=.T}}
 <body>
   <section class="body-section bg-white">
     <header class="body-header">
-      {{include "/common/pc-header-nav-mini.html"}}
+      {{include "/common/pchead.html"}}
     </header>
     <main class="body-main">
       <section class="w">

src/web/templates/pc/supsearch.html

@@ -3724,7 +3724,7 @@ function checkTagDisabled () {
       // 跳转信息发布
       goToPublish: function () {
         if(!loginflag){
-          $('#bidLogin').modal("show");
+          location.href = '/swordfish/frontPage/InformationDistribution/free/index'
           return
         }
         if (goTemplateData.inIframe) {

src/web/templates/pc/template/index/search-module.html

@@ -59,7 +59,7 @@
         <i class="j-icon base-icon icon-img-huangguan"></i>
         剑鱼官网
       </a>
-      <a class="cms-link mr12" href="/brand/index" target="_blank">企业愿景</a>
+      <a class="cms-link mr12" href="/brand/index#ent_culture" target="_blank">企业愿景</a>
       <a class="cms-link" href="/brand/index#Company_Dynamic" target="_blank">品牌介绍</a>
     </div>
     <div class="flex-row-center mt12">