改进Model类的JSON类型转换 支持非数组类型

This commit is contained in:
thinkphp
2016-06-07 11:38:30 +08:00
parent 71bcc1bb7b
commit 5988f36102

View File

@@ -321,11 +321,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$value = json_encode($value, JSON_FORCE_OBJECT);
}
break;
case 'json':
case 'array':
if (is_array($value)) {
$value = json_encode($value, JSON_UNESCAPED_UNICODE);
}
$value = (array) $value;
case 'json':
$value = json_encode($value, JSON_UNESCAPED_UNICODE);
break;
}
return $value;