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

@@ -499,13 +499,12 @@ func GuidelineDetails(id string, keyWord ...string) []map[string]interface{} {
 			"$regex": keyWord[0],
 		}
 	}
-
 	//相关内容推荐
-	query = map[string]interface{}{
-		"_id": map[string]interface{}{
-			"$ne": []primitive.ObjectID{_id},
-		},
+	query["_id"] = map[string]interface{}{
+		"$ne": []primitive.ObjectID{_id},
 	}
+
+	log.Println(" 详情页 推荐3", query)
 	var recommend []map[string]interface{}
 	dataRe, ok := mongodb.Find("content", query, `{"releasetime":-1,"l_createdate":-1}`, `{"_id":1,"i_viewnum":1,"s_title":1,"s_pic1":1,"s_pic":1,"releasetime":1,"s_description":1,"l_createdate":1,"s_contenttype":1,"s_secondclassifytype":1}`, false, 0, 500)
 	if ok && dataRe != nil && len(*dataRe) > 0 {

src/jfw/modules/app/src/web/templates/site/page/bankLanding/index.html

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

src/jfw/site/jyblog/entity.go

@@ -6,8 +6,10 @@ import (
 	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/public"
 	"encoding/json"
+	"fmt"
 	"html/template"
 	"jy/src/jfw/config"
+	"strings"
 	"time"
 )
 
@@ -26,7 +28,15 @@ func GetBlogDetail(_id string) (data *map[string]interface{}) {
 			(*r)["l_createdate"] = util.TimeDiff(time.Unix(util.Int64All(tmpdate1), 0))
 			tmpdate2, _ := (*r)["releasetime"]
 			(*r)["releasetime"] = util.TimeDiff(time.Unix(util.Int64All(tmpdate2), 0))
-			(*r)["s_content"] = template.HTML(util.ObjToString((*r)["s_content"]))
+			content := util.ObjToString((*r)["s_content"])
+			columnCode, _ := config.Sysconfig["columnCode"].(map[string]interface{})
+			helpCode := util.InterfaceToStr(columnCode["帮助中心"])
+			//帮助中心单独处理 需要对内容图片加域名
+			if util.ObjToString((*r)["s_contenttype"]) == helpCode {
+				newImg := fmt.Sprintf(`<img src="%simgFile`, util.InterfaceToStr(config.Seoconfig["jyadd"]))
+				content = strings.ReplaceAll(content, `<img src="/imgFile`, newImg)
+			}
+			(*r)["s_content"] = template.HTML(content)
 			(*r)["_id"] = se.EncodeString(BsonIdToSId((*r)["_id"]))
 			s_pic, _ := (*r)["s_pic"].(string)
 			if s_pic != "" {

src/web/staticres/common-module/pc-dialog/js/leave-info-dialog.js

@@ -335,7 +335,8 @@ var vm = new Vue({
     },
     defaultSource: function() {
       // 默认提交成功不显示广告图和邮箱文案 如果是结构化数据则显示
-      return this.source.indexOf('structed') === -1
+      var noEmailSource = ['structedData', 'pc_data_custom_export']
+      return noEmailSource.indexOf(this.source) === -1
     },
     showBranch: function () {
       // 切换到总裁或总经理之后 把之前选择的部门清空
@@ -555,7 +556,7 @@ var vm = new Vue({
       var _this = this
       $.ajax({
         type:'POST',
-        url: source.indexOf('structedData') > -1 ? '/salesLeads/collectInfo' : '/salesLeads/official/notLogin',
+        url: '/salesLeads/collectInfo',
         contentType: "application/json;charset=utf-8",
         data: JSON.stringify(params),
         success:function (res) {

src/web/staticres/css/pc.css

@@ -5161,3 +5161,8 @@ h6 {
 .login-dig-footer-box p.passTip{
   margin-top: 100px;
 }
+
+.guide-intro-dialog{
+  left: 50%;
+  margin: 120px 0;
+}

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

@@ -151,6 +151,7 @@
 }
 .faq-feedback .f-content li > a{
   color: #1D1D1D;
+  text-decoration: none;
 }
 
 .faq-feedback .f-content li > a:nth-child(1) {
@@ -163,6 +164,7 @@
 
 .faq-feedback .f-content li > a:hover{
   color: #2ABED1;
+  text-decoration: none;
 }
 .faq-more{
   padding-left: 32px;

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

@@ -170,4 +170,9 @@ summary.active a{
 
 .catalogue .detail li:hover,.catalogue .detail a:hover{
   color: #2ABED1;
+}
+.detail-title{
+  font-size: 24px;
+  line-height: 36px;
+  color: #1D1D1D;
 }

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

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

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

@@ -44,6 +44,7 @@
   let data = {{.T.catalog}}
 
   $(function () {
+    haslogin({{.T.logid}});
     $('.s-tree').html(getTree(data))
   })
 

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

@@ -21,7 +21,7 @@
 <section class="page-summary">
   <div class="s-tree"></div>
   <div class="s-content">
-    <div>
+    <div class="detail-title">
       {{.T.detail.s_title}}
     </div>
     <div>

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

@@ -92,6 +92,7 @@
                 $('#submit').removeAttr('disabled')
                 $('#textarea').val('')
                 $('#account').prop('checked', 'checked')
+                $('.entered-count').text(0)
               }, 2000)
             }else {
               showToast(res.error_msg)