diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php index 4b20a3d84..f0952fc0b 100755 --- a/application/index/controller/Order.php +++ b/application/index/controller/Order.php @@ -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', '支付成功'); diff --git a/application/index/view/default/public/pay_error.html b/application/index/view/default/public/pay_error.html index a22b372ca..9867f99a5 100755 --- a/application/index/view/default/public/pay_error.html +++ b/application/index/view/default/public/pay_error.html @@ -25,7 +25,9 @@ {{$msg}}
diff --git a/application/index/view/default/public/pay_success.html b/application/index/view/default/public/pay_success.html index 9936a8e6c..9a6b8b2c0 100755 --- a/application/index/view/default/public/pay_success.html +++ b/application/index/view/default/public/pay_success.html @@ -25,7 +25,9 @@ {{$msg}} diff --git a/application/plugins/wallet/Recharge.php b/application/plugins/wallet/Recharge.php index 05ff5868f..2def2292b 100755 --- a/application/plugins/wallet/Recharge.php +++ b/application/plugins/wallet/Recharge.php @@ -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', '支付成功'); diff --git a/application/plugins/wallet/service/PayService.php b/application/plugins/wallet/service/PayService.php index 1ac790e1e..e1a35ace8 100644 --- a/application/plugins/wallet/service/PayService.php +++ b/application/plugins/wallet/service/PayService.php @@ -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 { diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 561240689..2f6188735 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -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; }