Merge branch 'feature/v4.8.0' of http://192.168.3.207:8080/qmx/jy into feature/v4.8.0

src/config.json

@@ -409,5 +409,6 @@
   "jySchoolUrl":{
     "homeUrl": "/jySchool/strategy",
     "towUrl": "/jySchool/%s/index.html"
-  }
+  },
+  "dataMarketShowAB": 0
 }

src/jfw/front/dataMarket.go

@@ -1,7 +1,10 @@
 package front
 
 import (
+	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"fmt"
+	"jy/src/jfw/config"
 )
 
 // DataMarket 数据市场
@@ -23,7 +26,12 @@ func (this *DataMarket) Index() {
 
 // CustomExport 数据定制导出
 func (this *DataMarket) CustomExport() {
-	this.T["AB"] = len(this.Header("User-Agent"))/2 == 0
+	showA := false
+	if uA := this.Header("User-Agent"); uA != "" {
+		fmt.Println(int(uA[len(uA)-1])/10, "<", common.IntAll(config.Sysconfig["dataMarketShowAB"]), int(uA[len(uA)-1])/10 < common.IntAll(config.Sysconfig["dataMarketShowAB"]))
+		showA = int(uA[len(uA)-1])/10 < common.IntAll(config.Sysconfig["dataMarketShowAB"])
+	}
+	this.T["AB"] = showA
 	this.Render("/dataMarket/customExport/index.html")
 }
 

src/jfw/jyutil/classroomiInfo.go

@@ -330,7 +330,7 @@ func GetNextInfo(_id string, keyWord ...string) (lastId, nextId string) {
 			"$lt": time.Now().Unix(),
 		},
 	}
