diff --git a/public/img/avatar/profile.jpg b/public/img/avatar/profile.jpg new file mode 100644 index 0000000..b3a940b Binary files /dev/null and b/public/img/avatar/profile.jpg differ diff --git a/src/assets/scss/style.css b/src/assets/scss/style.css index 81ac81b..b549531 100644 --- a/src/assets/scss/style.css +++ b/src/assets/scss/style.css @@ -6109,7 +6109,7 @@ } .checkout-page-area { - padding-top: 140px; + padding-top: 100px; padding-bottom: 140px; } .checkout-page-area .form-control { diff --git a/src/components/HeaderBreadcrumb.vue b/src/components/HeaderBreadcrumb.vue new file mode 100644 index 0000000..01fd81d --- /dev/null +++ b/src/components/HeaderBreadcrumb.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/src/components/TopHeader.vue b/src/components/TopHeader.vue index 1fb2a45..21c76d1 100644 --- a/src/components/TopHeader.vue +++ b/src/components/TopHeader.vue @@ -6,6 +6,14 @@ import {useAccount} from "@/stores/user.js"; const account = useAccount() +const avatar = computed(() => { + if(account.info.avatar) { + return `${request.defaults.baseURL}${account.info.avatar}` + } else { + return '/img/avatar/profile.jpg' + } +}) + const isLogin = computed(() => !!getToken()) @@ -34,11 +42,10 @@ const isLogin = computed(() => !!getToken())
-
{{ account.info.userName }}
-
{{ account.info.email }}
+
{{ account.info.nickName }}
+
{{ account.info.email ?? '暂无电子邮件地址' }}
- +
diff --git a/src/router/index.js b/src/router/index.js index 8e5dbd8..24aadc1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -37,6 +37,10 @@ const router = createRouter({ path: '/cart', name: 'cart', component: () => import('@/views/Cart.vue'), + }, { + path: '/order', + name: 'order', + component: () => import('@/views/Order.vue'), } ], }) diff --git a/src/views/Cart.vue b/src/views/Cart.vue index 4af9d66..1ddddad 100644 --- a/src/views/Cart.vue +++ b/src/views/Cart.vue @@ -2,6 +2,8 @@ import {computed, onMounted, ref} from "vue"; import request from "@/net/index.js"; import Swal from "sweetalert2"; +import router from "@/router/index.js"; +import HeaderBreadcrumb from "@/components/HeaderBreadcrumb.vue"; const cartList = ref([]) @@ -49,23 +51,7 @@ onMounted(() => {