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

src/jfw/modules/app/src/app/jyutil/util.go

@@ -10,6 +10,7 @@ import (
 )
 
 var IosReg = regexp.MustCompile(`\(i[^;]+;( U;)? CPU.+Mac OS X`)
+var IosIpadReg = regexp.MustCompile(`\(i[^;]+;Intel Mac OS X`)
 
 func IosExamInfo(a *xweb.Action, vip, ent bool) (bool, bool, bool, bool) {
 	if !IosReg.MatchString(a.Header("User-Agent")) {

src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -1007,7 +1007,11 @@ function setLiActive(obj){
 	},500);
 }
 function mySysIsIos(){
-	return !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+	//ios终端
+	var flag1 = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+	var flag2 = !!navigator.userAgent.match(/\(i[^;]+;Intel Mac OS X/);
+	return flag1||flag2
+	
 }
 function appQuit(isKicked){
 	//清除小红点缓存