diff --git a/src/components/CommodityItem.vue b/src/components/CommodityItem.vue index f79c31b..b4d639d 100644 --- a/src/components/CommodityItem.vue +++ b/src/components/CommodityItem.vue @@ -1,104 +1,112 @@ - - - - - - {{ props.name }} - - - {{ props.price }} - - - - - - - - - + + + + + + {{ props.name }} + + + {{ props.price }} + + + + + + + + + diff --git a/src/lang/en.ts b/src/lang/en.ts index 07f7adf..8351b06 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -345,4 +345,9 @@ export default { Offices: "Offices", JoinWithUs: "Join with Us", }, + addShoppingCart:{ + title: 'Added to your Shopping Cart', + statement: 'Digital Assets Only. No physical product included.', + button: 'Set Shopping Cart', + } } \ No newline at end of file diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index 1278a73..e031cf3 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -345,4 +345,9 @@ export default { Offices: "办公室", JoinWithUs: "加入我们", }, + addShoppingCart:{ + title: "已添加到您的购物车", + statement: "仅限数字资产。不包含实体产品。", + button: "去购物车" + } } diff --git a/src/views/digitalDetail/index.vue b/src/views/digitalDetail/index.vue index 12b8211..dfb86ea 100644 --- a/src/views/digitalDetail/index.vue +++ b/src/views/digitalDetail/index.vue @@ -195,13 +195,14 @@ defineExpose({}) .digitalItemDetail{ width: 100%; height: 100%; + overflow-y: auto; position: relative; display: flex; flex-direction: column; .center{ - flex: 1; + // flex: 1; display: flex; - overflow: hidden; + // overflow: hidden; .img-list{ flex: 1; display: grid; @@ -211,6 +212,7 @@ defineExpose({}) // --row-width: 29.3rem; overflow-y: auto; position: relative; + border-right: 0.5px solid #585858; &::-webkit-scrollbar{ display: none; } @@ -268,12 +270,15 @@ defineExpose({}) } } .img-detail{ - border-left: 0.5px solid #585858; padding-left: 3.2rem; width: 57rem; display: flex; flex-direction: column; overflow-y: auto; + height: calc(var(--app-view-height) - var(--footer-height)); + position: sticky; + top: 0; + // height: 100%; &::-webkit-scrollbar{ display: none; } @@ -305,7 +310,6 @@ defineExpose({}) font-size: 3rem; line-height: 120%; margin-bottom: 1rem; - cursor: pointer; } .img-price{ font-family: KaiseiOpti-Bold; @@ -338,6 +342,7 @@ defineExpose({}) font-size: 1.8rem; line-height: 100%; margin-bottom: .8rem; + cursor: pointer; } .release-time{ font-family: KaiseiOpti-Regular; diff --git a/src/views/shopping-drawer.vue b/src/views/shopping-drawer.vue index 0d9f9cc..245f0d2 100644 --- a/src/views/shopping-drawer.vue +++ b/src/views/shopping-drawer.vue @@ -45,7 +45,7 @@ const {} = toRefs(data); - Added to your Shopping Cart + {{ $t('addShoppingCart.title') }} @@ -76,11 +76,11 @@ const {} = toRefs(data); - Digital Assets Only. No physical product included. + {{ $t('addShoppingCart.statement') }} - SeE Shopping Cart + {{ $t('addShoppingCart.button') }} diff --git a/src/views/shoppingCart/sc-item.vue b/src/views/shoppingCart/sc-item.vue index 0517da0..a817230 100644 --- a/src/views/shoppingCart/sc-item.vue +++ b/src/views/shoppingCart/sc-item.vue @@ -33,7 +33,7 @@ ${{ info.amount }} HKD { status: number @@ -77,6 +78,10 @@ const onRemove = () => { emit('remove', props.info) } + + const showDownload = computed(() => { + return props.isOrder ? props.info.status === 1 : props.orderActionsLayout + }) const handleBrandClick = () => { router.push({ name: 'brandDetail', diff --git a/src/views/wardrobe/Orders.vue b/src/views/wardrobe/Orders.vue index e50cc4c..0423187 100644 --- a/src/views/wardrobe/Orders.vue +++ b/src/views/wardrobe/Orders.vue @@ -30,7 +30,9 @@ - {{ order.shopName }} + + {{ order.shopName }} + {{ order.formatUpdatetime }} @@ -80,6 +82,7 @@ :show-date="false" :show-remove="false" :show-brand="false" + is-order order-actions-layout /> @@ -92,6 +95,7 @@
{{ order.formatUpdatetime }}