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

@@ -195,6 +195,9 @@ func Course(num, iType int) *[]map[string]interface{} {
 
 // 奖券详情
 func OptimalSelection(id string, price float64, lotteryMap map[string][]*activity.LotteryJson) (bool, float64) {
+	if price == 0 {
+		return false, 0
+	}
 	discountPrice := float64(0)
 
 	lotteryStr := lotteryMap[id]

src/web/staticres/public-pc/js/header-nav.js

@@ -83,7 +83,7 @@ function trySelectNav (name) {
         'list', 'article/content', 'article/bdprivate', 'article/mailprivate',
         'article/bdcontent', '/jypc/toPushView', '/jyblog', '/dataExport',
         '/front/dataService.html', '/front/course', '/front/dataexport', '/orderPay',
-        '/big/page/', '/big/pc/page/', '/proposedProject', '/jyxspc',
+        '/big/page/', '/big/pc/page/', '/proposedProject', '/jyxspc'
       ]
       var isLightTheme = lightThemeRegs.some(function (v) {
         return $href.indexOf(v) !== -1
@@ -171,7 +171,7 @@ $(function(){
   var curTheme = getNavTheme()
   $("#public-nav .iner .jynav li").bind("mouseenter",function(){
     var l = $(this).find('.jynav-list').length;
-    if(l > 0){
+    if(l >= 0){
       //  隐藏消息悬浮窗
       $('#public-nav .iner .jynav li').find('.jy-list-msg').hide()
       $(this).find('.jynav-list').toggle()

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

@@ -72,8 +72,8 @@
                 <span class="expired">已过期</span>
                 {{else}}
                   {{if $v.isDiscount}}
-                    {{if  $v.discountPrice }}
-                    <span class="hot-price">免费{{$v.discountPrice}}</span>
+                    {{if eq $v.discountPrice 0.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.discountPrice 100}}</span>
                     {{end}}