Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/component/Account/frontPage/bindPage.vue

@@ -2,7 +2,26 @@
     <div class="bindPage_page">
 		<div class="bindPage_page_body">
 			<div class="bind_item">
-				<div class="title">{{ $t('frontPage.BindWechat') }}</div>
+				<div class="title">{{ $t('frontPage.InternalBind') }}</div>
+				<div class="box">
+					<div class="type">
+						<div class="img"><img src="@/assets/images/homePage/aidaIcon.png" alt=""></div>
+						<div class="text" v-if="isSeller">AiDA Seller</div>
+						<div class="text" v-else>Not a Seller Yet</div>
+					</div>
+					<div v-if="isSeller" class="gallery_btn" @click="onEnterSeller">Enter Seller Dashboard</div>
+					<div v-else class="gallery_btn" @click="onBecomeSeller">Apply Now</div>
+				</div>
+				<div class="box">
+					<div class="type">
+						<div class="img"><img src="@/assets/images/homePage/stulishicon.png" alt=""></div>
+						<div class="text">Marketplace Access Active</div>
+					</div>
+					<div class="gallery_btn" @click="onOpenMarketplace">Enter Now</div>
+				</div>
+			</div>
+			<div class="bind_item">
+				<div class="title">{{ $t('frontPage.ExternalBind') }}</div>
 				<div class="box">
 					<div class="type">
 						<img v-if="!userDetail.accountExtendList?.WeChat" src="@/assets/images/loginPage/weiXinIcon.svg" alt="">
@@ -12,9 +31,6 @@
 					<div v-if="!userDetail.accountExtendList?.WeChat" class="gallery_btn" @click="openWeiXinModel">{{ $t('frontPage.BindNow') }}</div>
 					<div v-if="userDetail.accountExtendList?.WeChat" class="gallery_btn" @click="ungroupWeiXinModel">{{ $t('frontPage.Unbind') }}</div>
 				</div>
-			</div>
-			<div class="bind_item">
-				<div class="title">{{ $t('frontPage.BindGmail') }}</div>
 				<div class="box">
 					<div class="type">
 						<img v-if="!userDetail.accountExtendList?.Google" src="@/assets/images/loginPage/gmailIcon.svg" alt="">
@@ -87,6 +103,9 @@ export default defineComponent({
 			weiXinModel:null,
 			bindEmail:null,
 		})
+		const isSeller = computed(() => {
+			return store.state.seller.isSeller
+		})
 		let data = reactive({
 			scriptSrc:'https://accounts.google.com/gsi/client',
 		})
@@ -156,6 +175,15 @@ export default defineComponent({
 			bindPageDom.bindEmail.init('Modify')
 
 		}
+		const onEnterSeller = ()=>{
+			router.push({name:'brandProfile'})
+		}
+		const onBecomeSeller = ()=>{
+			router.push({name:'BecomeSeller'})
+		}
+		const onOpenMarketplace = ()=>{
+			console.log('onOpenMarketplace')
+		}
 		onMounted(async ()=>{
 			let  GOOGLE_CLIENT_ID
 			if(import.meta.env.VITE_USER_NODE_ENV == 'development'){
@@ -221,7 +249,11 @@ export default defineComponent({
         return{
            ...toRefs(accountHomeData),
            ...toRefs(bindPageDom),
+		   isSeller,
 		   openWeiXinModel,
+		   onEnterSeller,
+			onBecomeSeller,
+			onOpenMarketplace,
 		   ungroupGoogleModel,
 		   ungroupWeiXinModel,
 		   modifyEmail,
@@ -241,31 +273,37 @@ export default defineComponent({
 	padding-bottom: 2rem;
 	.bindPage_page_body{
 		.bind_item{
-			margin-bottom: 4rem;
+			margin-bottom: 4.8rem;
 			>.title{
-				font-size: 1.6rem;
+				font-size: 1.8rem;
-				margin-bottom: 1.5rem;
+				margin-bottom: 1.2rem;
-				font-weight: 600;
+				// font-weight: 600;
 			}
 			>.box{
 				width: 100%;
 				border: 2px solid #000;
 				border-radius: 2rem;
 				padding: 2rem;
+				margin-bottom: 1.2rem;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
 				>.type{
 					display: flex;
+					>.img>img,
 					>img{
 						margin-right: 3rem;
-						width: 5rem;
+						width: auto;
 						height: 5rem;
 					}
+					>.img{
+						width: 17rem;
+					}
 					>.text{
 						display: flex;
 						align-items: center;
 						font-size: 1.8rem;
+						color: #000;
 					}
 				}
 				.gallery_btn{

src/lang/cn.ts

@@ -921,6 +921,8 @@ export default {
 		jsContent13: '保存成功~'
 	},
 	frontPage: {
+		InternalBind: '内部绑定:',
+		ExternalBind: '外部绑定:',
 		BindWechat: '绑定微信',
 		Unbound: '未绑定',
 		BindNow: '绑定',

src/lang/en.ts

@@ -946,6 +946,8 @@ export default {
 		jsContent13: 'Save successfully~'
 	},
 	frontPage: {
+		InternalBind: 'Internal Bind:',
+		ExternalBind: 'External Bind:',
 		BindWechat: 'Bind Wechat',
 		Unbound: 'Unbound',
 		BindNow: 'Bind Now',