diff --git a/src/assets/icons/card.svg b/src/assets/icons/card.svg new file mode 100644 index 0000000..ab8adc7 --- /dev/null +++ b/src/assets/icons/card.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/pay/stripe.svg b/src/assets/icons/pay/stripe.svg new file mode 100644 index 0000000..5e10806 --- /dev/null +++ b/src/assets/icons/pay/stripe.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/pay/stripe.png b/src/assets/images/pay/stripe.png new file mode 100644 index 0000000..cd5568d Binary files /dev/null and b/src/assets/images/pay/stripe.png differ diff --git a/src/assets/images/pay/success.png b/src/assets/images/pay/success.png new file mode 100644 index 0000000..4cfb570 Binary files /dev/null and b/src/assets/images/pay/success.png differ diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index e00e238..baa6abd 100644 --- a/src/components/SvgIcon/index.vue +++ b/src/components/SvgIcon/index.vue @@ -1,50 +1,50 @@ diff --git a/src/views/pay/index.vue b/src/views/pay/index.vue index 201dba7..203805d 100644 --- a/src/views/pay/index.vue +++ b/src/views/pay/index.vue @@ -33,30 +33,17 @@ overflow-y: auto; --content-top: 4.8rem; > .content { + max-width: 160rem; + margin: 0 auto; + padding: 4rem 9rem 10rem; + gap: 10rem; display: flex; - > * { - flex: 1; + > .payment { + width: 60%; } - > .order-summary { - flex: 1; + > .sc-list { + width: 40%; } - // max-width: 126rem; - // padding-top: var(--content-top); - // margin: 0 auto; - // min-height: var(--app-view-height); - // display: flex; - // align-items: flex-start; - // > .sc-list { - // flex: 1; - // margin-right: 7.5rem; - // margin-bottom: 8rem; - // --sc-list-header-top: var(--content-top); - // } - // > .order-summary { - // position: sticky; - // top: var(--content-top); - // max-height: var(--app-view-height); - // } } } diff --git a/src/views/pay/payment.vue b/src/views/pay/payment.vue index d9ac9ff..715042d 100644 --- a/src/views/pay/payment.vue +++ b/src/views/pay/payment.vue @@ -1,18 +1,238 @@ diff --git a/src/views/shoppingCart/order-summary.vue b/src/views/shoppingCart/order-summary.vue index 650b302..463af68 100644 --- a/src/views/shoppingCart/order-summary.vue +++ b/src/views/shoppingCart/order-summary.vue @@ -37,7 +37,6 @@ import { computed, ref } from 'vue' import { FormatBytes, FormatDate } from '@/utils/tools' import { useRouter } from 'vue-router' - import { CreateOrder } from '@/api/shoppingCart' const router = useRouter() const props = defineProps({ list: { diff --git a/src/views/shoppingCart/sc-list.vue b/src/views/shoppingCart/sc-list.vue index 07c35e2..843705f 100644 --- a/src/views/shoppingCart/sc-list.vue +++ b/src/views/shoppingCart/sc-list.vue @@ -34,7 +34,7 @@ > (b.checked ? 1 : 0) - (a.checked ? 1 : 0)) } if (sortBy.value === 'DateAdded') { + console.log(list_.value) return list_.value.filter(() => true).sort((a, b) => b.date - a.date) } return list_.value.filter(() => true) @@ -164,7 +165,7 @@ cover: v.cover, //封面 amount: v.price, //价格 status: v.status, //状态 - date: v.addTime, //添加时间 + date: new Date(v.addTime).getTime(), //添加时间 tags: v.productCategory, //标签 salesVolume: v.salesVolume, //销售量 checked: false