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

src/index.yaml

@@ -96,3 +96,84 @@ topMenu:
         href: /front/entServerTransfer/nzbg
       - name: 招标项目管理
         href: /front/entServerTransfer/tbxmgl
+
+# 区位配置
+areaLocation:
+  - name: 华北
+    child:
+      - name: 北京
+        value: beijing
+      - name: 天津
+        value: tianjin
+      - name: 河北
+        value: hebei
+      - name: 山西
+        value: shanxi
+      - name: 内蒙古
+        value: neimenggu
+  - name: 华中
+    child:
+      - name: 河南
+        value: henan
+      - name: 湖北
+        value: hubei
+      - name: 湖南
+        value: hunan
+  - name: 东北
+    child:
+      - name: 辽宁
+        value: liaoning
+      - name: 吉林
+        value: jilin
+      - name: 黑龙江
+        value: heilongjiang
+  - name: 华东
+    child:
+      - name: 上海
+        value: shanghai
+      - name: 江苏
+        value: jiangsu
+      - name: 浙江
+        value: zhejiang
+      - name: 安徽
+        value: anhui
+      - name: 福建
+        value: fujian
+      - name: 江西
+        value: jiangxi
+      - name: 山东
+        value: shandong
+  - name: 华南
+    child:
+      - name: 广东
+        value: guangdong
+      - name: 广西
+        value: guangxi
+      - name: 海南
+        value: hainan
+  - name: 西南
+    child:
+      - name: 重庆
+        value: chongqing
+      - name: 四川
+        value: sichuan
+      - name: 贵州
+        value: guizhou
+      - name: 云南
+        value: yunnan
+      - name: 西藏
+        value: xizang
+  - name: 西北
+    child:
+      - name: 陕西
+        value: shaanxi
+      - name: 甘肃
+        value: gansu
+      - name: 青海
+        value: qinghai
+      - name: 宁夏
+        value: ningxia
+      - name: 新疆
+        value: xinjiang
+
+seoWebDomain: http://%s.myjy.cn

src/jfw/front/index.go

