Merge remote-tracking branch 'origin/master'

# Conflicts: # src/pages/order/complete.vue

Merge remote-tracking branch 'origin/master'
# Conflicts: # src/pages/order/complete.vue
87325864 · 李超鹏 · 94705533 · 6cd34ecf · 87325864 · 87325864
Commit 87325864 authored Apr 30, 2021 by 李超鹏
Expand all Show whitespace changes
Inline Side-by-side

Showing with 675 additions and 2 deletions

App.vue src/App.vue +2 -2

complete.vue src/pages/order/complete.vue +673 -0

No files found.
--- a/src/App.vue
+++ b/src/App.vue
--- a/src/pages/order/complete.vue
+++ b/src/pages/order/complete.vue