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

src/jfw/jyutil/classroomiInfo.go

@@ -322,13 +322,15 @@ 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{}{
 			"$lt": time.Now().Unix(),
 		},
 	}
-	for _, t := range []string{"s_contenttype", "s_secondclassifytype", "s_threeclassifytype"} {
+	for _, t := range []string{"s_contenttype"} {
 		if tv, _ := (*doc)[t].(string); tv != "" {
 			commonQuery[t] = tv
 		}
@@ -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/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/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/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,