购物车

Merge branch 'main' of http://18.167.251.121:10003/aidlab/Aida_Purchaser_Front
aaa
2026-05-21 11:46:04 +08:00 · 2026-05-21 11:36:15 +08:00 · 2026-05-21 11:36:14 +08:00 · 2026-05-21 11:33:32 +08:00 · 2026-05-21 11:32:52 +08:00 · 2026-05-21 11:25:11 +08:00
49 changed files with 1463 additions and 435 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1 @@
-# VITE_APP_URL = http://192.168.31.82:8771
-# VITE_APP_URL = http://18.167.251.121:10095
-VITE_APP_URL = https://www.lc-api.aida.com.hk
+VITE_APP_URL = http://192.168.31.82:10094
--- a/.env.production
+++ b/.env.production
@@ -1,2 +1 @@
-VITE_APP_URL = https://www.lc-api.aida.com.hk
-# VITE_APP_URL = http://18.167.251.121:10095
+VITE_APP_URL = http://192.168.31.82:10094
--- a/index.html
+++ b/index.html
@@ -7,14 +7,14 @@
 	<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> -->
 	<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
 	<link rel="stylesheet" href="/fonts/index.css">
-    <title>Lane Crawford</title>
+    <title>Stylish Parade</title>
    <!-- Open Graph / WhatsApp share metadata -->
-    <meta property="og:title" content="Lane Crawford" />
-    <meta property="og:description" content="create and share looks from the Lane Crawford creation gallery." />
+    <meta property="og:title" content="Stylish Parade" />
+    <meta property="og:description" content="create and share looks from the Stylish Parade creation gallery." />
    <meta property="og:image" content="" />
    <meta property="og:url" content="https://www.lc.aida.com.hk" />
    <meta property="og:type" content="website" />
-    <meta property="og:site_name" content="Lane Crawford" />
+    <meta property="og:site_name" content="Stylish Parade" />
    <meta name="twitter:card" content="summary_large_image" />
  </head>
  <body>
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,6 +15,7 @@
 	import ShoppingDrawer from '@/views/shopping-drawer.vue'
 	const globalStore = useGlobalStore()
 	const loading = computed(() => globalStore.state.loading)
