Merge branch 'liuxin' into develop

1bf4df7f · linxin · 71766352 · 53972781 · 1bf4df7f · 1bf4df7f
Commit 1bf4df7f authored Nov 08, 2019 by linxin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 242 additions and 110 deletions

back.png src/assets/payment/back.png +0 -0

go.png src/assets/payment/go.png +0 -0

pay-entry.vue src/pages/pay/firstPay/pay-entry.vue +242 -110

No files found.
--- a/src/assets/payment/back.png
+++ b/src/assets/payment/back.png
--- a/src/assets/payment/go.png
+++ b/src/assets/payment/go.png
--- a/src/pages/pay/firstPay/pay-entry.vue
+++ b/src/pages/pay/firstPay/pay-entry.vue