diff --git a/src/assets/images/example.png b/src/assets/images/example.png
new file mode 100644
index 0000000..20e47b2
Binary files /dev/null and b/src/assets/images/example.png differ
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()
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, // 未开始