Quellcode durchsuchen

Modify 支付图标显示

兔姬桑 vor 4 Jahren
Ursprung
Commit
cba52a9fc9

+ 1 - 2
app/Http/Controllers/Api/WebApi/V2RayController.php

@@ -39,8 +39,7 @@ class V2RayController extends BaseController
             'v2_path'         => $node->v2_path,
             'v2_tls'          => $node->v2_tls ? true : false,
             'v2_tls_provider' => $tlsProvider,
-        ]
-        );
+        ]);
     }
 
     // 获取节点可用的用户列表

+ 24 - 0
public/assets/images/payment/stripe.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 468 222.5" style="enable-background:new 0 0 468 222.5;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#635BFF;}
+</style>
+<g>
+	<path class="st0" d="M414,113.4c0-25.6-12.4-45.8-36.1-45.8c-23.8,0-38.2,20.2-38.2,45.6c0,30.1,17,45.3,41.4,45.3
+		c11.9,0,20.9-2.7,27.7-6.5v-20c-6.8,3.4-14.6,5.5-24.5,5.5c-9.7,0-18.3-3.4-19.4-15.2h48.9C413.8,121,414,115.8,414,113.4z
+		 M364.6,103.9c0-11.3,6.9-16,13.2-16c6.1,0,12.6,4.7,12.6,16H364.6z"/>
+	<path class="st0" d="M301.1,67.6c-9.8,0-16.1,4.6-19.6,7.8l-1.3-6.2h-22v116.6l25-5.3l0.1-28.3c3.6,2.6,8.9,6.3,17.7,6.3
+		c17.9,0,34.2-14.4,34.2-46.1C335.1,83.4,318.6,67.6,301.1,67.6z M295.1,136.5c-5.9,0-9.4-2.1-11.8-4.7l-0.1-37.1
+		c2.6-2.9,6.2-4.9,11.9-4.9c9.1,0,15.4,10.2,15.4,23.3C310.5,126.5,304.3,136.5,295.1,136.5z"/>
+	<polygon class="st0" points="223.8,61.7 248.9,56.3 248.9,36 223.8,41.3 	"/>
+	<rect x="223.8" y="69.3" class="st0" width="25.1" height="87.5"/>
+	<path class="st0" d="M196.9,76.7l-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7,15.9-6.3,19-5.2v-23C214.5,68.1,202.8,65.9,196.9,76.7z"/>
+	<path class="st0" d="M146.9,47.6l-24.4,5.2l-0.1,80.1c0,14.8,11.1,25.7,25.9,25.7c8.2,0,14.2-1.5,17.5-3.3V135
+		c-3.2,1.3-19,5.9-19-8.9V90.6h19V69.3h-19L146.9,47.6z"/>
+	<path class="st0" d="M79.3,94.7c0-3.9,3.2-5.4,8.5-5.4c7.6,0,17.2,2.3,24.8,6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6
+		C67.5,67.6,54,78.2,54,95.9c0,27.6,38,23.2,38,35.1c0,4.6-4,6.1-9.6,6.1c-8.3,0-18.9-3.4-27.3-8v23.8c9.3,4,18.7,5.7,27.3,5.7
+		c20.8,0,35.1-10.3,35.1-28.2C117.4,100.6,79.3,105.9,79.3,94.7z"/>
+</g>
+</svg>

+ 1 - 1
resources/views/admin/config/system.blade.php

@@ -1544,7 +1544,7 @@
                                             </div>
                                         </div>
                                         <div class="form-group col-lg-6 d-flex">
-                                            <label class="col-md-3 col-form-label" for="stripe_secret_key">WebHook Signing secret</label>
+                                            <label class="col-md-3 col-form-label" for="stripe_signing_secret">WebHook Signing secret</label>
                                             <div class="col-md-7">
                                                 <div class="input-group">
                                                     <input type="text" class="form-control" id="stripe_signing_secret" value="{{$stripe_signing_secret}}"/>

+ 6 - 8
resources/views/user/buy.blade.php

@@ -53,14 +53,12 @@
                     @endif
                     <div class="col-md-12 mb-30">
                         <div class="float-right">