@@ -2,6 +2,7 @@ package front
 
 import (
 	"app.yhyue.com/moapp/jybase/common"
+	util "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -64,6 +65,13 @@ func init() {
 
 // NewIndex 新版首页改版
 func (nIndex *NewIndex) NewIndex() error {
+	sessVal := nIndex.Session().GetMultiple()
+	userId := util.ObjToString(sessVal["userId"])
+
+	nIndex.T["hasLogin"] = userId != ""
+	nIndex.T["hotkey"] = hotKeyArrLoginEd
+	nIndex.T["hotKeyArrUnLogin"] = hotKeyArrUnLogin
+
 	//顶部菜单
 	nIndex.T["topMenu"] = g.Cfg("index").MustGet(context.Background(), "topMenu").Maps()
 	//招标公告
@@ -117,8 +125,6 @@ func (nIndex *NewIndex) NewIndex() error {
 	nIndex.T["strategyList"] = GetStrategyList()
 	//剑鱼课堂
 	nIndex.T["jySchool"] = jyutil.Course(6, 3)
-	//地区导航
-	nIndex.T["areaNav"] = GetAreaNav()
 
 	return nIndex.Render("/pc/newIndex.html", &nIndex.T)
 }
@@ -166,31 +172,6 @@ func (nIndex *NewIndex) EntServerTransfer(code string) {
 	_ = nIndex.Redirect(toUrl)
 }
 
-type AreaStruct struct {
-	Name string `json:"name"`
-	Url  string `json:"url"`
-}
-
-func GetAreaNav() []map[string]interface{} {
-	areaData := []map[string]interface{}{}
-	areaNode := common.ObjArrToMapArr(config.Seoconfig["areaLocation"].([]interface{}))
-	for _, v := range areaNode {
-		childArr := []AreaStruct{}
-		singleArea := common.ObjToMap(v)
-		for _, val := range common.ObjArrToMapArr((*singleArea)["child"].([]interface{})) {
-			childArr = append(childArr, AreaStruct{
-				Name: common.ObjToString(val["name"]),
-				Url:  fmt.Sprintf(common.InterfaceToStr(config.Seoconfig["seoWebDomain"]), common.ObjToString(val["value"])),
-			})
-		}
-		areaData = append(areaData, map[string]interface{}{
-			"name":  (*singleArea)["name"],
-			"child": childArr,
-		})
-	}
-	return areaData
-}
-
 // 推荐标讯专区
 func GetRecommendBidZone(typ int, pageSize int) (list []map[string]interface{}, typs string) {
 	if typ == 0 {

src/jfw/modules/subscribepay/src/util/dataExportExcel.go

@@ -60,7 +60,13 @@ func GetDataExportFileDataLen(path string) (int, error) {
 	if len(sheet1.Rows) == 0 {
 		return -1, fmt.Errorf("sheet1 hasn't Rows data ")
 	}
-	return sheet1.Rows[len(sheet1.Rows)-1].Cells[0].Int()
+	//避免最后一行为合并单元格数据
+	for l := len(sheet1.Rows) - 1; l > 0; l-- {
+		if sheet1.Rows[l].Cells[0].Value != "" {
+			return sheet1.Rows[l].Cells[0].Int()
+		}
+	}
+	return -1, fmt.Errorf("sheet1 get error")
 }
 
 // 生成数据导出excel

src/jfw/tag/a_init.go

@@ -16,4 +16,5 @@ func init() {
 	xweb.RootApp().AddTmplVar("ParseHtmlCss", ParseHtmlCss)
 	xweb.RootApp().AddTmplVar("ParseHtmlAttr", ParseHtmlAttr)
 	xweb.RootApp().AddTmplVar("Export", Export)
+	xweb.RootApp().AddTmplVar("GetAreaLocations", GetAreaLocations)
 }

src/jfw/tag/util.go

@@ -2,6 +2,10 @@ package tag
 
 import (
 	"app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jylog"
+	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/frame/g"
 	"html/template"
 )
 
@@ -24,3 +28,38 @@ func Division(num1, num2 interface{}) interface{} {
 	}
 	return n1 / n2
 }
+
+type AreaLocation struct {
+	Name  string    `json:"name"`
+	Child []AreaDom `json:"child"`
+}
+
+type AreaDom struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+	Url   string `json:"url"`
+}
+
+var JyAreaLocation []*AreaLocation
+
+var initAreaLocations = func() []*AreaLocation {
+	var jyAreaLocation []*AreaLocation
+	if err := g.Cfg("index").MustGet(context.Background(), "areaLocation").Struct(&jyAreaLocation); err != nil {
+		jylog.Errorf("加载areaLocation异常", err)
+		return nil
+	}
+	seoWebDomainFormat := g.Cfg("index").MustGet(context.Background(), "seoWebDomain").String()
+	for i := 0; i < len(jyAreaLocation); i++ {
+		for j := 0; j < len(jyAreaLocation[i].Child); j++ {
+			jyAreaLocation[i].Child[j].Url = fmt.Sprintf(seoWebDomainFormat, jyAreaLocation[i].Child[j].Value)
+		}
+	}
+	return jyAreaLocation
+}
+
+func GetAreaLocations() []*AreaLocation {
+	if len(JyAreaLocation) == 0 {
+		JyAreaLocation = initAreaLocations()
+	}
+	return JyAreaLocation
+}

src/seo.json

@@ -4800,167 +4800,5 @@
   "secSeoWebConfig": {
     "areaCodeMap": {"上海": "shanghai", "云南": "yunnan", "内蒙古": "neimenggu", "北京": "beijing", "吉林": "jilin", "四川": "sichuan", "天津": "tianjin", "宁夏": "ningxia", "安徽": "anhui", "山东": "shandong", "山西": "shanxi", "广东": "guangdong", "广西": "guangxi", "新疆": "xinjiang", "江苏": "jiangsu", "江西": "jiangxi", "河北": "hebei", "河南": "henan", "浙江": "zhejiang", "海南": "hainan", "湖北": "hubei", "湖南": "hunan", "甘肃": "gansu", "福建": "fujian", "西藏": "xizang", "贵州": "guizhou", "辽宁": "liaoning", "重庆": "chongqing", "陕西": "shaanxi", "青海": "qinghai", "黑龙江": "heilongjiang"},
     "area_href_format": "https://%s.jianyu360.cn"
-  },
-  "areaLocation": [
-    {
-      "name": "华北",
-      "child": [
-        {
-          "name":"北京",
-          "value":"beijing"
-        },
-        {
-          "name":"天津",
-          "value":"tianjin"
-        },
-        {
-          "name":"河北",
-          "value":"hebei"
-        },
-        {
-          "name":"山西",
-          "value":"shanxi"
-        },
-        {
-          "name":"内蒙古",
-          "value":"neimenggu"
-        }
-      ]
-    },
-    {
-      "name": "华中",
-      "child": [
-        {
-          "name":"河南",
-          "value":"henan"
-        },
-        {
-          "name":"湖北",
-          "value":"hubei"
-        },
-        {
-          "name":"湖南",
-          "value":"hunan"
-        }
-      ]
-    },
-    {
-      "name": "东北",
-      "child": [
-        {
-          "name":"辽宁",
-          "value":"liaoning"
-        },
-        {
-          "name":"吉林",
-          "value":"jilin"
-        },
-        {
-          "name":"黑龙江",
-          "value":"heilongjiang"
-        }
-      ]
-    },
-    {
-      "name": "华东",
-      "child": [
-        {
-          "name":"上海",
-          "value":"shanghai"
-        },
-        {
-          "name":"江苏",
-          "value":"jiangsu"
-        },
-        {
-          "name":"浙江",
-          "value":"zhejiang"
-        },
-        {
-          "name":"安徽",
-          "value":"anhui"
-        },
-        {
-          "name":"福建",
-          "value":"fujian"
-        },
-        {
-          "name":"江西",
-          "value":"jiangxi"
-        },
-        {
-          "name":"山东",
-          "value":"shandong"
-        }
-      ]
-    },
-    {
-      "name": "华南",
-      "child": [
-        {
-          "name":"广东",
-          "value":"guangdong"
-        },
-        {
-          "name":"广西",
-          "value":"guangxi"
-        },
-        {
-          "name":"海南",
-          "value":"hainan"
-        }
-      ]
-    },
-    {
-      "name": "西南",
-      "child": [
-        {
-          "name":"重庆",
-          "value":"chongqing"
-        },
-        {
-          "name":"四川",
-          "value":"sichuan"
-        },
-        {
-          "name":"贵州",
-          "value":"guizhou"
-        },
-        {
-          "name":"云南",
-          "value":"yunnan"
-        },
-        {
-          "name":"西藏",
-          "value":"xizang"
-        }
-      ]
-    },
-    {
-      "name": "西北",
-      "child": [
-        {
-          "name":"陕西",
-          "value":"shaanxi"
-        },
-        {
-          "name":"甘肃",
-          "value":"gansu"
-        },
-        {
-          "name":"青海",
-          "value":"qinghai"
-        },
-        {
-          "name":"宁夏",
-          "value":"ningxia"
-        },
-        {
-          "name":"新疆",
-          "value":"xinjiang"
-        }
-      ]
-    }
-  ],
-  "seoWebDomain": "http://%s.myjy.cn"
+  }
 }

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

