From 88a56189761fe2a614eda81e642cad99714e86d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com>
Date: Mon, 1 Jun 2026 10:10:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay/payment.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/pay/payment.vue b/src/views/pay/payment.vue
index d509dae..0f98b20 100644
--- a/src/views/pay/payment.vue
+++ b/src/views/pay/payment.vue
@@ -97,7 +97,7 @@
 <script setup lang="ts">
 	import { FormatBytes } from '@/utils/tools'
 	import { fetchDownloadItemsByGet } from '@/api/user'
-	import { computed, onMounted, ref } from 'vue'
+	import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 	import { CreateOrder, ORDER_STATUS, GetOrderStatus } from '@/api/shoppingCart'
 	import { useRouter, useRoute } from 'vue-router'
 	import { ElMessage } from 'element-plus'
@@ -119,6 +119,9 @@
 			})
 		}
 	})
+	onBeforeUnmount(() => {
+		clearInterval(viewTime.value)
+	})
 	const agreement = ref(false)
 	const paymentStatus = ref(ORDER_STATUS.PENDING)
 	const onPayWith = () => {
@@ -150,14 +153,23 @@
 			}
 		})
 	}
+	const viewTime = ref(null)
 	const openView = (url, width = 600, height = 800) => {
 		const left = (screen.width - width) / 2
 		const top = (screen.height - height) / 2
-		window.open(
+		const view = window.open(
 			url,
 			'_blank',
 			'width=' + width + ', height=' + height + ', left=' + left + ', top=' + top
 		)
+
+		clearInterval(viewTime.value)
+		viewTime.value = setInterval(() => {
+			if (view.closed) {
+				clearInterval(viewTime.value)
+				getOrderStatus()
+			}
+		}, 500)
 	}
 	const DOWNLOAD_STATUS = {
 		null: 0, // 未开始

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 2/2] 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 }}
 				</div>
 			</div>
 			<div class="btn" @click="addShopping">
@@ -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 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
-import img from "@/assets/images/collectionStory/Rectangle.png";
+import img from "@/assets/images/example.png";
 import coreConcept from "./coreConcept.vue";
 import inspiration from "./inspiration.vue";
 import feelingWithAiDA from "./feelingWithAiDA.vue";
@@ -14,19 +14,11 @@ const emit = defineEmits([
 let data = reactive({
 })
 const list = ref([
-	{
-		url: img,
-		title: "Windswept Burden",
-		price: "$100.00",
-	},{
-		url: img,
-		title: "Windswept Burden",
-		price: "$100.00",
-	},{
-		url: img,
-		title: "Windswept Burden",
-		price: "$100.00",
-	},
+	// {
+	// 	url: img,
+	// 	title: "Item sold here",
+	// 	price: "$?",
+	// },
 ])
 const addShopping = (item) => {
 	emit('addShopping', item)
@@ -47,9 +39,9 @@ const {} = toRefs(data);
 		<div class="left">
 			<div class="personal">
 				<img src="@/assets/images/collectionStory/code-create.png" alt="">
-				<div class="name">
+				<div class="name" @click="openCodeCreate">
 					<span>Code-Create</span>
-					<div class="icon" @click="openCodeCreate">
+					<div class="icon">
 						<SvgIcon name="share" size="24" />
 					</div>
 				</div>
@@ -100,8 +92,8 @@ const {} = toRefs(data);
 					display: flex;
 					gap: .4rem;
 					align-items: center;
+					cursor: pointer;
 					> .icon{
-						cursor: pointer;
 					}
 					> span{
 						font-family: 'KaiseiOpti-Bold';
diff --git a/src/views/collectionStory/index.vue b/src/views/collectionStory/index.vue
index 06b3b31..06140e7 100644
--- a/src/views/collectionStory/index.vue
+++ b/src/views/collectionStory/index.vue
@@ -22,10 +22,10 @@ const {} = toRefs(data);
 	<div class="collectionStory">
 		<div class="first-screen">
 			<img class="banner" src="@/assets/images/collectionStory/collection_story_banner.png" alt="">
-			<div class="back">
+			<!-- <div class="back">
 				<SvgIcon name="collectionStory-back" size="20" />
 				<div class="text">{{ $t('collectionStory.back') }}</div>	
-			</div>
+			</div> -->
 			<div class="title-content">
 				<div class="title-box">
 					<div class="title">
@@ -59,6 +59,7 @@ const {} = toRefs(data);
 			height: auto;
 			display: flex;
 			overflow: hidden;
+			align-items: center;
 			> .back{
 				position: absolute;
 				top: 2.4rem;
@@ -78,7 +79,7 @@ const {} = toRefs(data);
 				width: 100%;
 				position: absolute;
 				padding: 0 6.7rem;
-				margin-top: 11.5rem;
+				// margin-top: 11.5rem;
 				display: flex;
 				flex-direction: column;
 				align-items: flex-start;
@@ -87,7 +88,7 @@ const {} = toRefs(data);
 					flex-direction: column;
 					> .title{
 						font-size: 6.5rem;
-						line-height: 100%;
+						line-height: 1.3;
 						font-weight: 500;
 						color: #585858;
 					}
diff --git a/src/views/digitalItem/index.vue b/src/views/digitalItem/index.vue
index cdf2dda..f1f79e3 100644
--- a/src/views/digitalItem/index.vue
+++ b/src/views/digitalItem/index.vue
@@ -177,12 +177,13 @@ defineExpose({})
 					--el-border-radius-base: 0;
 					--el-select-input-color: rgba(0, 0, 0, 0.5);
 					--el-select-input-font-size: 1rem;
+					--el-border-color: #222222;
 					.el-select__wrapper {
 						font-size: 1.07rem;
 						padding: 0 0.7rem;
 						line-height: 1;
 						min-height: 0;
-						height: 2.2rem;
+						height: 2.8rem;
 
 						.header-label {
 							font-family: KaiseiOpti-Regular;
diff --git a/src/views/digitalItem/merchant-info.vue b/src/views/digitalItem/merchant-info.vue
index 4916d9c..4d8c708 100644
--- a/src/views/digitalItem/merchant-info.vue
+++ b/src/views/digitalItem/merchant-info.vue
@@ -20,6 +20,7 @@ const categories = ref(['all'])
 const gender = ref(['all'])
 
 const clearFilters = () => {
+	if(categories.value?.[0] == 'all' && gender.value?.[0] == 'all')return 
 	categories.value = ['all']
 	gender.value = ['all']
 	handleChange()