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

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

@@ -94,4 +94,7 @@
   text-align: center;
   font-size: 16px;
   color: #fff;
+}
+.f-btn[disabled]{
+  cursor: not-allowed;
 }

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

@@ -88,6 +88,9 @@
   font-size: 16px;
   line-height: 24px;
   color: #1D1D1D;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 .card .list-middle > a:hover{
   color: #2ABED1;
@@ -187,11 +190,9 @@
   font-size: 16px;
   color: #fff;
   text-align: center;
+  cursor: pointer;
 }
-.feedback .feedback-btn:hover,
-.feedback .feedback-btn:active{
-  color: #fff;
-}
+
 .hot-handel{
   padding: 80px 0;
 }

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

@@ -33,6 +33,7 @@ body{
   line-height: 22px;
   color: #686868;
   cursor: pointer;
+  word-break: break-all;
 }
 .s-tree .tree-item:hover{
   color:#2ABED1;

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

@@ -226,6 +226,10 @@
   line-height: 22px;
   color: #FF3A20;
 }
+.card-main .expired{
+  color: #686868;
+  font-size: 14px;
+}
 .course-card:hover .card-main .c-m-title{
   color: #2ABED1;
 }

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

@@ -1,5 +1,4 @@
-<!-- <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"}}/site/common/css/pc-school-head.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/helpCenter/feedback.html

@@ -72,6 +72,14 @@
         $('.entered-count').text($(this).val().length)
       })
       $('#submit').on('click',function (){
+        if ($('#textarea').val().length < 10) {
+          showToast('请至少填写10个字的反馈，谢谢')
+          $(this).attr("disabled","disabled")
+          setTimeout(function() {
+            $('#submit').removeAttr('disabled')
+          }, 2000)
+          return
+        }
         $(this).attr("disabled","disabled")
         let content=$("textarea").val()
         let mold=$("[name='type']:checked").val()
@@ -79,9 +87,14 @@
           {mold:mold,content:content},
           function (res){
             if(res.data){
-              window.history.go(-1)
+              showToast('提交成功')
+              setTimeout(function() {
+                $('#submit').removeAttr('disabled')
+                $('#textarea').val('')
+                $('#account').prop('checked', 'checked')
+              }, 2000)
             }else {
-              alert(res.error_msg)
+              showToast(res.error_msg)
             }
         })
       })

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

@@ -56,9 +56,9 @@
             <ul class="f-content">
               {{range $kk,$vv:=$v.SeedData}}
               <li>
-                <a href="{{$vv.Href}}" title="{{$vv.Name}}">•  {{$vv.Name}}</a>
+                <a href="{{$vv.Href}}" title="{{$vv.Name}}" target="_blank">•  {{$vv.Name}}</a>
                 {{if eq (Add $kk 1) (len $v.SeedData)}}
-                <a class="faq-more" href="{{$v.Href}}">更多</a>
+                <a class="faq-more" href="{{$v.Href}}" target="_blank">更多</a>
                 {{end}}
               </li>
               {{end}}
@@ -69,7 +69,7 @@
           <div class="feedback">
             <h3 class="f-title">意见反馈</h3>
             <div class="f-content">请把您的意见与建议反馈给我们</div>
-            <a class="feedback-btn" target="_blank" href="/helpCenter/feedback">立即反馈</a>
+            <span class="feedback-btn" data-href="/helpCenter/feedback">立即反馈</span>
           </div>
         </div>
         <div class="hot-handel">
@@ -114,6 +114,14 @@
           }
         }
       })
+      $('.feedback-btn').on('click', function() {
+        if (!loginflag){
+          openLoginDig()
+        } else {
+          var url = $(this).attr('data-href')
+          window.open(url)
+        }
+      })
     })
   </script>
   {{include "/common/baiducc.html"}}

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

@@ -68,10 +68,14 @@
               </p>
               <p class="c-m-cp">
                 <span class="hot-count">{{$v.i_clickRate}}</span>
-                {{if eq $v.i_price 0}}
-                <span class="hot-price">免费</span>
+                {{if $v.isExpired}}
+                <span class="expired">已过期</span>
                 {{else}}
-                <span class="hot-price" style="font-size:18px;line-height: 28px;"><em style="font-size:12px;line-height: 18px;">￥</em>{{Division $v.i_price 100}}</span>
+                  {{if eq $v.i_price 0}}
+                  <span class="hot-price">免费</span>
+                  {{else}}
+                  <span class="hot-price" style="font-size:18px;line-height: 28px;"><em style="font-size:12px;line-height: 18px;">￥</em>{{Division $v.i_price 100}}</span>
+                  {{end}}
                 {{end}}
               </p>
             </div>