加付款备注
This commit is contained in:
parent
e63dade12e
commit
ca5ae4060f
|
@ -56,8 +56,7 @@ class OrderController extends BaseController
|
||||||
/**
|
/**
|
||||||
* 显示订单
|
* 显示订单
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|\Illuminate\View\View|void
|
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\JsonResponse|\Illuminate\View\View|void *
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public function showOrder(Request $request){
|
public function showOrder(Request $request){
|
||||||
if($request->input('out_trade_sn')){
|
if($request->input('out_trade_sn')){
|
||||||
|
|
|
@ -310,6 +310,15 @@ trait PayTrait
|
||||||
{
|
{
|
||||||
return $this->order_sn . '定制订单';//这里需要伪造,
|
return $this->order_sn . '定制订单';//这里需要伪造,
|
||||||
}
|
}
|
||||||
|
private function getcode($length){
|
||||||
|
$str = '0123456789abcdefghijklmnopqrstuvwxyz';
|
||||||
|
$s = '';
|
||||||
|
for ($i = 1; $i <= $length; $i++) {
|
||||||
|
$num = mt_rand(0, 34);
|
||||||
|
$s .= substr($str,$num, 1);
|
||||||
|
}
|
||||||
|
return $s;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 提交订单的参数设置
|
* 提交订单的参数设置
|
||||||
|
@ -332,6 +341,7 @@ trait PayTrait
|
||||||
$data['out_trade_sn'] = $request->input('out_trade_sn', '');
|
$data['out_trade_sn'] = $request->input('out_trade_sn', '');
|
||||||
$data['ewm_account'] = $request->input('ewm_account', '');
|
$data['ewm_account'] = $request->input('ewm_account', '');
|
||||||
$data['language'] = $request->input('language', 'zh_cn');
|
$data['language'] = $request->input('language', 'zh_cn');
|
||||||
|
$data['ewm_mark'] = $this->getcode(6);
|
||||||
|
|
||||||
$data['order_at'] = date('Y-m-d H:i:s');
|
$data['order_at'] = date('Y-m-d H:i:s');
|
||||||
if ($is_local) {
|
if ($is_local) {
|
||||||
|
|
|
@ -225,17 +225,16 @@
|
||||||
<span class="color_999">{{ $order->order_sn }}</span>
|
<span class="color_999">{{ $order->order_sn }}</span>
|
||||||
<span class="pull_right color_999 copy" data-clipboard-text="{{ $order->order_sn }}">复制订单编号</span>
|
<span class="pull_right color_999 copy" data-clipboard-text="{{ $order->order_sn }}">复制订单编号</span>
|
||||||
</h5>
|
</h5>
|
||||||
@if($pay_type=='tr_bank2')
|
|
||||||
<h4>转账时把订单编号填在备注里</h4>
|
|
||||||
@endif
|
|
||||||
<div class="code_bg m10 bg_ccc">
|
<div class="code_bg m10 bg_ccc">
|
||||||
<h3 class="color_333 f-w-400 p-t-20 text-center">¥ <span
|
<h3 class="color_333 f-w-400 p-t-20 text-center">¥ <span
|
||||||
class="color">{{ $order->order_money }}</span><span class="color1">(请勿修改金额付款)</span></h3>
|
class="color">{{ $order->order_money }}</span><span class="color1">(请勿修改金额付款)</span></h3>
|
||||||
{{--<h3 class="color_333 f-w-400 exp p-b-10">付款备注:<span class="color">{{ $order->ewm_mark }}</span><span class="color1">(请在支付备注上填写)</h3>--}}
|
{{-- <h3 class="color_333 f-w-400 exp p-b-10">付款备注:<span class="color">{{ $order->ewm_mark }}</span><span class="color1">(请在支付备注上填写)</h3>--}}
|
||||||
|
|
||||||
{{--<h3 class="color_red text-center font-20">
|
{{-- <h3 class="color_red text-center font-20">--}}
|
||||||
<span class="p-r-05">¥</span><span>{{ $order->order_money }}</span></h3>
|
{{-- <span class="p-r-05">¥</span><span>{{ $order->order_money }}</span></h3>--}}
|
||||||
<h3 class="color_red text-center font-20 p-b-10">付款备注:{{ $order->ewm_mark }}</h3>--}}
|
{{-- <h3 class="color_red text-center font-20 p-b-10">付款备注:{{ $order->ewm_mark }}</h3>--}}
|
||||||
@if($pay_type=='tr_bank2')
|
@if($pay_type=='tr_bank2')
|
||||||
|
|
||||||
<h5 class="font-12 bank-item p-l-20 bg_color_white p-r-20 f-w-400 p-b-05">
|
<h5 class="font-12 bank-item p-l-20 bg_color_white p-r-20 f-w-400 p-b-05">
|
||||||
|
@ -269,13 +268,13 @@
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
{{-- <h5 class="color_333 f-w-400 text-center p-t-20">
|
<h5 class="color_333 f-w-400 text-center p-t-20">
|
||||||
<span class="p-r-05">付款页面备注请填写</span>
|
<span class="p-r-05">付款页面备注请填写</span>
|
||||||
<span>(</span>
|
<span>(</span>
|
||||||
<span class="color_FF0000">必填</span>
|
<span class="color_FF0000">必填</span>
|
||||||
<span>)</span>
|
<span>)</span>
|
||||||
</h5>
|
</h5>
|
||||||
<h3 class="color_red text-center font-20 p-b-10">{{ $order->ewm_mark }}</h3>--}}
|
<h3 class="color_red text-center font-20 p-b-10">{{ $order->ewm_mark }}</h3>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@if($pay_type=='tr_wxalbank')
|
@if($pay_type=='tr_wxalbank')
|
||||||
|
@ -312,16 +311,17 @@
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="none"></div>
|
{{-- <div class="none"></div>--}}
|
||||||
<div class="code_footer" style="{{ !$is_mobile?'position: static':'' }}">
|
{{-- <div class="code_footer" style="{{ !$is_mobile?'position: static':'' }}">--}}
|
||||||
<a href="javascript:void(0)" onclick="payOk()"
|
{{-- <a href="javascript:void(0)" onclick="payOk()"--}}
|
||||||
style="background-color: {{ $pay_type=='tr_alipay'?'#00a0e9':'' }}">
|
{{-- style="background-color: {{ $pay_type=='tr_alipay'?'#00a0e9':'' }}">--}}
|
||||||
<span>我已付款</span>
|
{{-- <span>我已付款</span>--}}
|
||||||
<span>{{ $order->order_money }}</span>
|
{{-- <span>{{ $order->order_money }}</span>--}}
|
||||||
<span>元</span>
|
{{-- <span>元</span>--}}
|
||||||
</a>
|
{{-- </a>--}}
|
||||||
<a href="javascript:void(0)" id="cancleOrder">取消此交易</a>
|
{{-- <a href="javascript:void(0)" id="cancleOrder">取消此交易</a>--}}
|
||||||
</div>
|
{{-- </div>--}}
|
||||||
|
|
||||||
<div class="pay_tan tan_bg hide">
|
<div class="pay_tan tan_bg hide">
|
||||||
<div class="code_tan bg_color_white"
|
<div class="code_tan bg_color_white"
|
||||||
style="position:fixed; top: 50% !important; left: 50% !important; transform: translate(-50%, -50%);">
|
style="position:fixed; top: 50% !important; left: 50% !important; transform: translate(-50%, -50%);">
|
||||||
|
|
Loading…
Reference in New Issue