-                            <div class="btn-group btn-group-lg">
-                                @include('user.components.purchase')
-                                @if($goods->type <= 2)
-                                    <button class="btn btn-flat" onclick="pay('credit','0')">
-                                        <img src="/assets/images/payment/creditpay.svg" height="48px" alt="{{trans('home.service_pay_button')}}"/>
-                                    </button>
-                                @endif
-                            </div>
+                            @include('user.components.purchase')
+                            @if($goods->type <= 2)
+                                <button class="btn btn-flat mt-2 mx-0 p-0" onclick="pay('credit','0')">
+                                    <img src="/assets/images/payment/creditpay.svg" height="48px" alt="{{trans('home.service_pay_button')}}"/>
+                                </button>
+                            @endif
                         </div>
                     </div>
                 </div>

+ 10 - 18
resources/views/user/components/purchase.blade.php

@@ -1,37 +1,29 @@
 @if(sysConfig('is_AliPay'))
-    <button class="btn btn-flat" onclick="pay('{{sysConfig('is_AliPay')}}','1')">
+    <button class="btn btn-round btn-outline-default mt-2" onclick="pay('{{sysConfig('is_AliPay')}}','1')">
         <img src="/assets/images/payment/alipay.svg" height="36px" alt="alipay"/>
     </button>
 @endif
 @if(sysConfig('is_QQPay'))
-    <button class="btn btn-flat" onclick="pay('{{sysConfig('is_QQPay')}}','2')">
+    <button class="btn btn-round btn-outline-default mt-2" onclick="pay('{{sysConfig('is_QQPay')}}','2')">
         <img src="/assets/images/payment/qqpay.svg" height="36px" alt="qq"/>
     </button>
 @endif
 @if(sysConfig('is_WeChatPay'))
-    <button class="btn btn-flat" onclick="pay('{{sysConfig('is_WeChatPay')}}','3')">
+    <button class="btn btn-round btn-outline-default mt-2" onclick="pay('{{sysConfig('is_WeChatPay')}}','3')">
         <img src="/assets/images/payment/wechatpay.svg" height="36px" alt="wechat"/>
-    </button>'
+    </button>
 @endif
 @if(sysConfig('is_otherPay') == 'bitpayx')
-    <button class="btn btn-flat" onclick="pay('{{sysConfig('is_otherPay')}}','4')">
+    <button class="btn btn-round btn-outline-default mt-2" onclick="pay('bitpayx','4')">
         <img src="/assets/images/payment/btc.svg" height="36px" alt="other"/>
         <span class="font-size-24 black"> 虚拟货币</span>
-    </button>'
+    </button>
 @elseif(sysConfig('is_otherPay') == 'paypal')
-    <button class="btn btn-flat" onclick="pay('{{sysConfig('is_otherPay')}}','5')">
+    <button class="btn btn-round btn-outline-default mt-2" onclick="pay('paypal','5')">
         <img src="https://www.paypalobjects.com/webstatic/mktg/Logo/pp-logo-150px.png" height="32px" alt="PayPal"/>
-    </button>'
+    </button>
 @elseif(sysConfig('is_otherPay') == 'stripe')
-    <style>
-        .stripeLogo {
-            width: 70px;
-            height: 28px;
-            display: inline-block;
-            font-size: 18px;
-        }
-    </style>
-    <button class="btn btn-outline-{{config('theme.bg_color')}} mt-2" onclick="pay('{{sysConfig('is_otherPay')}}','6','{{ $goods->type }}','{{ $goods->id }}')">
-        <div class="stripeLogo">Stripe</div>
+    <button class="btn btn-round btn-outline-default mt-2" onclick="pay('stripe','6')">
+        <img src="/assets/images/payment/stripe.svg" height="40px" alt="stripe"/>
     </button>
 @endif

+ 1 - 1
resources/views/user/services.blade.php

@@ -156,7 +156,7 @@
                     </form>
                 </div>
                 <div class="modal-footer">
-                    <div class="btn btn-group-lg charge_credit">
+                    <div class="charge_credit">
                         @include('user.components.purchase')
                     </div>
                     <button type="button" class="btn btn-primary" id="change_btn" onclick="pay()">{{trans('home.recharge')}}</button>