Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #7522.

Browse Source
This commit is contained in:
chenfei
2020-07-25 22:13:30 +08:00
parent deb448d2bb
commit 6972e19d53
1 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/base/front/front.class.php
+37 -8
View File
@@ -802,7 +802,14 @@ class baseJS
{
global $app;
if($app->viewType == 'json') return json_encode(array('message' => $message));
if($app->viewType == 'json')
{
$output = array();
$output['data'] = json_encode(array('message' => $message));
$output['md5'] = md5(json_encode(array('message' => $message)));
return json_encode($output);
}
return self::start($full) . "alert('" . $message . "')" . self::end() . self::resetForm();
}
@@ -834,7 +841,15 @@ class baseJS
{
global $app;
if($app->viewType == 'json') return json_encode(array('message' => $message));
if($app->viewType == 'json')
{
$output = array();
$output['status'] = 'fail';
$output['data'] = json_encode(array('message' => $message));
$output['md5'] = md5(json_encode(array('message' => $message)));
return json_encode($output);
}
$alertMessage = '';
if(is_array($message))
@@ -882,11 +897,16 @@ class baseJS
global $app;
if($app->viewType == 'json')
{
$output['message'] = $message;
$output['okURL'] = common::getSysURL() . $okURL;
$output['cancleURL'] = common::getSysURL() . $cancleURL;
$output['okTarget'] = $okTarget;
$output['cancleTarget'] = $cancleTarget;
$data = array();
$data['message'] = $message;
$data['okURL'] = common::getSysURL() . $okURL;
$data['cancleURL'] = common::getSysURL() . $cancleURL;
$data['okTarget'] = $okTarget;
$data['cancleTarget'] = $cancleTarget;
$output = array();
$output['data'] = json_encode($data);
$output['md5'] = md5(json_encode($data));
return json_encode($output);
}
@@ -948,7 +968,16 @@ EOT;
$url = $config->webRoot;
}
if($app->viewType == 'json') return json_encode(array('locate' => common::getSysURL() . $url));
if($app->viewType == 'json')
{
$data = strtolower($url) == 'back' ? array('locate' => 'back') : array('locate' => common::getSysURL() . $url);
$output = array();
$output['data'] = json_encode($data);
$output['md5'] = md5(json_encode($data));
return json_encode($output);
}
$js = self::start();
if(strtolower($url) == "back")