支付方式界面美化

app/Http/Controllers/AdminController.php

@@ -2013,7 +2013,7 @@ EOF;
 					}
 					break;
 				case 'paypal':
-					if(!self::$systemConfig['paypal_username'] || !self::$systemConfig['paypal_password']){
+					if(!self::$systemConfig['paypal_username'] || !self::$systemConfig['paypal_password'] || !self::$systemConfig['paypal_secret']){
 						return Response::json(['status' => 'fail', 'message' => '请先设置【PayPal】必要参数']);
 					}
 					break;

app/Http/Controllers/Gateway/PayPal.php

@@ -73,7 +73,7 @@ class PayPal extends AbstractPayment
 
 	protected function getCheckoutData($sn, $amount)
 	{
-		$amount = ceil($amount/$this->exChange*100)/100;
+		$amount = 0.3+ceil($amount/$this->exChange*100)/100;
 
 		return [
 			'invoice_id'          => $sn,

public/assets/images/bitcoin.svg

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="40px" height="40px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
-<g>
-	<path d="M3.837,20.516c-0.276,0-0.5-0.207-0.5-0.482V20c0-1.747,0.269-3.468,0.8-5.115c0.085-0.263,0.367-0.405,0.629-0.323
-		c0.263,0.085,0.407,0.367,0.323,0.629C4.59,16.739,4.337,18.357,4.337,20C4.337,20.275,4.114,20.516,3.837,20.516z M24.854,34.896
-		c-1.558,0.506-3.185,0.765-4.836,0.767c-0.276,0-0.5,0.226-0.5,0.5s0.224,0.5,0.5,0.5l0,0c1.756-0.002,3.489-0.276,5.146-0.815
-		c0.263-0.084,0.405-0.367,0.319-0.63C25.398,34.956,25.115,34.811,24.854,34.896z M5.108,24.868
-		c-0.085-0.263-0.364-0.406-0.63-0.32c-0.262,0.085-0.406,0.368-0.32,0.63c0.542,1.66,1.341,3.221,2.376,4.639
-		c0.098,0.135,0.25,0.205,0.404,0.205c0.102,0,0.206-0.03,0.294-0.097c0.223-0.163,0.272-0.476,0.109-0.698
-		C6.37,27.895,5.618,26.428,5.108,24.868z M24.794,5.084c1.563,0.502,3.033,1.246,4.37,2.212c0.089,0.064,0.191,0.095,0.292,0.095
-		c0.155,0,0.308-0.072,0.405-0.207c0.162-0.224,0.111-0.537-0.111-0.698c-1.422-1.028-2.986-1.82-4.65-2.354
-		c-0.263-0.083-0.543,0.061-0.629,0.323C24.387,4.718,24.531,5,24.794,5.084z M6.9,11.03c0.155,0,0.308-0.072,0.405-0.207
-		C8.27,9.49,9.432,8.322,10.761,7.35c0.223-0.163,0.271-0.476,0.108-0.699c-0.162-0.223-0.475-0.271-0.699-0.108
-		c-1.413,1.033-2.649,2.276-3.675,3.693c-0.162,0.224-0.112,0.536,0.112,0.698C6.696,11,6.799,11.03,6.9,11.03z M14.962,5.138
-		c0.051,0,0.104-0.008,0.156-0.025c1.556-0.51,3.183-0.771,4.835-0.775c0.275-0.001,0.5-0.225,0.499-0.501
-		c-0.001-0.275-0.226-0.499-0.5-0.499h-0.001c-1.757,0.005-3.488,0.283-5.144,0.825c-0.262,0.086-0.405,0.368-0.319,0.631
-		C14.556,5.004,14.751,5.138,14.962,5.138z M15.176,34.906c-1.562-0.506-3.031-1.252-4.366-2.221
-		c-0.223-0.164-0.537-0.112-0.698,0.109C9.95,33.02,10,33.332,10.223,33.494c1.42,1.029,2.983,1.824,4.645,2.361
-		c0.051,0.018,0.103,0.023,0.154,0.023c0.211,0,0.407-0.135,0.476-0.346C15.583,35.273,15.439,34.991,15.176,34.906z M32.676,29.202
-		c-0.968,1.33-2.133,2.496-3.463,3.465c-0.223,0.163-0.271,0.476-0.109,0.699c0.099,0.134,0.25,0.206,0.404,0.206
-		c0.102,0,0.205-0.031,0.294-0.096c1.415-1.031,2.653-2.271,3.683-3.688c0.164-0.225,0.113-0.536-0.108-0.698
-		C33.15,28.928,32.838,28.979,32.676,29.202z M36.163,19.468c-0.276,0-0.5,0.255-0.5,0.532c0,1.652-0.256,3.281-0.763,4.839
-		c-0.084,0.263,0.06,0.544,0.322,0.63c0.051,0.018,0.103,0.024,0.152,0.024c0.211,0,0.407-0.134,0.477-0.347
-		c0.539-1.656,0.812-3.39,0.812-5.146v-0.064C36.663,19.66,36.439,19.468,36.163,19.468z M34.882,15.103
-		c0.069,0.21,0.265,0.344,0.476,0.344c0.053,0,0.104-0.008,0.156-0.025c0.262-0.086,0.404-0.369,0.318-0.631
-		c-0.546-1.66-1.35-3.219-2.387-4.633c-0.164-0.223-0.478-0.271-0.698-0.107c-0.222,0.164-0.271,0.476-0.106,0.699
-		C33.615,12.078,34.369,13.543,34.882,15.103z M40,20c0,11.027-8.973,20-20,20C8.972,40,0,31.027,0,20C0,8.972,8.972,0,20,0
-		C31.027,0,40,8.972,40,20z M38,20c0-9.925-8.075-18-18-18S2,10.075,2,20s8.075,18,18,18S38,29.925,38,20z M21.686,20.818
-		c-0.334-0.127-0.844-0.191-1.528-0.191h-1.563v2.614c0.006,0.37,0.02,0.586,0.043,0.649c0.029,0.079,0.076,0.137,0.143,0.168
-		c0.066,0.03,0.246,0.049,0.539,0.049H20.2c0.512,0,0.937-0.049,1.272-0.146c0.338-0.094,0.625-0.292,0.859-0.593
-		s0.354-0.66,0.354-1.082c0-0.357-0.084-0.66-0.25-0.91C22.27,21.133,22.02,20.945,21.686,20.818z M34.436,20
-		c0,7.973-6.463,14.436-14.436,14.436c-7.972,0-14.435-6.463-14.435-14.436c0-7.972,6.463-14.435,14.435-14.435
-		C27.973,5.565,34.436,12.028,34.436,20z M25.822,22.609c0-0.536-0.127-1.021-0.381-1.457c-0.254-0.438-0.6-0.775-1.029-1.02
-		c-0.301-0.174-0.732-0.333-1.299-0.476c0.527-0.179,0.951-0.405,1.271-0.68c0.321-0.274,0.567-0.59,0.738-0.947
-		c0.17-0.358,0.255-0.736,0.255-1.134c0-0.548-0.161-1.052-0.481-1.511c-0.324-0.458-0.785-0.811-1.385-1.055
-		c-0.234-0.095-0.512-0.167-0.811-0.225v-2.131h-2.045v1.987h-1.314v-1.987h-2.045v1.987h-3.119v1.67h0.477
-		c0.317,0,0.532,0.03,0.645,0.087c0.113,0.057,0.192,0.136,0.238,0.233c0.047,0.098,0.07,0.327,0.07,0.684v6.734
-		c0,0.354-0.022,0.579-0.07,0.68c-0.046,0.102-0.125,0.18-0.238,0.233c-0.113,0.055-0.327,0.083-0.645,0.083h-0.477v1.67h3.119
-		v1.986h2.045v-1.986h1.163c0.054,0,0.103-0.001,0.152-0.001v1.987h2.045v-2.158c0.343-0.066,0.646-0.149,0.901-0.254
-		c0.705-0.281,1.25-0.691,1.639-1.231C25.628,23.841,25.822,23.25,25.822,22.609z M21.454,18.679
-		c0.333-0.115,0.581-0.29,0.749-0.521c0.167-0.233,0.25-0.504,0.25-0.81c0-0.317-0.079-0.588-0.237-0.813
-		c-0.159-0.225-0.39-0.385-0.688-0.48c-0.301-0.096-0.838-0.144-1.609-0.144h-1.324v2.943h1.324
-		C20.611,18.853,21.122,18.795,21.454,18.679z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

public/assets/images/payment/bch.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1580624875214" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5418" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1024 512c0 282.624-229.376 512-512 512S0 794.624 0 512 229.376 0 512 0 1024 229.376 1024 512" fill="#8AC072" p-id="5419"></path><path d="M701.44 524.8c7.168 13.312 8.192 28.672 3.584 43.008-4.608 14.336-14.336 26.112-27.648 32.768l-133.632 69.632-51.712-99.84 133.632-69.632c27.136-14.336 61.44-3.584 75.776 24.064m-118.784-192.512c14.336 4.608 26.112 14.336 32.768 27.648 14.336 27.648 3.584 61.44-24.064 75.776l-133.632 69.632-51.2-99.84 133.632-69.632c12.8-7.168 28.16-8.192 42.496-3.584m22.016-70.144c-33.28-10.24-68.096-7.168-98.816 8.704l-17.408 9.216-43.008-82.944-63.488 32.768 43.008 82.944-54.272 28.16-43.008-82.944-15.36 7.68-61.44 32.256 41.472 79.872-75.264 38.912 36.864 71.168 75.264-38.912 134.656 258.56-74.752 39.424 36.864 71.168 75.264-38.912 35.328 67.584 15.36-7.68 61.44-32.256-36.864-70.656 54.272-28.16 36.864 70.656 62.976-32.768-36.864-70.656 17.92-9.216c11.264-6.144 21.504-13.312 30.72-22.016 15.36-14.848 26.624-33.28 33.28-54.272 10.24-32.768 7.168-68.096-8.704-98.816-16.896-32.256-45.568-54.272-77.824-64 10.752-32.256 8.704-68.608-7.68-100.864-16.896-30.72-43.52-53.76-76.8-64" fill="#FFFFFF" p-id="5420"></path></svg>

public/assets/images/payment/eos.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1580624798869" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3733" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512z m0 969.8c-252.8 0-457.8-205-457.8-457.8S259.2 54.2 512 54.2s457.8 205 457.8 457.8-205 457.8-457.8 457.8z" fill="#0093F1" p-id="3734"></path><path d="M511.7 915.7l-17.8-10.2-228.8-140.1-19.1-8.4-1.2-8.5 3.3-17.6 85.7-364.4 6.3-9.2 12.6-18.5L497.4 127.3 508 111.8l2.4-3.5 2.4 3.4 10.7 15.3 148.7 213.6 12.9 18.5 6 8.6 84.7 365.2 3.4 17.6-1.3 8.5-19.1 8.3-231.7 138.4-15.4 10zM570.6 762.1l-30.4 96.3 160.3-95.8-129.9-0.5zM323 761.1l158.1 96.8-29.6-96.4L323 761.1z m164.1 0.6l23.7 77.1 24.3-76.9-48-0.2z m94.1-33.5l150.8 0.6-97.6-169.1-53.2 168.5z m-104.6-0.4l69.1 0.3 65.7-208.2L512 347.5l-99.6 171.8 64.2 208.5z m-184.7-0.7l149.2 0.6-51.8-168.5L291.9 727.1z m356.4-211.3l70.8 122.8-46.4-200-24.4 77.2zM352 438.1l-46.7 198.1 70.3-121.3L352 438.1z m176.9-129.1l96.4 167 31.2-98.8-128.6-184.4 1 116.2z m-160.5 67.2l30.4 98.8L495 309.1l-1-116.8-125.6 183.9z" fill="#0093F1" p-id="3735"></path></svg>

public/assets/images/payment/eth.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1580624767785" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2972" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024C229.225412 1024 0 794.774588 0 512S229.225412 0 512 0s512 229.225412 512 512-229.225412 512-512 512z m0-60.235294c249.494588 0 451.764706-202.270118 451.764706-451.764706 0-249.494588-202.270118-451.764706-451.764706-451.764706C262.505412 60.235294 60.235294 262.505412 60.235294 512c0 249.494588 202.270118 451.764706 451.764706 451.764706z m0-60.235294C295.755294 903.529412 120.470588 728.244706 120.470588 512S295.755294 120.470588 512 120.470588s391.529412 175.284706 391.529412 391.529412-175.284706 391.529412-391.529412 391.529412z m12.047059-692.705883v217.750589l177.694117 77.884235L524.047059 210.823529z m-186.910118 294.550589l175.254588-76.8V210.944l-175.284705 294.430118z m186.910118 121.374117l181.217882-106.014117-181.217882-79.390118v185.404235zM331.294118 520.673882l181.097411 106.074353v-185.404235L331.294118 520.673882z m192.752941 143.36v149.112471l179.862588-254.433882-179.862588 105.321411z m-11.65553 149.112471v-149.112471L332.498824 558.682353 512.391529 813.176471z" fill="#B188FF" p-id="2973"></path></svg>

public/assets/images/payment/ltc.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1580624832064" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4655" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 46.545455C256 46.545455 46.545455 256 46.545455 512s209.454545 465.454545 465.454545 465.454545 465.454545-209.454545 465.454545-465.454545S768 46.545455 512 46.545455zM442.181818 260.654545h144.290909l-51.2 190.836364 69.818182-23.272727-18.618182 65.163636-69.818182 27.927273-27.927272 111.709091h237.381818l-23.272727 93.090909H316.509091l37.236364-148.945455-55.854546 18.618182 18.618182-69.818182L372.363636 512l69.818182-251.345455z" fill="" p-id="4656"></path></svg>

resources/views/admin/system.blade.php

@@ -1191,7 +1191,7 @@
 													<span class="input-group-append"><button class="btn btn-primary" type="button" onclick="update('bitpay_secret')">修改</button></span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3"><a href="https://merchants.mugglepay.com/basic/api" target="_blank"> 在本页</a>中获取后台服务器的秘钥 </span>
+											<span class="text-help offset-md-3">在<a href="https://merchants.mugglepay.com/basic/api" target="_blank">API设置</a>中获取后台服务器的秘钥 </span>
 										</div>
 									</div>
 								</div>
@@ -1200,13 +1200,13 @@
 										<div class="row">
 											<label class="col-md-3 col-form-label">PayPal</label>
 											<div class="col-md-7">
-												请到 <a href="" target="_blank">PayPal</a> 申请账号
+												使用商家账号登录<a href="https://www.paypal.com/businessprofile/mytools/apiaccess/firstparty" target="_blank">API凭证申请页</a>, 同意并获取设置信息
 											</div>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
 										<div class="row">
-											<label class="col-md-3 col-form-label" for="paypal_username">账号</label>
+											<label class="col-md-3 col-form-label" for="paypal_username">API用户名</label>
 											<div class="col-md-7">
 												<div class="input-group">
 													<input type="text" class="form-control" id="paypal_username" value="{{$paypal_username}}"/>
@@ -1217,7 +1217,7 @@
 									</div>
 									<div class="form-group col-lg-6">
 										<div class="row">
-											<label class="col-md-3 col-form-label" for="paypal_password">密码</label>
+											<label class="col-md-3 col-form-label" for="paypal_password">API密码</label>
 											<div class="col-md-7">
 												<div class="input-group">
 													<input type="text" class="form-control" id="paypal_password" value="{{$paypal_password}}"/>
@@ -1228,7 +1228,7 @@
 									</div>
 									<div class="form-group col-lg-6">
 										<div class="row">
-											<label class="col-md-3 col-form-label" for="paypal_secret">秘钥</label>
+											<label class="col-md-3 col-form-label" for="paypal_secret">签名</label>
 											<div class="col-md-7">
 												<div class="input-group">
 													<input type="text" class="form-control" id="paypal_secret" value="{{$paypal_secret}}"/>
@@ -1237,7 +1237,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="form-group col-lg-6">
+									<div class="form-group col-lg-6" hidden>
 										<div class="row">
 											<label class="col-md-3 col-form-label" for="paypal_certificate">证书</label>
 											<div class="col-md-7">
@@ -1248,7 +1248,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="form-group col-lg-6">
+									<div class="form-group col-lg-6" hidden>
 										<div class="row">
 											<label class="col-md-3 col-form-label" for="paypal_app_id">应用ID</label>
 											<div class="col-md-7">

resources/views/user/buy.blade.php

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

resources/views/user/components/purchase.blade.php

@@ -1,14 +1,14 @@
 @if(\App\Components\Helpers::systemConfig()['is_AliPay'])
-	<button class="btn btn-flat waves-attach" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_AliPay']}}','1')"><img src="/assets/images/alipay.svg" width="50px" height="50px" alt="alipay"/></button>
+	<button class="btn btn-flat" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_AliPay']}}','1')"><img src="/assets/images/payment/alipay.svg" height="36px" alt="alipay"/></button>
 @endif
 @if(\App\Components\Helpers::systemConfig()['is_QQPay'])
-	<button class="btn btn-flat waves-attach" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_QQPay']}}','2')"><img src="/assets/images/qq.svg" width="50px" height="50px" alt="qq"/></button>
+	<button class="btn btn-flat" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_QQPay']}}','2')"><img src="/assets/images/payment/qqpay.svg" height="36px" alt="qq"/></button>
 @endif
 @if(\App\Components\Helpers::systemConfig()['is_WeChatPay'])
