统一支付和登录二维码样式

app/Http/Admin/Views/setting/pay.volt

@@ -34,7 +34,7 @@
                     type: 2,
                     title: '支付宝 - 支付测试',
                     resize: false,
-                    area: ['640px', '300px'],
+                    area: ['640px', '320px'],
                     content: [url, 'no']
                 });
             });
@@ -45,7 +45,7 @@
                     type: 2,
                     title: '微信 - 支付测试',
                     resize: false,
-                    area: ['640px', '300px'],
+                    area: ['640px', '320px'],
                     content: [url, 'no']
                 });
             });

app/Http/Home/Controllers/UserConsoleController.php

@@ -108,8 +108,6 @@ class UserConsoleController extends Controller
 
         $service = new AccountInfoService();
 
-        $captcha = $service->getSettings('captcha');
-
         $account = $service->handle();
 
         $service = new OAuthProviderService();
@@ -137,7 +135,6 @@ class UserConsoleController extends Controller
         $this->view->setVar('wechat_oa_connected', $wechatOAConnect ? 1 : 0);
         $this->view->setVar('oauth_provider', $oauthProvider);
         $this->view->setVar('connects', $connects);
-        $this->view->setVar('captcha', $captcha);
         $this->view->setVar('account', $account);
     }
 

app/Http/Home/Views/user/console/subscribe.volt

@@ -1,33 +0,0 @@
-{% extends 'templates/main.volt' %}
-
-{% block content %}
-
-    <div class="layout-main">
-        <div class="my-sidebar">{{ partial('user/console/menu') }}</div>
-        <div class="my-content">
-            <div class="wrap">
-                <div class="my-nav">
-                    <span class="title">关注订阅</span>
-                </div>
-                <div class="my-subscribe">
-                    {% if subscribed == 0 %}
-                        <div id="sub-qrcode" class="qrcode"></div>
-                        <div id="sub-tips" class="tips">订阅官方公众号，接收重要通知！</div>
-                    {% else %}
-                        <div class="tips">你已经订阅官方公众号</div>
-                    {% endif %}
-                </div>
-                <div class="layui-hide">
-                    <input type="hidden" name="subscribed" value="{{ subscribed }}">
-                </div>
-            </div>
-        </div>
-    </div>
-
-{% endblock %}
-
-{% block include_js %}
-
-    {{ js_include('home/js/wechat.oa.subscribe.js') }}
-
-{% endblock %}

public/static/admin/css/common.css

@@ -294,9 +294,10 @@ img.kg-icon-sm {
 }
 
 img.kg-qrcode {
-    width: 140px;
+    width: 160px;
-    height: 140px;
+    height: 160px;
-    border: 3px dashed #ccc;
+    padding: 10px;
+    border: 3px solid #999;
 }
 
 .kg-order-date {

public/static/home/css/common.css

@@ -1616,7 +1616,8 @@
 }
 
 #pay-layer .qrcode img {
-    border: 3px dashed #666;
+    border: 3px solid #999;
+    padding: 10px;
     width: 160px;
     height: 160px;
 }
@@ -1746,7 +1747,7 @@
 
 .wechat-scan-box .qrcode img {
     border: 3px solid #999;
-    padding: 3px;
+    padding: 5px;
 }
 
 .wechat-scan-box .tips {
@@ -2118,25 +2119,6 @@
     margin: 0 10px;
 }
 
-.my-subscribe {
-    margin-bottom: 15px;
-}
-
-.my-subscribe .qrcode {
-    border: 3px dashed #666;
-    margin: 30px auto;
-    width: 160px;
-    height: 160px;
-}
-
-.my-subscribe .tips {
-    text-align: center;
-}
-
-.my-subscribe .success {
-    color: green;
-}
-
 .order-filter {
     padding: 15px 20px;
 }

public/static/home/js/order.pay.js

@@ -49,7 +49,8 @@ layui.use(['jquery', 'layer'], function () {
             id: 'pay-layer',
             title: title,
             content: content,
-            area: ['640px', '320px']
+            area: ['640px', '320px'],
+            resize: false
         })
     }