Fix #79 & Change QRcode js

public/assets/custom/qart.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"qart.js","sources":["webpack://qart/webpack/universalModuleDefinition"],"sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"qart\"] = factory();\n\telse\n\t\troot[\"qart\"] = factory();\n})(window, function() {\nreturn "],"mappings":"AAAA","sourceRoot":""}

resources/views/admin/logs/onlineIPMonitor.blade.php

@@ -107,7 +107,7 @@
 
         // 搜索
         function Search() {
-            window.location.href = '{{route('admin.log.online')}}' + $('#id').val() + '&ip=' + $('#ip').val() + '&email=' +
+            window.location.href = '{{route('admin.log.online')}}' + $('#id').val() + '?ip=' + $('#ip').val() + '&email=' +
                 $('#email').val() + '&port=' + $('#port').val() + '&nodeId=' + $('#nodeId option:selected').val();
         }
     </script>

resources/views/user/index.blade.php

@@ -133,7 +133,7 @@
             </div>
             <div class="col-xxl-9 col-xl-8 col-lg-7 col-md-6 col-12">
                 <div class="row" data-plugin="matchHeight" data-by-row="true">
-                    <div class="col-xl-4 col-lg-6 pb-30">
+                    <div class="col-xl-4 col-lg-6 mb-30">
                         <div class="card card-shadow h-full">
                             <div class="card-block text-center p-20">
                                 <i class="font-size-40 wb-wrench"></i>
@@ -143,12 +143,12 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-xl-4 col-lg-6 pb-30">
+                    <div class="col-xl-4 col-lg-6 mb-30">
                         <div class="card card-shadow text-center h-full">
                             <div class="card-block">
                                 @if(sysConfig('is_push_bear') && sysConfig('push_bear_qrcode'))
                                     <h4 class="card-title"><i class="wb-bell mr-10 yellow-600"></i>微信公告推送</h4>
-                                    <div id="qrcode"></div>
+                                    <div id="qrcode" class="mb-10"></div>
                                 @else
                                     <h4 class="card-title"><i class="wb-bell mr-10 yellow-600"></i>交流群</h4>
                                 @endif
@@ -157,7 +157,7 @@
                     </div>
                 </div>
                 <div class="row" data-plugin="matchHeight" data-by-row="true">
-                    <div class="col-xxl-6 mb-35">
+                    <div class="col-xxl-6 mb-30">
                         <div class="panel panel-info panel-line h-full">
                             <div class="panel-heading">
                                 <h2 class="panel-title">
@@ -230,18 +230,19 @@
     <script src="/assets/global/js/Plugin/aspieprogress.js" type="text/javascript"></script>
     <script src="/assets/global/js/Plugin/matchheight.js" type="text/javascript"></script>
     @if(sysConfig('is_push_bear') && sysConfig('push_bear_qrcode'))
-        <script src="/assets/custom/qart.min.js"></script>
+        <script src="/assets/custom/easy.qrcode.min.js"></script>
         <script type="text/javascript">
-            $(document).ready(function () {
-                new QArt({
-                    value: '{{sysConfig('push_bear_qrcode')}}',
-                    imagePath: '{{asset('/assets/images/wechat.png')}}',
-                    filter: 'color',
-                    version: 10,
-                    size: 175,
-                    fillType: 'scale_to_fit',
-                }).make(document.getElementById('qrcode'));
-            });
+            // Options
+            var options = {
+                text: @json(sysConfig('push_bear_qrcode')),
+                width: 150,
+                height: 150,
+                backgroundImage: '{{asset('/assets/images/wechat.png')}}',
+                autoColor: true,
+            };
+
+            // Create QRCode Object
+            new QRCode(document.getElementById("qrcode"), options);
         </script>
     @endif
     <script type="text/javascript">

resources/views/user/payment.blade.php

@@ -22,15 +22,15 @@
                             <li class="list-group-item"> 请在<code>15分钟</code>内完成支付，否者订单将会自动关闭</li>
                         </ul>
                     </div>
-                    <div class="col-auto ml-auto mr-auto">
+                    <div class="col-auto mx-auto">
                         @if($payment->qr_code && $payment->url)
-                            <div id="qrcode"></div>
+                            <div id="qrcode" class=" w-p100 h-p100"></div>
                         @else
                             <img class="h-250 w-250" src="{{$payment->qr_code}}" alt="支付二维码">
                         @endif
                     </div>
                 </div>
-                <div class="alert alert-danger text-center">
+                <div class="alert alert-danger text-center mt-10">
                     <strong>手机用户</strong>：长按二维码 -> 保存图片 ->打开支付软件 -> 扫一扫 -> 选择相册 进行付款
                 </div>
             </div>
@@ -39,17 +39,17 @@
 @endsection
 @section('script')
     @if($payment->qr_code && $payment->url)
-        <script src="/assets/custom/qart.min.js"></script>
+        <script src="/assets/custom/easy.qrcode.min.js"></script>
         <script type="text/javascript">
-            $(document).ready(function () {
-                new QArt({
-                    value: @json($payment->url),
-                    imagePath: '{{asset($pay_type_icon)}}',
-                    filter: 'color',
-                    version: 10,
-                    size: 300,
-                }).make(document.getElementById('qrcode'));
-            });
+            // Options
+            var options = {
+                text: @json($payment->url),
+                backgroundImage: '{{asset($pay_type_icon)}}',
+                autoColor: true,
+            };
+
+            // Create QRCode Object
+            new QRCode(document.getElementById("qrcode"), options);
         </script>
     @endif