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/jySchool/css/index.css

@@ -226,6 +226,12 @@
   line-height: 22px;
   color: #FF3A20;
 }
+.card-main .init-price{
+  font-size: 14px;
+  color: #9b9ba3;
+  line-height: 18px;
+  text-decoration: line-through;
+}
 .card-main .expired{
   color: #686868;
   font-size: 14px;

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

@@ -71,10 +71,19 @@
                 {{if $v.isExpired}}
                 <span class="expired">已过期</span>
                 {{else}}
-                  {{if eq $v.i_price 0}}
-                  <span class="hot-price">免费</span>
+                  {{if $v.isDiscount}}
+                    {{if  $v.discountPrice }}
+                    <span class="hot-price">免费{{$v.discountPrice}}</span>
+                    {{else}}
+                    <span class="hot-price" style="font-size:18px;line-height: 28px;"><em style="font-size:12px;line-height: 18px;">￥</em>{{Division $v.discountPrice 100}}</span>
+                    {{end}}
+                    <span class="init-price">￥{{Division $v.i_price 100}}</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}}
                 {{end}}
               </p>