From 130ce4ff00bd41e66b43ba0c279be99ece3e022b Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 19 Jun 2020 10:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/controller/Keys.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/wechat/controller/Keys.php b/app/wechat/controller/Keys.php
index 6c3046d86..ca84be383 100644
--- a/app/wechat/controller/Keys.php
+++ b/app/wechat/controller/Keys.php
@@ -58,9 +58,9 @@ class Keys extends Controller
                 $result = $wechat->create($this->request->get('keys', ''));
                 $this->success('生成二维码成功！', "javascript:$.previewImage('{$wechat->url($result['ticket'])}')");
             } catch (HttpResponseException $exception) {
-                throw  $exception;
-            } catch (\Exception $e) {
-                $this->error("生成二维码失败，请稍候再试！<br> {$e->getMessage()}");
+                throw $exception;
+            } catch (\Exception $exception) {
+                $this->error("生成二维码失败，请稍候再试！<br> {$exception->getMessage()}");
             }
         }
         // 关键字列表显示
@@ -76,8 +76,8 @@ class Keys extends Controller
     protected function _index_page_filter(&$data)
     {
         foreach ($data as &$vo) {
+            $vo['type'] = $this->types[$vo['type']] ?? $vo['type'];
             $vo['qrc'] = url('wechat/keys/index') . "?action=qrc&keys={$vo['keys']}";
-            $vo['type'] = isset($this->types[$vo['type']]) ? $this->types[$vo['type']] : $vo['type'];
         }
     }