Skip to content

Commit 7e9cd2a

Browse files
committed
增加订单数据渲染
1 parent 2eddcd5 commit 7e9cd2a

File tree

5 files changed

+58
-15
lines changed

5 files changed

+58
-15
lines changed

resources/mixes/vue-omnipay/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
window.config = {
1111
apiUrl: 'http://corecmf.dev/api/omnipay/main',
1212
csrfToken: '',
13-
data:{"wechat":{"appOrder":{"appid":"wxd18b8356c98591dc","partnerid":"10035597","prepayid":"wx201710030850584a3d1680c70690385526","package":"Sign=WXPay","noncestr":"0231301f3a0f1ee32053d023d2b9caee","timestamp":1506991943,"sign":"2E7248955FC91316C3D5AC12EB349701"},"jsOrder":{"appId":"wxd18b8356c98591dc","package":"prepay_id=wx201710030850584a3d1680c70690385526","nonceStr":"f3c611ebd6a885b3b25b18342a0ecffa","timeStamp":"1506991943","signType":"MD5","paySign":"5B404746A5C54FC528DD1FEF66FC3159"},"webOrder":"weixin:\/\/wxpay\/bizpayurl?pr=cortSlD"}},
13+
data:{"wechat":{"appOrder":{"appid":"wxd18b8356c98591dc","partnerid":"10035597","prepayid":"wx20171003110733c20650cf6f0915936445","package":"Sign=WXPay","noncestr":"52e7873269ac678ea9f8c56ded7d493d","timestamp":1507000139,"sign":"A09455F6674D6022BBCA7EA74BA0B39E"},"jsOrder":{"appId":"wxd18b8356c98591dc","package":"prepay_id=wx20171003110733c20650cf6f0915936445","nonceStr":"461df0e5157622b2f3ea96d643701139","timeStamp":"1507000139","signType":"MD5","paySign":"7A37FEEB4DC1CF593878CD120E2EF4CC"},"webOrder":"weixin:\/\/wxpay\/bizpayurl?pr=woVPPxd"},"order":{"order_id":"20171003030858637674","uid":0,"name":"\u6d4b\u8bd5\u8ba2\u5355[\u9a71\u52a8:wechat]","fee":16.8,"gateway":"wechat","updated_at":"2017-10-03 03:08:58","created_at":"2017-10-03 03:08:59","id":73}},
1414
}
1515
</script>
1616
</head>

resources/mixes/vue-omnipay/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"babel-preset-env": "^1.3.2",
2424
"babel-preset-stage-2": "^6.22.0",
2525
"babel-register": "^6.22.0",
26+
"builder-vue-element": "^1.0.7",
2627
"chalk": "^1.1.3",
2728
"connect-history-api-fallback": "^1.3.0",
2829
"copy-webpack-plugin": "^4.0.1",

resources/mixes/vue-omnipay/src/components/app/app.vue

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,20 @@
33
<div class="omnipay-item">
44
<div class="left">
55
<div class="logo"><img src="/static/assets/wechat.png"></div>
6-
<div class="price">应付金额:<strong><i>¥</i>38.00</strong></div>
7-
<div class="order"><p>创建时间:2017-10-02 11:41:16</p></div>
6+
<div class="price">应付金额:<strong><i>¥</i>{{ price }}</strong></div>
7+
<div class="created_at">
8+
<p>订单名称:{{ name }}</p>
9+
<p>订单编号:{{ order_id }}</p>
10+
<p>创建时间:{{ created_at }}</p>
11+
</div>
812
</div>
913
<div class="right">
1014
<div class="pic">
11-
<img src="https://zsstatus.tuanimg.com/pay/weixin/rq?pay=weixin%3A%2F%2Fwxpay%2Fbizpayurl%3Fpr%3DUm2LVjh">
15+
<bve-qrcode-item
16+
class="qrcode"
17+
v-model="wechatQrcode"
18+
:config="wechatQrcodeConfig"
19+
/>
1220
</div>
1321
<div class="fb"><i></i>请使用微信扫描<br>二维码以完成支付</div>
1422
</div>
@@ -21,6 +29,37 @@ export default {
2129
name: 'app',
2230
created () {
2331
console.log(window.config)
32+
},
33+
data () {
34+
return {
35+
wechatQrcodeConfig: {
36+
size: 260
37+
}
38+
}
39+
},
40+
computed: {
41+
gateway () {
42+
return window.config.data.order.gateway
43+
},
44+
price () {
45+
return window.config.data.order.fee.toFixed(2)
46+
},
47+
created_at () {
48+
return window.config.data.order.created_at
49+
},
50+
order_id () {
51+
return window.config.data.order.order_id
52+
},
53+
name () {
54+
return window.config.data.order.name
55+
},
56+
/**
57+
* [wechatQrcode 微信支付pc二维码]
58+
* @return {[type]} [description]
59+
*/
60+
wechatQrcode () {
61+
return window.config.data.wechat.webOrder
62+
}
2463
}
2564
}
2665
</script>
@@ -62,7 +101,7 @@ body{
62101
}
63102
}
64103
}
65-
>.order{
104+
>.created_at{
66105
padding: 10px 0;
67106
border-top:1px solid #e5e5e5;
68107
border-bottom:1px solid #e5e5e5;
@@ -75,15 +114,15 @@ body{
75114
>.right{
76115
width: 55%;
77116
padding: 5% 5% 5% 5%;
117+
display: flex;
118+
display: -webkit-flex; /* Safari */
119+
flex-direction: column;
120+
align-items: center;
78121
>.pic{
79-
width: 267px;
80-
height: 267px;
122+
width: 260px;
123+
height: 260px;
81124
background: url("/static/assets/loading.gif") center center no-repeat;
82-
>img{
83-
width: 267px;
84-
height: 267px;
85-
border:1px solid #e7e7e7;
86-
}
125+
border:1px solid #e7e7e7;
87126
}
88127
>.fb{
89128
padding:10px;

resources/mixes/vue-omnipay/src/main.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import Vue from 'vue'
22
import App from './components/app'
3+
4+
import BuilderVueElement from 'builder-vue-element'
5+
Vue.use(BuilderVueElement)
36
/* eslint-disable no-new */
47
new Vue({
58
el: '#app',

src/App/Http/Controllers/OmnipayController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@ protected function alipay($gateway,$order)
7070
*/
7171
protected function wechat($gateway,$order)
7272
{
73-
$order = [
73+
$wechatOrder = [
7474
'open_id' => 'oEFAEj2KZxrRp2OijMFccnMrfN3Q',
7575
'out_trade_no' => $order->order_id,
7676
'body' => $order->name,
7777
'total_fee' => $order->fee*100, //=0.01
7878
'spbill_create_ip' => '127.0.0.1',
7979
'fee_type' => 'CNY',
8080
];
81-
$response = $gateway->purchase($order)->send();
81+
$response = $gateway->purchase($wechatOrder)->send();
8282
$wechat = [
8383
'appOrder' => $response->getAppOrderData(),
8484
'jsOrder' => $response->getJsOrderData(),
8585
'webOrder' => $response->getCodeUrl(),
8686
];
87-
return view('core::index',[ 'model' => 'omnipay', 'data' => json_encode(['wechat' => $wechat]) ]);
87+
return view('core::index',[ 'model' => 'omnipay', 'data' => json_encode(['wechat' => $wechat, 'order' => $order]) ]);
8888
}
8989
/**
9090
* [unionpay 银联支付购买]

0 commit comments

Comments
 (0)