Merge remote-tracking branch 'origin/feature/v4.8.0' into feature/v4.8.0

src/jfw/jyutil/classroomiInfo.go

@@ -322,6 +322,8 @@ func GetNextInfo(_id string, keyWord ...string) (lastId, nextId string) {
 	if doc == nil || len(*doc) == 0 {
 		return
 	}
+	//增加浏览次数
+	go Browsing(_id, util.IntAll((*doc)["i_viewnum"]))
 	commonQuery := map[string]interface{}{
 		"i_status": 1,
 		"releasetime": map[string]interface{}{
@@ -338,6 +340,7 @@ func GetNextInfo(_id string, keyWord ...string) (lastId, nextId string) {
 			"$regex": keyWord[0],
 		}
 	}
+	log.Println("content上下文query:", commonQuery)
 	dataOn, ok := mongodb.Find("content", commonQuery, `{"releasetime":-1,"l_createdate":-1}`, `{"_id":1,"i_viewnum":1,releasetime":-1,"l_createdate":1}`, false, -1, -1)
 	if ok && dataOn != nil && len(*dataOn) > 0 {
 		for k, v := range *dataOn {
@@ -490,3 +493,10 @@ func PidColumn(id string) []Navigation {
 	return allColumn
 
 }
+
+func Browsing(id string, viewNum int) {
+	mongodb.UpdateById("content", id, map[string]interface{}{
+		"$set": map[string]interface{}{
+			"i_viewnum": viewNum + 1,
+		}})
+}

src/jfw/jyutil/jyCms.go

@@ -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/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info_bank.html

@@ -504,7 +504,7 @@
         console.log(this.ajaxParams)
         var _this = this
         var loading = _this.showLoading()
-        var ajax_url= this.ajaxParams.source.indexOf('bankLanding') !== -1 ? '/salesLeads/officialNotLogin' : '/salesLeads/collectInfo'
+        var ajax_url= this.ajaxParams.source.indexOf('bankLanding') !== -1 ? '/salesLeads/official/notLogin' : '/salesLeads/collectInfo'
         this.ajaxFn(ajax_url, this.ajaxParams, function (r) {
           if (r) {
             loading.clear()

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/frontRouter/pc/customExport/css/index.css

@@ -389,7 +389,7 @@ h2.title{
   text-align: center;
 }
 .custom-process-box{
-  height:588px;
+  height:676px;
   padding-top:68px;
   background-image: url(/frontRouter/pc/customExport/image/process-bg.png);
   color:#fff;

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/site/page/industryInfo/css/industry_detail.css

@@ -242,6 +242,11 @@
   position: relative;
   width: 100%;
   height: 100%;
+  cursor: pointer;
+}
+.mySwiper .swiper-wrapper .swiper-slide img{
+  width: 100%;
+  height: 240px;
 }
 .mySwiper .swiper-pagination{
   display: flex;

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

@@ -165,7 +165,7 @@
             <div class="info">7×24小时服务支持，承诺售后问题2小时内做出响应和安排。服务期间，数据交付内容可根据业务需求灵活调整，提供企业服务咨询和专业技术指导。</div>
           </div>
         </div>
-        <div class="common-custom-btn btn-cell btn-light">定制数据方案</div>
+        <div class="common-custom-btn btn-cell btn-light" onClick="needSubmitHandle()">定制数据方案</div>
       </div>
     </section>
     <!--行业解决方案-->

src/web/templates/frontRouter/wx/bigmember/free/perfect_info_bank.html

@@ -591,7 +591,7 @@
           this.ajaxParams.branch = this.infoMap.branch.indexOf('总裁') > -1 || this.infoMap.branch.indexOf('总经理') > -1 ? '' : this.infoMap.branch
           var _this = this
           var loading = _this.showLoading()
-          var ajax_url= this.ajaxParams.source.indexOf('bankLanding') !== -1 ? '/salesLeads/officialNotLogin' : '/salesLeads/collectInfo'
+          var ajax_url= this.ajaxParams.source.indexOf('bankLanding') !== -1 ? '/salesLeads/official/notLogin' : '/salesLeads/collectInfo'
           $.ajax({
             type: 'POST',
             url: ajax_url,

src/web/templates/site/page/industryInfo/class.html

@@ -86,10 +86,10 @@
               <div class="swiper mySwiper swiper-initialized swiper-horizontal swiper-pointer-events swiper-backface-hidden" >
                 <div class="swiper-wrapper" id="swiper-wrapper" aria-live="polite" style="transition-duration: 0ms; transform: translate3d(-3072px, 0px, 0px);">
                   {{range $k,$v :=  .T.rightData.course}}
-                    <div class="swiper-slide" role="group" style="width: 1536px;" aria-label="1">
+                    <div class="swiper-slide" onclick="window.open('/jyxspc/courser-details?id={{$v._id}}')" role="group" style="width: 1536px;" aria-label="1">
                       <img src="{{$v.s_picUrl2}}" alt="">
                       <div class="swiper_title">
-                        <span onclick="window.open('/jyxspc/courser-details?id={{$v._id}}')">{{$v.s_name}}</span>
+                        <span>{{$v.s_name}}</span>
                       </div>
                     </div>
                   {{end}}