Merge branch 'litemall-vue' of https://github.com/pkwenda/litemall into pkwenda-litemall-vue

9b217226 · Junling Bu · 3cb559bb · ce4ef458 · 9b217226 · 9b217226
Commit 9b217226 authored Apr 15, 2019 by Junling Bu
--- a/litemall-vue/src/views/order/orderDetail/bottom-goods-info.vue
+++ b/litemall-vue/src/views/order/orderDetail/bottom-goods-info.vue
--- a/litemall-vue/src/views/order/orderDetail/index.vue
+++ b/litemall-vue/src/views/order/orderDetail/index.vue
--- a/litemall-vue/src/views/order/orderDetail/top-user-info.vue
+++ b/litemall-vue/src/views/order/orderDetail/top-user-info.vue
--- a/litemall-vue/src/views/order/payment-status/index.vue
+++ b/litemall-vue/src/views/order/payment-status/index.vue
--- a/litemall-vue/src/views/order/payment/index.vue
+++ b/litemall-vue/src/views/order/payment/index.vue
--- a/litemall-vue/src/views/order/place-order-entity/bottom-goods-info.vue
+++ b/litemall-vue/src/views/order/place-order-entity/bottom-goods-info.vue
--- a/litemall-vue/src/views/order/place-order-entity/index.vue
+++ b/litemall-vue/src/views/order/place-order-entity/index.vue
--- a/litemall-vue/src/views/order/place-order-entity/top-user-info.vue
+++ b/litemall-vue/src/views/order/place-order-entity/top-user-info.vue
--- a/litemall-vue/src/views/order/place-order-virtual/index.vue
+++ b/litemall-vue/src/views/order/place-order-virtual/index.vue
--- a/litemall-vue/src/views/order/tabbar-cart.vue
+++ b/litemall-vue/src/views/order/tabbar-cart.vue
--- a/litemall-vue/src/views/user/module-address-edit/area.json
+++ b/litemall-vue/src/views/user/module-address-edit/area.json
--- a/litemall-vue/src/views/user/module-address-edit/index.vue
+++ b/litemall-vue/src/views/user/module-address-edit/index.vue
--- a/litemall-vue/src/views/user/module-address/index.vue
+++ b/litemall-vue/src/views/user/module-address/index.vue
--- a/litemall-vue/src/views/user/module-autonym-edit/id-card-upload.vue
+++ b/litemall-vue/src/views/user/module-autonym-edit/id-card-upload.vue
--- a/litemall-vue/src/views/user/module-autonym-edit/index.vue
+++ b/litemall-vue/src/views/user/module-autonym-edit/index.vue
--- a/litemall-vue/src/views/user/module-autonym/index.vue
+++ b/litemall-vue/src/views/user/module-autonym/index.vue
--- a/litemall-vue/src/views/user/module-collect/index.vue
+++ b/litemall-vue/src/views/user/module-collect/index.vue
--- a/litemall-vue/src/views/user/module-invitation/index.vue
+++ b/litemall-vue/src/views/user/module-invitation/index.vue
--- a/litemall-vue/src/views/user/module-server/index.vue
+++ b/litemall-vue/src/views/user/module-server/index.vue
--- a/litemall-vue/src/views/user/module-team/index.vue
+++ b/litemall-vue/src/views/user/module-team/index.vue