@@ -24,6 +24,9 @@
 #searchInner #whole.active {
   background-color: transparent;
 }
+#searchInner .no-login-mask.active {
+  background: transparent;
+}
 #searchInner .active{
 	background-color: #2cb7ca;
 }

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

@@ -5,12 +5,22 @@ var _page = {
   },
   initEvents: function () {
     this.initSearchEvents()
+    this.initBiddingDescTab()
   },
   initSearchEvents: function () {
     $('.search-type-list').on('click', '.search-type-item', function (e) {
       $(this).addClass('active').siblings().removeClass('active')
     })
   },
+  initBiddingDescTab: function () {
+    var tabWrapper = $('.bidding-desc-module')
+    tabWrapper.find('.bidding-desc-item').on('click', function () {
+      var key = $(this).attr('data-name')
+      $(this).addClass('active').siblings().removeClass('active')
+      tabWrapper.find('.bidding-desc-content-card-list[data-value='+ key +']').show().siblings().hide()
+    })
+    tabWrapper.find('.bidding-desc-item:eq(0)').trigger('click')
+  },
   initHotBuyerShortName: function () {
     $('.hot-buyer-list .list-info-item-head').each(function() {
       var head_text = $(this).text()

src/web/staticres/js/index/index_swiper.js

@@ -1,7 +1,15 @@
 var pageSwiper = {
   idList: [
-    '#swiper-container-1',
-    '#swiper-container-2',
+    // '#swiper-container-1',
+    // '#swiper-container-2',
+
+    // 'new-pc-index-top-ad',
+    // 'new-pc-index-carousel',
+    // 'new-pc-index-middle-carousel',
+    // 'new-pc-index-ent-service',
+    // 'new-pc-index-twenty-three-right',
+    // 'new-pc-index-twenty-three-left',
+    // 'new-pc-index-twenty-seven',
   ],
   swiperList: [],
   init: function () {

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

@@ -300,4 +300,19 @@ text-align: center;
 /* 合作伙伴结束 */
 .mt-60{
   margin-top: 60px;
+}
+@keyframes CfadeInUp {
+  from {
+    transform: translateY(50px);
+  }
+
+  to {
+    transform: translateY(0px);
+    opacity: 1;
+  }
+}
+
+.CfadeInUp {
+  /* opacity: 0; */
+  animation: 1s ease forwards alternate;
 }

src/web/staticres/pccss/index_pc.css

@@ -108,10 +108,9 @@
     align-items: center;
     justify-content: space-between;
     line-height: 22px;
+    width: 100%;
 }
-.cms-card-list-item:not(:last-of-type) {
-    margin-bottom: 10px;
-}
+
 .cms-card-list-item-left {
     display: block;
     margin-right: 10px;
@@ -123,6 +122,13 @@
     font-size: 12px;
     color: #999;
 }
+
+/* ------card-list-item */
+
+.cms-card .cms-card-list-item:not(:last-of-type) {
+    margin-bottom: 10px;
+}
+
 .cms-card-header-right {
     font-size: 12px;
     line-height: 18px;
@@ -164,6 +170,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    white-space: nowrap;
 }
 .index-search-module .header-top-left {
     display: flex;
@@ -387,23 +394,26 @@
 }
 
 /* message-module */
-.index-message-list-container .list-msg .el-carousel__container{
-    height:24px !important;
+.index-message-list-container .list-msg .el-carousel__container {
+    height: 24px !important;
 }
-.index-message-list-container .list-msg .el-carousel, .index-message-list-container .list-msg .el-carousel .el-carousel__item{
-    width:100%;
+
+.index-message-list-container .list-msg .el-carousel,
+.index-message-list-container .list-msg .el-carousel .el-carousel__item {
+    width: 100%;
 }
+
 .index-message-list-container .list-msg {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 1200px;
-  height: 24px;
-  margin: 0px auto;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 1200px;
+    height: 24px;
+    margin: 0px auto;
 }
 
 .index-message-list-container .noActive {
-  margin-top: 56px;
+    margin-top: 56px;
 }
 .index-message-list-container .list-msg .l-msg{
     display: flex;
@@ -412,79 +422,79 @@
     align-items: center;
 }
 .index-message-list-container .list-msg .l-msg .words {
-  width:calc(50% - 16px);
-  display: flex;
-  flex-direction: initial;
-  align-items: center;
+    width: calc(50% - 16px);
+    display: flex;
+    flex-direction: initial;
+    align-items: center;
 }
 .index-message-list-container .list-msg .l-msg .words:nth-of-type(1){
     margin-right:32px;
 }
 
 .index-message-list-container .list-msg .l-msg .words .icon_voice {
-  margin-right: 4px;
-  width: 24px;
-  height: 24px;
+    margin-right: 4px;
+    width: 24px;
+    height: 24px;
 }
 
 .index-message-list-container .list-msg .r-msg {
-  width: 20px;
-  height: 20px;
-  cursor: pointer;
+    width: 20px;
+    height: 20px;
+    cursor: pointer;
 }
 .index-message-list-container .list-msg .l-msg .words i {
-  width: 6px;
-  height: 6px;
-  background: #FF3A20;
-  border-radius: 50%;
-  margin-right: 9px;
+    width: 6px;
+    height: 6px;
+    background: #FF3A20;
+    border-radius: 50%;
+    margin-right: 9px;
 }
 
 .index-message-list-container .list-msg .l-msg .words h3 {
-  font-size: 16px;
-  font-weight: 400;
-  color: #1D1D1D;
-  line-height: 24px;
-  white-space: nowrap;
+    font-size: 16px;
+    font-weight: 400;
+    color: #1D1D1D;
+    line-height: 24px;
+    white-space: nowrap;
 }
 
 .index-message-list-container .list-msg .l-msg .words .title {
     /*display: inline-block;*/
     /*max-width:390px;*/
-  font-size: 14px;
-  color: #1D1D1D;
-  line-height: 24px;
-  margin: 0 16px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+    font-size: 14px;
+    color: #1D1D1D;
+    line-height: 24px;
+    margin: 0 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 .index-message-list-container .list-msg .l-msg .words span:hover {
-  color: #2CB7CA;
-  cursor: pointer;
+    color: #2CB7CA;
+    cursor: pointer;
 }
 
 .index-message-list-container .list-msg .l-msg .words p {
-  font-size: 12px;
-  color: #999999;
-  line-height: 24px;
-  white-space: nowrap;
+    font-size: 12px;
+    color: #999999;
+    line-height: 24px;
+    white-space: nowrap;
 }
 
 .index-message-list-container .list-msg .l-msg .words .isActive {
-  margin-left: 15px;
+    margin-left: 15px;
 }
 .index-message-list-container .list-msg  .no-read-count{
     background: linear-gradient(0deg, #FB483D, #FB483D);
-    color:#FFF;
+    color: #FFF;
     text-align: center;
     font-size: 12px;
     line-height: 18px;
     padding: 2px 8px;
     border-radius: 10px 10px 0 10px;
-    min-width:75px;
-    margin-right:12px;
+    min-width: 75px;
+    margin-right: 12px;
 }
 
 /* zb-aside-card */
@@ -817,7 +827,7 @@
     margin-bottom: 16px;
 }
 /* hot-chart */
-.data-service-module  .hot-industry-year-chart {
+.data-service-module .hot-industry-year-chart {
     padding: 20px;
     min-height: 382px;
     border-radius: 8px;
@@ -833,6 +843,109 @@
 }
 
 /* bidding-desc-module */
-.bidding-desc-module {
-    
+.bidding-desc-module {}
+
+.bidding-desc-module .service-module-content-bd {
+    margin-top: 20px;
+    padding: 10px 0 16px;
+    width: 100%;
+}
+
+.bidding-desc-module .bidding-desc-content-card-list {
+    width: 100%;
+}
+
+.bidding-desc-module .bidding-desc-content-card-list .cms-card-list-item {
+    margin-right: 40px;
+    width: 30%;
+}
+
+.bidding-desc-module .bidding-desc-content-card-list .cms-card-list-item:nth-of-type(3n) {
+    margin-right: 0;
+}
+
+.bidding-desc-module .bidding-desc-module-content .bidding-desc-item:not(:last-of-type) {
+    margin-right: 20px;
+}
+
+/* partners-project-container */
+.partners-project-list {
+    display: flex;
+    align-items: center;
+}
+
+.partners-project-item {
+    width: 184px;
+    height: 60px;
+    border-radius: 4px;
+    overflow: hidden;
+    border: 1px solid red;
+}
+
+.partners-project-item:not(:last-of-type) {
+    margin-right: 19px;
+}
+
+.partners-project-item a,
+.partners-project-item img {
+    display: block;
+    width: 100%;
+}
+
+/* area-nav 底部区域导航 */
+.area-navigation-card {
+    padding: 30px 20px;
+}
+.area-aside-item {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    line-height: 28px;
+}
+.area-aside-item {
+    margin-bottom: 20px;
+    margin-right: 36px;
+}
+
+.area-aside-item .area-aside-item-name {
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 2px 12px;
+    border-radius: 8px;
+    background: linear-gradient(180deg, rgba(42, 190, 209, 0.1) 0%, rgba(42, 190, 209, 0) 100%);
+}
+.area-aside-item-name a {
+    color: #2ABED1;
+    font-size: inherit;
+}
+.area-aside-item .area-aside-item-children {
+    padding-left: 58px;
+    display: flex;
+    align-items: center;
+    flex: 1;
+    flex-wrap: wrap;
+}
+.area-aside-item .area-aside-item-child {
+    margin: 0 6px;
+}
+.area-group--bottom {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: 22px;
+}
+.area-item--bottom .area-aside-item .area-aside-item-name {
+    max-height: 28px;
+}
+.area-item--bottom {
+    width: 25%;
+    align-self: flex-start;
 }
+/* 底部地区导航 end */

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

@@ -91,9 +91,15 @@ a {
     border-color: #2ABED1;
 }
 
-.j-s-button.plain.active {
+.j-s-button.plain.bg {
     background-color: rgba(42, 190, 209, 0.08);
 }
+.j-s-button.plain.bg.active {
+    color: #fff;
+    border-color: #2ABED1;
+    background-color: #2ABED1;
+}
+
 
 /* empty */
 .image > img {

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

@@ -42,28 +42,28 @@
   </div>
   <div class="AppDownload-middle">
     <div class="content">
-      <div class="item">
+      <div class="item CfadeInUp">
         <div class="item-left">
           <h1>01 <span class="title">免费查看标讯信息，直接看不遮挡</span></h1>
           <p class="desc">聚合1.8亿+招标信息，标讯项目随时查</p>
         </div>
         <img src="{{Msg "seo" "cdn"}}/landingpage/image/AppDownload/ggxx.png?v={{Msg "seo" "version"}}" alt="" class="item-right">
       </div>
-      <div class="item mt-60">
+      <div class="item mt-60 CfadeInUp">
         <img src="{{Msg "seo" "cdn"}}/landingpage/image/AppDownload/mddy.png?v={{Msg "seo" "version"}}" alt="" class="item-right">
         <div class="item-left">
           <h1>02 <span class="title">免费订阅商机，52分钟极速推送</span></h1>
           <p class="desc">按需订阅，实时推送，重要商机不遗漏</p>
         </div>
       </div>
-      <div class="item mt-60">
+      <div class="item mt-60 CfadeInUp">
         <div class="item-left">
           <h1>03 <span class="title">免费跟踪项目动态，及时把控项目</span></h1>
           <p class="desc">项目变动，第一时间推送，掌握最新动态</p>
         </div>
         <img src="{{Msg "seo" "cdn"}}/landingpage/image/AppDownload/xmxx.png?v={{Msg "seo" "version"}}" alt="" class="item-right">
       </div>
-      <div class="item mt-60">
+      <div class="item mt-60 CfadeInUp">
         <img src="{{Msg "seo" "cdn"}}/landingpage/image/AppDownload/ggxx2.png?v={{Msg "seo" "version"}}" alt="" class="item-right">
         <div class="item-left">
           <h1>04 <span class="title">免费查看联系方式 获得更多线索</span></h1>

src/web/templates/pc/newIndex.html

@@ -39,7 +39,19 @@
         </section>
         <!-- banner swiper -->
         <section class="main-module swiper-module-12">
-          {{include "/pc/template/index/banner-swiper.html"}}
+          {{$ad_1:=(Ad "new-pc-index-top-ad" -1 .Host)}}
+          {{if $ad_1}}
+          <div class="banner-swiper swiper-container" id="new-pc-index-top-ad">
+            <div class="swiper-wrapper">
+              {{range $ad := $ad_1}}
+              <a class="swiper-slide" target="_blank" href="{{$ad.S_link}}">
+                <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
+              </a>
+              {{end}}
+            </div>
+            <div class="w1200 swiper-pagination custom-dot"></div>
+          </div>
+          {{end}}
         </section>
         <!-- 13消息中心 -->
         <section class="main-module">
@@ -52,7 +64,19 @@
               {{include "/pc/template/index/zb-aside-card.html"}}
               <div class="swiper-module-15">
                 <!-- 首页上部分中心轮播图 -->
-                {{include "/pc/template/index/banner-swiper.html"}}
+                {{$ad_2:=(Ad "new-pc-index-carousel" -1 .Host)}}
+                {{if $ad_2}}
+                <div class="banner-swiper swiper-container" id="new-pc-index-carousel">
+                  <div class="swiper-wrapper">
+                    {{range $ad := $ad_2}}
+                    <a class="swiper-slide" target="_blank" href="{{$ad.S_link}}">
+                      <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
+                    </a>
+                    {{end}}
+                  </div>
+                  <div class="w1200 swiper-pagination custom-dot"></div>
+                </div>
+                {{end}}
               </div>
             </section>
             <!-- 招标动态 -->
@@ -65,7 +89,19 @@
             </section>
             <!-- 项目专区下广告位 -->
             <section class="aside-main-module mb20 swiper-module-21">
-              {{include "/pc/template/index/banner-swiper.html"}}
+              {{$ad_3:=(Ad "new-pc-index-middle-carousel" -1 .Host)}}
+              {{if $ad_3}}
+              <div class="banner-swiper swiper-container" id="new-pc-index-middle-carousel">
+                <div class="swiper-wrapper">
+                  {{range $ad := $ad_3}}
+                  <a class="swiper-slide" target="_blank" href="{{$ad.S_link}}">
+                    <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
+                  </a>
+                  {{end}}
+                </div>
+                <div class="w1200 swiper-pagination custom-dot"></div>
+              </div>
+              {{end}}
             </section>
             <!-- 机构专区 -->
             <section class="aside-main-module mb20">
@@ -74,10 +110,34 @@
             <!-- 机构专区下广告位 -->
             <section class="aside-main-module mb20 swiper-module-23">
               <div class="swiper-module-23-children">
-                {{include "/pc/template/index/banner-swiper.html"}}
+                {{$ad_4:=(Ad "new-pc-index-twenty-three-left" -1 .Host)}}
+                {{if $ad_4}}
+                <div class="banner-swiper swiper-container" id="new-pc-index-twenty-three-left">
+                  <div class="swiper-wrapper">
+                    {{range $ad := $ad_4}}
+                    <a class="swiper-slide" target="_blank" href="{{$ad.S_link}}">
+                      <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
+                    </a>
+                    {{end}}
+                  </div>
+                  <div class="w1200 swiper-pagination custom-dot"></div>
+                </div>
+                {{end}}
               </div>
               <div class="swiper-module-23-children">
-                {{include "/pc/template/index/banner-swiper.html"}}
+                {{$ad_5:=(Ad "new-pc-index-twenty-three-right" -1 .Host)}}
+                {{if $ad_5}}
+                <div class="banner-swiper swiper-container" id="new-pc-index-twenty-three-right">
+                  <div class="swiper-wrapper">
+                    {{range $ad := $ad_5}}
+                    <a class="swiper-slide" target="_blank" href="{{$ad.S_link}}">
+                      <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
+                    </a>
+                    {{end}}
+                  </div>
+                  <div class="w1200 swiper-pagination custom-dot"></div>
+                </div>
+                {{end}}
               </div>
             </section>
             <!-- 企业服务专区 -->
@@ -142,6 +202,14 @@
             {{include "/pc/template/index/cms-card-deep.html"}}
           </aside>
         </section>
+        <!-- 客户合作案例 -->
+        <section class="main-module swiper-module-30">
+          {{include "/pc/template/index/partners-project-list.html"}}
+        </section>
+        <!-- 地区导航 -->
+        <section class="main-module">
+          {{include "/pc/template/index/area-nav-module.html"}}
+        </section>
       </section>
     </main>
     <div class="body-footer">

src/web/templates/pc/template/index/area-nav-module.html

@@ -0,0 +1,22 @@
+<!-- 区域导航 -->
+<section class="module-card-container area-navigation-module">
+  <header class="module-card-header">
+    <h3 class="module-card-title">地区导航</h3>
+  </header>
+  <main class="module-card-content area-navigation-card">
+    {{range $v:= GetAreaLocations}}
+    <div class="area-aside-item">
+      <div class="area-aside-item-name">
+        <p class="highlight-text">{{$v.Name}}</p>
+      </div>
+      <div class="area-aside-item-children">
+        {{range $n:=$v.Child}}
+        <div class="area-aside-item-child">
+          <a class="cms-link" href="{{$n.Url}}" target="_blank">{{$n.Name}}</a>
+        </div>
+        {{end}}
+      </div>
+    </div>
+    {{end}}
+  </main>
+</section>

src/web/templates/pc/template/index/bidding-desc-module.html

@@ -4,17 +4,64 @@
     <h3 class="module-card-title">招投标攻略</h3>
   </header>
   <main class="module-card-content bidding-desc-module-content">
-    <ul class="service-module-content-hd bidding-desc-list">
-      <li class="bidding-desc-item" data-name="招标采购">招标采购</li>
-      <li class="bidding-desc-item" data-name="投标指南">投标指南</li>
-      <li class="bidding-desc-item" data-name="中标技巧">中标技巧</li>
-      <li class="bidding-desc-item" data-name="回答百科">回答百科</li>
+    <ul class="service-module-content-hd bidding-desc-list clearfix">
+      <li class="bidding-desc-item j-s-button plain bg" data-name="招标采购">招标采购</li>
+      <li class="bidding-desc-item j-s-button plain bg" data-name="投标指南">投标指南</li>
+      <li class="bidding-desc-item j-s-button plain bg" data-name="中标技巧">中标技巧</li>
     </ul>
-    <ul class="service-module-content-bd">
-      <li class="bidding-desc-content-card-list" data-name="招标采购"></li>
-      <li class="bidding-desc-content-card-list" data-name="投标指南"></li>
-      <li class="bidding-desc-content-card-list" data-name="中标技巧"></li>
-      <li class="bidding-desc-content-card-list" data-name="回答百科"></li>
+    <ul class="service-module-content-bd clearfix">
+      <li class="bidding-desc-content-card-list" data-value="招标采购" style="display: none;">
+        <ul class="bidding-desc-card-column clearfix">
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+        </ul>
+      </li>
+      <li class="bidding-desc-content-card-list" data-value="投标指南" style="display: none;">
+        <ul class="bidding-desc-card-column clearfix">
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+        </ul>
+      </li>
+      <li class="bidding-desc-content-card-list" data-value="中标技巧" style="display: none;">
+        <ul class="bidding-desc-card-column clearfix">
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+          <li class="cms-card-list-item">
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="" target="_blank">fasfasdfasdfsadfasf</a>
+            <span class="cms-card-list-item-right">asdfsafsdafsadf</span>
+          </li>
+        </ul>
+      </li>
     </ul>
   </main>
 </section>

src/web/templates/pc/template/index/partners-project-list.html

@@ -0,0 +1,15 @@
+<!-- 客户合作案例 -->
+<section class="partners-project-container">
+  {{$ad_5:=(Ad "new-pc-index-bottom-ad" -1 .Host)}}
+  {{if $ad_5}}
+  <ul class="partners-project-list">
+    {{range $ad := $ad_5}}
+    <li class="partners-project-item">
+      <a href="{{$ad.S_link}}">
+        <img src="{{$ad.S_pic}}" alt="{{$ad.S_picalt}}">
+      </a>
+    </li>
+    {{end}}
+  </ul>
+  {{end}}
+</section>

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

@@ -33,21 +33,24 @@
       </div>
       <i class="hot-divider"></i>
       <ul class="hot-key-list">
-        <li class="hot-key-item">
-          <a class="cms-link" href="">医院</a>
-        </li>
-        <li class="hot-key-item">
-          <a class="cms-link" href="">一卡通</a>
-        </li>
-        <li class="hot-key-item">
-          <a class="cms-link" href="">台式机</a>
-        </li>
-        <li class="hot-key-item">
-          <a class="cms-link" href="">多媒体</a>
-        </li>
-        <li class="hot-key-item">
-          <a class="cms-link" href="">综合布线综合布线</a>
-        </li>
+        {{$hasLogin := .T.hasLogin}}
+        {{if and (not $hasLogin) .T.hotKeyArrUnLogin }}
+          {{range $i,$v := .T.hotKeyArrUnLogin}}
+            {{if lt $i 10}}
+            <li class="hot-key-item">
+              <a class="cms-link" href="{{$v.Url}}">{{$v.Name}}</a>
+            </li>
+            {{end}}
+          {{end}}
+        {{else}}
+          {{range $i,$v := .T.hotkey}}
+            {{if lt $i 10}}
+            <li class="hot-key-item">
+              <a class="cms-link" href="{{if  $hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords={{$v}}&searchvalue=&selectType=title">{{$v}}</a>
+            </li>
+            {{end}}
+          {{end}}
+        {{end}}
       </ul>
     </div>
   </div>