-	for _, t := range []string{"s_contenttype"} {
+	for _, t := range []string{"s_contenttype", "s_secondclassifytype", "s_threeclassifytype"} {
 		if tv, _ := (*doc)[t].(string); tv != "" {
 			commonQuery[t] = tv
 		}

src/jfw/jyutil/jyCms.go

@@ -37,7 +37,7 @@ func GetFirstJyCms(contentType string, size int) (r []map[string]interface{}) {
 		rs, _, _ := JyCmsSearch(map[string]string{
 			"s_contenttype": contentType,
 			"perPage":       fmt.Sprintf("%d", size),
-		}, "/jyblog/index_%s.html")
+		}, "")
 		if rs != nil {
 			for _, v := range *rs {
 				delete(v, "praise")
@@ -71,15 +71,24 @@ func JyCmsSearch(query map[string]string, makePageFormat string) (*[]map[string]
 			queryMap[v] = query[v]
 		}
 	}
-
+	queryStrType := query["queryType"]
 	if queryStr != "" {
-		queryMap["$or"] = []interface{}{
-			map[string]interface{}{
-				"s_title": map[string]interface{}{"$regex": queryStr},
-			},
-			map[string]interface{}{
-				"s_content": map[string]interface{}{"$regex": queryStr},
-			},
+		//攻略搜索只搜索标题
+		if queryStrType == "" {
+			queryMap["$or"] = []interface{}{
+				map[string]interface{}{
+					"s_title": map[string]interface{}{"$regex": queryStr},
+				},
+				map[string]interface{}{
+					"s_content": map[string]interface{}{"$regex": queryStr},
+				},
+			}
+		} else {
+			queryMap["$or"] = []interface{}{
+				map[string]interface{}{
+					"s_title": map[string]interface{}{"$regex": queryStr},
+				},
+			}
 		}
 	}
 

src/jfw/site/IndustryInfo/service.go

@@ -8,7 +8,7 @@ import (
 	"jy/src/jfw/paging"
 )
 
-const pageSize = 8
+const pageSize = 20
 
 // IndustryInfoService 行业资讯
 type IndustryInfoService struct {

src/jfw/site/jySchool/service.go

@@ -9,7 +9,7 @@ import (
 	"log"
 )
 
-const pageSize = 8
+const pageSize = 20
 
 // JySchoolService 剑鱼学堂
 type JySchoolService struct {
@@ -72,6 +72,7 @@ func (this *JySchoolService) Search(pageNumStr string) {
 		"perPage":       fmt.Sprint(pageSize),
 		"currentPage":   pageNum,
 		"s_contenttype": "ztbgl",
+		"queryType":     "1",
 		"query":         query,
 	}, "")
 	// 分页

src/web/staticres/css/pc.css

@@ -4633,7 +4633,7 @@ h6 {
   overflow: hidden;
   margin-top: -282px;
   /* left: calc(50vw - 360px); */
-  left: calc((100vw - 360px) / 2);
+  left: 50%;
   box-sizing: border-box;
   border-radius: 16px;
   font-family: Microsoft YaHei,sans-serif;
@@ -4643,6 +4643,23 @@ h6 {
   display: block;
 }
 
+/* 此处代码处理登录注册弹框居在宽度未知情况居中问题，且保证bootstrap动画效果（淡入淡出） */
+.modal.fade .modal-dialog{
+  -webkit-transform: translate(-50%,-25%);
+  -ms-transform: translate(-50%,-25%);
+  -o-transform: translate(-50%,-25%);
+  transform: translate(-50%,-25%);
+  -webkit-transition: -webkit-transform .3s ease-out;
+  -o-transition: -o-transform .3s ease-out;
+  transition: transform .3s ease-out;
+}
+.modal.in .modal-dialog {
+  -webkit-transform: translate(-50%,0);
+  -ms-transform: translate(-50%,0);
+  -o-transform: translate(-50%,0);
+  transform: translate(-50%,0);
+}
+
 .login-dig-box .logo {
   width: 96px;
   height: 25px;

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

@@ -71,18 +71,21 @@
 }
 .api-scheme .card-sub-title{
   margin: 20px 0;
+  font-size:20px;
+  line-height: 26px;
+  color: #171826;
 }
-.api-scheme .card-sub-title::before{
+.api-scheme .card-sub-title::before, .api-scheme .card-sub-title::after{
   content: '';
   display: inline-block;
   width: 8px;
-  height: 22px;
+  height: 26px;
   margin-right:8px;
   vertical-align: middle;
   background: url('/frontRouter/pc/dataMarket/images/line.png') no-repeat 45%;
   background-size:contain;
 }
-.api-scheme .card-sub-title::after{
+.api-scheme .card-sub-title:after{
   margin-left:8px;
 }
 .api-scheme .content{

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

@@ -838,12 +838,12 @@
   opacity: 0!important;
 }
 .public-nav.light-bg-dark-color .loginBtn{
-  color: #1D1D1D!important;
-  border: 1px solid rgb(224, 224, 224)!important;
+  /* color: #1D1D1D!important; */
+  /* border: 1px solid rgb(224, 224, 224)!important; */
 }
 .public-nav.light-bg-dark-color .loginBtn:hover{
-  color: #2CB7CA!important;
-  border: 1px solid #2CB7CA!important;
+  /* color: #2CB7CA!important;
+  border: 1px solid #2CB7CA!important; */
 }
 
 /* 透明背景白色字体 */
@@ -869,3 +869,94 @@
   position: relative;
   z-index: 9;
 }
+
+.head-search{
+  position: relative;
+  display: flex;
+  align-items: center;
+  margin-top: 14px;
+  width: 360px;
+  height: 36px;
+  padding: 0 8px 0 16px;
+  background: #F5F6F7;
+  border-radius: 8px;
+  border: 1px solid #F5F6F7;
+}
+.head-search >input{
+  flex: 1;
+  height: 100%;
+  padding: 0;
+  font-size: 14px;
+  border: 0;
+  background: transparent;
+}
+.head-search .head-search-icon{
+  flex-shrink: 0;
+  width: 20px;
+  height: 20px;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-image: url(/site/common/image/head-search-default.png);
+  cursor: pointer;
+}
+.head-search >input::placeholder{
+  color: #999999;
+}
+.head-search.focus {
+  border: 1px solid#2CB7CA;
+  background-color: #fff;
+}
+.head-search.focus .head-search-icon{
+  background-image: url(/site/common/image/head-search-active.png);
+}
+.search-nav-tab{
+  display: none;
+  position: absolute;
+  left: 0;
+  top: 58px;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 12px rgba(0, 0, 0, 0.1);
+  border-radius: 8px;
+  width: 212px;
+  height: 54px;
+  line-height: 54px;
+}
+.search-nav-tab span{
+  position: relative;
+  display: inline-block;
+  padding: 0 16px;
+  font-size: 14px;
+  color: #686868;
+  cursor: pointer;
+  transition: all 0.6s;
+}
+.search-nav-tab span.tab-active{
+  color: #2CB7CA;
+  transition: all 0.6s;
+}
+.search-nav-tab span.tab-active::after{
+  position: absolute;
+  content: '';
+  bottom: 0;
+  left: 50%;
+  width: 28px;
+  height: 2px;
+  transform: translateX(-50%);
+  background: #2CB7CA;
+}
+.useronline{
+  height: 100%!important;
+  margin-top: 0;
+}
+.useronline .user-avatar{
+  margin-top: 14px!important;
+}
+.useronline > button{
+  height: 100%!important;
+  background: #2ABED1!important;
+  margin: unset!important;
+  border: 0;
+  color: #fff!important;
+  border-radius: 0;
+}

src/web/staticres/site/common/css/pc-school-head.css

@@ -949,11 +949,21 @@ right: -14px;
   transform: translateX(-50%);
   background: #2CB7CA;
 }
-
-
-
-
-
+.useronline{
+  height: 100%!important;
+  margin-top: 0;
+}
+.useronline .user-avatar{
+  margin-top: 14px!important;
+}
+.useronline > button{
+  height: 100%!important;
+  background: #2ABED1!important;
+  margin: unset!important;
+  border: 0;
+  color: #fff!important;
+  border-radius: 0;
+}
 .tips_none{
   display: none!important;
 }

src/web/staticres/site/page/bankLanding/index.js

@@ -44,5 +44,17 @@ $(function () {
 $('.btn_').click(function(){
   consultDialog.isshow=true // 咨询弹窗
 })
+$('.public-nav .jynav li').hover(function(){
+  setNavTheme('light')
+  $('.loginBtn').css({'color': '#1d1d1d', 'border-color': 'rgb(224, 224, 224)'})
+  $('.public-nav').removeClass('light-bg-light-color').removeClass('light-bg-dark-color')
+}, function() {
+  if($(window).scrollTop() > 120){
+    return
+  }
+  setNavTheme('dark')
+  $('.loginBtn').css({'color': '#fff', 'border-color': '#fff'})
+
+})
 
 })

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

@@ -142,10 +142,22 @@
   margin-top: 8px;
   font-size: 16px;
   line-height: 24px;
+  display: flex;
+  align-items: center;
+  
 }
 .faq-feedback .f-content li > a{
   color: #1D1D1D;
 }
+
+.faq-feedback .f-content li > a:nth-child(1) {
+  max-width: 264px;
+  display: inline-block;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
 .faq-feedback .f-content li > a:hover{
   color: #2ABED1;
 }

src/web/templates/dataMarket/customExport/index.html

@@ -115,7 +115,7 @@
             </div>
             <div class="con-info">
               <img src='{{Msg "seo" "cdn"}}/frontRouter/pc/customExport/image/export-b-text2.png?v={{Msg "seo" "version"}}' alt="">
-              <p>有多年经验的专业数据团队+人工智能，通过人机结合的方式，把数据的误差控制在1‰的范围内。</p>
+              <p>有多年经验的专业数据团队+人工智能，通过人机结合的方式，把数据的误差控制在1%的范围内。</p>
             </div>
           </div>
           <div class="con-row">

src/web/templates/dataMarket/index.html

@@ -192,7 +192,9 @@
   // 数据导出
   function dataExport () {
     checkLogin()
-    location.href = "/front/dataExport/toSieve"
+    if(loginflag){
+      location.href = "/front/dataExport/toSieve"
+    }
   }
   function checkLogin () {
     var moduleOpen = $('body').hasClass('modal-open')
@@ -206,5 +208,7 @@
     location.href = "/front/dataMarket/customExport"
   }
 </script>
+<!--百度统计-->
+{{include "/common/baiducc.html"}}
 </body>
 </html>

src/web/templates/pc/index.html

@@ -212,9 +212,9 @@
 		  <div class="jy-index-news CfadeInUp">
         <h3 class="module-title">最新资讯</h3>
         <div class="w1200 news-container">
-        {{range $i, $v := JyCms "hyzc" 12}}
+        {{range $i, $v := JyCms "hyzx" 12}}
           {{if eq $i 0}}
-          <div class="news-card" onclick="window.open('/jyblog/{{$v._id}}.html')">
+          <div class="news-card" onclick="window.open('/jySite/{{$v._id}}.html')">
             <div class="card-img">
               <img src="{{$v.s_pic}}" alt="{{$v.s_title}}">
             </div>
@@ -228,9 +228,9 @@
         {{end}}
 
         <div class="news-list">
-          {{range $i, $v := JyCms "hyzc" 12}}
+          {{range $i, $v := JyCms "hyzx" 12}}
             {{if gt $i 0}}
-              <a class="news-item" href="/jyblog/{{$v._id}}.html" target="_blank">
+              <a class="news-item" href="/jySite/{{$v._id}}.html" target="_blank">
                 <span class="news-item-text">{{$v.s_title}}</span>
                 <span class="news-item-date">{{$v.time}}</span>
               </a>

src/web/templates/site/common/pc-school-head.html

@@ -1,4 +1,5 @@
-<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/site/common/css/pc-school-head.css?v={{Msg "seo" "version"}}'>
+<!-- <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/site/common/css/pc-school-head.css?v={{Msg "seo" "version"}}'> -->
+<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/public-pc/css/header-nav.css?v={{Msg "seo" "version"}}'>
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/ad/css/index.css?v={{Msg "seo" "version"}}'>
 
 <section class="public-nav" id="public-nav" style="display: none">

src/web/templates/site/page/bankLanding/pc/index.html

@@ -81,7 +81,7 @@
       <div class="item ml-20">
         <img src="{{Msg "seo" "cdn"}}/site/page/bankLanding/images/after.png?v={{Msg "seo" "version"}}" alt="">
         <p class="title">售后维护</p>
-        <p class="text_">根据业务单位的实际需求，经验丰富的数据团队可对数据进行深度加工分析，有针对性的解决企业获客及风险评估板个性化问题。</p>
+        <p class="text_">根据业务单位的实际需求，经验丰富的数据团队可对数据进行深度加工分析，有针对性的解决企业获客及风险评估版块个性化问题。</p>
       </div>
     </div>
     <div class="btn_">点击了解更多</div>

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

@@ -69,7 +69,7 @@
           <div class="feedback">
             <h3 class="f-title">意见反馈</h3>
             <div class="f-content">请把您的意见与建议反馈给我们</div>
-            <a class="feedback-btn" href="/helpCenter/feedback">立即反馈</a>
+            <a class="feedback-btn" target="_blank" href="/helpCenter/feedback">立即反馈</a>
           </div>
         </div>
         <div class="hot-handel">

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

@@ -88,7 +88,7 @@
         </div>
         <div class="f-doc-container">
           {{range $k,$v := .T.newJyDoc }}
-          <div class="doc-card">
+          <div class="doc-card" onclick="window.location.href='/swordfish/docs/content/{{$v.docId}}'">
             <div class="doc-img">
               <img  class="img-bg" src='{{Msg "seo" "cdn"}}{{$v.previewImgId}}?v={{Msg "seo" "version"}}' alt="">
               <!-- 图片类型 doc@2x、excel@2x、pdf@2x、ppt@2x-->
@@ -128,7 +128,9 @@
                 <div class="s-b-item" onclick="window.location.href='/jySite/{{$n._id}}.html'">
                   {{$n.s_pic1}}
                   <img class="s-b-item-bg" src='{{Msg "seo" "cdn"}}{{$n.s_pic1}}?v={{Msg "seo" "version"}}' alt="{{$n.s_title}}">
-                  <p class="s-b-item-bar">{{$n.s_title}}</p>
+                  <div class="s-b-item-bar">
+                    <p class="ellipsis-2">{{$n.s_title}}</p>
+                  </div>
                   <div class="shade-bg">
                     <img class="shade-more" src='{{Msg "seo" "cdn"}}/site/page/jySchool/image/more.png?v={{Msg "seo" "version"}}' alt="">
                   </div>

src/web/templates/site/page/jyblogdetail.html

@@ -98,7 +98,7 @@
           相关内容推荐
         </div>
         {{range $k,$v:= .T.bottomInfo}}
-        <div class="art_list">
+        <div class="art_list" onclick="window.location.href='/jySite/{{$v._id}}.html'">
           <div class="art_l_left">
             <div class="art_l_l_title">
               {{$v.s_title}}
@@ -121,8 +121,13 @@
         {{include "/site/common/slide-leave-info.html"}}
         <div class="real_time_info_module" style="margin-top:40px;">
           <div class="module_title">
-            <span>热点资讯</span>
-            <span onclick="window.location.href='/industryInfo/index'">MORE</span>
+            {{if eq .T.pCode "hyzx"}}
+              <span>最新文章</span>
+              <span onclick="window.location.href='/industryInfo/index'">MORE</span>
+            {{else}}
+              <span>内容推荐</span>
+              <span onclick="window.location.href='/jySchool/strategy'">MORE</span>
+            {{end}}
           </div>
           <ul class="module_content">
           {{range $k,$v := .T.rightInfo.latestPush}}
@@ -136,8 +141,13 @@
 
         <div class="real_time_info_module">
           <div class="module_title">
+            {{if eq .T.pCode "hyzx"}}
             <span>热门文章</span>
             <span onclick="window.location.href='/industryInfo/index'">MORE</span>
+            {{else}}
+            <span>重要资讯</span>
+            <span onclick="window.location.href='/jySchool/strategy'">MORE</span>
+            {{end}}
           </div>
           <ul class="module_content">
             {{range $k,$v := .T.rightInfo.randomExtraction}}