From fdc5f9d09553db0e7c486ba2fe507797302f2070 Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Mon, 1 Jun 2026 10:40:11 +0800 Subject: [PATCH] fix --- src/assets/images/example.png | Bin 0 -> 9465 bytes src/components/CommodityItem.vue | 9 +++---- src/components/checked.vue | 11 +++++---- src/views/brand/index.vue | 12 ++++++---- src/views/brandDetail/index.vue | 4 ++++ src/views/collectionStory/detail/index.vue | 26 +++++++-------------- src/views/collectionStory/index.vue | 9 +++---- src/views/digitalItem/index.vue | 3 ++- src/views/digitalItem/merchant-info.vue | 1 + 9 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 src/assets/images/example.png diff --git a/src/assets/images/example.png b/src/assets/images/example.png new file mode 100644 index 0000000000000000000000000000000000000000..20e47b2195bc76b821a4ac2d52962bea29a0113d GIT binary patch literal 9465 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 MqJ~1%3$xJw0i8nq1ONa4 literal 0 HcmV?d00001 diff --git a/src/components/CommodityItem.vue b/src/components/CommodityItem.vue index b4d639d..084f76f 100644 --- a/src/components/CommodityItem.vue +++ b/src/components/CommodityItem.vue @@ -52,7 +52,7 @@ :class="{ 'is-download': download }" v-if="props.showPrice && props.price" > - {{ props.price }} + HK${{ props.price }}
@@ -89,16 +89,17 @@ color: #232323; > .name { font-family: 'KaiseiOpti-Regular'; - font-weight: 400; - font-size: var(--commodity-name-fontSize, 1.6rem); + font-weight: 700; + font-size: var(--commodity-name-fontSize, 2rem); line-height: var(--commodity-name-lineHeight, 2.3rem); margin-bottom: var(--commodity-name-marginBottom, 0rem); } > .price { font-family: 'KaiseiOpti-Regular'; font-weight: 400; - font-size: var(--commodity-price-fontSize, 1.4rem); + font-size: var(--commodity-price-fontSize, 1.6rem); line-height: var(--commodity-price-lineHeight, 2.3rem); + margin-top: .8rem; &.is-download { color: #979797; } diff --git a/src/components/checked.vue b/src/components/checked.vue index 39761a7..511b6fe 100644 --- a/src/components/checked.vue +++ b/src/components/checked.vue @@ -15,14 +15,14 @@ const emit = defineEmits([ ]) const checkList = computed(()=>{ if(props.selected[0] === 'all'){ - return props.list.map(item => item.value) + return [] }else{ return [...props.selected] } }) const handleChange = (val) => { let data = val.filter(item => item !== 'all') - if(data.length == props.list.length){ + if(data.length == props.list.length || data.length == 0){ data = ['all'] }else{ data = [...val] @@ -31,18 +31,19 @@ const handleChange = (val) => { emit('change', data) } const checkAll = computed(()=>{ - return checkList.value.length === props.list.length + return props.selected?.[0] == 'all' }) const handleCheckAllChange = (val) => { let data = [] if(val && props.selected[0] !== 'all'){ data = ['all'] // data = props.list.map(item => item.value) + emit('update:selected', data) + emit('change', data) }else{ data = [] } - emit('update:selected', data) - emit('change', data) + } let data = reactive({ }) diff --git a/src/views/brand/index.vue b/src/views/brand/index.vue index 52e233a..dc4f8cb 100644 --- a/src/views/brand/index.vue +++ b/src/views/brand/index.vue @@ -188,6 +188,7 @@ const {} = toRefs(data); position: relative; height: 34.4rem; transition: all .3s; + flex-shrink: 0; &.active{ height: 14.7rem; } @@ -227,7 +228,7 @@ const {} = toRefs(data); flex-direction: column; align-items: center; flex: 1; - overflow: hidden; + // overflow: hidden; > .input{ width: 66.6rem; display: flex; @@ -286,14 +287,17 @@ const {} = toRefs(data); > .merchantList{ width: 121.8rem; margin-top: 6rem; - flex: 1; - overflow-y: auto; - gap: 3.2rem; + // flex: 1; + // overflow-y: auto; display: flex; flex-direction: column; ::-webkit-scrollbar{ display: none; } + :deep(.item){ + margin-top: 2.1rem; + padding-bottom: 2.1rem; + } .end{ font-family: 'KaiseiOpti-Regular'; font-weight: 400; diff --git a/src/views/brandDetail/index.vue b/src/views/brandDetail/index.vue index ccde17e..c98fa3b 100644 --- a/src/views/brandDetail/index.vue +++ b/src/views/brandDetail/index.vue @@ -78,8 +78,12 @@ defineExpose({}) overflow-y: auto; .header-img{ width: 100%; + border-bottom: 1px solid #232323; >img{ width: 100%; + height: 100%; + display: block; + object-fit: cover; } } .content{ diff --git a/src/views/collectionStory/detail/index.vue b/src/views/collectionStory/detail/index.vue index ed8f739..971bb48 100644 --- a/src/views/collectionStory/detail/index.vue +++ b/src/views/collectionStory/detail/index.vue @@ -1,6 +1,6 @@