diff --git a/public/static/img/unionpay.ico b/public/static/img/unionpay.ico new file mode 100644 index 0000000..570ae99 Binary files /dev/null and b/public/static/img/unionpay.ico differ diff --git a/public/static/img/unionpay.jpg b/public/static/img/unionpay.jpg new file mode 100644 index 0000000..67e2061 Binary files /dev/null and b/public/static/img/unionpay.jpg differ diff --git a/public/static/img/wxpay.ico b/public/static/img/wxpay.ico index c144db3..74ac9e2 100644 Binary files a/public/static/img/wxpay.ico and b/public/static/img/wxpay.ico differ diff --git a/view/index/doc.html b/view/index/doc.html index 19a9053..72e7ee3 100644 --- a/view/index/doc.html +++ b/view/index/doc.html @@ -751,6 +751,10 @@ wxpay 微信支付 + + unionpay + 云闪付 +

订单明细 + @@ -56,6 +69,7 @@ + @@ -207,7 +221,7 @@ { title: '成交金额', field: 'really_price', align: 'center', minWidth: 85 }, { title: '支付状态', field: 'state', align: 'center', minWidth: 85, templet: '
{{# if(d.state==1){return`成功`}else{if(new Date(d.close_time)>new Date("")){return`等待`}else{return`过期`} } }}
' }, { title: '支付时间', field: 'pay_time', align: 'center', minWidth: 160, templet: '
{{= d.pay_time == d.create_time ? "- -" : d.pay_time}}
' }, - { title: '支付平台', field: 'type', align: 'center', width: 120, templet: '
{{# if(d.type=="wxpay"){return`微信支付`}if(d.type=="alipay"){return`支付宝`} }}
' }, + { title: '支付平台', field: 'type', align: 'center', width: 120, templet: '
{{# if(d.type=="wxpay"){return`
微信支付
`}if(d.type=="alipay"){return`
支付宝
`}if(d.type=="unionpay"){return`
云闪付
`} }}
' }, { title: '收款平台[账号:终端]', field: 'platform', align: 'center', minWidth: 160, templet: '
{{# return`${d.payAccount.platform} [${d.aid}:${d.cid}]` }}
' }, { title: '操作', align: 'center', width: 120, fixed: 'right', templet: '
设置
' } ]] diff --git a/view/order/show_order.html b/view/order/show_order.html index fea5784..a345a9e 100644 --- a/view/order/show_order.html +++ b/view/order/show_order.html @@ -23,6 +23,15 @@ margin-left: 20px; } + .paytype { + display: flex; + align-items: center; + } + + .paytype>strong { + margin-left: 3px; + } + .alipay { color: #1677ff; } @@ -30,6 +39,10 @@ .wxpay { color: #1AAD19; } + + .unionpay { + color: #d81e06; + } @@ -54,8 +67,8 @@
-
- '支付宝','wxpay'=>'微信支付'];$payway_img=['alipay'=>'/static/img/alipay.ico','wxpay'=>'/static/img/wxpay.ico'];echo "{$payway[$type]}" ?> +
+ '支付宝','wxpay'=>'微信支付','unionpay'=>'云闪付'];$payway_img=['alipay'=>'/static/img/alipay.ico','wxpay'=>'/static/img/wxpay.ico','unionpay'=>'/static/img/unionpay.ico'];echo "{$payway[$type]}" ?>
diff --git a/view/order/test_pay.html b/view/order/test_pay.html index 0ca278e..23401b3 100644 --- a/view/order/test_pay.html +++ b/view/order/test_pay.html @@ -3,7 +3,7 @@ - 订单明细 + 支付测试