+	globalStore.setLoading(false)
 	const viewRef = ref()
 	const viewStyle = ref({
 		'--app-view-width': '',
--- a/src/api/account.ts
+++ b/src/api/account.ts
@@ -0,0 +1,122 @@
+import request from '@/utils/request'
+
+/**
+ * 登录发送验证码
+ * @param data - 包含邮箱的参数
+ * @param data.email - 邮箱
+ * @param data.password - 密码
+*/
+export const AccountSendLoginCode = (data) => {
+	return request({
+		url: '/buyer/account/preLogin',
+		method: 'post',
+		data,
+		loading: true
+	})
+}
+/**
+ * 登录
+ * @param data - 包含邮箱的参数
+ * @param data.email - 邮箱
+ * @param data.password - 密码
+ * @param data.emailVerifyCode - 验证码
+*/
+export const AccountLogin = (data) => {
+	return request({
+		url: '/buyer/account/login',
+		method: 'post',
+		data,
+		loading: true
+	})
+}
+
+/**
+ * 注册
+ * @param data - 包含注册信息的参数
+ * @param data.email - 邮箱
+ * @param data.password - 密码
+ * @param data.username - 用户名
+ * @param data.emailVerifyCode - 验证码
+ */
+export const AccountRegister = (data) => {
+	return request({
+		url: '/buyer/account/register',
+		method: 'post',
+		data,
+		loading: true
+	})
+}
+/**
+ * 注册||忘记密码：发送邮箱验证码
+ * @param data - 包含邮箱的参数
+ * @param data.email - 邮箱
+ * @param data.operationType - 操作类型：FORGET_PWD, REGISTER
+*/
+export const AccountSendVerifyCode = (data) => {
+	return request({
+		url: '/buyer/account/sendCode',
+		method: 'post',
+		data,
+		loading: true
+	})
+}
+/**
+ * 忘记密码：重置密码
+ * @param data - 包含邮箱的参数
+ * @param data.email - 邮箱
+ * @param data.password - 密码
+ * @param data.emailVerifyCode - 验证码
+*/
+export const AccountResetPassword = (data) => {
+	return request({
+		url: '/buyer/account/resetPassword',
+		method: 'post',
+		data,
+		loading: true
+	})
+}
+/**
+ * 通用验证码校验
+ * @param data - 包含邮箱的参数
+ * @param data.email - 邮箱
+ * @param data.emailVerifyCode - 验证码
+ * @param data.operationType - 操作类型：FORGET_PWD, BIND_MAILBOX
+*/
+export const AccountVerifyCode = (data) => {
+	return request({
+		url: '/buyer/account/verifyCode',
+		method: 'post',
+		data,
+		loading: true
+	})
+}
+
+/**
+ * 变更邮箱：发送新邮箱验证码
+ * @param data - 包含邮箱的参数
+ * @param data.oldEmail - 旧邮箱
+ * @param data.newEmail - 新邮箱
+*/
+export const AccountSendEmailChangeCode = (data) => {
+	return request({
+		url: '/buyer/account/sendEmailChangeCode',
+		method: 'post',
+		data,
+		loading: true
+	})
+}
+/**
+ * 变更邮箱：绑定新邮箱
+ * @param data - 包含邮箱的参数
+ * @param data.oldEmail - 旧邮箱
+ * @param data.newEmail - 新邮箱
+ * @param data.emailVerifyCode - 验证码
+*/
+export const AccountBindEmail = (data) => {
+	return request({
+		url: '/buyer/account/bindEmail',
+		method: 'post',
+		data,
+		loading: true
+	})
+}
--- a/src/api/brand.ts
+++ b/src/api/brand.ts
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+/**
+ * 获取店铺列表
+ * @param data 获取店铺列表的参数
+ * @param data.keyword 模糊查询店铺
+ * @returns 获取店铺列表
+ */
+export interface designerListData {
+	keyword: string
+}
+export const getDesignerList = (data:designerListData,loading?:boolean) => {
+	return request({
+		url: '/buyer/designer/search',
+		method: 'get',
+		params: data,
+		loading
+	})
+}
+
+/**
+ * 获取店铺详情
+ * @param data 获取店铺详情的参数
+ * @param data.sellerId 店铺 id
+ * @returns 获取店铺详情
+ */
+export interface designerDetailData {
+	sellerId?: string
+}
+export const getDesignerDetail = (data:designerDetailData,loading?:boolean) => {
+	return request({	
+		url: `/buyer/designer/shop/${data.sellerId}`,
+		method: 'get',
+		loading
+	})
+}
--- a/src/api/listing.ts
+++ b/src/api/listing.ts
@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+/**
+ * 获取店铺商品列表
+ * @param data 获取店铺商品列表的参数
+ * @param data.sellerId 店铺id
+ * @param data.designFor 查询类型 female/male/all
+ * @param data.pageNum 页码
+ * @param data.pageSize 页面大小
+ * @returns 获取店铺商品列表
+ */
+export interface listingListData {
+	sellerId?: string
+	designFor?: string
+	pageNum?: number
+	pageSize?: number
+}
+export const getlistingList = (data:listingListData,loading?:boolean) => {
+	return request({
+		url: '/buyer/listing/shop/seller',
+		method: 'get',
+		params: data,
+		loading
+	})
+}
+
+/**
+ * 获取商品详情
+ * @param data 获取商品详情的参数
+ * @param data.id 商品 id
+ * @returns 获取商品详情
+ */
+export interface listingDetailData {
+	id?: string
+}
+export const getListingDetail = (data:listingDetailData,loading?:boolean) => {
+	return request({	
+		url: `/buyer/listing/mall/detail`,
+		method: 'get',
+		params: data,
+		loading
+	})
+}
+
+/**
+ * 获取资产数字商品列表
+ * @param data 获取资产数字商品列表的参数
+ * @param data.designFor 查询类型 female/male/all
+ * @param data.categories 商品分类
+ * @param data.sortField 排序字段 price/salesVolume/updateTime/viewCount/createTime，默认 updateTime
+ * @param data.sortOrder 排序顺序：asc/desc，默认 desc
+ * @param data.pageNum 页码
+ * @param data.pageSize 页面大小
+ * @returns 获取资产数字商品列表
+ */
+export interface listingMallData {
+	designFor: string,
+	categories: string[],
+	sortField: string,
+	sortOrder: string,
+	pageNum: number,
+	pageSize: number
+}
+export const getListingMallList = (data:listingMallData,loading?:boolean) => {
+	return request({	
+		url: `/buyer/listing/mall`,
+		method: 'post',
+		data,
+		loading
+	})
+}
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -1,77 +0,0 @@
-import request from '@/utils/request'
-
-interface LoginParamsType {
-  name?: string // 姓名
-  email: string // 邮箱
-  password?: string // 密码
-  operationType: 'REGISTER' | 'LOGIN' | 'FORGET_PWD'
-  verifyCode?: string // 验证码
-}
-
-// 发送验证码
-export const precheckEmail = (params: { email: string }): Promise<ApiResponse> => {
-  return request({
-    url: '/api/auth/precheckEmail',
-    method: 'get',
-    params
-  })
-}
-
-export const fetchRegisterOrLogin = (data: LoginParamsType): Promise<LoginResponse> => {
-  return request({
-    url: '/api/auth/registerOrLogin',
-    method: 'post',
-    data
-  })
-}
-
-export const resetPassword = (data: LoginParamsType): Promise<ApiResponse> => {
-  return request({
-    url: '/api/auth/forgotPwd',
-    method: 'post',
-    data
-  })
-}
-
-export const checkLoginStatus = (): Promise<ApiResponse<LoginResponse>> => {
-  return request({
-    url: '/api/auth/checkLoginStatus',
-    method: 'get',
-    meta: { responseAll: true }
-  })
-}
-
-export const LogOut = (): Promise<ApiResponse> => {
-  return request({
-    url: '/api/auth/logout',
-    method: 'get'
-  })
-}
-
-// Google登录/注册参数类型
-interface GoogleAuthParamsType {
-  accessToken?: string // Google ID Token (用于One Tap登录)
-}
-export const googleAuth = (data: GoogleAuthParamsType): Promise<LoginResponse> => {
-  return request({
-    url: '/api/auth/parseGoogleAccessToken',
-    method: 'get',
-    params: data
-  })
-}
-
-
-/** 更改用户信息
- * @param data 包含用户信息的对象
- * @param data.username 用户名
- * @param data.email 邮箱
- * @param data.password 密码
- * @returns 包含更新后的用户信息的对象
-*/
-export const updateUserInfo = (data: any) => {
-  return request({
-    url: '/api/auth/updateUserInfo',
-    method: 'post',
-    data
-  })
-}
--- a/src/api/shoppingCart.ts
+++ b/src/api/shoppingCart.ts
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+/**
+ * 加入购物车
+ * @param data - 包含邮箱的参数
+ * @param data.listingId - 商品ID
+ * @param data.listingIds - 商品ID列表
+*/
+export const AddShoppingCart = (data, loading?: boolean) => {
+	return request({
+		url: '/buyer/buyer/cart/add',
+		method: 'post',
+		data,
+		loading
+	})
+}
+
+/**
+ * 清空购物车
+*/
+export const ClearShoppingCart = (loading?: boolean) => {
+	return request({
+		url: '/buyer/buyer/cart/clear',
+		method: 'delete',
+		loading
+	})
+}
+
+/**
+ * 获取购物车列表
+ * @param loading - 是否显示loading
+ * @returns 购物车列表数据
+*/
+export const GetShoppingCartList = (loading?: boolean) => {
+	return request({
+		url: '/buyer/buyer/cart/list',
+		method: 'get',
+		loading
+	})
+}
+
+/**
+ * 从购物车移除商品
+ * @param data - 包含邮箱的参数
+ * @param data.listingId - 商品ID
+ * @param data.listingIds - 商品ID列表
+*/
+export const RemoveShoppingCartItem = (data, loading?: boolean) => {
+	return request({
+		url: '/buyer/buyer/cart/remove',
+		method: 'delete',
+		data,
+		loading
+	})
+}
--- a/src/assets/icons/brand/delete.svg
+++ b/src/assets/icons/brand/delete.svg
@@ -0,0 +1,5 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.1113 5.26938H12.1387V3.63221C12.1387 2.87065 11.518 2.25 10.7565 2.25H6.73062C5.96906 2.25 5.34841 2.87065 5.34841 3.63221V5.26938H3.37575C3.16774 5.26938 3 5.43713 3 5.64513C3 5.85313 3.16774 6.02087 3.37575 6.02087H4.00646V14.3678C4.00646 15.1293 4.62711 15.75 5.38867 15.75H12.0984C12.86 15.75 13.4806 15.1293 13.4806 14.3678V6.02423H14.1113C14.3193 6.02423 14.4871 5.85649 14.4871 5.64848C14.4871 5.44048 14.3193 5.27274 14.1113 5.27274V5.26938ZM6.73062 3.00485H10.7565C11.102 3.00485 11.3872 3.28666 11.3872 3.63556V5.12848C11.3872 5.209 11.3234 5.27274 11.2429 5.27274H6.24751C6.167 5.27274 6.10325 5.209 6.10325 5.12848V3.63556C6.10325 3.29001 6.38506 3.00485 6.73397 3.00485H6.73062ZM12.0984 15.0019H5.38867C5.04312 15.0019 4.75795 14.7201 4.75795 14.3711V6.02423H12.7258V14.3711C12.7258 14.7167 12.444 15.0019 12.0951 15.0019H12.0984Z" fill="#979797"/>
+<path d="M7.40098 7.95319C7.15943 7.95319 6.96484 8.14777 6.96484 8.38932V12.2977C6.96484 12.5393 7.15943 12.7339 7.40098 12.7339C7.64253 12.7339 7.83711 12.5393 7.83711 12.2977V8.38932C7.83711 8.14777 7.64253 7.95319 7.40098 7.95319Z" fill="#979797"/>
+<path d="M10.0846 7.95319C9.84302 7.95319 9.64844 8.14777 9.64844 8.38932V12.2977C9.64844 12.5393 9.84302 12.7339 10.0846 12.7339C10.3261 12.7339 10.5207 12.5393 10.5207 12.2977V8.38932C10.5207 8.14777 10.3261 7.95319 10.0846 7.95319Z" fill="#979797"/>
+</svg>
--- a/src/assets/icons/brand/more.svg
+++ b/src/assets/icons/brand/more.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.5 12.5C9.5 13.8805 10.6195 15 12 15C13.3805 15 14.5 13.8805 14.5 12.5C14.5 11.1195 13.3805 10 12 10C10.6195 10 9.5 11.1195 9.5 12.5ZM13.5 12.5C13.5 13.327 12.827 14 12 14C11.173 14 10.5 13.327 10.5 12.5C10.5 11.673 11.173 11 12 11C12.827 11 13.5 11.673 13.5 12.5Z" fill="#7B7B7B"/>
+<path d="M3 12.5C3 13.8805 4.1195 15 5.5 15C6.8805 15 8 13.8805 8 12.5C8 11.1195 6.8805 10 5.5 10C4.1195 10 3 11.1195 3 12.5ZM7 12.5C7 13.327 6.327 14 5.5 14C4.673 14 4 13.327 4 12.5C4 11.673 4.673 11 5.5 11C6.327 11 7 11.673 7 12.5Z" fill="#7B7B7B"/>
+<path d="M16 12.5C16 13.8805 17.1195 15 18.5 15C19.8805 15 21 13.8805 21 12.5C21 11.1195 19.8805 10 18.5 10C17.1195 10 16 11.1195 16 12.5ZM20 12.5C20 13.327 19.327 14 18.5 14C17.673 14 17 13.327 17 12.5C17 11.673 17.673 11 18.5 11C19.327 11 20 11.673 20 12.5Z" fill="#7B7B7B"/>
+</svg>
--- a/src/assets/icons/brand/search.svg
+++ b/src/assets/icons/brand/search.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="13.8654" cy="13.8665" r="7.86667" stroke="#232323" stroke-width="1.33333"/>
+<path d="M19.5586 19.5552L26.6697 26.6663" stroke="#232323" stroke-width="1.33333" stroke-linecap="round"/>
+</svg>
--- a/src/assets/icons/brand/time.svg
+++ b/src/assets/icons/brand/time.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 20C4.48583 20 0 15.5142 0 10C0 4.48583 4.48583 0 10 0C15.5142 0 20 4.48583 20 10C20 15.5142 15.5142 20 10 20ZM10 0.833333C4.94583 0.833333 0.833333 4.94583 0.833333 10C0.833333 15.0542 4.94583 19.1667 10 19.1667C15.0542 19.1667 19.1667 15.0542 19.1667 10C19.1667 4.94583 15.0542 0.833333 10 0.833333ZM12.3333 14.0833C12.5175 13.945 12.555 13.6842 12.4175 13.5L10.0008 10.2775V4.58333C10.0008 4.35333 9.81417 4.16667 9.58417 4.16667C9.35417 4.16667 9.1675 4.35333 9.1675 4.58333V10.4167C9.1675 10.5067 9.19667 10.5942 9.25083 10.6667L11.7508 14C11.8333 14.1092 11.9583 14.1667 12.0842 14.1667C12.1708 14.1667 12.2583 14.1392 12.3333 14.0833Z" fill="black"/>
+</svg>
--- a/src/assets/icons/digital/pullIcon.svg
+++ b/src/assets/icons/digital/pullIcon.svg
@@ -0,0 +1,5 @@
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.5">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.82684 8.7465L7.13386 6.43947L9.44089 8.7465C9.67278 8.97839 10.0474 8.97839 10.2793 8.7465C10.5112 8.51461 10.5112 8.14001 10.2793 7.90812L7.55008 5.17893C7.31819 4.94704 6.94359 4.94704 6.7117 5.17893L3.98251 7.90812C3.75062 8.14001 3.75062 8.51461 3.98251 8.7465C4.2144 8.97244 4.59495 8.97839 4.82684 8.7465Z" fill="black"/>
+</g>
+</svg>
--- a/src/assets/icons/shop.svg
+++ b/src/assets/icons/shop.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 6.4C20 5.3 19.1 4 18 4H7.5C7.4 4 7.2 4 7.1 4C5.9 4.2 5 5.2 5 6.4L4 9C4 10.4 5.1 11.5 6.5 11.5C7.9 11.5 8.1 11.1 8.5 10.5C8.9 11.1 9.7 11.5 10.5 11.5C11.3 11.5 12.1 11.1 12.5 10.5C12.9 11.1 13.7 11.5 14.5 11.5C15.3 11.5 16.1 11.1 16.5 10.5C16.9 11.1 17.7 11.5 18.5 11.5C19.9 11.5 21 10.4 21 9M5.9 6.4C5.9 5.6 6.5 5 7.2 4.9C7.2 4.9 7.3 4.9 7.4 4.9H17.9C18.5 4.9 19 5.8 19 6.4C19 7 20 9.1 20 9.1C20 10 19.3 10.7 18.4 10.7C17.5 10.7 16.8 10 16.8 9.1V7.6H15.9V9.1C15.9 10 15.2 10.7 14.3 10.7C13.4 10.7 12.7 10 12.7 9.1V7.6H11.8V9.1C11.8 10 11.1 10.7 10.2 10.7C9.3 10.7 8.6 10 8.6 9.1V7.6H7.7V9.1C7.7 10 7.50938 10.7 6.60938 10.7C5.48438 10.7 4.9 9.9 4.9 9L5.9 6.4Z" fill="#232323"/>
+<path d="M6 11.2V19.3C6 19.9 6.4 20.3 7 20.3H18C18.6 20.3 19 19.9 19 19.3V13.5" stroke="#232323" stroke-width="0.75" stroke-linecap="round"/>
+<path d="M17 15.5V13.5C17 13.2239 16.7761 13 16.5 13C16.2239 13 16 13.2239 16 13.5V15.5C16 15.7761 16.2239 16 16.5 16C16.7761 16 17 15.7761 17 15.5Z" fill="#232323"/>
+</svg>
--- a/src/assets/icons/statement.svg
+++ b/src/assets/icons/statement.svg
@@ -0,0 +1,4 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.32919 0C3.73406 0 0 3.7382 0 8.33333C0 12.9285 3.7382 16.6667 8.32919 16.6667C12.9202 16.6667 16.6584 12.9285 16.6584 8.33333C16.6584 3.7382 12.9243 0 8.32919 0ZM8.32919 15.7352C4.24739 15.7352 0.927306 12.4151 0.927306 8.33333C0.927306 4.25153 4.24739 0.931445 8.32919 0.931445C12.411 0.931445 15.7311 4.25153 15.7311 8.33333C15.7311 12.4151 12.411 15.7352 8.32919 15.7352Z" fill="#979797"/>
+<path d="M8.84744 7.50551C8.84744 7.21972 8.61576 6.98804 8.32997 6.98804C8.04418 6.98804 7.8125 7.21972 7.8125 7.50551V12.4732C7.8125 12.759 8.04418 12.9907 8.32997 12.9907C8.61576 12.9907 8.84744 12.759 8.84744 12.4732V7.50551Z" fill="#979797"/>
+</svg>
--- a/src/assets/images/brand-null.png
+++ b/src/assets/images/brand-null.png
--- a/src/assets/images/brand/brandBg.png
+++ b/src/assets/images/brand/brandBg.png
--- a/src/assets/images/brand/brandDetailBg.png
+++ b/src/assets/images/brand/brandDetailBg.png
--- a/src/assets/images/brand/brandLoading.gif
+++ b/src/assets/images/brand/brandLoading.gif
--- a/src/assets/images/collectionStory/code-create.png
+++ b/src/assets/images/collectionStory/code-create.png
--- a/src/assets/images/collectionStory/collection_story_banner.png
+++ b/src/assets/images/collectionStory/collection_story_banner.png
--- a/src/assets/images/logos/aidaAndStylish.png
+++ b/src/assets/images/logos/aidaAndStylish.png
--- a/src/assets/images/logos/stylish-parade-black.png
+++ b/src/assets/images/logos/stylish-parade-black.png
--- a/src/components/checked.vue
+++ b/src/components/checked.vue
@@ -14,11 +14,23 @@ const emit = defineEmits([
 	'update:selected'
 ])
 const checkList = computed(()=>{
-	return [props.selected]
+	if(props.selected[0] === ''){
+		return props.list.map(item => item.value)
+	}else{
+		return [...props.selected]
+	}
 })
 const handleChange = (val) => {
-	if (val.length > 1) {
-		emit('update:selected', val[val.length - 1])
+	emit('update:selected', val)
+}
+const checkAll = computed(()=>{
+	return checkList.value.length === props.list.length
+})
+const handleCheckAllChange = (val) => {
+	if(val){
+		emit('update:selected', props.list.map(item => item.value))
+	}else{
+		emit('update:selected', [])
 	}
 }
 let data = reactive({
@@ -31,6 +43,14 @@ defineExpose({})
 const {} = toRefs(data);
 </script>
 <template>
+	<div class="all">
+		<el-checkbox
+			v-model="checkAll"
+			@change="handleCheckAllChange"
+		>
+			All
+		</el-checkbox>
+	</div>
 	<el-checkbox-group v-model="checkList" @change="handleChange">
 		<el-checkbox 
 			v-for="item in props.list" 
@@ -42,6 +62,9 @@ const {} = toRefs(data);
 	</el-checkbox-group>
 </template>
 <style lang="less" scoped>
+	.all{
+		margin-bottom: 1.2rem;
+	}
 	.el-checkbox-group{
 		display: flex;
 		flex-direction: column;
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -23,6 +23,11 @@ const router = createRouter({
      name: 'brand',
      component: () => import('../views/brand/index.vue')
    },
+	{
+		path: '/brand/:id',
+		name: 'brandDetail',
+		component: () => import('../views/brandDetail/index.vue')
+	},
    {
      path: '/digitalItem',
      name: 'digitalItem',
--- a/src/stores/userInfo.ts
+++ b/src/stores/userInfo.ts
@@ -5,21 +5,20 @@ import { removeLocal, setLocal } from '@/utils/local'
 import MyEvent from '@/utils/myEvent'
 export const useUserInfoStore = defineStore('userInfo', () => {
 	const state = ref({
-    userInfo: {},
-    token: '',
-    generateParams: {
-      stylist: '',
-      sex: '',
-      stylistImage: ''
-    }
+		userInfo: {
+			userId: "",
+			email: "",
+			username: "",
+			accessToken: "",
+			expiresIn: "",
+		},
+		token: ''
 	})

-  // getters
-  const getUserInfo = computed(() => state.value.userInfo)
-
 	// actions
 	const setUserInfo = (data: any) => {
 		state.value.userInfo = data
+		setToken(data.accessToken)
 	}

 	const setToken = (data: string) => {
@@ -27,44 +26,26 @@ export const useUserInfoStore = defineStore('userInfo', () => {
 		setLocal(data, 'token')
 	}

-  const getGenerateParams = () => {
-    return state.value.generateParams
-  }
-
-  const setGenerateParams = (data: any) => {
-    state.value.generateParams = data
-  }
-
-  const resetGenerateParams = () => {
-    state.value.generateParams = {
-      stylist: '',
-      sex: '',
-      stylistImage: ''
-    }
-  }
-
-  const logOut = () => {
+	const logout = () => {
 		// 处理退出登录的一些逻辑
 		return new Promise((resolve) => {
+			state.value.userInfo = {
+				userId: "",
+				email: "",
+				username: "",
+				accessToken: "",
+				expiresIn: "",
+			}
 			state.value.token = ''
-      state.value.userInfo = {}
 			removeLocal('token')
-      resetGenerateParams()
-      MyEvent.emit('clear-generate-state')
-      MyEvent.emit('clear-client-state')
-      MyEvent.emit('clearAllCache')
 			resolve('')
 		})
 	}

 	return {
 		state,
-    getUserInfo,
 		setToken,
 		setUserInfo,
-    setGenerateParams,
-    getGenerateParams,
-    resetGenerateParams,
-    logOut
+		logout
 	}
 })
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -75,9 +75,10 @@ service.interceptors.response.use(
 		const res = response.data
 		// 处理异常的情况
 		// console.log(res)
-		if (res.code != 200) {
-			ElMessage.error(res.message)
-			return Promise.reject(new Error(res.errMsg || res.message || 'error'))
+		if (res.errCode != 0) {
+			let msg = res.errMsg || res.message || 'error'
+			ElMessage.error(msg)
+			return Promise.reject(new Error(msg))
 		} else {
 			// 默认只返回data，不返回状态码和message
 			// 通过 meta 中的 responseAll 配置来取决后台是否返回所有数据(包括状态码，message和data)
@@ -109,8 +110,7 @@ service.interceptors.response.use(
 					message: 'Please log in and try again.',
 					duration: 5000
 				})
-				router.push('/login')
-				useUserInfoStore().logOut(false)
+				useUserInfoStore().logout()
 				return Promise.reject(false)
 			}
 			error.config && removePending(error.config)
--- a/src/views/brand/brand-item.vue
+++ b/src/views/brand/brand-item.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts">
+import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
+const props = defineProps({
+	item:{
+		type:Object,
+		default:()=>{},
+	},
+})
+const emit = defineEmits([
+	'viewProfile',
+])
+const viewProfile = (item) => {
+	emit('viewProfile', item)
+}
+let data = reactive({
+})
+onMounted(()=>{
+})
+onUnmounted(()=>{
+})
+defineExpose({})
+const {} = toRefs(data);
+</script>
+<template>
+	<div class="item">
+		<div class="left">
+			<div class="portrait">
+				<img :src="item.avatar" alt="">
+			</div>
+			<div class="info">
+				<div class="name">{{ item.shopName }}</div>
+				<div class="collection">
+					{{ item.ownerName }} | 
+					{{ item?.listingTotal || 0 }} Collections
+				</div>
+				<div class="view-profile" @click="viewProfile(item)">View Profile</div>
+			</div>
+		</div>
+		<div class="right">
+			<div class="img-list">
+				<div class="img-item" v-for="itemImg in item?.covers" :key="itemImg">
+					<img :src="itemImg" alt="">
+				</div>
+			</div>
+			<div class="more">
+				<div class="icon" v-show="item?.covers?.length == 5">
+					<svgIcon name="brand-more" size="24" />
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+<style lang="less" scoped>
+	.item{
+		display: flex;
+		width: 100%;
+		height: 14rem;
+		justify-content: space-between;
+		border-bottom: 0.5px solid #C4C4C4;
+		> .left{
+			display: flex;
+			.portrait{
+				width: 8rem;
+				height: 8rem;
+				margin-right: 2.4rem;
+				> img{
+					width: 100%;
+					height: 100%;
+					object-fit: cover;
+				}
+			}
+			.info{
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				> .name{
+					font-family: "KaiseiOpti-Bold";
+					font-weight: 700;
+					font-size: 2rem;
+					line-height: 100%;
+				}
+				> .collection{
+					color: #7B7B7B;
+					font-family: "KaiseiOpti-Regular";
+					font-weight: 400;
+					font-size: 1.2rem;
+					line-height: 2.3rem;
+					margin-top: .4rem;
+				}
+				> .view-profile{
+					margin-top: 2.4rem;
+					border-bottom: 2px solid #585858;
+					background: #F9F9F9;
+					font-family: "KaiseiOpti-Regular";
+					font-weight: 400;
+					font-size: 1.4rem;
+					letter-spacing: -0.4px;
+					line-height: 3.4rem;
+					padding: 0 2.55rem;
+					cursor: pointer;
+				}
+			}
+		}
+		> .right{
+			display: flex;
+			> .img-list{
+				display: flex;
+				gap: 3.2rem;
+				> .img-item{
+					width: 9.2rem;
+					height: 12rem;
+					img{
+						width: 100%;
+						height: 100%;
+						object-fit: contain;
+					}
+				}
+			}
+			> .more{
+				width: 8rem;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+</style>
--- a/src/views/brand/index.vue
+++ b/src/views/brand/index.vue
@@ -1,9 +1,13 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
-import CommodityList from "./commodity-list.vue";
-import MerchantInfo from "./merchant-info.vue";
 import { useRouter } from "vue-router";
 import myEvent from '@/utils/myEvent'
+import scListNull from '@/views/shoppingCart/sc-list-null.vue'
+import brandItem from '@/views/brand/brand-item.vue'
+import { getDesignerList } from '@/api/brand'
+
+
+import img from '@/assets/images/collectionStory/Rectangle.png'
 //const props = defineProps({
 //})
 //const emit = defineEmits([
@@ -11,13 +15,99 @@ import myEvent from '@/utils/myEvent'
 const router = useRouter()
 let data = reactive({
 })
-const addShopping = (item) => {
-	myEvent.emit('addShopping', item)
+
+const searchBrand = ref('')
+const merchantList = ref([
+])
+const getMerchantData = reactive({
+	pageSize: 10,
+	pageNum: 1,
+	isShowMark:false,
+	isNoData:false,
+})
+const searchHistory = ref([
+	
+])
+
+let changeSearchBrandTime = null
+const changeSearchBrand = () => {
+	clearTimeout(changeSearchBrandTime)
+	getDesignerList({
+		keyword: searchBrand.value,
+	}).then((res)=>{
+		merchantList.value = []
+		merchantList.value.push(...res)
+	})
+	// changeSearchBrandTime = setTimeout(()=>{
+	// 	getMerchantData.pageNum = 1
+	// 	getMerchantData.isShowMark = false
+	// 	getMerchantData.isNoData = false
+	// },300)
 }
-const openDetail = (item) => {	
-	router.push({name: 'digitalDetail', params: {id: item.id}})
+
+// const getBrandList = async () => {
+// 	if(getMerchantData.isShowMark && !getMerchantData.isNoData)return
+// 	getMerchantData.isShowMark = true
+// 	let value = {
+// 		pageSize: getMerchantData.pageSize,
+// 		pageNum: getMerchantData.pageNum,
+// 		status: 1,
+// 	}
+// 	setTimeout(()=>{
+// 			if(merchantList.value.length >= 5){
+// 				getMerchantData.isNoData = true
+// 				merchantList.value = []
+// 				return
+// 			}
+// 			getMerchantData.pageNum += 1
+// 			merchantList.value.push({
+// 				name:'Roaming Clouds',
+// 				portrait: img,
+// 				collectionsName:'by Lian Su ',
+// 				collections:[
+// 					img,img,img,
+// 				],
+// 			})
+// 			getMerchantData.isShowMark = false
+// 	},1000)
+// 	// await getPublishList(value).then((res)=>{
+// 	// 	if(res.content.length == 0)getMerchantData.isNoData = true
+// 	// 	getMerchantData.pageNum += 1
+// 	// 	list.value.push(...res.content)
+// 	// })
+// }
+// const vObserve  = {
+// 	mounted (el,binding) {
+// 		getMerchantData.isShowMark = false
+// 		getMerchantData.isNoData = false
+// 		new IntersectionObserver(
+// 		(entries, observer) => {
+// 				// 如果不是相交，则直接返回
+// 				// console.log(entries[0]);
+// 				if (!entries[0].intersectionRatio) return;
+// 				getMerchantData.pageNum += 1
+// 				binding.value()
+// 			},
+// 			// { root:worksPage }
+// 		).observe(el);
+// 	}
+// }
+
+const deleteHistory = (item) => {
+	searchHistory.value = searchHistory.value.filter((i) => i != item)
+	localStorage.setItem('brandSearchHistory', JSON.stringify(searchHistory.value));
 }
+const viewProfile = (item) => {
+	if(!searchHistory.value.includes(searchBrand.value))searchHistory.value.push(searchBrand.value)
+	localStorage.setItem('brandSearchHistory', JSON.stringify(searchHistory.value));
+	router.push({
+		path:'/brand/'+item.sellerId,
+	})
+}
+
 onMounted(()=>{
+	const value = localStorage.getItem('brandSearchHistory');
+	if(value)searchHistory.value = JSON.parse(value)
 })
 onUnmounted(()=>{
 })
@@ -26,15 +116,52 @@ const {} = toRefs(data);
 </script>
 <template>
 	<div class="brand">
-		<div class="header-img">
+		<div class="header-img" :class="{'active': searchBrand.length > 0}">
 			<img src="@/assets/images/brand/brandBg.png" alt="">
+			<div class="text-box">
+				<div class="title">Brand</div>
+				<span>Every brand, every story — discover who's behind the collections.</span>
+			</div>
 		</div>
 		<div class="content">
-			<div class="merchant-info">
-				<MerchantInfo></MerchantInfo>
+			<div class="input">
+				<input type="text" v-model="searchBrand" @input="changeSearchBrand" placeholder="Search brand">
+				<div class="icon">
+					<SvgIcon name="brand-search" size="32" />
+				</div>
+			</div>
+			<div class="merchantList" v-if="searchBrand.length > 0">
+				<brand-item v-for="item in merchantList" :key="item.name" :item="item" @viewProfile="viewProfile"></brand-item>
+				<div class="end" v-show="!getMerchantData.isNoData && !getMerchantData.isShowMark">- The End-</div>
+				<!-- <div v-show="!getMerchantData.isNoData" class="material_content_list_loding">
+					<span class="page_loading" v-show="!getMerchantData.isShowMark" v-observe="getBrandList"></span>
+					<img v-if="getMerchantData.isShowMark" src="@/assets/images/brand/brandLoading.gif" alt="">
+				</div> -->
+
+				<div class="merchantListNull" v-if="getMerchantData.isNoData && searchBrand.length > 0">
+					<sc-list-null 
+						nullImage="brand"
+						:showButton="false" 
+						title="Brand No Found"
+						tip="Try using another keywords."
+					/>
+				</div>
+			</div>
+			<div class="null-input" v-if="searchBrand.length == 0">
+				<div class="title">
+					<div class="icon">
+						<SvgIcon name="brand-time" size="20" />
+					</div>
+					<span>Searching History</span>
+				</div>
+				<div class="history">
+					<div v-for="item in searchHistory" :key="item" @click.stop="searchBrand = item" class="item">
+						<span>{{item}}</span>
+						<div class="icon" @click.stop="deleteHistory(item)">
+							<SvgIcon name="brand-delete" size="18" />
+						</div>
+					</div>
 				</div>
-			<div class="commodity-list">
-				<CommodityList @addShopping="addShopping" @openDetail="openDetail"></CommodityList>
 			</div>
 		</div>
 		<Footer></Footer>
@@ -46,34 +173,151 @@ const {} = toRefs(data);
 		height: 100%;
 		position: relative;
 		overflow-y: auto;
+		display: flex;
+		flex-direction: column;
 		.header-img{
 			width: 100%;
+			position: relative;
+			height: 34.4rem;
+			transition: all .3s;
+			&.active{
+				height: 14.7rem;
+			}
 			>img{
 				width: 100%;
+				position: absolute;
+				bottom: 0;
+			}
+			> .text-box{
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				text-align: center;
+				> .title{
+					font-family: 'KaiseiOpti-Bold';
+					font-weight: 700;
+					font-size: 4rem;
+					line-height: 2.3rem;
+					letter-spacing: 0%;
+					color: #000;
+				}
+				> span{
+					display: block;
+					margin-top: 2.4rem;
+					font-family: 'KaiseiOpti-Regular';
+					font-weight: 400;
+					font-size: 1.6rem;
+					line-height: 140%;
 				}
 			}
-		.content{
+		}
+		>.content{
 			display: flex;
 			height: auto;
 			align-items: flex-start;
-			.merchant-info{
-				width: 40rem;
-				padding-left: 12.7rem;
-				padding-right: 2.7rem;
-				height: var(--app-view-height);
-				overflow-y: auto;
-				position: sticky;
-				top: 0;
-				&::-webkit-scrollbar{
-					width: 0;
-					height: 0;
-				}
-			}
-			.commodity-list{
+			flex-direction: column;
+			align-items: center;
 			flex: 1;
-				border-left: 0.5px solid #585858;
-				border-right: 0.5px solid #585858;
-				margin-right: 9rem;
+			overflow: hidden;
+			> .input{
+				width: 66.6rem;
+				display: flex;
+				border-bottom: 2px solid #232323;
+				padding: 1.4rem 1.4rem 1.4rem 2.4rem;
+				background-color: #f9f9f9;
+				display: flex;
+				margin-top: 8rem;
+				> input{
+					width: 57.2rem;
+					line-height: 3.2rem;
+					padding: 0;
+					border: none;
+					font-family: 'KaiseiOpti-Regular';
+					font-weight: 400;
+					font-size: 1.6rem;
+					line-height: 100%;
+					margin-right: 2.4rem;
+					background-color: transparent;
+					outline: none;
+				}
+				> .icon{
+					cursor: pointer;
+				}
+			}
+			> .null-input{
+				margin-top: 8rem;
+				.title{
+					display: flex;
+					justify-content: center;
+					.icon{
+						margin-right: 2rem;
+					}
+				}
+				.history{
+					margin-top: 4rem;
+					width: 59rem;
+					display: flex;
+					flex-wrap: wrap;
+					justify-content: center;
+					column-gap: 3.2rem;
+					row-gap: 1.2rem;
+					.item{
+						cursor: pointer;
+						display: flex;
+						> span{
+							font-family: 'KaiseiOpti-Regular';
+							font-weight: 400;
+							font-size: 1.4rem;
+							line-height: 100%;
+							margin-right: .4rem;
+						}
+					}
+				}
+			}
+			> .merchantList{
+				width: 121.8rem;
+				margin-top: 6rem;
+				flex: 1;
+				overflow-y: auto;
+				gap: 3.2rem;
+				display: flex;
+				flex-direction: column;
+				::-webkit-scrollbar{
+					display: none;
+				}
+				.end{
+					font-family: 'KaiseiOpti-Regular';
+					font-weight: 400;
+					font-size: 12px;
+					line-height: 140%;
+					height: 7rem;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+				> .material_content_list_loding{
+					width: 100%;
+					height: 5rem;
+					aspect-ratio: 1/1;
+					overflow: hidden;
+					display: flex;
+					flex-shrink: 0;
+					justify-content: center;
+					> .page_loading{
+						width: 5rem;
+						height: 5rem;
+					}
+					> img{
+						width: 5rem;
+						height: 5rem;
+						object-fit: contain;
+					}
+				}
+				> .merchantListNull{
+					flex: 1;
+					width: 100%;
+				}
 			}
 		}
 	}
--- a/src/views/brandDetail/commodity-list.vue
+++ b/src/views/brandDetail/commodity-list.vue
@@ -37,11 +37,7 @@ const list = ref([
 		url: img,
 		title: "Windswept Burden",
 		price: "$100.00",
-	},{
-		url: img,
-		title: "Windswept Burden",
-		price: "$100.00",
-	},
+	}
 ])
 const type = ref('All')
 const addShopping = (item) => {
@@ -128,41 +124,26 @@ const {} = toRefs(data);
 			}
 		}
 		.list{
-			border-top: 0.5px solid #585858;
 			width: 100%;
 			flex: 1;
+			// display: grid;
+			// align-content: start;
+			// grid-template-columns: repeat(3, 1fr);
+			overflow: hidden;
+
 			display: grid;
 			align-content: start;
-			grid-template-columns: repeat(3, 1fr);
-			overflow-y: auto;
+			grid-template-columns: repeat(auto-fit, minmax(min(100%, 28rem), 1fr));
+			border-top: 0.5px solid #585858;
+			padding: .5px 0 0 .5px;
 			/* 垂直线（右边框） */
 			.item{
 				position: relative;
 				padding: 1.2rem;
-			}
-			.item::before {
-				content: '';
-				position: absolute;
-				right: 0;
-				top: 0;
-				height: 100%;
-				border-right: 0.5px solid #585858;
-				z-index: 1;
-			}
-
-				/* 水平线（下边框） */
-			.item::after {
-				content: '';
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				width: 100%;
 				border-bottom: 0.5px solid #585858;
-				z-index: 1;
-			}
-				/* 移除最后一列的右边框 */
-			.item:nth-child(3n)::before {
-				display: none;
+				border-right: 0.5px solid #585858;
+				margin-right: -1px;
+				margin-bottom: -1px;
 			}
 		}
 	}
--- a/src/views/brandDetail/index.vue
+++ b/src/views/brandDetail/index.vue
@@ -0,0 +1,101 @@
+<script setup lang="ts">
+import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
+import CommodityList from "./commodity-list.vue";
+import MerchantInfo from "./merchant-info.vue";
+import { useRouter, useRoute } from "vue-router";
+import myEvent from '@/utils/myEvent'
+import { getDesignerDetail } from '@/api/brand'
+
+//const props = defineProps({
+//})
+//const emit = defineEmits([
+//])
+const router = useRouter()
+const route = useRoute()
+
+const designerDetail = ref({
+	avatar: '',
+	brandBanner: '',
+	description: '',
+	email: '',
+	mobile: '',
+	ownerName: '',
+	shopName: '',
+	socialLinks: '[]',
+})
+
+const addShopping = (item) => {
+	myEvent.emit('addShopping', item)
+}
+const openDetail = (item) => {	
+	router.push({name: 'digitalDetail', params: {id: item.id}})
+}
+const getDetail = ()=>{
+	let data = {
+		sellerId: route.params.id,
+	}
+	getDesignerDetail(data,true).then((res)=>{
+		designerDetail.value = res
+	})
+}
+onMounted(()=>{
+	getDetail()
+})
+onUnmounted(()=>{
+})
+defineExpose({})
+</script>
+<template>
+	<div class="brand">
+		<div class="header-img">
+			<img :src="designerDetail.brandBanner || '@/assets/images/brand/brandDetailBg.png'" alt="">
+		</div>
+		<div class="content">
+			<div class="merchant-info">
+				<MerchantInfo :designerDetail="designerDetail"></MerchantInfo>
+			</div>
+			<div class="commodity-list">
+				<CommodityList @addShopping="addShopping" @openDetail="openDetail"></CommodityList>
+			</div>
+		</div>
+		<Footer></Footer>
+	</div>
+</template>
+<style lang="less" scoped>
+	.brand{
+		width: 100%;
+		height: 100%;
+		position: relative;
+		overflow-y: auto;
+		.header-img{
+			width: 100%;
+			>img{
+				width: 100%;
+			}
+		}
+		.content{
+			display: flex;
+			height: auto;
+			align-items: flex-start;
+			.merchant-info{
+				width: 40rem;
+				padding-left: 12.7rem;
+				padding-right: 2.7rem;
+				height: var(--app-view-height);
+				overflow-y: auto;
+				position: sticky;
+				top: 0;
+				&::-webkit-scrollbar{
+					width: 0;
+					height: 0;
+				}
+			}
+			.commodity-list{
+				flex: 1;
+				border-left: 0.5px solid #585858;
+				border-right: 0.5px solid #585858;
+				margin-right: 9rem;
+			}
+		}
+	}
+</style>
--- a/src/views/brandDetail/merchant-info.vue
+++ b/src/views/brandDetail/merchant-info.vue
@@ -1,7 +1,22 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
-//const props = defineProps({
-//})
+const props = defineProps({
+	designerDetail: {
+		type: Object,
+		default: () => {
+			return {
+				avatar: '',
+				brandBanner: '',
+				description: '',
+				email: '',
+				mobile: '',
+				ownerName: '',
+				shopName: '',
+				socialLinks: '[]',
+			}
+		},
+	},
+})
 //const emit = defineEmits([
 //])
 let data = reactive({
@@ -16,12 +31,12 @@ const {} = toRefs(data);
 <template>
 	<div class="merchantInfo">
 		<div class="profile">
-			<img src="@/assets/images/collectionStory/Rectangle.png" alt="">
+			<img :src="designerDetail.avatar || '@/assets/images/collectionStory/Rectangle.png'" alt="">
 		</div>
 		<div class="info">
 			<div class="detail">
-				<div class="name">Lian Su</div>
-				<div class="title">Roaming Clouds</div>
+				<div class="name">{{ designerDetail.ownerName }}</div>
+				<div class="title">{{ designerDetail.shopName }}</div>
 			</div>
 			<div class="contact">
 				<div class="title">Contact</div>
@@ -29,30 +44,26 @@ const {} = toRefs(data);
 					<div class="icon">
 						<svg-icon name="brand-email" size="24" />
 					</div>
-					<div>lian.su@urieworweoo.com</div>
+					<div>{{ designerDetail.email }}</div>
 				</div>
 				<div class="phone label">
 					<div class="icon">
 						<svg-icon name="brand-call" size="24" />
 					</div>
-					<div>+86 139 4829 7710</div>
+					<div>{{ designerDetail.mobile }}</div>
 				</div>
-				<div class="address label">
+				<div class="address label" v-for="value in JSON.parse(designerDetail.socialLinks)">
 					<div class="icon">
 						<svg-icon name="brand-link" size="24" />
 					</div>
-					<div>746312432</div>
-				</div>
-				<div class="website label">
-					<div class="icon">
-						<svg-icon name="brand-link" size="24" />
-					</div>
-					<div>https://urieworweoo.com</div>
+					<div>{{value}}</div>
 				</div>
 			</div>
 			<div class="about">
 				<div class="title">About</div>
-				<div class="content">Lian Su’s work weaves understated ethnic influences into contemporary minimalism. She explores materials and silhouettes that bridge heritage and modern sensibilities. Her designs reflect a quiet dialogue between cultural memory and forward-looking innovation.</div>
+				<div class="content">
+					{{ designerDetail.description }}
+				</div>
 			</div>
 		</div>
 	</div>
--- a/src/views/collectionStory/detail/index.vue
+++ b/src/views/collectionStory/detail/index.vue
@@ -4,6 +4,7 @@ import img from "@/assets/images/collectionStory/Rectangle.png";
 import coreConcept from "./coreConcept.vue";
 import inspiration from "./inspiration.vue";
 import feelingWithAiDA from "./feelingWithAiDA.vue";
+import joinUs from "./join-us.vue";
 import CommodityItem from "@/components/CommodityItem.vue";
 //const props = defineProps({
 //})
@@ -30,6 +31,10 @@ const list = ref([
 const addShopping = (item) => {
 	emit('addShopping', item)
 }
+const openCodeCreate = () => {
+	window.open('https://code-create.com.hk/', '_blank')
+}
+
 onMounted(()=>{
 })
 onUnmounted(()=>{
@@ -41,21 +46,22 @@ const {} = toRefs(data);
 	<div class="detail">
 		<div class="left">
 			<div class="personal">
-				<img :src="img" alt="">
+				<img src="@/assets/images/collectionStory/code-create.png" alt="">
 				<div class="name">
-					<span>Lian Su</span>
-					<div class="icon">
+					<span>Code-Create</span>
+					<div class="icon" @click="openCodeCreate">
 						<SvgIcon name="share" size="24" />
 					</div>
 				</div>
 			</div>
 		</div>
 		<div class="center">
-			<coreConcept ></coreConcept>
+			<joinUs></joinUs>
+			<!-- <coreConcept ></coreConcept>
 			<div class="line"></div>
 			<inspiration ></inspiration>
 			<div class="line"></div>
-			<feelingWithAiDA ></feelingWithAiDA>
+			<feelingWithAiDA ></feelingWithAiDA> -->
 		</div>
 		<div class="right">
 			<div class="item" v-for="item in list" :key="item.url">
@@ -67,10 +73,11 @@ const {} = toRefs(data);
 <style lang="less" scoped>
 	.detail{
 		width: 100%;
-		height: auto;
 		position: relative;
 		display: flex;
+		height: calc(100vh - var(--header-height) - var(--footer-height));
 		align-items: flex-start;
+		overflow: hidden;
 		> div{
 			// height: 100%;
 		}
@@ -93,6 +100,9 @@ const {} = toRefs(data);
 					display: flex;
 					gap: .4rem;
 					align-items: center;
+					> .icon{
+						cursor: pointer;
+					}
 					> span{
 						font-family: 'KaiseiOpti-Bold';
 						font-weight: 700;
@@ -110,8 +120,9 @@ const {} = toRefs(data);
 			border-right: 0.5px solid #585858;
 			// overflow-y: auto;
 			overflow: hidden;
-			// height: 100%;
-			height: auto;
+			height: 100%;
+			// height: auto;
+			position: relative;
 			.line{
 				border: 0.5px solid #58585899;
 				width: 100%;
@@ -123,14 +134,15 @@ const {} = toRefs(data);
 		> .right{
 			width: 25.4rem;
 			padding-top: 6rem;
-			position: sticky;
+			// position: sticky;
 			top: 0;
-			height: calc(100vh - var(--header-height));
+			// height: calc(100vh - var(--header-height));
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			gap: 4rem;
 			overflow-y: auto;
+			height: 100%;
 			&::-webkit-scrollbar{
 				display: none;
 			}
--- a/src/views/collectionStory/detail/join-us.vue
+++ b/src/views/collectionStory/detail/join-us.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts">
+import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
+//const props = defineProps({
+//})
+//const emit = defineEmits([
+//])
+let data = reactive({
+})
+onMounted(()=>{
+})
+onUnmounted(()=>{
+})
+defineExpose({})
+const {} = toRefs(data);
+</script>
+<template>
+	<div class="joinUs">
+		<div class="title">Join Our Designer Community</div>
+		<div class="info">
+			<div>
+				Join our community of visionaries and publish your collection story.
+			</div>
+			<div>
+				We are currently seeking collections that deeply integrate the AiDA creative workflow, specifically those that resonate through powerful core concepts and evocative inspiration. 
+			</div>
+			<br />
+			<div>
+				This architecture is designed to elevate your exposure through profound "propositional expression," ensuring that soulful, story-driven designs achieve higher market premiums and superior sales conversion.
+			</div>
+		</div>
+	</div>
+</template>
+<style lang="less" scoped>
+	.joinUs{
+		width: 100%;
+		height: auto;
+		position: relative;
+		padding: 6rem 0;
+		> .title{
+			padding: 0 2.4rem;
+			font-family: "KaiseiOpti-Bold";
+			font-weight: 700;
+			font-size: 3rem;
+			line-height: 100%;
+			margin-bottom: 6rem;
+		}
+		> .info{
+			width: 70.7rem;
+			margin: 0 auto;
+			margin-bottom: 4rem;
+			> div{
+				font-family: "KaiseiOpti-Regular";
+				font-weight: 400;
+				font-size: 1.6rem;
+				line-height: 2.3rem;
+			}
+		}
+	}
+</style>
--- a/src/views/collectionStory/index.vue
+++ b/src/views/collectionStory/index.vue
@@ -28,24 +28,15 @@ const {} = toRefs(data);
 			</div>
 			<div class="title-content">
 				<div class="title-box">
-					<div class="left">
 					<div class="title">
-							Windswept Burden
+						We’re Seeking 
 					</div>
 					<div class="info">
-							Publish Date: 24th Nov 2025
+						Fashion Voice Worth Featuring.
 					</div>
 				</div>
-					<div class="right">
-						<div class="info">
-							“We are spiritual nomads carrying what wind cannot take. <br />
-							Inspired by those who knew home is not a place, but what you wear.”
-						</div>
-					</div>
-				</div>
-				<div class="scrolling-learn-more">
-					<div>Scrolling Learn More</div>
-					<SvgIcon name="collectionStory-scrollingLearnMore" size="48" />
+				<div class="button">
+					<a href="mailto:info@code-create.com.hk">Contact Us if Interested</a>
 				</div>
 			</div>
 		</div>
@@ -73,7 +64,7 @@ const {} = toRefs(data);
 				display: flex;
 				align-items: center;
 				gap: .8rem;
-				color: #fff;
+				color: #000;
 				cursor: pointer;
 				> .text{
 					font-size: 2rem;
@@ -83,73 +74,46 @@ const {} = toRefs(data);
 			}
 			> .title-content{
 				width: 100%;
-				height: 63.2rem;
-				margin-top: 24.8rem;
-				background: linear-gradient(180deg, rgba(0, 0, 0, 0) 38.37%, rgba(0, 0, 0, 0.192) 90.74%);
-				padding: 0 4rem;
-				> .title-box{
-					margin-top: 36.7rem;
-					color: #fff;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					> .left{
-						font-family: 'KaiseiOpti-Bold';
-						font-weight: 700;
-						> .title{
-							font-size: 6rem;
-							line-height: 6rem;
-						}
-						> .info{
-							margin-top: 1.7rem;
-							font-size: 1.8rem;
-							line-height: 100%;
-							vertical-align: bottom;
-						}
-					}
-					> .right{
-						> .info{
-							font-weight: 500;
-							font-size: 1.8rem;
-							line-height: 100%;
-							text-align: right;
-						}
-					}
-				}	
-			}
-			.scrolling-learn-more{
 				position: absolute;
-				bottom: 2.1rem;
-				left: 50%;
-				transform: translateX(-50%);
+				padding: 0 6.7rem;
+				margin-top: 11.5rem;
 				display: flex;
 				flex-direction: column;
-				color: #fff;
-				animation: scroll 3s linear infinite;
-				@keyframes scroll {
-					0% {
-						transform: translateY(0);
-					}
-					50% {
-						transform: translateY(-20%);
-					}
-					100% {
-						transform: translateY(0%);
-					}
-				}
-				> div{
-					font-family: 'KaiseiOpti-Regular';
-					font-weight: 400;
-					font-size: 1.4rem;	
+				align-items: flex-start;
+				> .title-box{
+					display: flex;
+					flex-direction: column;
+					> .title{
+						font-size: 6.5rem;
 						line-height: 100%;
-					text-align: center;
-					margin-bottom: 1.5rem;
-					white-space: nowrap;
+						font-weight: 500;
+						color: #585858;
+					}
+					> .info{
+						font-size: 3rem;
+						font-weight: 500;
+						line-height: 100%;
+						color: #585858;
+					}
+				}	
+				> .button{
+					padding: 0 4.5rem;
+					line-height: 5.1rem;
+					background-color: #1B1B1B;
+					color: #fff;
+					margin-top: 4rem;
+					font-weight: 700;
+					font-size: 2rem;
+					letter-spacing: -0.4px;
+					cursor: pointer;
+					> a{
+						color: #fff;
+						text-decoration: none;
+					}
 				}
 			}
 			.banner{
 				width: 100%;
-				position: absolute;
 				z-index: -1;
 			}
 		}
--- a/src/views/digitalDetail/index.vue
+++ b/src/views/digitalDetail/index.vue
@@ -62,10 +62,7 @@ const {} = toRefs(data);
 						<div class="detail">
 							<div class="name">Roaming Clouds</div>
 							<div class="release-time">
-								<div class="icon">
-									<svg-icon name="digital-document" size="24"></svg-icon>
-								</div>
-								<span>12mb  |  Release in Feb 26, 2026</span>
+								<span>Release in Feb 26, 2026</span>
 							</div>
 						</div>
 					</div>
@@ -235,9 +232,7 @@ const {} = toRefs(data);
 								color: #585858;
 								display: flex;
 								align-items: center;
-								> span{
-									margin-left: 1rem;
-								}
+								
 							}
 						}
 					}
--- a/src/views/digitalItem/commodity-list.vue
+++ b/src/views/digitalItem/commodity-list.vue
@@ -77,42 +77,24 @@ const {} = toRefs(data);
 		.list{
 			width: 100%;
 			flex: 1;
+			// display: grid;
+			// align-content: start;
+			// grid-template-columns: repeat(3, 1fr);
+			overflow: hidden;
+
 			display: grid;
 			align-content: start;
-			grid-template-columns: repeat(3, 1fr);
-			overflow-y: auto;
+			grid-template-columns: repeat(auto-fit, minmax(min(100%, 28rem), 1fr));
+			border-top: 0.5px solid #585858;
+			padding: .5px 0 0 .5px;
 			/* 垂直线（右边框） */
 			.item{
 				position: relative;
 				padding: 1.2rem;
-				--commodity-marginBottom: 2rem;
-				--commodity-name-fontSize: 2rem;
-				--commodity-name-marginBottom: .8rem;
-				--commodity-price-fontSize: 1.6rem;
-			}
-			.item::before {
-				content: '';
-				position: absolute;
-				right: 0;
-				top: 0;
-				height: 100%;
-				border-right: 0.5px solid #585858;
-				z-index: 1;
-			}
-
-				/* 水平线（下边框） */
-			.item::after {
-				content: '';
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				width: 100%;
 				border-bottom: 0.5px solid #585858;
-				z-index: 1;
-			}
-				/* 移除最后一列的右边框 */
-			.item:nth-child(3n)::before {
-				display: none;
+				border-right: 0.5px solid #585858;
+				margin-right: -1px;
+				margin-bottom: -1px;
 			}
 		}
 	}
--- a/src/views/digitalItem/index.vue
+++ b/src/views/digitalItem/index.vue
@@ -3,6 +3,8 @@ import { ref, onMounted, onUnmounted, reactive, toRefs, onActivated } from "vue"
 import CommodityList from "./commodity-list.vue";
 import MerchantInfo from "./merchant-info.vue";
 import { useRouter } from "vue-router";
+import scListNull from '@/views/shoppingCart/sc-list-null.vue'
+
 // 定义组件名称
 defineOptions({
  name: 'digitalItem'
@@ -16,6 +18,20 @@ const scrollTop = ref(0)
 const router = useRouter()
 let data = reactive({
 })
+
+const categoriesList = ref([
+	{
+		value:'Best Selling',
+		label:'Best Selling'
+	},{
+		value:'Price: Low to High',
+		label:'Price: Low to High'
+	},{
+		value:'Newest First',
+		label:'Newest First'
+	},
+])
+const categories = ref('Newest First')
 const addShopping = (item) => {}
 const openDetail = (item) => {
 	scrollTop.value = digitalItemRef.value.scrollTop
@@ -42,12 +58,36 @@ const {} = toRefs(data);
 				<p class="info">Virtual fashion creations collected in your personal archive</p>
 			</div>
 		</div>
+		<div class="filters">
+			<div class="filter-item">
+				<el-select v-model="categories" placeholder="Sort By" :teleported="false">
+					<template #label="{ label }">
+						<span class="header-label">Sort By</span>
+						<span class="header-value">{{ label }}</span>
+					</template>
+					<el-option
+						v-for="item in categoriesList"
+						:key="item.label"
+						:value="item.value"
+						:label="item.label"
+					/>
+				</el-select>
+			</div>
+		</div>
 		<div class="content">
 			<div class="merchant-info">
 				<MerchantInfo></MerchantInfo>
 			</div>
 			<div class="commodity-list">
-				<CommodityList @addShopping="addShopping" @openDetail="openDetail"></CommodityList>
+				<CommodityList v-if="true" @addShopping="addShopping" @openDetail="openDetail"></CommodityList>
+				<div v-else class="null">
+					<sc-list-null 
+						nullImage="shopping-cart"
+						:showButton="false" 
+						title="Nothing in Digital Item"
+						tip="Try adjusting your filters or refreshing the page."
+					/>
+				</div>
 			</div>
 		</div>
 		<Footer></Footer>
@@ -89,12 +129,67 @@ const {} = toRefs(data);
 				}
 			}
 		}
-		.content{
+		> .filters{
+			width: 100%;
+			height: 6rem;
+			display: flex;
+			align-items: center;
+			padding: 0 9rem;
+			justify-content: flex-end;
+			> .filter-item{	
+				:deep(.el-select) {
+					width: 15rem;
+					--el-border-radius-base: 0;
+					--el-select-input-color: rgba(0, 0, 0, 0.5);
+					--el-select-input-font-size: 1rem;
+					.el-select__wrapper {
+						font-size: 1.07rem;
+						padding: 0 0.7rem;
+						line-height: 1;
+						min-height: 0;
+						height: 2.2rem;
+
+						.header-label {
+							font-family: KaiseiOpti-Regular;
+							color: rgba(0, 0, 0, 0.5);
+							margin-right: 0.6rem;
+						}
+						.header-value {
+							font-family: KaiseiOpti-Bold;
+							color: #232323;
+						}
+					}
+					.el-select__popper {
+						--el-popper-border-radius: 0;
+						border: 0.1rem solid #d0d0d0;
+						.el-select-dropdown__list {
+							padding: 0;
+							> .el-select-dropdown__item {
+								margin-bottom: 0.89rem;
+								color: #232323;
+								font-size: 1.069rem;
+								height: 2.68rem;
+								line-height: 2.68rem;
+								padding: 0 1.4rem;
+								&:last-child {
+									margin-bottom: 0;
+								}
+								&.is-selected {
+									font-family: KaiseiOpti-Bold;
+									background-color: #f4f4f4;
+								}
+							}
+						}
+					}
+				}
+
+			}
+		}
+		> .content{
 			display: flex;
 			height: auto;
-			align-items: flex-start;
+			// align-items: flex-start;
 			border-top: 0.5px solid #585858;
-			margin-top: 6rem;
 			.merchant-info{
 				width: 38.5rem;
 				padding-left: 10.2rem;
@@ -112,6 +207,10 @@ const {} = toRefs(data);
 				border-left: 0.5px solid #585858;
 				border-right: 0.5px solid #585858;
 				margin-right: 9rem;
+				display: flex;
+				.null{
+					flex: 1;
+				}
 			}
 		}
 	}
--- a/src/views/digitalItem/merchant-info.vue
+++ b/src/views/digitalItem/merchant-info.vue
@@ -7,10 +7,6 @@ import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
 let data = reactive({
 })
 const categoriesList = ref([
-	{
-		label: 'All',
-		value: 'All'
-	},
 	{
 		label: 'Outwear',
 		value: 'Outwear'
@@ -37,10 +33,6 @@ const categoriesList = ref([
 	},
 ]);
 const genderList = ref([
-	{
-		label: 'All',
-		value: 'All'
-	},
 	{
 		label: 'Male',
 		value: 'Male'
@@ -50,12 +42,12 @@ const genderList = ref([
 		value: 'Female'
 	},
 ])
-const categories = ref('All')
-const gender = ref('All')
+const categories = ref([''])
+const gender = ref([''])

 const clearFilters = () => {
-	categories.value = 'All'
-	gender.value = 'All'
+	categories.value = ['']
+	gender.value = ['']
 }
 onMounted(()=>{
 })
--- a/src/views/home/section-footer.vue
+++ b/src/views/home/section-footer.vue
@@ -4,7 +4,7 @@
 			<div class="mate">
 				<div class="logos">
 					<img src="@/assets/images/logos/code-create-black.png" />
-					<img src="@/assets/images/logos/stylish-arade-black.png" />
+					<img src="@/assets/images/logos/stylish-parade-black.png" />
 					<img src="@/assets/images/logos/aida-black.png" />
 				</div>
 				<div class="tip">
--- a/src/views/login/login-dialog.vue
+++ b/src/views/login/login-dialog.vue
@@ -55,6 +55,12 @@
 </template>

 <script setup lang="ts">
+	import {
+		AccountSendLoginCode,
+		AccountLogin,
+		AccountRegister,
+		AccountSendVerifyCode
+	} from '@/api/account'
 	import { computed, ref, markRaw, watch, onBeforeUnmount } from 'vue'
 	import md5 from 'md5'
 	import login from './login.vue'
@@ -63,6 +69,8 @@
 	import registerSuccess from './register-success.vue'
 	import retrievePassword from './retrieve-password.vue'
 	import myEvent from '@/utils/myEvent'
+	import { useUserInfoStore } from '@/stores/userInfo'
+	const userStore = useUserInfoStore()
 	const data = ref({
 		name: '',
 		email: '',
@@ -121,22 +129,42 @@
 	})

 	const onLogin = (res: any) => {
+		AccountSendLoginCode({
+			email: res.email,
+			password: md5(res.password)
+		}).then((v) => {
 			data.value = res
 			data.value.type = TabNames.login
 			currentTab.value = TabNames.email_verify
+		})
 	}
 	const onRegister = (res: any) => {
+		const value = {
+			email: res.email,
+			operationType: 'REGISTER'
+		}
+		AccountSendVerifyCode(value).then((v) => {
 			data.value = res
 			data.value.type = TabNames.register
 			currentTab.value = TabNames.email_verify
+		})
 	}
 	const onSubmitEmailCode = (code: string) => {
+		const value = {
+			email: data.value.email,
+			password: md5(data.value.password),
+			emailVerifyCode: code
+		}
 		if (data.value.type === TabNames.login) {
-			console.log('登录', code)
+			AccountLogin(value).then((v) => {
+				userStore.setUserInfo(v)
 				show.value = false
+			})
 		} else {
-			console.log('注册', code)
+			value['username'] = data.value.name
+			AccountRegister(value).then((v) => {
 				currentTab.value = TabNames.register_success
+			})
 		}
 	}
 </script>
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -1,9 +1,5 @@
 <template>
 	<div class="login">
-		<div class="header">
-			<img src="@/assets/images/logos/aidaAndStylish.png" alt="" />
-			<div v-html="$t('Login.loginTip')"></div>
-		</div>
 		<el-form :model="formData" :rules="ruleForm" label-position="top" ref="formRef">
 			<el-form-item :label="$t('Login.email')" prop="email">
 				<el-input v-model="formData.email" :placeholder="$t('Login.enterEmail')" name="email" />
@@ -76,24 +72,4 @@

 <style lang="less" scoped>
 	@import './less/style.less';
-	.login {
-		> .header {
-			width: 100%;
-			margin: 1rem 0 3rem;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			> img {
-				width: auto;
-				height: 2.8rem;
-			}
-			> div {
-				text-align: right;
-				font-family: KaiseiOpti-Regular;
-				font-size: 1.1rem;
-				color: #232323;
-				line-height: 1.75rem;
-			}
-		}
-	}
 </style>
--- a/src/views/login/retrieve-password.vue
+++ b/src/views/login/retrieve-password.vue
@@ -71,6 +71,7 @@
 </template>

 <script setup lang="ts">
+	import { AccountSendVerifyCode, AccountVerifyCode, AccountResetPassword } from '@/api/account'
 	import md5 from 'md5'
 	import { computed, reactive, ref } from 'vue'
 	import { validateEmail, validatePass } from './tools'
@@ -103,22 +104,12 @@
 	const onSubmit1 = () => {
 		form1Ref.value?.validate?.((valid) => {
 			if (valid) {
-				index.value = 1
-			} else {
-				console.warn('error submit!')
-			}
-		})
-	}
-	const onSubmit2 = () => {
-		form2Ref.value?.validate?.((valid) => {
-			if (valid) {
-				const data = {
+				AccountSendVerifyCode({
 					email: formData.email,
-					code: formData.code,
-					password: md5(formData.password)
-				}
-				console.log(data)
-				emit('back')
+					operationType: 'FORGOT_PWD'
+				}).then(() => {
+					index.value = 1
+				})
 			} else {
 				console.warn('error submit!')
 			}
@@ -126,8 +117,30 @@
 	}
 	const onVerifyCode = (code: string) => {
 		if (!code) return
+		AccountVerifyCode({
+			email: formData.email,
+			emailVerifyCode: code,
+			operationType: 'FORGOT_PWD'
+		}).then(() => {
 			formData.code = code
 			index.value = 2
+		})
+	}
+	const onSubmit2 = () => {
+		form2Ref.value?.validate?.((valid) => {
+			if (valid) {
+				const data = {
+					email: formData.email,
+					password: md5(formData.password),
+					emailVerifyCode: formData.code
+				}
+				AccountResetPassword(data).then(() => {
+					emit('back')
+				})
+			} else {
+				console.warn('error submit!')
+			}
+		})
 	}
 </script>

--- a/src/views/main-header.vue
+++ b/src/views/main-header.vue
@@ -8,7 +8,9 @@
 				v-for="v in navList1"
 				:key="v.path"
 				class="nav-item"
-				:class="{ active: activePath === v.path }"
+				:class="{
+					active: v.path === '/' ? activePath === v.path : new RegExp(`^${v.path}`).test(activePath)
+				}"
 				@click="onNavItemClick(v.path)"
 			>
 				<span>{{ v.name }}</span>
@@ -19,18 +21,18 @@
 				class="icon"
 				v-for="v in navList2"
 				:key="v.path"
-				:class="{ active: activePath === v.path }"
+				:class="{ active: new RegExp(`^${v.path}`).test(activePath) }"
 				@click="onNavItemClick(v.path)"
 			>
 				<svg-icon :name="activePath === v.path ? v.active_icon : v.icon" size="22" />
 			</div>
-			<div class="login" @click="onLogin">Login</div>
 			<el-popover
 				ref="profilePopover"
 				placement="bottom-end"
 				trigger="click"
 				:show-arrow="false"
 				popper-style="width: 24rem; padding: 0; border-radius: 0; right: 2rem; top: 10rem;"
+				v-if="userInfo.userId"
 			>
 				<template #reference><div class="profile"></div></template>
 				<template #default>
@@ -39,7 +41,7 @@
 							<img src="@/assets/images/profile-content-bg.jpg" alt="" />
 							<div class="content">
 								<div class="profile"></div>
-								<div class="name">Hi, Alexandra_chen</div>
+								<div class="name">Hi, {{ userInfo.username }}</div>
 							</div>
 						</div>
 						<div class="nav-item" @click="onMyWardrobe">
@@ -62,6 +64,7 @@
 					</div>
 				</template>
 			</el-popover>
+			<div class="login" @click="onLogin" v-else>Login</div>
 			<div class="language" @click="onLanguageClick">
 				<span :class="{ active: locale === 'CHINESE_SIMPLIFIED' }">中</span> /
 				<span :class="{ active: locale === 'ENGLISH' }">ENG</span>
@@ -71,13 +74,17 @@
 </template>

 <script setup lang="ts">
+	import { ElMessageBox } from 'element-plus'
 	import { computed, ref } from 'vue'
 	import { useRouter, useRoute } from 'vue-router'
 	import myEvent from '@/utils/myEvent'
 	import { useI18n } from 'vue-i18n'
+	import { useUserInfoStore } from '@/stores/userInfo'
 	const { t, locale } = useI18n()
+	const userInfoStore = useUserInfoStore()
 	const router = useRouter()
 	const route = useRoute()
+	const userInfo = computed(() => userInfoStore.state.userInfo)
 	const activePath = computed(() => route.path)
 	const navList1 = ref([
 		{
@@ -135,7 +142,12 @@
 	}
 	const onLogout = () => {
 		hideProfilePopover()
-		console.log('logout')
+		ElMessageBox.confirm('Are you sure to log off?')
+			.then(() => {
+				userInfoStore.logout()
+				router.go(0)
+			})
+			.catch(() => {})
 	}
 	const onLanguageClick = () => {
 		locale.value = locale.value === 'ENGLISH' ? 'CHINESE_SIMPLIFIED' : 'ENGLISH'
--- a/src/views/shopping-drawer.vue
+++ b/src/views/shopping-drawer.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
 import myEvent from '@/utils/myEvent'
-import scList from '@/views/shoppingCart/sc-list.vue'
+// import scList from '@/views/shoppingCart/sc-list.vue'
+import { useRouter } from "vue-router";
+import img from '@/assets/images/brand-null.png'

 //const props = defineProps({
 //})
@@ -9,11 +11,17 @@ import scList from '@/views/shoppingCart/sc-list.vue'
 //])
 let data = reactive({
 })
+const router = useRouter()
 const isShoppingShow = ref(false)
 const shoppingClose = () => {
 	isShoppingShow.value = false
 }

+const goShopping = () => {
+	router.push({path: '/shoppingCart'})
+	isShoppingShow.value = false
+}
+
 onMounted(()=>{
 	myEvent.add('addShopping', (item) => {
 		isShoppingShow.value = true
@@ -27,14 +35,182 @@ defineExpose({})
 const {} = toRefs(data);
 </script>
 <template>
-	<el-drawer v-model="isShoppingShow" width="50rem" :close-on-click-modal="false" title="I am the title" :with-header="false">
-		<sc-list is-mini style="flex: 0.6;" @close="shoppingClose"/>
+	<el-drawer v-model="isShoppingShow" width="50rem" class="addShoppingDrawer"  :close-on-click-modal="false" title="I am the title" :with-header="false">
+		<div class="addShoppingInfo">
+			<div class="header">
+				<div class="title">Added to your Shopping Cart</div>
+				<span class="close" @click="shoppingClose"
+					><svg-icon name="close" size="13"
+				/></span>
+			</div>
+			<div class="content">
+				<div class="img-list">
+					<div class="img-box">
+						<img :src="img" alt="">
+					</div>
+					<div class="img-box">
+						<img :src="img" alt="">
+					</div>
+					<div class="img-box">
+						<img :src="img" alt="">
+					</div>
+				</div>
+				<div class="inf-box">
+					<div class="name">North Outfit Set</div>
+					<div class="shopping-name">
+						<div class="icon">
+							<SvgIcon name="shop" size="24" />
+						</div>
+						Roaming Clouds
+					</div>
+					<div class="price">$15 <span class="currency">HKD</span></div>
+				</div>
+				<div class="statement">
+					<div class="icon">
+						<SvgIcon name="statement" size="16.6" />
+					</div>
+					Digital Assets Only. No physical product included.
+				</div>
+			</div>
+			<div class="button" @click="goShopping">
+				SeE Shopping Cart
+			</div>
+		</div>
+		<!-- <sc-list is-mini style="flex: 0.6;" @close="shoppingClose"/> -->
 	</el-drawer>
 </template>
+<style lang="less">
+	.el-drawer.addShoppingDrawer{
+		--el-drawer-padding-primary: 2.4rem 3.4rem;
+	}
+</style>
 <style lang="less" scoped>
-	.homeNavBox{
+	
+	.addShoppingInfo{
 		width: 100%;
 		height: 100%;
 		position: relative;
+		display: flex;
+		flex-direction: column;
+		> .header{
+			border-bottom: 0.1rem solid #c4c4c4;
+			display: flex;
+			padding-bottom: 2.4rem;
+			align-items: center;
+			justify-content: space-between;
+			> .title{
+				font-family: KaiseiOpti-Bold;
+				font-size: 2rem;
+				line-height: 120%;
+				color: #121212;
+				font-weight: 400;
+			}
+			> .close{
+				cursor: pointer;
+			}
+		}
+		> .content{
+			flex: 1;
+			padding-top: 9.6rem;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			> .img-list{
+				height: 37.5rem;
+				width: 33.7rem;
+				position: relative;
+				> .img-box{
+					position: absolute;
+					overflow: hidden;
+					width: 26.9rem;
+					height: 34.1rem;
+					border: 1px solid #EFEFEF;
+					top: 1.7rem;
+					right: 0;
+					left: auto;
+					transform-origin: bottom;
+					box-shadow: 1rem .8rem 2.4rem 0px #4D4D4D0A;
+					> img{
+						width: 100%;
+						height: 100%;
+						object-fit: cover;
+					}
+					&:nth-child(1){
+						transform: rotate(-8deg);
+						background-color: #eaeaea;
+						right: 2rem;
+					}
+					&:nth-child(2){
+						transform: rotate(-4deg);
+						background-color: #eeeeee;
+						right: 1rem;
+					}
+					&:nth-child(3){
+						transform: rotate(0);
+						background-color: #fafafa;
+					}
+				}
+			}
+			> .inf-box{
+				margin-top: 5.18rem;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				> .name{
+					font-family: KaiseiOpti-Bold;
+					font-weight: 700;
+					font-size: 2.4rem;
+					line-height: 140%;
+				}
+				> .shopping-name{
+					margin-top: 1.3rem;
+					font-weight: 500;
+					font-size: 1.6rem;
+					line-height: 140%;
+					display: flex;
+					align-items: center;
+					> .icon{
+						margin-right: 0.8rem;
+					}
+				}
+				> .price{
+					margin-top: 1.2rem;
+					font-family: KaiseiOpti-Bold;
+					font-weight: 700;
+					font-style: Bold;
+					font-size: 1.8rem;
+					line-height: 140%;
+					> .currency{
+						font-size: 1.2rem;
+						font-weight: 500;
+						line-height: 140%;
+					}
+				}
+			}
+			> .statement{
+				margin-top: 5rem;
+				font-family: KaiseiOpti-Regular;
+				color: #979797;
+				display: flex;
+				font-weight: 400;
+				font-size: 1.2rem;
+				line-height: 140%;
+				> .icon{
+					margin-right: 0.8rem;
+				}
+			}
+		}
+		> .button{
+			font-family: KaiseiOpti-Regular;
+			font-weight: 400;
+			font-size: 14px;
+			line-height: 4.6rem;
+			letter-spacing: 3%;
+			text-align: center;
+			width: 100%;
+			border: 1px solid #232323;
+			margin-bottom: calc(6rem - 2.4rem);
+			cursor: pointer;
+		}
 	}
 </style>
--- a/src/views/shoppingCart/sc-list-null.vue
+++ b/src/views/shoppingCart/sc-list-null.vue
@@ -1,19 +1,26 @@
 <template>
 	<div class="sc-list-null">
-		<img src="@/assets/images/shopping-cart-null.png" alt="" />
-		<div class="title">Your Cart is empty</div>
-		<div class="tip">Discover new fashion assets and add them to your cart.</div>
-		<button custom v-show="showButton" @click="handleExploreClick">EXPLORE DIGITAL ITEMS</button>
+		<img v-if="nullImage === 'shopping-cart'" src="@/assets/images/shopping-cart-null.png" />
+		<img v-else-if="nullImage === 'brand'" src="@/assets/images/brand-null.png" />
+		<div class="title">{{ title }}</div>
+		<div class="tip">{{ tip }}</div>
+		<button custom v-show="showButton" @click="handleClick">{{ buttonText }}</button>
 	</div>
 </template>

 <script setup lang="ts">
 	import { computed, ref, onMounted } from 'vue'
 	const props = defineProps({
-		showButton: { type: Boolean, default: true }
+		nullImage: { type: String as () => 'shopping-cart' | 'brand', default: 'shopping-cart' },
+		title: { type: String, default: '' },
+		tip: { type: String, default: '' },
+		showButton: { type: Boolean, default: true },
+		buttonText: { type: String, default: 'EXPLORE DIGITAL ITEMS' }
 	})
-	const handleExploreClick = () => {
-		console.log('探索')
+	const emit = defineEmits(['explore'])
+	const handleClick = () => {
+		console.log('emit("explore")')
+		emit('explore')
 	}
 </script>

@@ -33,6 +40,7 @@
 		> .title {
 			font-family: KaiseiOpti-Bold;
 			font-size: 1.6rem;
+			line-height: 2.4rem;
 			color: #979797;
 			margin-bottom: 0.8rem;
 		}
@@ -40,6 +48,7 @@
 			width: 50%;
 			font-family: KaiseiOpti-Regular;
 			font-size: 1.4rem;
+			line-height: 2.4rem;
 			color: #979797;
 		}
 		> button {
@@ -49,7 +58,7 @@
 			font-family: KaiseiOpti-Medium;
 			font-size: 1.6rem;
 			color: #979797;
-			margin-top: 4.2rem;
+			margin-top: 3rem;
 		}
 	}
 </style>
--- a/src/views/shoppingCart/sc-list.vue
+++ b/src/views/shoppingCart/sc-list.vue
@@ -37,7 +37,12 @@
 			</div>
 		</div>
 		<div class="list">
-			<sc-list-null v-show="list.length === 0" :show-button="!isMini" />
+			<sc-list-null
+				v-show="list.length === 0"
+				:show-button="!isMini"
+				title="Your Cart is empty"
+				tip="Discover new fashion assets and add them to your cart."
+			/>
 			<sc-item
 				v-for="v in list"
 				:key="v.id"
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -66,11 +66,10 @@ export default defineConfig(({ mode }) => {
 				overlay: true
 			},
 			proxy: {
-				'/api': {
-					//'/api'是自行设置的请求前缀
+				'/buyer': {
 					target: env.VITE_APP_URL,
 					changeOrigin: true, //用于控制请求头中的host值
-					rewrite: (path) => path.replace(/^\/api/, '/api') //路径重写，（正则）匹配以api开头的路径为空（将请求前缀删除）
+					rewrite: (path) => path.replace(/^\/buyer/, '/buyer') //路径重写，（正则）匹配以api开头的路径为空（将请求前缀删除）
 				}
 			}
 		}
Author	SHA1	Message	Date
李志鹏	31de24cc2b	购物车	2026-05-21 11:46:04 +08:00
李志鹏	c18b424f99	Merge branch 'main' of http://18.167.251.121:10003/aidlab/Aida_Purchaser_Front	2026-05-21 11:36:15 +08:00
李志鹏	b9be27ab85	aaa	2026-05-21 11:36:14 +08:00
zhangyahui	5476a1f69d	Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/Aida_Purchaser_Front	2026-05-21 11:33:32 +08:00
zhangyahui	9f620ab9d5	feat: 我的衣柜接口	2026-05-21 11:32:52 +08:00
X1627315083@163.com	e418bf80ad	brand对接接口	2026-05-21 11:25:11 +08:00
李志鹏	2346e079a1	登录、退出登录	2026-05-21 11:04:12 +08:00
李志鹏	6772bf0e90	Merge branch 'main' of http://18.167.251.121:10003/aidlab/Aida_Purchaser_Front	2026-05-21 10:48:55 +08:00
李志鹏	26dfbd9bb5	接口配置	2026-05-21 10:48:53 +08:00
X1627315083@163.com	8c8ec7846d	调整添加购物车逻辑	2026-05-12 17:02:49 +08:00
X1627315083@163.com	8d441766c5	fix	2026-05-12 14:13:56 +08:00
X1627315083@163.com	bf907a1378	digital空状态	2026-05-12 13:35:53 +08:00
李志鹏	de6295f2af	Merge branch 'main' of http://18.167.251.121:10003/aidlab/Aida_Purchaser_Front	2026-05-12 13:32:48 +08:00
李志鹏	3e0a7b8928	导航栏激活	2026-05-12 13:32:47 +08:00
X1627315083@163.com	09909552bc	digital 过滤调整	2026-05-12 13:27:30 +08:00
李志鹏	baf57515c0	登录还原	2026-05-12 11:10:42 +08:00
X1627315083@163.com	b8c844363c	brand页面交互调整	2026-05-11 16:16:59 +08:00
李志鹏	87b071c319	22	2026-05-11 14:34:37 +08:00
李志鹏	bdc824e1f6	11	2026-05-11 14:22:52 +08:00
李志鹏	1c7b2d32a6	空列表	2026-05-11 14:21:42 +08:00