Merge branch 'feature/v4.8.31' of http://192.168.3.207:8080/qmx/jy into dev/v4.8.31_wmh

src/jfw/front/pcIndex.go

@@ -34,11 +34,12 @@ const (
 
 type PcIndex struct {
 	*xweb.Action
-	newSordfish  xweb.Mapper `xweb:"/(old|)"`                  //剑鱼标讯pc首页
-	brandIndex   xweb.Mapper `xweb:"/brand/index"`             //品牌网站首页
-	productIndex xweb.Mapper `xweb:"/product/index"`           //品牌网站首页
-	newSordfishC xweb.Mapper `xweb:"/pcindex.html"`            //剑鱼标讯pc首页-统计
-	searchResult xweb.Mapper `xweb:"/list/(\\w+)/(\\w+).html"` //剑鱼标讯分类 地区结果列表
+	newSordfish   xweb.Mapper `xweb:"/(old|)"`                  //剑鱼标讯pc首页
+	brandIndex    xweb.Mapper `xweb:"/brand/index"`             //品牌网站首页
+	brandIndexOld xweb.Mapper `xweb:"/brand/index_old"`         //品牌网站首页
+	productIndex  xweb.Mapper `xweb:"/product/index"`           //品牌网站首页
+	newSordfishC  xweb.Mapper `xweb:"/pcindex.html"`            //剑鱼标讯pc首页-统计
+	searchResult  xweb.Mapper `xweb:"/list/(\\w+)/(\\w+).html"` //剑鱼标讯分类 地区结果列表
 }
 
 func init() {
@@ -46,6 +47,10 @@ func init() {
 }
 
 func (this PcIndex) BrandIndex() error {
+	return this.Render("/pc/brand/index.html")
+}
+
+func (this PcIndex) BrandIndexOld() error {
 	return this.Render("/frontRouter/pc/brand/free/index.html")
 }
 func (this PcIndex) ProductIndex() error {

src/jfw/front/shorturl.go

@@ -59,11 +59,13 @@ var seoAgentReg = regexp.MustCompile("Baiduspider|360Spider|bingbot|Googlebot")
 
 func (s *Short) Article(stype, id string) error {
 	userId, _ := s.GetSession("userId").(string)
-	if (stype == "content" || stype == "indexcontent") && userId == "" && seoAgentReg.MatchString(s.UserAgent()) {
-		sids := encrypt.CommonDecodeArticle(stype, id)
-		return s.NologinCommon("", stype, id, sids[0])
-	} else if userId == "" {
-		return s.Redirect("/notin/page")
+	if (stype == "content" || stype == "indexcontent") && userId == "" {
+		if seoAgentReg.MatchString(s.UserAgent()) {
+			sids := encrypt.CommonDecodeArticle(stype, id)
+			return s.NologinCommon("", stype, id, sids[0])
+		} else {
+			return s.Redirect("/notin/page")
+		}
 	}
 	return s.LoginCommon(userId, stype, id)
 }

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

@@ -0,0 +1,813 @@
+/* 公共 */
+.w1200{
+  width: 1200px;
+  margin: 0 auto;
+}
+.jy-index .module-title{
+  padding-bottom: 40px;
+  text-align: center;
+  color: #1D1D1D;
+  font-size: 28px;
+  line-height: 36px;
+  letter-spacing: 0.1em;
+}
+.jy-index .card-time{
+  position: relative;
+  display: inline-block;
+  padding: 0 16px;
+  color: #2CB7CA;
+  font-size: 14px;
+  line-height: 22px;
+  font-style: oblique;
+}
+
+/* banner */
+.jy-index-banner{
+  width: 100%;
+  height: 500px;
+  overflow: hidden;
+}
+.jy-index-banner > .swiper-container,
+.jy-index-banner > .swiper-container .swiper-slide{
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  cursor: pointer;
+}
+.jy-index-banner .swiper-slide > img{
+  width: 100%;
+  height: 500px;
+  object-fit: cover;
+}
+.jy-index-banner .custom-dot {
+  bottom: 28px;
+}
+.jy-index-banner .custom-dot .swiper-pagination-bullet{
+  width: 40px;
+  height: 4px;
+  margin: 0 8px;
+  background: rgba(0, 0, 0, 0.2);
+  border-radius: 10px;
+  cursor: pointer;
+  opacity: 1;
+}
+.jy-index-banner .custom-dot.light-swiper-bg-light-color .swiper-pagination-bullet {
+  background: rgba(255, 255, 255, 0.32);
+  opacity: 1;
+}
+.jy-index-banner .custom-dot.light-swiper-bg-light-color .swiper-pagination-bullet-active {
+  background: #fff
+}
+.jy-index-banner .custom-dot .swiper-pagination-bullet-active{
+  background: #2CB7CA;
+}
+.jy-index-banner .swiper-pagination-bullet:only-child{
+  display: none!important;
+}
+
+/* 公司动态 */
+.jy-index-dt{
+  width: 100%;
+  height: 730px;
+  padding: 56px 0;
+  background: url(/images/index/dt-bg.png) no-repeat center;
+  background-size: cover;
+}
+.jy-index-dt .more{
+  text-align: right;
+}
+.jy-index-dt .more .item-link{
+  color: #686868;
+  font-size: 14px;
+  line-height: 24px;
+  text-decoration: none;
+  padding-right: 24px;
+  background: url(/images/index/link-arrow.png) right center no-repeat;
+  background-size: 20px 20px;
+}
+
+.jy-index-dt .item-link:hover{
+  background: url(/images/index/link-arrow-active.png) right center no-repeat;
+  background-size: 20px 20px;
+  color: #2CB7CA;
+}
+.jy-index-dt .dt-container{
+  display: flex;
+  align-items: center;
+  margin-top: 16px;
+}
+.jy-index-dt .dt-container .dt-card{
+  flex-shrink: 0;
+  width: 380px;
+  height: 500px;
+  margin-right: 30px;
+  background: #FFFFFF;
+  box-shadow: 4px 4px 16px rgba(0, 0, 0, 0.1);
+  cursor: pointer;
+  overflow: hidden;
+  border-radius: 8px;
+  /* transition-property: transform,top;
+  transition-duration: 1s,0.3s; */
+}
+/* .jy-index-dt .dt-container .dt-card:hover{
+  transform: scale(1.08);
+  top: 10px;
+} */
+.jy-index-dt .dt-container .dt-card:last-child{
+  margin-right: 0;
+}
+.jy-index-dt .dt-card .card-img{
+  width: 100%;
+  height: 252px;
+  overflow: hidden;
+
+}
+.jy-index-dt .dt-card .card-img > img{
+  width: 100%;
+  height: 100%;
+  transition: all 0.6s;
+}
+.jy-index-dt .dt-card .card-img > img:hover{
+  transform: scale(1.1);
+}
+.jy-index-dt .dt-card .card-main{
+  padding: 28px;
+}
+.jy-index-dt .dt-card .card-title{
+  margin-top: 20px;
+  height: 72px;
+  font-size: 24px;
+  line-height: 36px;
+  color: #333333;
+  overflow: hidden;
+}
+.jy-index-dt .dt-card .card-summary{
+  margin-top: 10px;
+  font-size: 14px;
+  line-height: 22px;
+  color: #686868;
+  text-align: justify;
+}
+.jy-index-dt .dt-card:hover .card-title{
+  color: #2CB7CA;
+}
+
+/* 核心产品 */
+.jy-index-product{
+  padding: 70px 0;
+}
+.jy-index-product .main-product,
+.jy-index-product .other-product{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 15px;
+}
+.jy-index-product .main-product-item {
+  position: relative;
+  width: 588px;
+  height: 216px;
+  padding: 0 32px;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100% 100%;
+  cursor: pointer;
+  overflow: hidden;
+}
+.jy-index-product .other-product-item{
+  position: relative;
+  width: 384px;
+  height: 216px;
+  padding: 0 32px;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100% 100%;
+  cursor: pointer;
+  overflow: hidden;
+}
+
+.jy-index-product .svip-product{
+  background-image: url(/images/index/svip-product.png);
+}
+.jy-index-product .bigmember-product{
+  background-image: url(/images/index/bigmember-product.png);
+}
+.jy-index-product .buyer-product{
+  background-image: url(/images/index/buyer-product.png);
+}
+.jy-index-product .agency-product{
+  background-image: url(/images/index/agency-product.png);
+}
+.jy-index-product .data-market-product{
+  background-image: url(/images/index/data-market-product.png);
+}
+.jy-index-product .p-link{
+  position: absolute;
+  top: 24px;
+  display: none;
+  padding-right: 32px;
+  background: url(/images/index/link-arrow.png) 60px center no-repeat;
+  background-size: 20px 20px;
+  font-size: 14px;
+  line-height: 22px;
+  color: #686868;
+}
+
+.jy-index-product .p-name{
+  padding: 150px 0 0;
+  font-size: 24px;
+  line-height: 36px;
+}
+.jy-index-product .main-product-item .p-name{
+  color: #fff;
+  transition: All 0.4s ease-in-out;
+  -webkit-transition: All 0.4s ease-in-out;
+  -moz-transition: All 0.4s ease-in-out;
+  -o-transition: All 0.4s ease-in-out;
+}
+.jy-index-product .other-product-item .p-name{
+  color: #1D1D1D;
+  transition: All 0.4s ease-in-out;
+  -webkit-transition: All 0.4s ease-in-out;
+  -moz-transition: All 0.4s ease-in-out;
+  -o-transition: All 0.4s ease-in-out;
+}
+
+.jy-index-product .p-detail{
+  /* display: none; */
+  margin-top: 100px;
+  max-width: 262px;
+  text-align: justify;
+  transition: All 0.4s ease-in-out;
+  -webkit-transition: All 0.4s ease-in-out;
+  -moz-transition: All 0.4s ease-in-out;
+  -o-transition: All 0.4s ease-in-out;
+}
+.jy-index-product .other-product-item:hover{
+  /* position: relative; */
+  display: inline-block;
+  /* margin: 0px; */
+  max-width: 100%;
+  color: #fff;
+  overflow: hidden;
+}
+.jy-index-product .main-product-item:hover .p-link{
+  display: block;
+  color: #fff;
+  padding-right: 32px;
+  background: url(/images/index/link-arrow-light.png) 60px center no-repeat;
+  background-size: 20px 20px;
+  transition: All 0.8s ease-in-out;
+  -webkit-transition: All 0.8s ease-in-out;
+  -moz-transition: All 0.8s ease-in-out;
+  -o-transition: All 0.8s ease-in-out;
+}
+.jy-index-product .main-product-item:hover .p-name{
+  padding-top: 96px;
+}
+.jy-index-product .main-product-item:hover .p-detail{
+  margin-top: 8px;
+  font-size: 14px;
+  color: #fff;
+  line-height: 20px;
+}
+.jy-index-product .other-product-item:hover .p-link{
+  display: block;
+  transition: All 0.8s ease-in-out;
+  -webkit-transition: All 0.8s ease-in-out;
+  -moz-transition: All 0.8s ease-in-out;
+  -o-transition: All 0.8s ease-in-out;
+}
+.jy-index-product .other-product-item:hover .p-name{
+  padding-top: 116px;
+}
+.jy-index-product .other-product-item:hover .p-detail{
+  max-width: 234px;
+  line-height: 20px;
+  margin-top: 8px;
+  color: #1D1D1D;
+  font-size: 14px;
+}
+
+/* 行业解决方案 */
+.jy-index-plan{
+  width: 100%;
+  height: 570px;
+  padding: 56px 0;
+  background: url(/images/index/plan-bg.png) no-repeat center center;
+  background-size: 100% 100%;
+}
+.jy-index-plan .plan-container{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 40px;
+}
+.jy-index-plan .plan-item{
+  position: relative;
+  width: 384px;
+  height: 340px;
+  padding: 0 42px;
+  background: #fff;
+  border-radius: 8px;
+  box-sizing: border-box;
+  cursor: pointer;
+}
+
+.jy-index-plan .plan-item-1 > .item-icon{
+  position: absolute;
+  right: 24px;
+  top: -40px;
+  width: 150px;
+  height: 150px;
+  background: url(/images/index/plan-item-1.png) no-repeat center center;
+  background-size: contain;
+}
+.jy-index-plan .plan-item-2 > .item-icon{
+  position: absolute;
+  right: 24px;
+  top: -40px;
+  width: 150px;
+  height: 150px;
+  background: url(/images/index/plan-item-2.png) no-repeat center center;
+  background-size: contain;
+}
+.jy-index-plan .plan-item-3 > .item-icon{
+  position: absolute;
+  right: 24px;
+  top: -40px;
+  width: 150px;
+  height: 130px;
+  background: url(/images/index/plan-item-3.png) no-repeat center center;
+  background-size: contain;
+}
+.jy-index-plan .item-header{
+  padding-top: 60px;
+  color: #1D1D1D;
+  font-size: 24px;
+  line-height: 28px;
+}
+
+.jy-index-plan .item-content{
+  padding-top: 48px;
+  font-size: 14px;
+  line-height: 26px;
+  letter-spacing: 0.08em;
+  color: #1D1D1D;
+  text-align: justify;
+}
+.jy-index-plan .item-link{
+  position: absolute;
+  padding-right: 24px;
+  bottom: 24px;
+  font-size: 14px;
+  line-height: 22px;
+  color: #686868;
+  background: url(/images/index/link-arrow.png) right center no-repeat;
+  background-size: 20px 20px;
+}
+
+.jy-index-plan .plan-item:hover{
+  background: url(/images/index/plan-hover.png) no-repeat bottom center #fff;
+  background-size: 384px 135px;
+}
+
+.jy-index-plan .plan-item:hover::after{
+  position: absolute;
+  content: '';
+  top: 0;
+  left: 42px;
+  width: 50px;
+  height: 4px;
+  background: linear-gradient(90deg, #95CDFF 1.92%, #2CB7CA 100%);
+  -webkit-animation: borderTo 0.5s alternate 1 ease;
+  animation: borderTo 0.5s alternate 1 ease;
+}
+.jy-index-plan .plan-item:hover .item-header,
+.jy-index-plan .plan-item:hover .item-link
+{
+  color: #2ABED1;
+  transition: all 0.5s;
+}
+.jy-index-plan .plan-item:hover .item-link{
+  background: url(/images/index/link-arrow-active.png) right center no-repeat;
+  background-size: 20px 20px;
+}
+
+@-webkit-keyframes borderTo {
+  from {
+    left: 0;
+  }
+  to {
+    left: 42px;
+  }
+}
+@keyframes borderTo {
+  from {
+    left: 0;
+  }
+  to {
+    left: 42px;
+  }
+}
+
+/* 合作伙伴 */
+.jy-index-partners{
+  width: 100%;
+  padding: 70px 0;
+  background: #FFF;
+}
+.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;
+}
+
+
+/*******************底部************************/
+.pc-index-bottom{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  z-index: 999;
+}
+
+.pc-index-bottom > .bottom-member-ad {
+  display: inline-block;
+  width: 100%;
+  height: 100%;
+  max-height: 200px;
+  object-fit: contain;
+  cursor: pointer;
+}
+
+.j-bottom{
+  background-color: #2B2D30;
+  color: #fff;
+  padding: 40px 0px 25px 0px;
+  text-align: center;
+  font-weight: normal;
+}
+.j-bottom>div{
+  width: 1200px;
+  margin: 0px auto;
+}
+.j-bottom-b,.j-bottom-t{
+  display: inline-block;
+  vertical-align: top;
+}
+.j-bottom-t a{
+  color: #fff;
+  margin: 0px 10px;
+  text-decoration: none;
+}
+.j-bottom-t a:first-of-type{
+  margin-left: 0px;
+}
+.j-bottom-t [type="text"]{
+  height: 50px;
+  width: 450px;
+  border-radius: 0px;
+  background-color: #3E3D42;
+  padding-left: 20px;
+  border-width: 0px;
+  font-size: 16px;
+  padding-right: 40px;
+}
+.j-bottom-t [type="text"]::-webkit-input-placeholder{
+  color: #A9A9A9;
+}
+.j-bottom-t form{
+  margin-top: 10px;
+}
+.j-bottom-t .j-inputgroup{
+  position: relative;
+}
+.j-bottom-t .j-searchbtn{
+  display: inline-block;
+  width: 65px;
+  border: 2px solid #fff;
+  height: 48px;
+  vertical-align: top;
+  padding-top: 9px;
+  cursor: pointer;
+}
+.j-bottom-t>div:first-of-type{
+  margin-top: 45px;
+  font-size: 16px;
+}
+.j-bottom-t>div:last-of-type{
+  color: #B9B9BB;
+  margin-top: 20px;
+}
+.j-bottom-b{
+  margin-left: 250px;
+  line-height: 25px;
+  font-size: 14px;
+}
+.j-bottom-b>img{
+  width: 120px;
+  height: 120px;
+  margin-bottom: 5px;
+}
+.j-bottom-b>font:first-of-type{
+  font-size: 16px;
+}
+.backTop{
+  width: 44px;
+  height: 44px;
+  position: fixed;
+  right: 10px;
+  bottom: 10px;
+  cursor: pointer;
+  display: none;
+}
+.backTop-a{
+  bottom: 340px;
+  position: absolute;
+  z-index: 1;
+}
+/*底部*/
+.j-bottom{
+  line-height:22px;
+  position: relative;
+  padding-bottom: 65px;
+}
+
+
+/* 友情链接 */
+.jy_friendlink{
+  color: rgba(255,255,255,.8);
+  display: flex;
+  padding: 0px 0 32px;
+  border-bottom: 1px solid rgba(255,255,255,0.12);
+}
+.jy_friendlink_content ul li{
+  padding: 0 16px;
+}
+.jy_friendlink_title{
+  margin-right: 40px;
+  word-break: keep-all;
+}
+.jy_friendlink_content ul li img{
+  height: 28px;
+}
+
+
+.jy_classify{
+  padding: 32px 0 68px;
+  display: flex;
+  justify-content: space-between;
+}
+.jy_classify_l{
+  position: relative;
+  display: flex;
+  /* border-right: 1px solid rgba(255, 255, 255, 0.12); */
+}
+.jy_classify_l::after{
+  position: absolute;
+  content: '';
+  top: 0;
+  right: -28px;
+  width: 1px;
+  height: 168px;
+  background: rgba(255, 255, 255, 0.12);
+  z-index: 9;
+}
+.jy_classify_l dl{
+  margin-right: 40px;
+  flex: 1;
+}
+.jy_classify_l dl dt,
+.jy_classify_l dl dt > a{
+  font-size: 14px;
+  color: rgba(255,255,255,.8);
+  line-height: 22px;
+  margin-bottom: 8px;
+  white-space: nowrap;
+  font-weight: 400;
+}
+.jy_classify_l dl dt > a:hover{
+  text-decoration: none;
+  color: #2cb7ca;
+}
+
+.jy_classify_l dl dd{
+  position: relative;
+}
+.jy_classify_l dl dd a{
+  display: block;
+  font-size: 12px;
+  color: rgba(255,255,255,.6);
+  line-height: 20px;
+  white-space: nowrap;
+}
+.jy_classify_l dl dd a:hover{
+  text-decoration: none;
+  color: #2cb7ca;
+}
+.jy_classify_l dl dd:hover .jy_community{
+  display: block;
+}
+.jy_classify_l dl dd .jy_community{
+  display: none;
+  position: absolute;
+  right: -130px;
+  top: -50px;
+  background: #fff;
+  border-radius: 4px;
+  width: 120px;
+  padding: 10px 10px 5px;
+}
+.jy_classify_l dl dd .jy_community p{
+  color: #1d1d1d;
+  font-size: 14px;
+  text-align: center;
+}
+.jy_classify_l dl dd .jy_community img{
+  width: 100px;
+}
+.jy_classify_r .jy_classify_kefu{
+  display: flex;
+  /* align-items: center; */
+  flex-direction: column;
+}
+.jy_classify_r .jy_classify_kefu img{
+  width: 128px;
+}
+.jy_classify_r .jy_classify_kefu span{
+  font-size: 16px;
+  color: rgba(255,255,255,.8);
+  line-height: 22px;
+  height: 24px;
+  line-height: 24px;
+  padding-left: 25px;
+  background: url(/images/pc/phone-grey.png) no-repeat left center;
+  background-size: 20px;
+  /* margin-left: 20px; */
+  margin-top: 12px;
+  white-space: nowrap;
+}
+.jy_classify_list ul{
+  margin-top: 16px;
+  display: flex;
+}
+.jy_classify_list ul li{
+  position: relative;
+  margin-right: 8px;
+}
+.jy_classify_list ul li span{
+  display: block;
+  width: 40px;
+  height: 40px;
+  background: #fff;
+  cursor: pointer;
+}
+.jy_classify_list ul li span a{
+  display: block;
+  height: 40px;
+}
+.jy_classify_list ul li:nth-child(1) span{
+  background: url(/images/pc/phone_white.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li:nth-child(2) span{
+  background: url(/images/pc/window_white.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li:nth-child(3) span{
+  background: url(/images/pc/ios_white.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li:nth-child(4) span{
+  background: url(/images/pc/weixin_white.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li:nth-child(5) span{
+  background: url(/images/pc/qq_white.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li:nth-child(1).active span{
+  background: url(/images/pc/phone_light.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li:nth-child(2).active span{
+  background: url(/images/pc/window_light.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li:nth-child(3).active span{
+  background: url(/images/pc/ios_light.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li:nth-child(4).active span{
+  background: url(/images/pc/weixin_light.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li:nth-child(5).active span{
+  background: url(/images/pc/qq_light.png) no-repeat left center;
+  background-size: 40px;
+}
+.jy_classify_list ul li div{
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translate(-20%,106%);
+  width:80px;
+  height: 98px;
+  background: #fff;
+  display: none;
+  border-radius: 4px;
+  overflow: hidden;
+  z-index: 9;
+}
+.jy_classify_list ul li img{
+  width: 80px;
+}
+.jy_classify_list ul li:nth-child(1) div{
+  display: block;
+}
+.jy_classify_list ul li div p{
+  color: #1d1d1d;
+  font-size: 14px;
+  line-height: 20px;
+  text-align: center;
+  position: absolute;
+  bottom: 2px;
+  left: 13px;
+}
+
+
+
+.jy_proandcify{
+  text-align:left;
+  /* width:880px;
+  float:left; */
+}
+.jy_imgright{
+  float:right;
+  text-align:center;
+  width:194px;
+  /*	width:240px;*/
+}
+.jy_imgright img{
+  /**width:194px;**/
+  width:180px;
+}
+
+.jy_renzheng{
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 40px;
+  line-height: 40px;
+  background: #000;
+  box-sizing: content-box;
+}
+.jy_renzheng div a{
+  display: inline-block;
+}
+.jy_renzheng div{
+  width: 1200px;
+  margin: 0 auto;
+  font-size: 12px;
+  color: rgba(255,255,255,.8);
+  text-align: left;
+}

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

@@ -0,0 +1,491 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+  <meta charset="UTF-8" />
+  <title>{{Msg "seo" "qfw.swordfish.title"}}</title>
+  <meta name="Keywords" content='{{Msg "seo" "qfw.swordfish.key"}}'/>
+  <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="dark" name="enable-header"/>
+  <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+  <script>
+    if(window !== window.parent){
+      window.parent.location.replace(window.location.href)
+    }
+  </script>
+  {{include "/common/pnc.html"}}
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/swiper.min.css?v={{Msg "seo" "version"}}'>
+  <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/reset_pc.css?v={{Msg "seo" "version"}}' />
+  <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/brand/css/index.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">
+  <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" rel="stylesheet" />
+</head>
+<body>
+{{include "/common/pchead.html"}}
+
+<section class="jy-index" id="jy-index">
+  <!--轮播广告-->
+  <div class="jy-index-banner">
+    <div class="swiper-container" id="bannerSwiper">
+      <div class="swiper-wrapper">
+        {{range $k,$v:=Ad "jy_pc_brand_index_banner" -1 .Host}}
+        <a class="swiper-slide"
+           {{if $v.S_link }}href="{{$v.S_link}}"{{end}}
+           {{if eq $v.O_extend.Linktype "abroad" }} target="_blank" {{else}} target="_self" {{end}}
+        >
+        <img class="img-banner" data-theme="{{$v.O_extend.Theme}}" src='{{$v.S_pic}}' alt="{{$v.S_remark}}">
+        </a>
+        {{end}}
+      </div>
+      <div class="swiper-pagination custom-dot"></div>
+    </div>
+  </div>
+
+  <!-- 公司动态 -->
+  <div class="jy-index-dt CfadeInUp">
+    <h3 class="module-title">公司动态</h3>
+    <p class="w1200 more">
+      <a href="/jyCms/gsdt/index.html" class="item-link" target="_blank">查看更多</a>
+    </p>
+    <div class="w1200 dt-container">
+      {{range $i, $v := JyCms "gsdt" 3}}
+      <div class="dt-card" onclick="window.open('/jyblog/{{$v._id}}.html')">
+        <div class="card-img">
+          <img src="{{$v.s_pic1}}" alt="{{$v.s_title}}">
+        </div>
+        <div class="card-main">
+          <div class="card-time">{{$v.time}}</div>
+          <div class="card-title">{{$v.s_title}}</div>
+          <div class="ellipsis-3 card-summary">{{$v.s_description}}</div>
+        </div>
+      </div>
+      {{end}}
+    </div>
+  </div>
+
+  <!-- 核心产品区域 -->
+  <div class="jy-index-product CfadeInUp">
+    <h3 class="module-title">核心产品</h3>
+    <div class="w1200 product-container">
+      <div class="main-product">
+        <div class="product-item main-product-item svip-product" data-href="/front/subscribe.html">
+          <div class="p-link">了解详情</div>
+          <div class="p-name">超级订阅</div>
+          <div class="p-detail">按需订阅，实时推送，高效获取最新招标信息。</div>
+        </div>
+        <div class="product-item main-product-item bigmember-product"  data-href="/big/page/index">
+          <div class="p-link">了解详情</div>
+          <div class="p-name">大会员</div>
+          <div class="p-detail">招投标大数据帮你推荐超前项目、分析业主、企业画像，针对目标市场数据导出、分析。</div>
+        </div>
+      </div>
+      <div class="other-product">
+        <div class="product-item other-product-item buyer-product" data-href="/swordfish/frontPage/serviceSystem/free/index?serviceType=1">
+          <div class="p-link">了解详情</div>
+          <div class="p-name">采购单位服务</div>
+          <div class="p-detail">提供信息发布、供应商招募、供应商推荐，精准对接海量供需资源。</div>
+        </div>
+        <div class="product-item other-product-item agency-product" data-href="/swordfish/frontPage/serviceSystem/free/index?serviceType=2">
+          <div class="p-link">了解详情</div>
+          <div class="p-name">招标代理机构服务</div>
+          <div class="p-detail">帮招标代理机构推荐可信赖的供应商、采购单位，拓宽采购的渠道！</div>
+        </div>
+        <div class="product-item other-product-item data-market-product" data-href="/front/dataMarket/index">
+          <div class="p-link">了解详情</div>
+          <div class="p-name">数据市场</div>
+          <div class="p-detail">1.8亿+ 条招标数据开放交易，根据企业自身需求自行构建各类数据应用！</div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- 行业解决方案 -->
+  <div class="jy-index-plan CfadeInUp">
+    <h3 class="module-title">行业解决方案</h3>
+    <div class="w1200 plan-container">
+      <div class="plan-item plan-item-1" onclick="window.open('/swordfish/frontPage/solution/free/index')">
+        <div class="item-icon"></div>
+        <div class="item-header">电信运营商</div>
+        <div class="item-content">以剑鱼标讯收录的海量招投标信息及企业公示数据为基础，实现省、市、县三级数据联动，通过对源数据进行清洗、整理、分析，提供相应的行业解决方案。</div>
+        <div class="item-link">了解详情</div>
+      </div>
+      <div class="plan-item plan-item-2" onclick="window.open('http://clpages.cn/yxtgwyxy?from_wecom=1')">
+        <div class="item-icon"></div>
+        <div class="item-header">医疗器械</div>
+        <div class="item-content">为企业提供医疗市场情报、竞争对手情报、客户情报、合作伙伴情报、商机管理等服务，帮助企业全面透视市场情况，解决医疗器械市场数据监测难题，辅助市场决策，做好渠道建设和维护，提升企业竞争力。</div>
+        <div class="item-link">了解详情</div>
+      </div>
+      <div class="plan-item plan-item-3" onclick="window.open('/bank/pc/scheme')">
+        <div class="item-icon"></div>
+        <div class="item-header">银行</div>
+        <div class="item-content">剑鱼标讯充分利用人工智能和大数据技术，帮助银行对公营销挖掘“机构、大中小”客户，为银行提供基于大数据技术构建的批量、精准、高效的整合营销解决方案。</div>
+        <div class="item-link">了解详情</div>
+      </div>
+    </div>
+  </div>
+
+  <!-- 合作伙伴 -->
+  <div class="jy-index-partners CfadeInUp">
+    <h3 class="module-title">合作伙伴</h3>
+    <div class="partners-container swiper-container">
+      <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 class="pc-index-bottom">
+    <img class="bottom-member-ad" adv_name="PC首页广告位-底部" src="" alt="底部广告位">
+  </div>
+
+  {{include "/common/pcbottom.html"}}
+</section>
+
+</body>
+<script src='{{Msg "seo" "cdn"}}/js/swiper.min.js?v={{Msg "seo" "version"}}'></script>
+<script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}'></script>
+<script type="text/javascript">
+  var pageIndex = {
+    init: function() {
+      this.lunBoFn() // banner轮播
+      this.setCopyRightForBottom() // 设置copyright
+    },
+    lunBoFn: function () {
+      // banner广告位轮播
+      var bannerSwiper = new Swiper('#bannerSwiper', {
+        slidesPerView: 1,
+        centeredSlides: true,
+        observer: true,
+        speed: 800,
+        pagination: {
+          el: '.swiper-pagination',
+          clickable :true
+        },
+        autoplay: $('#bannerSwiper').find('.swiper-slide').length > 1 ? {
+          delay: 10000
+        } : false, // imageList.length > 1 ? true : false
+        paginationClickable: true,
+        loop: $('#bannerSwiper').find('.swiper-slide').length > 1 ? true : false, // imageList.length > 1 ? true : false
+        on: {
+          slideChangeTransitionStart: function() {
+            var img = document.getElementsByClassName('swiper-slide-active')[0].children[0];
+            var theme = $(img).attr('data-theme')
+            var opa = $(document).scrollTop() / 20
+            if (opa < 1) {
+              if (theme === 'light') {
+                setTimeout(function(){
+                  $('.public-nav').addClass('light-bg-dark-color').removeClass('light-bg-light-color')
+                  $('.swiper-pagination').addClass('light-swiper-bg-dark-color').removeClass('light-swiper-bg-light-color')
+                  $('.loginBtn').css('color', '#1d1d1d')
+                }, 100)
+              } else {
+                setTimeout(function(){
+                  $('.public-nav').addClass('light-bg-light-color').removeClass('light-bg-dark-color')
+                  $('.loginBtn').css('color', '#fff')
+                  var a = $('.jy-index .jy-index-banner .custom-dot .swiper-pagination-bullet-active')
+                  // $('.jy-index .jy-index-banner .custom-dot .swiper-pagination-bullet').css('background', 'rgba(255, 255, 255, 0.32)')
+                  $('.swiper-pagination').addClass('light-swiper-bg-light-color').removeClass('light-swiper-bg-dark-color')
+                }, 100)
+              }
+            }
+          }
+        }
+      });
+      bannerSwiper.init();
+      // 合作伙伴走马灯
+      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()
+    },
+    setCopyRightForBottom: function (url) {
+      var host = url || location.host
+      var nowCopyRightInfo = {
+        rule: '',
+        icp: ''
+      }
+      var copyRightMap = [
+        {
+          rule: 'jianyu360.com',
+          icp: '京ICP备14030217号-3'
+        },
+        {
+          rule: 'jianyu360.cn',
+          icp: '京ICP备2021020018号-1'
+        },
+        {
+          rule: 'jianyubiaoxun.com',
+          icp: '京ICP备14030217号-8'
+        }
+      ]
+      copyRightMap.forEach(function (v) {
+        if (host.indexOf(v.rule) !== -1) {
+          nowCopyRightInfo = v
+        }
+      })
+      var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + nowCopyRightInfo.icp + '</a>'
+      $('.copyright').html(copyright)
+    },
+
+    onClickEvent: function() {
+      $("#close2x").click(function () {
+        localStorage.setItem("tc", day)
+        $("#index_tc").animate({
+          opacity: "hide"
+        }, "slow");
+        $("#close2x").animate({
+          opacity: "hide"
+        }, "slow");
+        $(".tans").animate({
+          opacity: "hide"
+        }, "slow");
+      });
+      $("#index_tc").on("click", function () {
+        var dataUrl = $(this).attr("dataUrl")
+        if (dataUrl!=""){
+          localStorage.setItem("tc", day)
+          window.location.href = dataUrl;
+        }
+      })
+
+      $('.product-item').on('click', function() {
+        window.location.href = $(this).attr('data-href')
+      })
+
+      $('#app-btn').on('click', function(){
+        if (!loginflag ) {
+          openLoginDig()
+          return
+        }
+        vm.dialogTitle = '请填写信息，我们会根据您的需求，提供最适合的产品演示服务！'
+        vm.isNeedSubmit('pc_index_bid_data')
+      })
+
+      $('.jy-index-platform .tab-header').hover(function() {
+        $(this).stop().addClass('active').siblings('.tab-content').stop().slideDown()
+        $(this).parent('.tab-menu').siblings().children('.tab-header').stop().removeClass('active').siblings('.tab-content').stop().slideUp()
+        $($('.platform-right img[data-index="' + $(this).attr('data-index') +'"]')).stop().fadeIn('fast').siblings().stop().fadeOut('fast')
+      })
+
+      $("strong[data-format-time]").each(function () {
+        var timeStr = $(this).attr('data-format-time')
+        if (timeStr) {
+          $(this).text(utils.dateFromNow(timeStr * 1000))
+        }
+      })
+
+      $('#jy-index').css('min-height', document.documentElement.clientHeight + 'px')
+
+      clearInterval(memberTimer)
+      var memberTimer = setInterval(function () {
+        if (window.memberStatus >= 0) {
+          clearInterval(memberTimer)
+        }
+        adBottomFn()
+      }, 2000)
+      function adBottomFn () {
+        console.log(window.memberStatus, 'dahuiyuan');
+
+        if (window.memberStatus > 0) {
+
+          $('.pc-index-bottom').hide()
+          fixBottomADHeight(false)
+        } else {
+          var top1 = 0;
+          var top2 = 0;
+          var timer = null;
+          $(document).scroll(function(){
+            clearTimeout(timer)
+            timer = setTimeout(isScrollEnd, 1000);
+            top1 = document.documentElement.scrollTop || document.body.scrollTop;
+
+            $('.pc-index-bottom').fadeOut()
+          })
+          function isScrollEnd() {
+            top2 = document.documentElement.scrollTop || document.body.scrollTop;
+            if(top1 == top2 && (window.memberStatus <= 0 || !window.memberStatus)){
+
+              $('.pc-index-bottom').fadeIn()
+            }
+          }
+        }
+      }
+    }
+  }
+  $(function () {
+    pageIndex.init()
+    haslogin({{.T.logid}});
+
+
+    // 首页底部广告位
+    {{$bottom:=(Ad "jy_pc_brand_index_bottom" -1 .Host)}}
+    var bottom_img = ({{$bottom}})
+
+    // 首页底部样式调整，适配广告位
+    function fixBottomADHeight (type) {
+      var adHeight = $('.pc-index-bottom').height()
+      if (type) {
+        $(".jy_renzheng").css('padding-bottom', adHeight)
+        $(".j-bottom").attr('data-padding-bottom', Number($(".j-bottom").css('padding-bottom').replace('px', '')))
+        $(".j-bottom").css('padding-bottom', Number($(".j-bottom").css('padding-bottom').replace('px', '')) + adHeight)
+      } else {
+        $(".jy_renzheng").css('padding-bottom', 0)
+        $(".j-bottom").css('padding-bottom', Number($(".j-bottom").attr('data-padding-bottom')))
+      }
+    }
+    $('.pc-index-bottom .bottom-member-ad').on('load', function () {
+      fixBottomADHeight(true)
+    })
+    $('.pc-index-bottom .bottom-member-ad').attr('src', bottom_img[0].s_pic)
+    $('.pc-index-bottom .bottom-member-ad').unbind('click').click(function () {
+      window.open(bottom_img[0].s_link)
+    })
+  })
+</script>
+</html>