blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

修复文件上传功能

Browse Source
This commit is contained in:
邹景立 2021-05-28 17:05:13 +08:00
parent 37ad2cb16d
commit da5f3e12ba
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/admin/view/api/upload.js
View File

@ -1,12 +1,13 @@
define(['md5'], function (SparkMD5, allowMime) {
allowMime = JSON.parse('{$exts|raw}');
return function (element, callable, completeCallable) {
return function (element, callable) {
/*! 初始化变量 */
var opt = {element: $(element), exts: [], mimes: [], files: {}, cache: {}, load: 0};
opt.count = {total: 0, uploaded: 0}, opt.size = opt.element.data('size') || 0;
opt.safe = opt.element.data('safe') ? 1 : 0, opt.hload = opt.element.data('hide-load') ? 1 : 0;
opt.field = opt.element.data('field') || 'file', opt.input = $('input[name="' + opt.field + '"]:not([type=file])');
opt.uptype = opt.safe ? 'local' : opt.element.attr('data-uptype') || '', opt.multiple = opt.element.data('multiple') > 0;
opt.element.data('input', opt.element.data('input') || $('input[name="' + (opt.element.data('field') || 'file') + '"]:not([type=file])'));
opt.safe = opt.element.data('safe') ? 1 : 0, opt.input = $(opt.element.data('input')), opt.hload = opt.element.data('hide-load') ? 1 : 0;
opt.count = {total: 0, uploaded: 0}, opt.size = opt.element.data('size') || 0, opt.multiple = opt.element.data('multiple') > 0;
opt.uptype = opt.safe ? 'local' : opt.element.attr('data-uptype') || '';
/*! 文件选择筛选 */
$((opt.element.data('type') || '').split(',')).map(function (i, ext) {
if (allowMime[ext]) opt.exts.push(ext), opt.mimes.push(allowMime[ext]);

6
app/data/service/payment/WechatPaymentService.php
View File

@ -58,11 +58,7 @@ class WechatPaymentService extends PaymentService
// 返回支付参数
return $this->payment->jsapiParams($info['prepay_id']);
}
if (isset($info['err_code_des'])) {
throw new Exception($info['err_code_des']);
} else {
throw new Exception('获取预支付码失败！');
}
throw new Exception($info['err_code_des'] ?? '获取预支付码失败！');
} catch (Exception $exception) {
throw $exception;
} catch (\Exception $exception) {