From da5f3e12ba64f2a9a9c505222321d4d0c8cc9cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 28 May 2021 17:05:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/api/upload.js                      | 11 ++++++-----
 app/data/service/payment/WechatPaymentService.php |  6 +-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/admin/view/api/upload.js b/app/admin/view/api/upload.js
index bf832f9e2..59a9f4777 100644
--- a/app/admin/view/api/upload.js
+++ b/app/admin/view/api/upload.js
@@ -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]);
diff --git a/app/data/service/payment/WechatPaymentService.php b/app/data/service/payment/WechatPaymentService.php
index 7bfd5b27e..e7e5a4a82 100644
--- a/app/data/service/payment/WechatPaymentService.php
+++ b/app/data/service/payment/WechatPaymentService.php
@@ -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) {