sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

钱包充值

feat/task1-c-wallet
gongfuxiang 2019-05-08 01:07:39 +08:00
parent 9a9a429127
commit 332760f5bf
6 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/index/controller/Order.php
View File

@ -229,9 +229,16 @@ class Order extends Common
*/
public function Respond()
{
// 获取支付回调数据
$params = input();
$params['user'] = $this->user;
$ret = OrderService::Respond($params);
// 自定义链接
$this->assign('to_url', MyUrl('index/order/index'));
$this->assign('to_title', '我的订单');
// 状态
if($ret['code'] == 0)
{
$this->assign('msg', '支付成功');

4
application/index/view/default/public/pay_error.html
View File

@ -25,7 +25,9 @@
<span class="msg">{{$msg}}</span>
<div class="tips-nav">
<a href="{{$Think.__MY_URL__}}" class="am-btn am-btn-secondary am-radius">回到首页</a>
<a href="{{:MyUrl('index/order/index')}}" class="am-btn am-btn-primary am-radius">我的订单</a>
{{if !empty($to_url) and !empty($to_title)}}
<a href="{{$to_url}}" class="am-btn am-btn-primary am-radius">{{$to_title}}</a>
{{/if}}
</div>
</div>
</div>

4
application/index/view/default/public/pay_success.html
View File

@ -25,7 +25,9 @@
<span class="msg">{{$msg}}</span>
<div class="tips-nav">
<a href="{{$Think.__MY_URL__}}" class="am-btn am-btn-secondary am-radius">回到首页</a>
<a href="{{:MyUrl('index/order/index')}}" class="am-btn am-btn-primary am-radius">我的订单</a>
{{if !empty($to_url) and !empty($to_title)}}
<a href="{{$to_url}}" class="am-btn am-btn-primary am-radius">{{$to_title}}</a>
{{/if}}
</div>
</div>
</div>

7
application/plugins/wallet/Recharge.php
View File

@ -158,8 +158,15 @@ class Recharge extends Common
*/
public function respond($params = [])
{
// 获取支付回调数据
$params['user'] = $this->user;
$ret = PayService::Respond($params);
// 自定义链接
$this->assign('to_url', PluginsHomeUrl('wallet', 'wallet', 'recharge'));
$this->assign('to_title', '充值明细');
// 状态
if($ret['code'] == 0)
{
$this->assign('msg', '支付成功');

2
application/plugins/wallet/service/PayService.php
View File

@ -361,7 +361,7 @@ class PayService
if($give_money > 0)
{
$money_field = [
['field' => 'normal_money', 'money_type' => 0, 'msg' => ' [ '.$pay_price.'元, 赠送'.$give_money.'元 ]'],
['field' => 'normal_money', 'money_type' => 0, 'msg' => ' [ '.$pay_price.'元 , 赠送'.$give_money.'元 ]'],
['field' => 'give_money', 'money_type' => 2, 'msg' => ' [ 赠送'.$give_money.'元 ]'],
];
} else {

2
public/static/index/default/css/common.css
View File

@ -270,7 +270,7 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
.tips-success i.am-icon-check-circle { color: #4CAF50; }
.tips-error span.msg, .tips-success span.msg { font-size: 22px; margin-left: 10px; }
.tips-error .tips-nav, .tips-success .tips-nav { margin-top: 20px; }
.tips-error .tips-nav .am-btn:not(:last-child), .tips-success .tips-nav .am-btn:not(:last-child) { margin-right: 20px; }
.tips-error .tips-nav .am-btn:not(:first-child), .tips-success .tips-nav .am-btn:not(:first-child) { margin-left: 20px; }
/* 页面加载数据 */
.loding-view { text-align: center; color: #888; padding: 10px 0; }