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

src/jfw/front/dataExport.go

@@ -468,6 +468,7 @@ func (d *DataExport) SuperSearchExport() error {
 	if userId == "" {
 		return errors.New("未登录")
 	}
+	source := d.GetString("jump_source") //兼容工作桌面外检索跳转工作桌面内
 	//接收超级搜索页面参数
 	reqData := public.BidSearchExport{
 		Keywords:        d.GetString("keywords"),                     //搜索词
@@ -514,26 +515,29 @@ func (d *DataExport) SuperSearchExport() error {
 	d.SetSession("Echo_searchMode", reqData.SearchMode)
 	d.SetSession("Echo_wordsMode", reqData.WordsMode)
 	d.SetSession("Echo_additionalWords", reqData.AdditionalWords)
-	saveData := reqData.PassBidSearchExport(config.Sysconfig)
-
-	saveData["selectType"] = selectType
-	saveData["s_openid"] = openid
-	saveData["s_userid"] = userId
-	saveData["comeinfrom"] = "supersearchPage"
-	//是否开启 正文 标题同时搜索只搜正文的开关
-	saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
-
-	region := util.If(reqData.Area == "全国", "", reqData.Area).(string)
-	if region != "" && reqData.City != "" {
-		region += "," + reqData.City
-	} else {
-		region = reqData.City
+	if source == "" {
+		saveData := reqData.PassBidSearchExport(config.Sysconfig)
+
+		saveData["selectType"] = selectType
+		saveData["s_openid"] = openid
+		saveData["s_userid"] = userId
+		saveData["comeinfrom"] = "supersearchPage"
+		//是否开启 正文 标题同时搜索只搜正文的开关
+		saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
+
+		region := util.If(reqData.Area == "全国", "", reqData.Area).(string)
+		if region != "" && reqData.City != "" {
+			region += "," + reqData.City
+		} else {
+			region = reqData.City
+		}
+		saveData["region"] = util.If(region != "", strings.Split(region, ","), []string{}).([]string)
+		//存入数据库
+		_id := mongodb.Save(dataexport.ExportTable, saveData)
+		log.Println(_id, "saveData:", saveData)
+		return d.Redirect("/front/dataExport/toCreateOrderPage/" + encrypt.SE.Encode2Hex(_id))
 	}
-	saveData["region"] = util.If(region != "", strings.Split(region, ","), []string{}).([]string)
-	//存入数据库
-	_id := mongodb.Save(dataexport.ExportTable, saveData)
-	log.Println(_id, "saveData:", saveData)
-	return d.Redirect("/front/dataExport/toCreateOrderPage/" + encrypt.SE.Encode2Hex(_id))
+	return nil
 }
 func (d *DataExport) ToCreateOrderPage(_id string) error {
 	id := encrypt.SE.Decode4Hex(_id)

src/jfw/front/nzjProject.go

@@ -492,7 +492,10 @@ func NewHotEnt(isWinner bool, number int) (data []map[string]interface{}) {
 }
 
 // 中标喜报
-func WinnerGladTidings() (entBidArr []map[string]interface{}) {
+func WinnerGladTidings(number int) (entBidArr []map[string]interface{}) {
+	seed := time.Now().UnixNano()
+	rand.Seed(seed)
+
 	redisKey := "winnerGladTidings"
 	data, _ := redis.Get(RedisNameNew, redisKey).([]interface{})
 	if len(data) > 0 {
@@ -534,7 +537,11 @@ WHERE
 		}
 		wait.Wait()
 		if len(entBidArr) > 0 {
-			redis.Put(RedisNameNew, redisKey, entBidArr, 24*3600*7)
+			if len(entBidArr) > number {
+				randomNumber := rand.Intn(len(entBidArr) - number)
+				entBidArr = entBidArr[randomNumber : randomNumber+number]
+			}
+			redis.Put(RedisNameNew, redisKey, entBidArr, 24*3600)
 		}
 	}
 	return entBidArr

src/web/staticres/bid-fileinter/css/bid_content.css

@@ -4,7 +4,6 @@
 .page--bid-content {
     font-family: Microsoft YaHei,sans-serif;
     position: relative;
-    padding-top: 64px;
     min-height: calc(100vh - 364px);
     min-width: 1200px;
     overflow: hidden;

src/web/staticres/big-member/css/open_app.css

@@ -2,7 +2,6 @@
 .open-app {
   font-family: Microsoft YaHei,sans-serif;
   position: relative;
-  padding-top: 64px;
   /* padding-bottom: 121px; */
   min-height: calc(100vh - 364px);
   /* 分割 */

src/web/staticres/big-member/css/page_index.css

@@ -2,7 +2,6 @@
 .page--big--index {
   font-family: Microsoft YaHei,sans-serif;
   position: relative;
-  padding-top: 64px;
   padding-bottom: 121px;
   min-height: calc(100vh - 364px);
   /* 分割 */

src/web/staticres/big-member/css/pc_buy_commit.css

@@ -40,7 +40,7 @@ input[type="radio"] {
 
 .page--big--buycommit {
   font-family: Microsoft YaHei,sans-serif;
-  padding-top: 64px;
+  border-top: 1px solid transparent;
   padding-bottom: 121px;
   min-height: calc(100vh - 364px);
 }

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

@@ -1,6 +1,5 @@
 .brand_box {
     width: 100%;
-    padding-top: 64px;
     background: #FFF;
     /* padding-bottom: 438px; */
     padding-bottom: 111px;

src/web/staticres/common-module/exhibition/css/detail.css

@@ -4,7 +4,6 @@
     min-height: 100vh;
     background: #F5F6F7;
     box-sizing: border-box;
-    padding-top: 64px;
     padding-bottom: 111px;
   }
 

src/web/staticres/common-module/exhibition/css/detail_pc.css

@@ -3,7 +3,6 @@
     min-height: 100vh;
     background: #F5F6F7;
     box-sizing: border-box;
-    padding-top: 64px;
     padding-bottom: 37px;
     box-sizing: border-box;
   }

src/web/staticres/common-module/exhibition/css/index.css

@@ -3,8 +3,6 @@
   .box {
     width: 100%;
     background: #F5F6F7;
-    /* min-height: 100vh; */
-    padding-top: 64px;
     padding-bottom: 111px;
   }
 

src/web/staticres/common-module/exhibition/css/index_pc.css

@@ -4,7 +4,6 @@
     width: 100%;
     background: #F5F6F7;
     min-height: 100vh;
-    padding-top: 64px;
     /* padding-bottom: 111px; */
     box-sizing: border-box;
   }

src/web/staticres/css/dataSmt/dataMart.css

@@ -1,8 +1,3 @@
-.dataMart {
-  padding-top: 72px;
-
-}
-
 .dataMart .header {
   position: relative;
   width: 100%;

src/web/staticres/css/dev2/superSearch.css

@@ -39,7 +39,6 @@
 }
 #searchInner{
 	line-height:1;
-  padding-top:64px;
   min-height: calc(100vh - 364px);
 }
 .com-highlight{
@@ -205,13 +204,13 @@
 
 .fixed-top{
   position: fixed;
-  top: 64px;
+  top: 52px;
   width: 1200px;
   z-index: 99;
 }
 .table-fixed-top{
   position: fixed;
-  top: 64px;
+  top: 52px;
   width: 1200px;
   background: #fff;
   z-index: 100;

src/web/staticres/enptc/css/enptc_index.css

@@ -2,7 +2,6 @@
 .enptc-index {
   font-family: Microsoft YaHei,sans-serif;
   position: relative;
-  padding-top: 64px;
   padding-bottom: 121px;
   min-height: calc(100vh - 364px);
   /* 分割 */

src/web/staticres/enterpriseCertificatio/css/enterpriseCertificatio.css

@@ -7,7 +7,6 @@
 .enterpriseCertificatio .head {
   width: 100%;
   height: 480px;
-  padding-top: 64px;
   box-sizing: border-box;
   position: relative;
   background: linear-gradient(270deg, #0547F2 25.44%, #058EF2 75.13%);

src/web/staticres/frontRouter/pc/cooperation/css/index.css

@@ -1,6 +1,3 @@
-.cooperation-page{
-  padding-top: 72px;
-}
 .cooperation-page-banner{
   width: 100%;
   height: 420px;

src/web/staticres/frontRouter/pc/couponland/css/land-pc.css

@@ -3,7 +3,6 @@
   display: none !important;
 }
 .squeeze-container {
-  padding-top: 64px;
   min-height: calc(100vh - 364px);
 }
 .squeeze-pc {

src/web/staticres/frontRouter/pc/customanage/css/index.css

@@ -1,6 +1,3 @@
-.customanage-page{
-  margin-top: 72px;
-}
 .head-main{
   width: 100%;
   height: 420px;

src/web/staticres/frontRouter/pc/mesgCenter/css/index-pc.css

@@ -8,7 +8,6 @@
     align-items: center;
   }
 .mesg-container {
-  padding-top: 64px;
   min-height: calc(100vh - 364px);
   background: #F2F4F7;
 }

src/web/staticres/frontRouter/pc/my_data_packet/css/index-pc.css

@@ -4,7 +4,6 @@
 }
 .d-packet-container {
     line-height: 1;
-    padding-top: 64px;
     padding-bottom: 70px;
     min-height: calc(100vh - 364px);
     background: #ececec;

src/web/staticres/frontRouter/pc/seeBuyerHistory/css/index-pc.css

@@ -42,7 +42,6 @@
 
 .see-container {
     line-height: 1;
-    padding-top: 64px;
     padding-bottom: 70px;
     min-height: calc(100vh - 364px);
 }

src/web/staticres/frontRouter/pc/seeHistory/css/index-pc.css

@@ -4,7 +4,6 @@
 }
 .see-container {
     line-height: 1;
-    padding-top: 64px;
     padding-bottom: 70px;
     min-height: calc(100vh - 364px);
 }

src/web/staticres/js/index/index_2023.12.js

@@ -19,7 +19,6 @@ var _page = {
     },
   },
   init: function () {
-    headerNavMini.changeHeaderPlaceholder(true)
     this.initEvents()
     this.initHotBuyerShortName()
     this.initHotIndustryTwoLine()
@@ -71,7 +70,8 @@ var _page = {
           targetUrl = url + '?keywords=' + searchValue
         }
         if (targetUrl) {
-          window.open(targetUrl)        
+          location.href = targetUrl
+          // window.open(targetUrl)        
         }
       }
     })

src/web/staticres/js/login.js

@@ -502,7 +502,7 @@ var logic = function(data,num){
 		LoginPolling.stop();
 		//登录成功，停止心跳监测
 		webSocketHeartCheck.reset();
-		if(ws.readyState==1){
+		if(ws && ws.readyState==1){
 			ws.send("close");
 			ws.close();
 		}
@@ -821,10 +821,12 @@ var haslogin = function(num,kyorpn,url){
 
         // TODO login callback
         try {
-          loginCallback()
+          // header专用回调。
+          loginCallbackHeader(data)
         } catch (e) {}
         try {
-          headerNavMini.checkLogin(true)
+          // 页面专用回调
+          loginCallback(data)
         } catch (e) {}
   
         encryptId = data.encryptId

src/web/staticres/js/pc-collect-user-info.js

@@ -405,7 +405,10 @@ var vm = new Vue({
         super_membership_day: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
         peugeot_supplier_regist:'请完善您的个人信息，抢先对接采购单位',
         peugeot_view_infor: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
-        ent_portrait_biddingProject:'请留下联系方式，我们会尽快联系您体验投标项目管理全部功能！'
+        ent_portrait_biddingProject:'请留下联系方式，我们会尽快联系您体验投标项目管理全部功能！',
+        cooperation_index: '无',
+        customanage_index: '请留下联系方式，我们会尽快联系您体验客户管理全部功能！',
+        ent_portrait_digitalMarketing: '请留下联系方式，我们会尽快联系您体验数字化营销全部功能！'
       },
       isRefresh: false, // 留完资是否需要刷新页面
       sourceDescMap: {
@@ -557,6 +560,15 @@ var vm = new Vue({
         }else if (source === 'ent_portrait_biddingProject'){
           this.dialogTitle = text
           this.dialogTitleTop = '欢迎体验剑鱼投标项目管理'
+        } else if (source === 'cooperation_index') {
+          this.dialogTitle = ''
+          this.dialogTitleTop = '请留下您的信息，我们会尽快和您联系'
+        } else if (source === 'customanage_index') {
+          this.dialogTitle = text
+          this.dialogTitleTop = '欢迎体验剑鱼客户管理'
+        }else if (source === 'ent_portrait_digitalMarketing') {
+          this.dialogTitle = text
+          this.dialogTitleTop = '欢迎体验剑鱼数字化营销'
 
         }
         // else if (source.indexOf("article_collection") > -1){

src/web/staticres/js/pur-search-index-pc.js

@@ -201,6 +201,9 @@ var vm = new Vue({
         getBIParams () {
           const urlParams = new URLSearchParams(window.location.search)
           return urlParams.get('resource')
+        },
+        loginIn () {
+          return this.isLogin
         }
     },
     created: function () {

src/web/staticres/landingpage/css/AppDownload.css

@@ -1,5 +1,5 @@
 .AppDownload{
-  padding-top: 52px;
+  /* padding-top: 52px; */
 }
 .AppDownload-head{
   width: 100%;

src/web/staticres/landingpage/css/InformationDistribution.css

@@ -1,8 +1,7 @@
 .InformationDistribution {
   width: 100%;
   background: #FFF;
-  padding-top: 52px;
- 
+  /* padding-top: 52px; */
 }
 .Information-head {
   position: relative;

src/web/staticres/landingpage/css/biddingProject.css

@@ -1,5 +1,5 @@
 .biddingProject{
-  padding-top: 52px;
+  /* padding-top: 52px; */
 }
 .biddingProject-head{
   width: 100%;

src/web/staticres/landingpage/css/digitalMarketing.css

@@ -0,0 +1,290 @@
+.digitalMarketing{
+  /* padding-top: 52px; */
+}
+.digitalMarketing-head{
+  width: 100%;
+  min-width: 1200px;
+  background:url('/landingpage/image/digitalMarketing/head.png') center center  no-repeat;
+  background-size: cover;
+  height: 420px;
+  box-sizing: border-box;
+  padding-top: 1px; 
+}
+.digitalMarketing-content{
+  width: 1200px;
+  margin: auto;
+}
+.digitalMarketing-content .digitalMarketing-title{
+  width:261px;
+  display: block;
+  margin-top: 52px;
+}
+.digitalMarketing-content .digitalMarketing-h2{
+font-size: 24px;
+font-weight: 400;
+line-height: 36px;
+color: #1D1D1D;
+margin-top: 26px;
+}
+.digitalMarketing-content .digitalMarketing-desc{
+  width: 549px;
+font-size: 14px;
+font-weight: 400;
+line-height: 22px;
+color: #686868;
+margin-top: 12px;
+}
+.digitalMarketing-content .digitalMarketing-btnbox{
+  margin-top: 56px;
+  display: flex;
+}
+.digitalMarketing-btnbox-left{
+  width: 180px;
+height: 46px;
+border-radius: 6px;
+background: linear-gradient(270deg, #3687FF 0%, #2ABED1 100%);
+box-shadow: 0px 4px 8px 0px #0070D81F;
+font-size: 18px;
+font-weight: 700;
+display: flex;
+justify-content: center;
+align-items: center;
+color: #FFFFFF;
+
+}
+.digitalMarketing-btnbox-right{
+  width: 180px;
+  height: 46px;
+  border-radius: 6px;
+  background: linear-gradient(90deg, #EFFFFF -2.53%, #CAFFFC 95.93%);
+  border: 1px solid #55E8FF;
+  box-shadow: 2px 2px 1px 0px #FFFFFFCC inset;
+  font-size: 18px;
+  font-weight: 700;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #2ABED1;
+  margin-left: 24px;
+}
+.digitalMarketing-middle{
+  background: linear-gradient(180deg, #F4FDFF 0%, #FFFFFF 100%);
+  padding: 80px 0 60px 0;
+}
+.digitalMarketing-middle-title{
+  width: 451px;
+  display: block;
+  margin: auto;
+}
+.digitalMarketing-middle-content{
+  width: 1144px;
+  display: block;
+  margin: auto;
+  margin-top: 80px;
+}
+.digitalMarketing-middle-btn{
+  width: 180px;
+  height: 46px;
+  border-radius: 6px;
+  background: linear-gradient(270deg, #3687FF 0%, #2ABED1 100%);
+  box-shadow: 0px 4px 8px 0px #0070D81F;
+  font-size: 18px;
+  font-weight: 700;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #FFFFFF;
+  margin: auto;
+  margin-top: 40px;
+}
+.digitalMarketing-middle-title-two{
+  width: 338px;
+  display: block;
+  margin: auto;
+  margin-top: 90px;
+}
+.digitalMarketing-middle-desc-two{
+font-size: 24px;
+font-weight: 400;
+line-height: 36px;
+color: #1D1D1D;
+margin-top: 20px;
+text-align: center;
+}
+.digitalMarketing-middle-box{
+  width: 1200px;
+  margin: auto;
+  display: flex;
+  justify-content: space-between;
+  margin-top: 98px;
+}
+.digitalMarketing-middle-box-text{
+  max-width: 480px;
+}
+.digitalMarketing-middle-box-text-title{
+display: inline-block;
+font-size: 32px;
+font-weight: 400;
+line-height: 36px;
+background-image:linear-gradient(270deg, #3687FF 0%, #2ABED1 100%); 
+-webkit-background-clip:text; 
+-webkit-text-fill-color:transparent; 
+margin-top: 18px;
+margin-right: 8px;
+}
+.digitalMarketing-middle-box-text-black{
+  display: inline-block;
+  font-size: 32px;
+  font-weight: 400;
+  line-height: 36px;
+  color: #1D1D1D;
+  margin-right: 8px;
+  margin-top: 18px;
+  
+  }
+.digitalMarketing-middle-box-text-desc{
+  margin-top: 24px;
+font-size: 14px;
+font-weight: 400;
+line-height: 29px;
+color: #686868; 
+}
+.digitalMarketing-middle-box-text-btn{
+  width: 180px;
+  height: 46px;
+  border-radius: 6px;
+  background: linear-gradient(270deg, #3687FF 0%, #2ABED1 100%);
+  box-shadow: 0px 4px 8px 0px #0070D81F;
+  font-size: 18px;
+  font-weight: 700;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #FFFFFF;
+  margin-top: 24px;
+}
+.digitalMarketing-middle-box-img{
+  display: block;
+}
+.w-650{
+  width: 650px;
+}
+.w-600{
+  width: 600px;
+}
+.w-630{
+  width: 630px;
+}
+/* 合
+作伙伴 */
+.jy-index-partners {
+  width: 100%;
+  padding: 60px 0;
+  background: #FFF;
+  position: relative;
+}
+.jy-index-partners .module-title{
+  font-size: 32px;
+  line-height: 36px;
+  text-align: center;
+  margin-bottom: 60px;
+
+}
+.partners-shadow-left{
+  width: 200px;
+  height: 312px;
+  background: linear-gradient(270deg, rgba(255, 255, 255, 0) 0%, #FFFFFF 47.87%, #FFFFFF 100%);
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 10;
+}
+.partners-shadow-right{
+  width: 200px;
+  height: 312px;
+  background: linear-gradient(270deg, #FFFFFF 0%, #FFFFFF 52.13%, rgba(255, 255, 255, 0) 100%);
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 10;
+}
+.jy-index-partners .swiper-wrapper {
+  -webkit-transition-timing-function: linear !important;
+  -moz-transition-timing-function: linear !important;
+  -ms-transition-timing-function: linear !important;
+  -o-transition-timing-function: linear !important;
+  transition-timing-function: linear !important;
+}
+
+.jy-index-partners .swiper-slide {
+  width: auto !important;
+  padding: 4px 8px;
+  text-align: center;
+}
+
+.jy-index-partners img {
+  display: inline-block;
+  width: 152px;
+  height: 100px;
+  transition: ease 0.3s;
+  position: relative;
+  /* cursor: pointer; */
+}
+
+.jy-index-partners ul li {
+  width: 130px;
+  height: 100px;
+  margin: 2px;
+  transition: ease 0.3s;
+  position: relative;
+}
+
+.jy-index-partners ul li img {
+  width: 130px;
+  height: 100px;
+}
+
+.jy-index-partners ul li:hover img {
+  border-radius: 8px;
+  /* box-shadow: 0px 0px 4px 4px rgb(233, 230, 230);  */
+  box-shadow: 0px 0px 24px rgb(0 0 0 / 16%);
+  position: absolute;
+  z-index: 1;
+}
+/* 合作伙伴结束 */
+@keyframes CfadeInUp {
+  from {
+    transform: translateY(50px);
+  }
+
+  to {
+    transform: translateY(0px);
+    opacity: 1;
+  }
+}
+
+.CfadeInUp {
+  /* opacity: 0; */
+  animation: 1s ease forwards alternate;
+}
+.button-blink {
+  position: relative;
+  overflow: hidden;
+  cursor: pointer;
+}
+.button-blink::after {
+  content: '';
+  display: block;
+  position: absolute;
+  top: -120px;
+  left: -80px;
+  width: 36px;
+  height: 360px;
+  background: #fff;
+  opacity: 0.16;
+  transform: rotate(-45deg);
+  transition: all 800ms ease-out;
+}
+.button-blink:hover::after {
+  left: 200%;
+}

src/web/staticres/pccss/index_pc.css

@@ -735,6 +735,9 @@
     flex: 1;
     max-width: 72%;
 }
+.notice-card .notice-card-footer {
+    margin: 16px 20px 24px;
+}
 
 #good-supplier-card .notice-card-content {
     height: 566px;
@@ -1005,6 +1008,7 @@
     margin-top: 20px;
     padding: 10px 0 16px;
     width: 100%;
+    height: 176px;
 }
 
 .bidding-desc-module .bidding-desc-content-card-list {

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

@@ -7,9 +7,11 @@ a {
 }
 
 /* link */
-.cms-link {
+.cms-link,
+.cms-link:focus {
     font-size: 14px;
     color: #686868;
+    text-decoration: none;
 }
 .cms-link.red {
     color: #FF3A20;
@@ -55,6 +57,9 @@ a {
     transform: rotate(-45deg);
     transition: all 800ms ease-out;
 }
+.blink-fast.button-blink::after {
+    transition-duration: 500ms;
+}
 .button-blink:hover::after {
     left: 200%;
 }
@@ -139,7 +144,7 @@ a.j-s-button:hover {
     width: 100%;
     z-index: 999;
 }
-.header-nav-mini {
+#public-nav.header-nav-mini {
     background-color: #F2F2F4;
 }
 .header-nav-mini-placeholder {
@@ -202,6 +207,8 @@ a.j-s-button:hover {
     display: flex;
     align-items: center;
     justify-content: center;
+    font-size: 14px;
+    color: #444;
 }
 .menu-item.active a,
 .menu-item.with-underline.active a {
@@ -391,6 +398,7 @@ body .menu-vip-button {
     margin-bottom: 12px;
     font-size: 14px;
     color: #686868;
+    width: 100%;
 }
 .site-dropdown-panel .dropdown-list:last-child{
     margin-bottom: 0;

src/web/staticres/public-pc/css/pc-header-nav-second.css

@@ -11,10 +11,7 @@
   height: 72px;
 
 }
-.header-nav-mini-placeholder {
-  height: 72px;
-}
-.pc-header-nav-second .pc-header-nav-second-head .pc-header-nav-second-head-content{
+.pc-header-nav-second .pc-header-nav-second-head-content{
   width: 1200px;
   margin: auto;
   height: 72px;
@@ -29,13 +26,13 @@
   width: 130px;
   height: 34px;
 }
-.pc-header-nav-second .pc-header-nav-second-head-left .pc-header-nav-second-head-line{
+.pc-header-nav-second .pc-header-nav-second-head-line{
   margin-left: 16px;
   width: 1px;
   height: 32px;
   background-color:#e0e0e0;
 }
-.pc-header-nav-second .pc-header-nav-second-head-left .pc-header-nav-second-head-desc{
+.pc-header-nav-second .pc-header-nav-second-head-desc{
   font-size: 14px;
   font-weight: 400;
   line-height: 18px;
@@ -48,12 +45,15 @@
   align-items: center;
   justify-content: end;
 }
-.pc-header-nav-second .pc-header-nav-second-head-right .pc-header-nav-second-head-right-item{
-font-size: 16px;
-font-weight: 400;
-line-height: 24px;
-margin-left: 24px;
-color: #1D1D1D;
-cursor: pointer;
-text-decoration: none;
-}
+.pc-header-nav-second .pc-header-nav-second-head-right-item{
+  font-size: 16px;
+  font-weight: 400;
+  line-height: 24px;
+  margin-left: 24px;
+  color: #1D1D1D;
+  cursor: pointer;
+  text-decoration: none;
+}
+/* .pc-header-nav-second .pc-header-nav-second-head-right-item:hover{
+  color: #2abde1;
+} */

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

@@ -41,20 +41,42 @@ function Message() {
 
 
 var headerNavMini = {
+  headerNavContainer: $('#header-nav-container'),
   headerNav: $('#public-nav'),
   headerNavPlaceholder: $('#header-nav-mini-placeholder'),
-  headerHeight: $('#public-nav').height(),
+  headerNavSecond: $('#pc-header-nav-second'),
+  _headerNavFixedHeight: $('#public-nav').height(),
+  // 因为二级菜单有动画延迟，所以直接写计算后的值
+  // (这个地方需要注意：这里写的值是第二个头部的真实显示高度。但是在未登陆下，第二个头部其实是不会显示的(高度为0)，但是这个变量仍然是72。)
+  _headerNavSecondHeight: 72,
   init: function () {
-    this.initStyle()
     this.initEvents()
   },
   initStyle: function () {},
-  changeHeaderPlaceholder: function (f) {
-    if (f) {
-      // 头部占位
-      this.headerNavPlaceholder.height(this.headerHeight).show()
-    } else {
-      this.headerNavPlaceholder.hide()
+  changeHeaderPlaceholder: function () {
+    // 头部占位
+    this.headerNavPlaceholder.height(this._headerNavFixedHeight)
+  },
+  // 登陆前不展示。登陆后工作台外的页面顶部统一展示(除了首页)
+  secondHeaderShow: function (login) {
+    if (!login) return
+    // exclude中的页面不会显示第二个头部
+    var pathname = location.pathname
+    var excludeReg = [
+      /^\/$/, // 首页
+      // new RegExp('/brand/index'),
+    ]
+    var findTarget = false
+    for (var i = 0; i < excludeReg.length; i++) {
+      if (excludeReg[i].test(pathname)) {
+        findTarget = true
+        break
+      }
+    }
+    if (!findTarget) {
+      this.headerNavSecond.slideDown({
+        speed: 200
+      })
     }
   },
   initEvents: function () {
@@ -127,6 +149,9 @@ var headerNavMini = {
       $('.login-register-button').show()
       $('.go-to-workspace').hide()
     }
+    this.initStyle()
+    this.changeHeaderPlaceholder()
+    this.secondHeaderShow(login)
   },
   changeMenuActive: function (name) {
     this.headerNav.find('[name='+name+']').addClass('active')
@@ -142,7 +167,7 @@ $(function () {
 })
 
 headerNavMini.checkLogin(false)
-function loginCallback () {
+function loginCallbackHeader (uInfo) {
   headerNavMini.checkLogin(loginflag)
   window.message = new Message()
   try {

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

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

src/web/staticres/serviceSystem/css/serviceSystem.css

@@ -17,15 +17,19 @@
 }
 
 .tabs {
-    position: fixed;
+    position: relative;
     width: 100%;
     background: rgba(255, 255, 255, 0.48);
     backdrop-filter: blur(4px);
     left: 0;
-    top: 64px;
+    top: 0;
     z-index: 99;
     display: block;
 }
+.tabs.fixed {
+    position: fixed;
+    top: 52px;
+}
 
 .tabs-item {
     width: 320px;
@@ -929,7 +933,7 @@
     position: fixed;
     left: 50%;
     transform: translateX(-50%);
-    top: 64px;
+    top: 52px;
     /* display: none; */
 
 }

src/web/staticres/serviceSystem/js/serviceSystem.js

@@ -29,6 +29,9 @@ var vm = new Vue({
         this.getcode()
         this.getImage()
     },
+    mounted: function () {
+        this.calcFixedTop()
+    },
     methods: {
         getstates: function(callback) {
             var this_ = this
@@ -164,7 +167,24 @@ var vm = new Vue({
             }
             this.isshow = true
         },
-
+        calcFixedTop: function () {
+            var headerTop = $('#public-nav').height()
+            var stickyBox = $('.serviceSystem_box .tabs')
+            $('.table_header_new').css({ top: headerTop })
+            $(window).on('scroll', function () {
+                var scrollTop = $(window).scrollTop()
+                var top = $('#header-nav-container').height()
+                if (scrollTop >= top - headerTop) {
+                    stickyBox.addClass('fixed').css({
+                        top: headerTop
+                    })
+                } else {
+                    stickyBox.removeClass('fixed').css({
+                        top: 0
+                    })
+                }
+            })
+        },
         tabclick: function (val) {
             if (val == this.tabs) {
                 return

src/web/staticres/site/page/helpCenter/css/feedback.css

@@ -6,7 +6,6 @@
   position: relative;
   width: 100%;
   height: 100%;
-  padding-top: 64px;
 }
 .page-feedback .feedback-container{
   padding: 0 100px;

src/web/staticres/tags/css/tags-lib.css

@@ -106,7 +106,6 @@ a:hover {
 }
 
 .page-content-container {
-    padding-top: 64px;
     min-height: calc(100vh - 364px);
 }
 .selector-card-container {

src/web/templates/bid-fileinter/page_bidfile_createorder.html

@@ -20,7 +20,7 @@ body{
   font-family: "Microsoft YaHei",sans-serif;
 }
 .j-content{
-  padding-top: 64px;
+  padding-top: 0;
 }
 .public-nav .iner .logo img{
 	width: 130px;

src/web/templates/bid-fileinter/page_bidfile_landpage.html

@@ -28,7 +28,7 @@ body{
   font-family: "Microsoft YaHei",sans-serif;
 }
 .j-content{
-  padding-top: 64px;
+  padding-top: 0;
 }
 .public-nav .iner .logo img{
 	width: 130px;

src/web/templates/bid-fileinter/page_bidfile_list.html

@@ -20,7 +20,7 @@ body{
   font-family: "Microsoft YaHei",sans-serif;
 }
 .j-content{
-  padding-top: 64px;
+  padding-top: 0;
 }
 .public-nav .iner .logo img{
 	width: 130px;

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

@@ -1,74 +1,78 @@
 <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-mini fixed-header" id="public-nav" style="display: none">
-    <main class="w header-nav-content">
-        <div class="h-nav-c-left flex-row-center">
-            <h2 class="nav-home">
-                <a class="flex-row-center" href="/"><i class="j-icon base-icon icon-img-nav-home"></i>首页</a>
-            </h2>
-            <p class="nav-tip">欢迎来到剑鱼标讯</p>
-            <div class="nav-area-substation home-site">
-                <button class="site-btn j-s-button main">各省分站</button>
-                <div class="site-dropdown-panel">
-                    <!-- <header class="dropdown-header">当前地区：北京</header> -->
-                    <ul class="dropdown-content clearfix">
-                       {{range $v:= GetAreaLocations}}
-                          <li class="dropdown-list">
-                            <strong class="list-label">{{$v.Name}}</strong>
-                            <span class="list-value-flex">
-                              {{range $n:=$v.Child}}
-                                 <a class="list-value" href="{{$n.Url}}">{{$n.Name}}</a>
-                              {{end}}
-                            </span>
-                          </li>
-                       {{end}}
-                    </ul>
+<section class="header-nav-container" id="header-nav-container">
+    <section class="header-nav-mini fixed-header" id="public-nav" style="display: none">
+        <main class="w header-nav-content">
+            <div class="h-nav-c-left flex-row-center">
+                <h2 class="nav-home">
+                    <a class="flex-row-center" href="/"><i class="j-icon base-icon icon-img-nav-home"></i>首页</a>
+                </h2>
+                <p class="nav-tip">欢迎来到剑鱼标讯</p>
+                <div class="nav-area-substation home-site">
+                    <button class="site-btn j-s-button main">各省分站</button>
+                    <div class="site-dropdown-panel">
+                        <!-- <header class="dropdown-header">当前地区：北京</header> -->
+                        <ul class="dropdown-content clearfix">
+                        {{range $v:= GetAreaLocations}}
+                            <li class="dropdown-list">
+                                <strong class="list-label">{{$v.Name}}</strong>
+                                <span class="list-value-flex">
+                                {{range $n:=$v.Child}}
+                                    <a class="list-value" href="{{$n.Url}}">{{$n.Name}}</a>
+                                {{end}}
+                                </span>
+                            </li>
+                        {{end}}
+                        </ul>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="h-nav-c-right flex-row-center">
-            <ul class="menu-list flex-row-center">
-                <li class="menu-item">
-                    <a class="menu-vip-button" href="/product/index?serviceType=0"><i class="j-icon base-icon icon-img-vip-v-deep"></i>服务列表</a>
-                </li>
-                {{$TopMenus :=JyTopMenu .Request.URL.Path}}
-                {{range $menu := $TopMenus.MenuList }}
-                <li class="menu-item hover-underline" name="{{$menu.Title}}">
-                  <a href="{{$menu.Link}}">{{$menu.Title}}</a>
-                </li>
-                {{end}}
-                <li class="menu-item message-menu login-show" id="noticed" style="display: none;">
-                    <a class="message-menu-link" href="/swordfish/frontPage/messageCenter/sess/index">
-                        <div class="icon-img-message">
-                            <img src="/images/index/message2@2x.png" class="message-img" alt="">
-                            <img src="/images/index/message2@2x.png" class="message-img-active" alt="">
-                            <!-- <img src="/images/index/message-active.png" class="message-img-active" alt=""> -->
+            <div class="h-nav-c-right flex-row-center">
+                <ul class="menu-list flex-row-center">
+                    <li class="menu-item">
+                        <a class="menu-vip-button" href="/product/index?serviceType=0"><i class="j-icon base-icon icon-img-vip-v-deep"></i>服务列表</a>
+                    </li>
+                    {{$TopMenus :=JyTopMenu .Request.URL.Path}}
+                    {{range $menu := $TopMenus.MenuList }}
+                    <li class="menu-item hover-underline" name="{{$menu.Title}}">
+                    <a href="{{$menu.Link}}">{{$menu.Title}}</a>
+                    </li>
+                    {{end}}
+                    <li class="menu-item message-menu login-show" id="noticed" style="display: none;">
+                        <a class="message-menu-link" href="/swordfish/frontPage/messageCenter/sess/index">
+                            <div class="icon-img-message">
+                                <img src="/images/index/message2@2x.png" class="message-img" alt="">
+                                <img src="/images/index/message2@2x.png" class="message-img-active" alt="">
+                                <!-- <img src="/images/index/message-active.png" class="message-img-active" alt=""> -->
+                            </div>
+                            <span class="tips" id="tips" style="display: none">99+</span>
+                        </a>
+                    </li>
+                    <li class="menu-item avatar-menu nav-avatar login-show" style="display: none;">
+                        <div class="avatar-img-container">
+                            <img data-user-avatar src="/common-module/public/image/auto.png" alt="">
                         </div>
-                        <span class="tips" id="tips" style="display: none">99+</span>
-                    </a>
-                </li>
-                <li class="menu-item avatar-menu nav-avatar login-show" style="display: none;">
-                    <div class="avatar-img-container">
-                        <img data-user-avatar src="/common-module/public/image/auto.png" alt="">
-                    </div>
-                    <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 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 class="out-button" onclick='signout()'>退出登录</div>
-                    </div>
-                </li>
-                <li class="menu-item action-menu">
-                    <button class="login-register-button j-s-button main" style="display: none">注册/登录</button>
-                    <a class="go-to-workspace j-s-button main" href="/page_workDesktop/" style="display: none">进入工作台</a>
-                </li>
-            </ul>
-        </div>
-    </main>
+                    </li>
+                    <li class="menu-item action-menu">
+                        <button class="login-register-button j-s-button main" style="display: none">注册/登录</button>
+                        <a class="go-to-workspace j-s-button main" href="/page_workDesktop/" style="display: none">进入工作台</a>
+                    </li>
+                </ul>
+            </div>
+        </main>
+    </section>
+    <section class="header-nav-mini-placeholder" id="header-nav-mini-placeholder"></section>
+    {{include "/common/pc-header-nav-second.html"}}
 </section>
-<section class="header-nav-mini-placeholder" id="header-nav-mini-placeholder" style="display: none;"></section>
+
 <!-- Modal -->
 <div class="modal fade" id="downloadApp" tabindex="-1" aria-labelledby="downloadApp" aria-hidden="true">
     <div class="modal-dialog">

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

@@ -1,5 +1,5 @@
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/public-pc/css/pc-header-nav-second.css?v={{Msg "seo" "version"}}' />
-<section id="pc-header-nav-second" class="pc-header-nav-second">
+<section id="pc-header-nav-second" class="pc-header-nav-second" style="display: none;">
  <div class="pc-header-nav-second-head">
   <div class="pc-header-nav-second-head-content">
     <div class="pc-header-nav-second-head-left">

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

@@ -2,10 +2,10 @@
 <html>
 
 <head>
-  <title>App下载-剑鱼标讯</title>
+  <title>剑鱼标讯APP下载_好用的招投标app - 剑鱼标讯官网</title>
   <meta content="IE=edge,Chrome=1" http-equiv="X-UA-Compatible" />
-  <meta name="Keywords" content="App下载,招标商机,人工智能,招标大数据,企业情报,剑鱼标讯"/>
-  <meta name="Description" content="App下载依托剑鱼标讯海量招标信息，为你提供招标商机服务、人工智能预测新项目服务、中标企业预测服务、招标大数据服务和企业情报大数据服务，帮助你全面获取销售机会、辅助进行投标决策、全面分析洞察市场、拓展客户和代理渠道。" />
+  <meta name="Keywords" content="剑鱼标讯app,招标app,招投标app,招投标软件"/>
+  <meta name="Description" content="剑鱼标讯专注于全国招标采购信息的搜索查询、订阅推送和数据定制化服务，提供涵盖采购意向、招标预告、招标公告、中标结果等多种信息类型，安装剑鱼标讯APP，即可快速、简单、便捷的查询全国招标采购信息，寻找挖掘商机线索！" />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <meta name="renderer" content="webkit" >
   <meta name="format-detection" content="telephone=no"/>
@@ -26,7 +26,6 @@
 <body>
 {{include "/common/pchead.html"}}
 <div class="AppDownload">
-  {{include "/common/pc-header-nav-second.html"}}
   <div class="AppDownload-head">
     <div class="content">
       <h2 class="title-m">亿万级标讯数据实时更新</h2>
@@ -297,7 +296,7 @@
         wH = $(window).height();
         wScrollTop = $(window).scrollTop();
         judgeTop();
-   
+
       });
     })()
     var partners = new Swiper('.partners-container', {
@@ -317,7 +316,7 @@
      partners.init()
 
   })
-  
+
 
 </script>
 <!--S-百度统计-->

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

@@ -25,7 +25,6 @@
 <body>
 {{include "/common/pchead.html"}}
 <div class="InformationDistribution">
-  {{include "/common/pc-header-nav-second.html"}}
   <section class="Information-head">
     <div class="head_content">
       <div class="text_box">

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

@@ -29,7 +29,6 @@
 <!-- 用户留资 -->
 <div id="vue-collect-user-info"></div>
 <div class="biddingProject">
-  {{include "/common/pc-header-nav-second.html"}}
   <div class="biddingProject-head">
     <div class="content">
       <img src="{{Msg "seo" "cdn"}}/landingpage/image/biddingProject/title1.png?v={{Msg "seo" "version"}}" alt="好用易上手" class="title1">

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

@@ -23,7 +23,6 @@
           align-items: center;
         }
       .bide-container {
-          padding-top: 64px;
           min-height: calc(100vh - 364px);
       }
       .bide-container img {

src/web/templates/frontRouter/pc/collection/sess/index.html

@@ -22,7 +22,6 @@
         <style>
             .collection-container {
                 line-height: 1;
-                padding-top: 64px;
                 min-height: calc(100vh - 364px);
             }
             .visited .a-i-title {

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

@@ -14,6 +14,7 @@
   <link href='{{Msg "seo" "cdn"}}/css/reset.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
   <link href='{{Msg "seo" "cdn"}}/pccss/reset_pc.css' rel="stylesheet" type="text/css" />
   <link href='{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}' rel="stylesheet" />
+  <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" rel="stylesheet" />
   <link href='{{Msg "seo" "cdn"}}/css/collect-user-info.css?v={{Msg "seo" "version"}}' rel="stylesheet">
   <link href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
   <link href='{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/css/index.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
@@ -22,13 +23,15 @@
 </head>
 <body>
 {{include "/common/pchead.html"}}
+<!-- 用户留资 -->
+<div id="vue-collect-user-info"></div>
 <div class="cooperation-page">
   <div class="cooperation-page-banner">
     <div class="banner-content w">
       <img class="text-theme" src="{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/cooperate.png" alt="">
       <img class="text-partner" src="{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/partner.png" alt="">
       <p class="text-title">聚合百万客户，共同拓展销售商机，领跑市场！</p>
-      <button class="btn-join" onclick="openLink()">邀您加入</button>
+      <button class="btn-join button-blink" onclick="openLink()">邀您加入</button>
     </div>
   </div>
   <main class="cooperation-page-join w">
@@ -52,7 +55,7 @@
           <img class="item-bottom" :src="item.bottom" alt="">
           <img class="item-center" :src="item.center" alt="">
           <img class="item-top" :src="item.top" alt="">
-          <button class="get-more-btn button-blink" onclick="openLink()">了解更多</button>
+          <button class="get-more-btn" onclick="openLink()">了解更多</button>
         </div>
       </div>
       <h3 class="coop-call-tip">以上合作方式如不能满足您的合作需求，您可以直接与我们联系</h3>
@@ -65,7 +68,7 @@
       <div class="join-left-text">
         <h2>加入我们 共生共赢共荣</h2>
         <p>我们制定了更高效的合作流程，帮助您的企业快速加入剑鱼标讯<br/>商业生态合作伙伴招募计划！</p>
-        <button class="get-more-btn button-blink no-positon" onclick="openLink()">开始合作</button>
+        <button class="get-more-btn no-positon" onclick="openLink()">开始合作</button>
       </div>
       <div class="join-right-text">
         <h2>联系方式</h2>
@@ -76,8 +79,10 @@
   </main>
 </div>
 <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/index.js></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/static-data.js?v={{Msg "seo" "version"}}'></script>
+<script src="//cdn-common.jianyu360.com/cdn/lib/countup/2.0.8/dist/countUp.js"></script>
 <script src='{{Msg "seo" "cdn"}}/js/pc-collect-user-info.js?v={{Msg "seo" "version"}}'></script>
 <script>
   var cooperateNode = new Vue({
@@ -126,7 +131,7 @@
       openLoginDig()
       return
     }
-    vm.isNeedSubmit('ent_portrait_biddingProject')
+    vm.isNeedSubmit('cooperation_index')
   }
 </script>
 <!--S-百度统计-->

src/web/templates/frontRouter/pc/coupon/sess/index.html

@@ -22,7 +22,6 @@
         }
         .page--docs--index .page-container {
             min-height: calc(100vh - 364px);
-            padding-top: 64px;
             box-sizing: border-box;
         }
         .page--docs--index .w-box .w1200 {

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

@@ -14,6 +14,7 @@
   <link href='{{Msg "seo" "cdn"}}/css/reset.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
   <link href='{{Msg "seo" "cdn"}}/pccss/reset_pc.css' rel="stylesheet" type="text/css" />
   <link href='{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}' rel="stylesheet" />
+  <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" rel="stylesheet" />
   <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/swiper.min.css?v={{Msg "seo" "version"}}'>
   <link href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
   <link href='{{Msg "seo" "cdn"}}/css/collect-user-info.css?v={{Msg "seo" "version"}}' rel="stylesheet">
@@ -23,6 +24,8 @@
 </head>
 <body>
 {{include "/common/pchead.html"}}
+<!-- 用户留资 -->
+<div id="vue-collect-user-info"></div>
 <div class="customanage-page">
   <header class="head-main">
     <div class="head-banner w">
@@ -43,7 +46,7 @@
           <p>客户管理方面挑战</p>
         </div>
         <div class="customanage-c-l-bottom">
-          <button class="head-btn" onclick="openLink('2')">免费咨询</button>
+          <button class="head-btn button-blink" onclick="openLink('2')">免费咨询</button>
         </div>
       </div>
       <div class="customanage-c-r">
@@ -58,8 +61,8 @@
       <img src="{{Msg "seo" "cdn"}}/frontRouter/pc/customanage/img/con-3.png" alt="">
       <img src="{{Msg "seo" "cdn"}}/frontRouter/pc/customanage/img/con-4.png" alt="">
       <div class="explain-banner-group">
-        <button class="explain-btn-l explain-btn" onclick="openLink('1')">预约演示</button>
-        <button class="explain-btn-r explain-btn" onclick="openLink('2')">免费咨询</button>
+        <button class="explain-btn-l explain-btn button-blink" onclick="openLink('1')">预约演示</button>
+        <button class="explain-btn-r explain-btn button-blink" onclick="openLink('2')">免费咨询</button>
       </div>
     </div>
   </main>
@@ -206,8 +209,10 @@
   </div>
 </div>
 <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/index.js></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/static-data.js?v={{Msg "seo" "version"}}'></script>
+<script src="//cdn-common.jianyu360.com/cdn/lib/countup/2.0.8/dist/countUp.js"></script>
 <script src='{{Msg "seo" "cdn"}}/js/pc-collect-user-info.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/swiper.min.js?v={{Msg "seo" "version"}}'></script>
 <script>
@@ -217,7 +222,7 @@
       return
     }
     if(data === '1') {
-      vm.isNeedSubmit('ent_portrait_biddingProject')
+      vm.isNeedSubmit('customanage_index')
     } else if(data === '2') {
       goCustomerUrl({ openNewWindow: true })
     }

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

@@ -0,0 +1,354 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <title>数字化营销-剑鱼标讯</title>
+  <meta content="IE=edge,Chrome=1" http-equiv="X-UA-Compatible" />
+  <meta name="Keywords" content="数字化营销,招标商机,人工智能,招标大数据,企业情报,剑鱼标讯"/>
+  <meta name="Description" content="数字化营销依托剑鱼标讯海量招标信息，为你提供招标商机服务、人工智能预测新项目服务、中标企业预测服务、招标大数据服务和企业情报大数据服务，帮助你全面获取销售机会、辅助进行投标决策、全面分析洞察市场、拓展客户和代理渠道。" />
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <meta name="renderer" content="webkit" >
+  <meta name="format-detection" content="telephone=no"/>
+  <meta name="enable-header" content="数字化营销"/>
+  {{include "/common/pnc.html"}}
+  <link href='{{Msg "seo" "cdn"}}/css/reset.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
+  <link href='{{Msg "seo" "cdn"}}/css/subscribe.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
+  <link href='{{Msg "seo" "cdn"}}/pccss/reset_pc.css' rel="stylesheet" type="text/css" />
+  <link href='{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}' rel="stylesheet" />
+  <link href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' rel="stylesheet"
+        type="text/css" />
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/swiper.min.css?v={{Msg "seo" "version"}}'>
+  <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" rel="stylesheet" />
+  <link href='{{Msg "seo" "cdn"}}/css/collect-user-info.css?v={{Msg "seo" "version"}}' rel="stylesheet">
+  <link href='{{Msg "seo" "cdn"}}/landingpage/css/digitalMarketing.css?v={{Msg "seo" "version"}}' rel="stylesheet"
+        type="text/css" />
+  <style>
+  </style>
+</head>
+<body>
+{{include "/common/pchead.html"}}
+<!-- 用户留资 -->
+<div id="vue-collect-user-info"></div>
+<div class="digitalMarketing">
+  <div class="digitalMarketing-head">
+    <div class="digitalMarketing-content">
+      <img src="{{Msg "seo" "cdn"}}/landingpage/image/digitalMarketing/head-text.png?v={{Msg "seo" "version"}}" alt="数字化营销" class="digitalMarketing-title">
+      <h2 class="digitalMarketing-h2">为一线员工赋能，为营销团队提效，为企业发展助力</h2>
+      <p class="digitalMarketing-desc">数字化营销是结合剑鱼平台自身的资讯优势，推出的企业营销数字化产品。它将资讯服务贯穿企业营销的全过程，提供企业情报库、线索和商机的分发、任务跟进与管理、机会复盘等功能，帮助企业实现数字化转型和升级。</p>
+      <div class="digitalMarketing-btnbox">
+        <div class="digitalMarketing-btnbox-left button-blink" onclick="Retain_capital()">预约演示</div>
+        <div class="digitalMarketing-btnbox-right button-blink" onclick="onlinekf()">免费咨询</div>
+      </div>
+    </div>
+  </div>
+  <div class="digitalMarketing-middle CfadeInUp">
+    <img src="{{Msg "seo" "cdn"}}/landingpage/image/digitalMarketing/middle-text1.png?v={{Msg "seo" "version"}}" alt="解决传统企业管理五大难题" class="digitalMarketing-middle-title">
+    <img src="{{Msg "seo" "cdn"}}/landingpage/image/digitalMarketing/middle-con.png?v={{Msg "seo" "version"}}" alt="" class="digitalMarketing-middle-content">
+    <div class="digitalMarketing-middle-btn button-blink" onclick="Retain_capital()">联系专家解决</div>
+    <img src="{{Msg "seo" "cdn"}}/landingpage/image/digitalMarketing/middle-text2.png?v={{Msg "seo" "version"}}" alt="营销功能将帮您实现" class="digitalMarketing-middle-title-two">
+    <p class="digitalMarketing-middle-desc-two">线索获客、培育、转化、分析的全流程、全场景解决方案</p>
+    <div class="digitalMarketing-middle-box">
+      <div class="digitalMarketing-middle-box-text">
+        <h1 class="digitalMarketing-middle-box-text-title">专属情报库</h1>
+        <h1 class="digitalMarketing-middle-box-text-black">获取商机更快</h1>
+        <p class="digitalMarketing-middle-box-text-desc">
+          结合自身的资讯优势，让企业从海量资讯中提取出<br>
+          可用于企业销售过程的情报，<br>
+          在线索跟踪中找到商机，在商机确定后锁定用户，<br>
+          提前介入项目并及时运作，把握销售主动权。
+        </p>
+        <div class="digitalMarketing-middle-box-text-btn button-blink">预约演示</div>
+      </div>
+      <img src="{{Msg "seo" "cdn"}}/landingpage/image/digitalMarketing/1.png?v={{Msg "seo" "version"}}" alt="" class="w-650 digitalMarketing-middle-box-img">
+    </div>
+    <div class="digitalMarketing-middle-box">
+      <img src="{{Msg "seo" "cdn"}}/landingpage/image/digitalMarketing/2.png?v={{Msg "seo" "version"}}" alt="" class="w-600 digitalMarketing-middle-box-img">
+      <div class="digitalMarketing-middle-box-text">
+        <h1 class="digitalMarketing-middle-box-text-black">用</h1>
+        <h1 class="digitalMarketing-middle-box-text-title">资讯服务</h1>
+        <h1 class="digitalMarketing-middle-box-text-black">指导市场营销</h1>
+        <p class="digitalMarketing-middle-box-text-desc">
+          营销提供的资讯服务，贯穿企业营销的全过程，<br>
+          包括：企业专属资讯定制、线索资讯汇集、<br>
+          客户情报资料归集、招投标过程的资讯支持，<br>
+          以及以市场占有率变化为指标的营销效率考核。
+          </p>
+        <div class="digitalMarketing-middle-box-text-btn button-blink" onclick="Retain_capital()">预约演示</div>
+      </div>
+    </div>
+    <div class="digitalMarketing-middle-box">
+      <div class="digitalMarketing-middle-box-text">
+        <h1 class="digitalMarketing-middle-box-text-title">企业级团队协作</h1>
+        <h1 class="digitalMarketing-middle-box-text-black">高效协同</h1>
+        <p class="digitalMarketing-middle-box-text-desc">
+          营销不仅赋能企业员工个人的销售工作，<br>
+          还支持团队级别的工作协作，通过丰富的资讯共享、<br>
+          便捷的沟通交流，扫清了团队业务工作中的独点和堵点，<br>
+          使工作流程更顺畅，团队协作更高效。
+          </p>
+        <div class="digitalMarketing-middle-box-text-btn button-blink" onclick="Retain_capital()">预约演示</div>
+      </div>
+      <img src="{{Msg "seo" "cdn"}}/landingpage/image/digitalMarketing/3.png?v={{Msg "seo" "version"}}" alt="" class="w-630 digitalMarketing-middle-box-img">
+    </div>
+    <div class="digitalMarketing-middle-box">
+      <img src="{{Msg "seo" "cdn"}}/landingpage/image/digitalMarketing/4.png?v={{Msg "seo" "version"}}" alt="" class="w-600 digitalMarketing-middle-box-img">
+      <div class="digitalMarketing-middle-box-text">
+        <h1 class="digitalMarketing-middle-box-text-black">为企业营销管理提供</h1>
+        <h1 class="digitalMarketing-middle-box-text-title">数字化支撑</h1>
+        <p class="digitalMarketing-middle-box-text-desc">
+          剑鱼数字化营销产品，可以帮助企业进行营销计划制定、<br>
+          专属营销资讯的定制、线索和商机的分发、任务跟进与管理、<br>
+          投标工作及机会复盘、营销目标和绩效考评等。
+        </p>
+        <div class="digitalMarketing-middle-box-text-btn button-blink" onclick="Retain_capital()">预约演示</div>
+      </div>
+    </div>
+    <div class="digitalMarketing-middle-box">
+      <div class="digitalMarketing-middle-box-text">
+        <h1 class="digitalMarketing-middle-box-text-title">智能任务分派</h1>
+        <h1 class="digitalMarketing-middle-box-text-black">数据总览全局</h1>
+        <p class="digitalMarketing-middle-box-text-desc">
+          根据定义的任务工单分派到人、<br>
+          流转跟进，回访结果可视化，<br>
+          实现工作结果数据可视化，落地闭环管理。
+        </p>
+        <div class="digitalMarketing-middle-box-text-btn button-blink" onclick="Retain_capital()">预约演示</div>
+      </div>
+      <img src="{{Msg "seo" "cdn"}}/landingpage/image/digitalMarketing/5.png?v={{Msg "seo" "version"}}" alt="" class="w-600 digitalMarketing-middle-box-img">
+    </div>
+  </div>
+  <div class="jy-index-partners CfadeInUp">
+    <h3 class="module-title">众多行业领军企业通过营销实现业绩增长！</h3>
+    <div class="partners-container swiper-container">
+      <div class="partners-shadow-left"></div>
+      <div class="partners-shadow-right"></div>
+      <div class="swiper-wrapper">
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/huawei.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/xinyu.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/duopuduo.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/baidu.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/ruijie.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/haikang.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/taipingyang.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/yitu.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/hanhe.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/guangda.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/dekey.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/jida.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/ali.png?v ={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/zhonghui.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/lianruan.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/minsheng.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/lehe.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/meinian.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/dianxin.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/jingyi.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/siem.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/shenxin.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/bot.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/yidong.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/wandong.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/aite.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/yushi.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/wanfu.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/lianying.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/ruiwode.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/drager.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/stryker.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/mindray.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+        <div class="swiper-slide">
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/zhongtongfu.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/braun.png?v={{Msg "seo" "version"}}'>
+          </div>
+          <div class="img-box">
+            <img src='{{Msg "seo" "cdn"}}/images/index/neusoft.png?v={{Msg "seo" "version"}}'>
+          </div>
+        </div>
+      </div>
+    </div>
+</div>
+</div>
+</div>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.7.14/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/index.js></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/selector/js/static-data.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
+<script src='{{Msg "seo" "cdn"}}/js/jquery.cookie.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
+<script src='{{Msg "seo" "cdn"}}/js/swiper.min.js?v={{Msg "seo" "version"}}'></script>
+<script src="//cdn-common.jianyu360.com/cdn/lib/countup/2.0.8/dist/countUp.js"></script>
+<script src='{{Msg "seo" "cdn"}}/js/pc-collect-user-info.js?v={{Msg "seo" "version"}}'></script>
+<script>
+  $(function () {
+    haslogin({{.T.logid}});
+    (function animateUp () {
+      var obj = $('.CfadeInUp');
+      var objH = $('.CfadeInUp').outerHeight();
+      var num = [];
+      var wH = $(window).height();
+      var wScrollTop = $(window).scrollTop();
+
+      // 获取页面所有obj的top位置，存入数组
+      for (var i = 0; i < obj.length; i++) {
+        num.push(obj.eq(i).offset().top + (objH / 3));
+      }
+      // console.log(num)
+      // 循环数组，判断obj的位置是否在可视区中
+      function judgeTop () {
+        for (var j = 0; j < num.length; j++) {
+          if (num[j] >= wScrollTop && num[j] < (wScrollTop + wH - 50)) {
+            // console.log(j)
+            if (j == 0) {
+              obj.eq(j).css({
+                'animation-name': 'CfadeInUp',
+                'animation-duration': 0.8 + 's',
+                'opacity': '1'
+              });
+            } else {
+              obj.eq(j).css({
+                'animation-name': 'CfadeInUp',
+                'animation-duration': 1.4 + 's',
+                'opacity': '1'
+              });
+            }
+          }
+        }
+      };
+      // 页面初始化时先调用一次
+      judgeTop();
+      // 触发滚动事件调用判断函数
+      $(window).scroll(function (event) {
+        wH = $(window).height();
+        wScrollTop = $(window).scrollTop();
+        judgeTop();
+   
+      });
+    })()
+    var partners = new Swiper('.partners-container', {
+          slidesPerView: "auto",
+          centeredSlides: true,
+          speed: 4000,
+          // autoplay: true,
+          freeMode: true,
+          loop: true,
+          slidesPerGroup: 1,
+          autoplay: {
+            delay: 1, //自动切换的时间间隔
+            disableOnInteraction: false,
+            pauseOnMouseEnter: true, //鼠标置于swiper时暂停自动切换，鼠标离开时恢复自动切换。
+          }
+        });
+     partners.init()
+  })
+  function onlinekf () {
+      if (!loginflag) {
+        openLoginDig();
+        return
+      }
+      goCustomerUrl({ openNewWindow: true })
+    }
+    function Retain_capital () {
+      if (!loginflag) {
+        openLoginDig();
+        return
+      }
+   vm.isNeedSubmit('ent_portrait_digitalMarketing')
+    }
+</script>
+<!--S-百度统计-->
+{{include "/common/pcbottom.html"}}
+{{include "/common/baiducc.html"}}
+<!--E-百度统计-->
+</body>
+</html>

src/web/templates/frontRouter/pc/entpc/sess/index.html

@@ -45,7 +45,6 @@
         }
         .page--entpc--index .page-container {
             min-height: calc(100vh - 364px);
-            padding-top: 64px;
             box-sizing: border-box;
         }
         .page--entpc--index .w-box .w1200 {

src/web/templates/frontRouter/pc/page_big_pc/sess/index.html

@@ -49,7 +49,6 @@
         }
         .page--docs--index .page-container {
             min-height: calc(100vh - 364px);
-            padding-top: 64px;
             box-sizing: border-box;
         }
         .in-iframe .page-container,

src/web/templates/frontRouter/pc/page_entbase_pc/sess/index.html

@@ -45,7 +45,6 @@
         }
         .page--entpc--index .page-container {
             min-height: calc(100vh - 364px);
-            padding-top: 64px;
             box-sizing: border-box;
         }
         .page--entpc--index .w-box .w1200 {

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

@@ -29,7 +29,7 @@
 <body>
     {{include "/common/pchead.html"}}
     <div class="serviceSystem_box" v-cloak>
-        <div class="tabs">
+        <div class="tabs sticky-box">
             <div class="tab_div">
                 <div :class="{'tabs-item':true,'tab_active':tabs==index}" v-for="(item,index) in tablist" @click.stop="tabclick(index)">
                     {item}

src/web/templates/frontRouter/pc/squeeze/sess/squeeze_pc.html

@@ -36,7 +36,7 @@
     }
 
     .j-content {
-      padding-top: 64px;
+      padding-top: 0;
     }
 
     .public-nav .iner .logo {

src/web/templates/frontRouter/pc/user/sess/set_favorite.html

@@ -18,7 +18,6 @@
     <link href='{{Msg "seo" "cdn"}}/frontRouter/pc/user/css/set_favorite.css?v={{Msg "seo" "version"}}' rel="stylesheet" />
     <style>
         .page--web--index .page-container {
-            padding-top: 64px;
             min-height: calc(100vh - 364px);
             box-sizing: border-box;
         }

src/web/templates/frontRouter/pc/userMerge/sess/accountmerge.html

@@ -20,7 +20,7 @@ body{
   font-family: "Microsoft YaHei",sans-serif;
 }
 .j-content{
-  padding-top: 64px;
+  padding-top: 0;
 }
 .public-nav .iner .logo img{
 	width: 130px;

src/web/templates/frontRouter/pc/userMerge/sess/bind.html

@@ -28,7 +28,6 @@
         border-bottom: 1px solid #e0e0e0;
     }
     .page-container {
-        padding-top: 64px;
         min-height: calc(100vh - 364px);
         box-sizing: border-box;
         background: linear-gradient(167.96deg, #FFFFFF 0%, #EDFEFF 45.31%, rgba(237, 254, 255, 0) 100%);

src/web/templates/micro/social-pc/index.html

@@ -50,7 +50,6 @@
         }
         .page--web--index .page-container {
             min-height: calc(100vh - 364px);
-            padding-top: 64px;
             box-sizing: border-box;
         }
     </style>

src/web/templates/micro/web-pc/index.html

@@ -44,7 +44,6 @@
         }
         .page--web--index .page-container {
             min-height: calc(100vh - 364px);
-            padding-top: 64px;
             box-sizing: border-box;
         }
         .page--web--index .search-header-content {

src/web/templates/pc/entsearchindex.html

@@ -22,7 +22,7 @@
         <style>
             .search-container {
                 line-height: 1;
-                padding-top: 88px;
+                padding-top: 22px;
                 min-height: calc(100vh - 364px);
                 background-color: #F5F5F5;
             }
@@ -156,7 +156,7 @@
                     <span class="tab-item" v-show="!inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">供应搜索</span>
                     <span class="tab-item" v-show="!inIframe" @click="location.replace('/jylab/supsearch/index.html?tab=2')">超前项目查询</span>
                     <!-- <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">拟在建项目查询</span> -->
-                    <div class="search-tab-right">
+                    <div class="search-tab-right" v-show="isLogin && !inIframe">
                       <span>完整版筛选，戳我>></span>
                       <span style="color: #2ABED1;cursor: pointer;" @click="goWorkSpace">进入工作台</span>
                     </div>

src/web/templates/pc/newIndex.html

@@ -2,9 +2,9 @@
 <html lang="zh-CN">
 <head>
   <meta charset="UTF-8">
-  <title>首页</title>
-  <meta name="Keywords" content="招标订阅,招标项目,中标项目,招标信息,剑鱼标讯" />
-  <meta name="Description" content="使用剑鱼标讯，可以精准匹配招标信息，只需要微信关注剑鱼标讯公众号，然后自行设定所关注的招标关键词和地区，满足订阅需求的招标信息就会在两个小时内自动推送。" />
+  <title>{{Msg "seo" "qfw.index.title"}}</title>
+  <meta name="Keywords" content='{{Msg "seo" "qfw.index.key"}}' />
+  <meta name="Description" content='{{Msg "seo" "qfw.index.description"}}' />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <meta name="format-detection" content="telephone=no" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
@@ -197,7 +197,9 @@
       </section>
 
       <!-- 合作伙伴 -->
-      {{include "/pc/template/index/banner-partners.html"}}
+      <section class="mt20">
+        {{include "/pc/template/index/banner-partners.html"}}
+      </section>
     </main>
     <div class="body-footer">
       {{include "/common/friend-link.html"}}

src/web/templates/pc/purScopebusniess.html

@@ -20,7 +20,6 @@
         <style>
             .search-container {
                 line-height: 1;
-                padding-top: 64px;
                 padding-bottom: 56px;
                 min-height: calc(100vh - 364px);
                 background-color: #f5f5fb;

src/web/templates/pc/pursearchindex.html

@@ -24,7 +24,7 @@
         <style>
             .search-container {
                 line-height: 1;
-                padding-top: 88px;
+                padding-top: 22px;
                 min-height: calc(100vh - 364px);
             }
             .in-iframe .search-container {
@@ -105,7 +105,7 @@
                   <span class="tab-item" v-show="!inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">供应搜索</span>
                   <span class="tab-item" v-show="!inIframe" @click="location.replace('/jylab/supsearch/index.html?tab=2')">超前项目查询</span>
                   <!-- <span class="tab-item" v-show="!inIframe" @click="location.replace('/jylab/entSearch/index.html')">拟在建项目查询</span> -->
-                  <div class="search-tab-right">
+                  <div class="search-tab-right" v-show="loginIn && !inIframe">
                     <span>完整版筛选，戳我>></span>
                     <span style="color: #2ABED1;cursor: pointer;" @click="goWorkSpace">进入工作台</span>
                   </div>

src/web/templates/pc/supsearch.html

@@ -802,7 +802,7 @@
           <!--领域化页面不展示-->
           {{if not .T.bidField}}
           <el-badge value="限免" type="danger" class="publish-button" v-if="!inResourceBIiframe">
-            <el-button type="primary" round @click="goToPublish">信息发布</el-button>
+            <el-button type="primary" id="setInfoBtn" round @click="goToPublish">信息发布</el-button>
           </el-badge>
           {{end}}
         </div>
@@ -1957,16 +1957,21 @@
       $('#go-customer-4').addClass('hide')
       if(getParam('tab') === '2') {
         searchInnerVue.searchTab = 2
-      }
-      if(!searchInnerVue.hideCQ) {
-        $('.nologin-hide').removeClass('hide')
-        $('.badge-recommend').addClass('hide')
-        $('.search-tab-item-0').addClass('hide')
       } else {
-        $('.nologin-hide').addClass('hide')
+        searchInnerVue.searchTab = 1
+      }
+      $('#setInfoBtn').text('免费发布信息')
+      if(!goTemplateData.inIframe) {
+        if(!searchInnerVue.hideCQ) {
+          $('.nologin-hide').removeClass('hide')
+          $('.badge-recommend').addClass('hide')
+          $('.search-tab-item-0').addClass('hide')
+        } else {
+          $('.nologin-hide').addClass('hide')
+        }
+        $('.city-list-divide').addClass('hide')
+        $('#sideIcon').addClass('hide')
       }
-      $('.city-list-divide').addClass('hide')
-      $('#sideIcon').addClass('hide')
       try{
         searchInnerVue.$refs.areaRefs.shoWcity=false//隐藏地市
       }catch(e){
@@ -1975,9 +1980,6 @@
       for (let i = 0; i < searchDoms.length; i++) {
         $(searchDoms[i]).show()
       }
-    } else if(!goTemplateData.inIframe) {
-      $('.badge-recommend').hide()
-      $('.search-tab-item-0').hide()
     }
 
     // 数据导出后续不再提示复选框
@@ -2003,9 +2005,20 @@
       $('#go-customer-4').removeClass('hide')
       $('.nologin-hide').removeClass('hide')
       if(!goTemplateData.inIframe) {
+        $('.search-tab-right').show()
         $('.badge-recommend').hide()
         $('.search-tab-item-0').hide()
+      } else {
+        $('.search-tab-right').hide()
+        $('.badge-recommend').show()
+        $('.search-tab-item-0').show()
+      }
+      if(getParam('tab') === '2') {
+        searchInnerVue.searchTab = 2
+      } else {
+        searchInnerVue.searchTab = 1
       }
+      $('#setInfoBtn').text('信息发布')
       $('.city-list-divide').removeClass('hide')
       $('#sideIcon').removeClass('hide')
       try{
@@ -2017,7 +2030,8 @@
       for (let i = 0; i < searchDoms.length; i++) {
         if(goTemplateData.inIframe) {
           $(searchDoms[i]).hide()
-          $('.nologin-hide').addClass('hide')
+          $('.badge-recommend').show()
+          $('.search-tab-item-0').show()
         }
       }
       /**
@@ -3187,9 +3201,21 @@ function checkTagDisabled () {
     },
     methods: {
       goWorkSpace: function () {
+        $.ajax({
+          url: '/front/dataExport/superSearchExport',
+          type: 'POST',
+          headers: {
+            'jump_source': '1'
+          }
+        })
         var formNode_ = $('#zbSeatchT')
         var goHref_ = location.origin + '/jylab/supsearch/index.html'
-        window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref_ + '?' + formNode_.serialize()))
+        if(getParam('tab') === '2') {
+          // 超前项目查询
+          window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref_ + '?tab=2&' + formNode_.serialize()))
+        } else {
+          window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref_ + '?' + formNode_.serialize()))
+        }
       },
       addParamsToFormUrl: function() {
         if (!this.inResourceBIiframe) return

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

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

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

@@ -18,7 +18,7 @@
           </ul>
         </main>
         <footer class="service-desc-footer">
-          <button class="service-desc-button s-confirm open-customer">申请开通</button>
+          <button class="service-desc-button s-confirm button-blink open-customer">申请开通</button>
         </footer>
       </section>
     </div>

src/web/templates/pc/template/index/notice-card.html

@@ -16,6 +16,13 @@
       {{end}}
     </section>
   </main>
+  <footer class="notice-card-footer">
+    {{if .T.hasLogin}}
+    <a class="service-desc-button s-confirm button-blink" href="/swordfish/page_web_pc/issued/info">免费发布信息</a>
+    {{else}}
+    <a class="service-desc-button s-confirm button-blink" href="/swordfish/frontPage/InformationDistribution/free/index">免费发布信息</a>
+    {{end}}
+  </footer>
   <!-- <main class="notice-card-content notice-card-list empty">
     {{include "/pc/template/common/empty.html"}}
   </main> -->

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

@@ -20,7 +20,7 @@
         <div class="index-search-input-container">
           <input type="text" class="search-input" name="keywords" autocomplete="off" placeholder="请输入搜项目名称等关键词，例如：医疗设备">
         </div>
-        <input type="button" class="search-button" value="剑鱼一下" id="doSearch">
+        <button class="search-button button-blink blink-fast" type="submit" id="doSearch">剑鱼一下</button>
       </div>
     </div>
     <div class="header-top-center-bd hot-key-container">

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

@@ -30,10 +30,12 @@
       <span class="u-i-h-line-label">账号类型：</span>
       <span class="u-i-h-line-value">{{.T.vipType}}</span>
     </p>
+    {{if and ( ne .T.vipType "注册用户") .T.vipEntTime}}
     <p class="user-info-header-line">
       <span class="u-i-h-line-label">会员服务到期时间：</span>
       <span class="u-i-h-line-value">{{.T.vipEntTime}}</span>
     </p>
+    {{end}}
   </header>
   {{$ad_menu:=(Ad "new-pc-index-menu" -1 .Host)}}
   {{if $ad_menu}}
@@ -41,7 +43,7 @@
     <ul class="user-power-list clearfix">
       {{range $ad := $ad_menu}}
         <li class="user-power-item pointer">
-          <a class="user-power-item-link" href="{{$ad.S_link}}" target="_blank">
+          <a class="user-power-item-link" href="{{$ad.S_link}}">
             <span class="user-power-item-icon">
               <img src="{{$ad.S_pic}}" alt="{{$ad.S_picalt}}">
             </span>

src/web/templates/site/page/helpCenter/index.html

@@ -7,7 +7,7 @@
   <meta name="Description" content='{{Msg "seo" "qfw.swordfish.description"}}'/>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <meta name="format-detection" content="tephone=no" />
-  <meta content="帮助中心" theme="light" name="enable-header"/>
+  <meta content="帮助中心" theme="dark" name="enable-header"/>
   <meta http-equiv="X-UA-Compatible" content="ie=edge" />
   {{include "/common/pnc.html"}}
   <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/reset_pc.css?v={{Msg "seo" "version"}}' />