diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php
index 0febd6b93..54d5214b9 100644
--- a/app/wechat/controller/Config.php
+++ b/app/wechat/controller/Config.php
@@ -17,7 +17,7 @@ namespace app\wechat\controller;
 
 use app\wechat\service\WechatService;
 use think\admin\Controller;
-use think\admin\Storage;
+use think\admin\storage\LocalStorage;
 
 /**
  * 微信授权绑定
@@ -27,7 +27,7 @@ use think\admin\Storage;
 class Config extends Controller
 {
     /**
-     * 微信授权绑定
+     * 微信授权配置
      * @auth true
      * @menu true
      * @throws \think\db\exception\DataNotFoundException
@@ -58,7 +58,7 @@ class Config extends Controller
                 $this->geoip = gethostbyname($this->request->host());
                 $this->app->cache->set('mygeoip', $this->geoip, 360);
             }
-            $this->title = '微信授权绑定';
+            $this->title = '微信授权配置';
             $this->fetch();
         } else {
             foreach ($this->request->post() as $k => $v) sysconf($k, $v);
@@ -76,7 +76,7 @@ class Config extends Controller
     }
 
     /**
-     * 微信支付配置
+     * 配置微信支付
      * @auth true
      * @menu true
      * @throws \think\admin\Exception
@@ -89,27 +89,51 @@ class Config extends Controller
         $this->_applyFormToken();
         if ($this->request->isGet()) {
             $this->title = '微信支付配置';
-            $file = Storage::instance('local');
+            $local = LocalStorage::instance();
             $this->mch_ssl_cer = sysconf('wechat.mch_ssl_cer');
             $this->mch_ssl_key = sysconf('wechat.mch_ssl_key');
             $this->mch_ssl_p12 = sysconf('wechat.mch_ssl_p12');
-            if (!$file->has($this->mch_ssl_cer, true)) $this->mch_ssl_cer = '';
-            if (!$file->has($this->mch_ssl_key, true)) $this->mch_ssl_key = '';
-            if (!$file->has($this->mch_ssl_p12, true)) $this->mch_ssl_p12 = '';
+            if (!$local->has($this->mch_ssl_cer, true)) $this->mch_ssl_cer = '';
+            if (!$local->has($this->mch_ssl_key, true)) $this->mch_ssl_key = '';
+            if (!$local->has($this->mch_ssl_p12, true)) $this->mch_ssl_p12 = '';
             $this->fetch();
         } else {
+            $this->error('抱歉，数据提交地址错误！');
+        }
+    }
+
+    /**
+     * 修改微信支付
+     * @auth true
+     * @throws \think\admin\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function paymentsave()
+    {
+        if ($this->request->isPost()) {
             if ($this->request->post('wechat.mch_ssl_type') === 'p12') {
-                if (!($sslp12 = $this->request->post('wechat.mch_ssl_p12'))) {
-                    $mchid = $this->request->post('wechat.mch_id');
-                    $content = Storage::instance('local')->get($sslp12, true);
-                    if (!openssl_pkcs12_read($content, $certs, $mchid)) {
-                        $this->error('商户MCH_ID与支付P12证书不匹配！');
-                    }
+                if (!LocalStorage::instance()->has(input('wechat.mch_ssl_p12', '-'), true)) {
+                    $this->error('商户证书 P12 证书不能为空！');
+                }
+                $content = LocalStorage::instance()->get(input('wechat.mch_ssl_p12', '-'), true);
+                if (!openssl_pkcs12_read($content, $certs, input('wechat.mch_id'))) {
+                    $this->error('商户账号与 P12 证书不匹配！');
+                }
+            } elseif ($this->request->post('wechat.mch_ssl_type') === 'pem') {
+                if (!LocalStorage::instance()->has(input('wechat.mch_ssl_key', '-'), true)) {
+                    $this->error('商户证书 KEY 不能为空！');
+                }
+                if (!LocalStorage::instance()->has(input('wechat.mch_ssl_cer', '-'), true)) {
+                    $this->error('商户证书 CERT 不能为空！');
                 }
             }
             foreach ($this->request->post() as $k => $v) sysconf($k, $v);
             sysoplog('微信管理', '修改微信支付配置成功');
             $this->success('微信支付配置成功！');
+        } else {
+            $this->error('抱歉，访问方式错误！');
         }
     }
 
diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php
index a532116ae..f7810d82b 100644
--- a/app/wechat/service/WechatService.php
+++ b/app/wechat/service/WechatService.php
@@ -195,11 +195,14 @@ class WechatService extends Service
             'mch_key'        => sysconf('wechat.mch_key'),
             'cache_path'     => $this->app->getRuntimePath() . 'wechat',
         ];
-        if (sysconf('wechat.mch_ssl_type') === 'p12') {
-            $options['ssl_p12'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_p12'), true);
-        } else {
-            $options['ssl_key'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_key'), true);
-            $options['ssl_cer'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_cer'), true);
+        switch (strtolower(sysconf('wechat.mch_ssl_type'))) {
+            case 'p12':
+                $options['ssl_p12'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_p12'), true);
+                break;
+            case 'pem':
+                $options['ssl_key'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_key'), true);
+                $options['ssl_cer'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_cer'), true);
+                break;
         }
         return $options;
     }
diff --git a/app/wechat/view/config/payment.html b/app/wechat/view/config/payment.html
index efc1ee4a8..b06f468e1 100644
--- a/app/wechat/view/config/payment.html
+++ b/app/wechat/view/config/payment.html
@@ -3,7 +3,7 @@
 {block name="content"}
 <div class="think-box-shadow">
     <div class="layui-anim layui-anim-fadein padding-top-20" style="width:850px">
-        <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card noshadow' autocomplete="off" lay-filter="payment">
+        <form onsubmit="return false;" action="{:url('paymentsave')}" data-auto="true" method="post" class='layui-form layui-card noshadow' autocomplete="off" lay-filter="payment">
 
             <div class="layui-card-header border-0">
                 <div class="layui-bg-gray padding-col-20 border-radius-5">
@@ -13,10 +13,10 @@
 
             <div class="layui-card-body">
                 <div class="layui-form-item margin-top-15">
-                    <label class="layui-form-label"><b>MCH_ID</b><br><span class="nowrap color-desc">微信商户编号</span></label>
+                    <label class="layui-form-label"><b>MCH_ID</b><br><span class="nowrap color-desc">微信商户账号</span></label>
                     <div class="layui-input-block">
-                        <input name="wechat.mch_id" required placeholder="微信商户编号（必填）" value="{:sysconf('wechat.mch_id')}" class="layui-input">
-                        <p class="help-block">微信商户编号，需要在微信商户平台获取，MCH_ID 与 APPID 匹配</p>
+                        <input name="wechat.mch_id" required placeholder="微信商户账号（必填）" value="{:sysconf('wechat.mch_id')}" class="layui-input">
+                        <p class="help-block">微信商户账号，需要在微信商户平台获取，MCH_ID 与 APPID 匹配</p>
                     </div>
                 </div>
 
@@ -33,9 +33,10 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label"><b>MCH_CERT</b><br><span class="nowrap color-desc">微信商户证书</span></label>
                     <div class="layui-input-block">
-                        {foreach ['pem'=>'上传 PEM 证书','p12'=>'上传 P12 证书'] as $k=>$v}
+                        {foreach ['none'=>'暂不使用支付证书', 'pem'=>'上传 PEM 证书', 'p12'=>'上传 P12 证书'] as $k=>$v}
                         <input type="radio" data-pem-type="{$k}" name="wechat.mch_ssl_type" value="{$k}" title="{$v}" lay-filter="data-mch-type">
                         {/foreach}
+                        <div data-mch-type="none"></div>
                         <p class="help-block">请选择需要上传证书类型，P12 或 PEM 二选一，证书需要从微信商户平台获取</p>
                         <div data-mch-type="p12" class="layui-tab-item padding-top-15 padding-bottom-15">
                             <input name="wechat.mch_ssl_p12" value="{$mch_ssl_p12|default=''}" type="hidden">
@@ -57,10 +58,12 @@
                         </div>
                     </div>
                 </div>
+                <!--{if auth('paymentsave')}-->
                 <div class="hr-line-dashed margin-top-30"></div>
-                <div class="layui-form-item text-center" style="width:550px">
+                <div class="layui-form-item text-center">
                     <button class="layui-btn" type="submit">保存配置</button>
                 </div>
+                <!--{/if}-->
             </div>
         </form>
     </div>
@@ -69,20 +72,21 @@
 
 {block name="script"}
 <script>
-    (new function () {
-        this.type = "{:sysconf('wechat.mch_ssl_type')}" || 'pem';
-        this.types = ['wechat.mch_ssl_p12', 'wechat.mch_ssl_key', 'wechat.mch_ssl_cer'];
-        layui.form.render(), layui.form.val('payment', {"wechat.mch_ssl_type": this.type});
-        layui.form.on('radio(data-mch-type)', apply), apply.call(this, {value: this.type});
-        for (this.index in this.types) $('input[name="' + this.types[this.index] + '"]').on('change', function (that) {
-            that = this, that.$button = $(this).next('button'), setTimeout(function () {
-                if (typeof that.value === 'string' && that.value.length > 5) {
-                    that.$button.find('i').addClass('color-green layui-icon-vercode').removeClass('layui-icon-upload-drag');
-                } else {
-                    that.$button.find('i').removeClass('color-green layui-icon-vercode').addClass('layui-icon-upload-drag');
-                }
-            }, 100);
-        }).trigger('change');
+    (new function (type) {
+        type = "{:sysconf('wechat.mch_ssl_type')}" || 'none';
+        layui.form.render(), layui.form.val('payment', {'wechat.mch_ssl_type': type});
+        layui.form.on('radio(data-mch-type)', apply), apply.call(this, {value: type});
+        ['wechat.mch_ssl_p12', 'wechat.mch_ssl_key', 'wechat.mch_ssl_cer'].forEach(function (type) {
+            $('input[name="' + type + '"]').on('change', function (that) {
+                that = this, that.$button = $(this).next('button'), setTimeout(function () {
+                    if (typeof that.value === 'string' && that.value.length > 5) {
+                        that.$button.find('i').addClass('color-green layui-icon-vercode').removeClass('layui-icon-upload-drag');
+                    } else {
+                        that.$button.find('i').removeClass('color-green layui-icon-vercode').addClass('layui-icon-upload-drag');
+                    }
+                }, 100);
+            }).trigger('change');
+        });
 
         function apply(data) {
             $('[data-mch-type="' + data.value + '"]').show().siblings('[data-mch-type]').hide();