From 73fd404c232b7b164574126e8e02828f69d9ac08 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 10 Dec 2019 11:44:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/controller/Config.php    | 15 +++++++--------
 app/wechat/view/config/options.html |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php
index 97d3651f9..57098c090 100644
--- a/app/wechat/controller/Config.php
+++ b/app/wechat/controller/Config.php
@@ -39,12 +39,6 @@ class Config extends Controller
         $this->_applyFormToken();
         $this->thrNotify = url('@wechat/api.push', [], false, true)->build();
         if ($this->request->isGet()) {
-            $this->title = '微信授权绑定';
-            $this->geoip = $this->app->cache->get('mygeoip', '');
-            if (empty($this->geoip)) {
-                $this->geoip = gethostbyname($this->request->host());
-                $this->app->cache->set('mygeoip', $this->geoip, 360);
-            }
             try {
                 $source = enbase64url(url('@admin', [], false, true) . '#' . $this->request->url());
                 $this->authurl = "http://open.cuci.cc/service/api.push/auth?source={$source}";
@@ -58,6 +52,12 @@ class Config extends Controller
             } catch (\Exception $e) {
                 $this->wechat = [];
             }
+            $this->geoip = $this->app->cache->get('mygeoip', '');
+            if (empty($this->geoip)) {
+                $this->geoip = gethostbyname($this->request->host());
+                $this->app->cache->set('mygeoip', $this->geoip, 360);
+            }
+            $this->title = '微信授权绑定';
             $this->fetch();
         } else {
             foreach ($this->request->post() as $k => $v) sysconf($k, $v);
@@ -65,8 +65,7 @@ class Config extends Controller
                 WechatService::ThinkAdminConfig()->setApiNotifyUri($this->thrNotify);
             }
             sysoplog('微信管理', '修改微信授权配置成功');
-            $uri = url('wechat/config/options');
-            $this->success('微信参数修改成功！', url('@admin') . "#{$uri}");
+            $this->success('微信参数修改成功！');
         }
     }
 
diff --git a/app/wechat/view/config/options.html b/app/wechat/view/config/options.html
index cc1ff8147..ac46bf3b3 100644
--- a/app/wechat/view/config/options.html
+++ b/app/wechat/view/config/options.html
@@ -27,7 +27,7 @@
 {block name='script'}
 <script>
     $(function () {
-        apply('{:sysconf("wechat.type")}');
+        apply('{:sysconf("wechat.type")}' || 'api');
         window.form.render();
         window.form.on('radio(wechat_type)', function (data) {
             apply(data.value);