-	<button class="btn btn-flat waves-attach" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_WeChatPay']}}','3')"><img src="/assets/images/wechat.svg" width="50px" height="50px" alt="wechat"/></button>'
+	<button class="btn btn-flat" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_WeChatPay']}}','3')"><img src="/assets/images/payment/wechatpay.svg" height="36px" alt="wechat"/></button>'
 @endif
 @if(\App\Components\Helpers::systemConfig()['is_otherPay'] == 'bitpayx')
-	<button class="btn btn-flat waves-attach" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_otherPay']}}','')"><img src="/assets/images/bitcoin.svg" width="50px" height="50px" alt="other"/></button>'
+	<button class="btn btn-flat" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_otherPay']}}','')"><img src="/assets/images/payment/btc.svg" height="36px" alt="other"/> <span class="font-size-24 black"> 虚拟货币</span></button>'
 @elseif(\App\Components\Helpers::systemConfig()['is_otherPay'] == 'paypal')
-	<button class="btn btn-flat waves-attach" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_otherPay']}}','')"><img src="/assets/images/paypal.svg" width="50px" alt="other"/></button>'
+	<button class="btn btn-flat" onclick="pay('{{\App\Components\Helpers::systemConfig()['is_otherPay']}}','')"><img src="https://www.paypalobjects.com/webstatic/mktg/Logo/pp-logo-150px.png" height="32px" alt="PayPal"/></button>'
 @endif

resources/views/user/services.blade.php

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