diff --git a/app/Http/Admin/Views/setting/pay.volt b/app/Http/Admin/Views/setting/pay.volt index e0f7585b..979445cf 100644 --- a/app/Http/Admin/Views/setting/pay.volt +++ b/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'] }); }); @@ -54,4 +54,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/Http/Home/Controllers/UserConsoleController.php b/app/Http/Home/Controllers/UserConsoleController.php index d2ed778c..7ba572b9 100644 --- a/app/Http/Home/Controllers/UserConsoleController.php +++ b/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); } diff --git a/app/Http/Home/Views/user/console/subscribe.volt b/app/Http/Home/Views/user/console/subscribe.volt deleted file mode 100644 index fc2c1849..00000000 --- a/app/Http/Home/Views/user/console/subscribe.volt +++ /dev/null @@ -1,33 +0,0 @@ -{% extends 'templates/main.volt' %} - -{% block content %} - -
-
{{ partial('user/console/menu') }}
-
-
-
- 关注订阅 -
-
- {% if subscribed == 0 %} -
-
订阅官方公众号,接收重要通知!
- {% else %} -
你已经订阅官方公众号
- {% endif %} -
-
- -
-
-
-
- -{% endblock %} - -{% block include_js %} - - {{ js_include('home/js/wechat.oa.subscribe.js') }} - -{% endblock %} \ No newline at end of file diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css index d1ee38bc..c773f2a1 100644 --- a/public/static/admin/css/common.css +++ b/public/static/admin/css/common.css @@ -294,9 +294,10 @@ img.kg-icon-sm { } img.kg-qrcode { - width: 140px; - height: 140px; - border: 3px dashed #ccc; + width: 160px; + height: 160px; + padding: 10px; + border: 3px solid #999; } .kg-order-date { diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css index e96c932b..60db7be1 100644 --- a/public/static/home/css/common.css +++ b/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; } diff --git a/public/static/home/js/order.pay.js b/public/static/home/js/order.pay.js index e2eaf894..ef525caa 100644 --- a/public/static/home/js/order.pay.js +++ b/public/static/home/js/order.pay.js @@ -49,8 +49,9 @@ layui.use(['jquery', 'layer'], function () { id: 'pay-layer', title: title, content: content, - area: ['640px', '320px'] + area: ['640px', '320px'], + resize: false }) } -}); \ No newline at end of file +});