瀏覽代碼

Merge branch 'dev2.10.9' of http://192.168.3.207:10080/qmx/jy into dev2.10.9

xuzhiheng 5 年之前
父節點
當前提交
be6ce907af

+ 1 - 1
src/jfw/modules/app/src/app/active/active_zb.go

@@ -66,7 +66,7 @@ func (this *active_zb) LivePage() error {
 		isVip := false
 		r, _ := public.MQFW.FindById("user", userid, `{"i_vip_status":1}`)
 		if r != nil && len(*r) != 0 {
-			if util.IntAll((*r)["i_vip_status"]) > 0 {
+			if util.IntAll((*r)["i_vip_status"]) == 2 {
 				isVip = true
 			}
 		}

+ 5 - 0
src/jfw/modules/app/src/web/templates/active/livePage/online.html

@@ -122,6 +122,11 @@
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/livePage/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/livePage/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script>
+    	  window.addEventListener('pageshow', function(event) {
+          if (event.persisted || window.performance && window.performance.navigation.type == 2) {
+            location.reload();
+          }
+        }, false);
         $(function () {
             try{
         			JyObj.hiddenBottom("0");