Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
qmx
/
jy
14
0
Салаа 0
Файлууд Асуудлууд 2 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

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

yangfeng 2 жил өмнө
parent
eeb389053e 71d2ff469d
commit
80d6e814db
6 өөрчлөгдсөн 25 нэмэгдсэн , 8 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 14 0
      src/jfw/site/helpCenter/service.go
  2. 0 0
      src/web/templates/site/page/helpCenter/videoDetail.html
  3. 1 1
      src/web/templates/site/page/industryInfo/class.html
  4. 1 1
      src/web/templates/site/page/jySchool/class.html
  5. 3 3
      src/web/templates/site/page/jySchool/search.html
  6. 6 3
      src/web/templates/site/page/jyblogdetail.html

+ 14 - 0
src/jfw/site/helpCenter/service.go
Файл харах 

@@ -19,6 +19,9 @@ type HelpCenterService struct {
 
 	catalog      xweb.Mapper `xweb:"/helpCenter/catalog/(.*)"`     //帮助中心意见反馈
 
 	catalog      xweb.Mapper `xweb:"/helpCenter/catalog/(.*)"`     //帮助中心意见反馈
 
 	detail       xweb.Mapper `xweb:"/helpCenter/detail/(.*).html"` //帮助中心意见反馈
 
 	detail       xweb.Mapper `xweb:"/helpCenter/detail/(.*).html"` //帮助中心意见反馈
 
 
 
+	helpVideoIndex xweb.Mapper `xweb:"/helpVideo/"`
 
+	helpVideoPage  xweb.Mapper `xweb:"/helpVideo/(.*)"`
 
+
 
 	feedbackSubmit xweb.Mapper `xweb:"/helpCenter/feedback/submit"` //帮助中心意见反馈
 
 	feedbackSubmit xweb.Mapper `xweb:"/helpCenter/feedback/submit"` //帮助中心意见反馈
 
 }
 
 }
 
 
 
@@ -76,3 +79,14 @@ func (this *HelpCenterService) FeedbackSubmit() {
 
 	}()
 
 	}()
 
 	this.ServeJson(NewResult(rData, errMsg))
 
 	this.ServeJson(NewResult(rData, errMsg))
 
 }
 
 }
 
+
 
+// HelpVideoIndex 帮助中心视频
 
+func (this *HelpCenterService) HelpVideoIndex() error {
 
+	return this.doVideoPage()
 
+}
 
+func (this *HelpCenterService) HelpVideoPage(htmlPage string) error {
 
+	return this.doVideoPage()
 
+}
 
+func (this *HelpCenterService) doVideoPage() error {
 
+	return this.Render("/site/page/helpCenter/videoDetail.html")
 
+}

+ 0 - 0
src/web/templates/frontRouter/pc/helpCenter/free/index.html → src/web/templates/site/page/helpCenter/videoDetail.html
Файл харах


+ 1 - 1
src/web/templates/site/page/industryInfo/class.html
Файл харах 

@@ -57,7 +57,7 @@
 
           {{range $k,$v := .T.list}}
 
           {{range $k,$v := .T.list}}
 
           <div class="art_list">
 
           <div class="art_list">
 
             <div class="art_l_left">
 
             <div class="art_l_left">
 
-              <div class="art_l_l_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">
 
+              <div class="art_l_l_title ellipsis" onclick="window.location.href='/jySite/{{$v._id}}.html'">
 
                 {{$v.s_title}}
 
                 {{$v.s_title}}
 
               </div>
 
               </div>
 
               <div class="art_l_l_content">
 
               <div class="art_l_l_content">

+ 1 - 1
src/web/templates/site/page/jySchool/class.html
Файл харах 

@@ -68,7 +68,7 @@
 
                 </div>
 
                 </div>
 
                 {{if ne $v.s_pic ""}}
 
                 {{if ne $v.s_pic ""}}
 
                 <div class="art_l_right">
 
                 <div class="art_l_right">
 
-                  <img src="{{$v.s_pic}}" alt="">
 
+                  <img src="{{$v.s_pic1}}" alt="">
 
                 </div>
 
                 </div>
 
                 {{end}}
 
                 {{end}}
 
               </div>
 
               </div>

+ 3 - 3
src/web/templates/site/page/jySchool/search.html
Файл харах 

@@ -70,7 +70,7 @@
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
               <div class="art_l_right">
 
               <div class="art_l_right">
 
-                <img src="{{$v.s_pic}}" alt="">
 
+                <img src="{{$v.s_pic1}}" alt="">
 
               </div>
 
               </div>
 
             </div>
 
             </div>
 
             {{end}}
 
             {{end}}
 
@@ -126,7 +126,7 @@
 
               <div class="strate_content">
 
               <div class="strate_content">
 
                 <div class="strate_c_list">
 
                 <div class="strate_c_list">
 
                   <div class="strate_l_left">
 
                   <div class="strate_l_left">
 
-                    <img src="{{$v.s_pic}}" alt="">
 
+                    <img src="{{$v.s_pic1}}" alt="">
 
                   </div>
 
                   </div>
 
                   <div class="strate_l_right">
 
                   <div class="strate_l_right">
 
                     <div class="strate_l_r_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</div>
 
                     <div class="strate_l_r_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</div>
 
@@ -151,7 +151,7 @@
 
               <div class="strate_content">
 
               <div class="strate_content">
 
                 <div class="strate_c_list">
 
                 <div class="strate_c_list">
 
                   <div class="strate_l_left">
 
                   <div class="strate_l_left">
 
-                    <img src="{{$v.s_pic}}" alt="">
 
+                    <img src="{{$v.s_pic1}}" alt="">
 
                   </div>
 
                   </div>
 
                   <div class="strate_l_right">
 
                   <div class="strate_l_right">
 
                     <div class="strate_l_r_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</div>
 
                     <div class="strate_l_r_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</div>

+ 6 - 3
src/web/templates/site/page/jyblogdetail.html
Файл харах 

@@ -17,8 +17,11 @@
 
   <link href='{{Msg "seo" "cdn"}}/site/page/industryInfo/css/industry_content.css?v={{Msg "seo" "version"}}' rel="stylesheet">
 
   <link href='{{Msg "seo" "cdn"}}/site/page/industryInfo/css/industry_content.css?v={{Msg "seo" "version"}}' rel="stylesheet">
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
-{{include "/site/common/pc-school-head.html"}}
 
-
 
+{{if eq .T.pCode "ztbgl"}}
 
+  {{include "/site/common/pc-school-head.html"}}
 
+{{else}}
 
+  {{include "/common/pchead.html"}}
 
+{{end}}
 
 <section class="page-industry-content">
 
 <section class="page-industry-content">
 
   <div class="page-school-main w1200">
 
   <div class="page-school-main w1200">
 
     <!--    导航-->
 
     <!--    导航-->
 
@@ -125,7 +128,7 @@
 
               <span>最新文章</span>
 
               <span>最新文章</span>
 
               <span onclick="window.location.href='/industryInfo/index'">MORE</span>
 
               <span onclick="window.location.href='/industryInfo/index'">MORE</span>
 
             {{else}}
 
             {{else}}
 
-              <span>内容推荐</span>
 
+              <span>内容推荐{{.T.pCode}}</span>
 
               <span onclick="window.location.href='/jySchool/strategy'">MORE</span>
 
               <span onclick="window.location.href='/jySchool/strategy'">MORE</span>
 
             {{end}}
 
             {{end}}
 
           </div>
 
           </div>