Merge branch 'master' into zenops_38

2022-07-14 08:37:24 +08:00
parent 7732038651 559baff057
commit c8527bdea4
87 changed files with 5331 additions and 515 deletions
@@ -966,8 +966,9 @@ class baseJS
        {
            $cancleAction = "$cancleTarget.location = '$cancleURL';";
        }
-
-        $js .= <<<EOT
+        if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') === false)
+        {
+            $js .= <<<EOT
 if(confirm("$message"))
 {
    $confirmAction
@@ -977,6 +978,12 @@ else
    $cancleAction
 }
 EOT;
+        }
+        else
+        {
+            $js .= $confirmAction;
+        }
+
        $js .= self::end();
        return $js;
    }