From 639993bcfbc871f46e8c2dbafda4aa6830b0fdf4 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 11 Feb 2025 10:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Account/frontPage/mylnformation.vue       | 47 ++++++++++++++++++-
 src/component/HomePage/bindEmail.vue          | 30 ++++++++++--
 src/store/userHabit/userHabit.ts              |  4 +-
 src/views/HomeView/Works.vue                  |  4 +-
 4 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/src/component/Account/frontPage/mylnformation.vue b/src/component/Account/frontPage/mylnformation.vue
index 1bec69e8..aaa9664b 100644
--- a/src/component/Account/frontPage/mylnformation.vue
+++ b/src/component/Account/frontPage/mylnformation.vue
@@ -1,6 +1,24 @@
 <template>
     <div class="accountEdit_page">
 		<div class="accountEdit_page_body">
+			<!-- <div class="accountEdit_page_body_item">
+				<div class="accountEdit_page_body_item_name">{{$t('account.Name')}}:</div>
+				<div class="accountEdit_page_body_item_inut" style="display: flex;justify-content: space-between;">
+					<a-select
+						class="gallerySelect"
+						v-model:value="selectSex"
+						size="large"
+						optionFilterProp="label"
+						style="width: 30%;"
+						:options="sexList"
+						:placeholder="$t('account.plaseSelectSex')"
+						allowClear
+						show-search
+					></a-select>
+					<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.occupation}" type="text" :placeholder="$t('account.plaseFirst')" v-model="surname">
+					<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.occupation}" type="text" :placeholder="$t('account.plaseLast')" v-model="givenName">
+				</div>
+			</div> -->
 			<div class="accountEdit_page_body_item">
 				<div class="accountEdit_page_body_item_name">{{$t('account.Country')}}:</div>
 				<div class="accountEdit_page_body_item_inut">
@@ -52,7 +70,15 @@ export default defineComponent({
 			Country:'',
 			CompanyName:'',
 			loadingShow:false,
-			countryList:country
+			countryList:country,
+			sexList:[
+				{label:t('account.Mr'),value:'Mr'},
+				{label:t('account.Ms'),value:'Ms'},
+				{label:t('account.Miss'),value:'Miss'},
+			],
+			selectSex:'Mr',
+			surname:'',
+			givenName:'',
 		})
 		let setSubmit = ()=>{
 			let data = {
@@ -75,8 +101,14 @@ export default defineComponent({
 		onMounted(()=>{
 			let country = userDetail.value.country
 			let CompanyName = userDetail.value.occupation
+			// let CompanyName = userDetail.value.occupation
+			// let CompanyName = userDetail.value.occupation
+			// let CompanyName = userDetail.value.occupation
 			accountHomeData.Country = country
 			accountHomeData.CompanyName = CompanyName
+			// accountHomeData.CompanyName = CompanyName
+			// accountHomeData.CompanyName = CompanyName
+			// accountHomeData.CompanyName = CompanyName
 		})
         return{
            ...toRefs(accountHomeData),
@@ -107,6 +139,19 @@ export default defineComponent({
 			.gallery_btn{
 				margin-left: auto;
 			}
+			.gallerySelect{
+				box-sizing: border-box;
+				height: 40px;
+				:deep(.ant-select-selector){
+					height: 40px;
+					border: 2px solid #D0D0D0;
+					border-radius: 1.6rem;
+					align-items: center;
+				}
+				:deep(.ant-select-selector):hover{
+					border: 2px solid #000;
+				}
+			}
 			input,textarea{
 				padding-left: 11px;
 				border-radius: 1.6rem;
diff --git a/src/component/HomePage/bindEmail.vue b/src/component/HomePage/bindEmail.vue
index f88d65e3..f618d36a 100644
--- a/src/component/HomePage/bindEmail.vue
+++ b/src/component/HomePage/bindEmail.vue
@@ -1,5 +1,5 @@
 <template>
-	<div ref="register"></div>
+	<div ref="register" class="bindEmail"></div>
 	<a-modal
 		class="register generalModel"
 		:get-container="() => $refs.register"
@@ -49,7 +49,7 @@
 						<!-- v-show="login$props.Type == 'username'" -->
 						<div >
 							<div class="login_form_content" :state="emailStap">
-								<div class="login_form_title marign_top30">{{ $t('account.Email') }}</div>
+								<div class="login_form_title marign_top30">{{ $t('account.Email') }} <span class="must">*</span></div>
 								<input
 									class="login_form_input"
 									:class="{active:(userDetail.email !== '-------------') && bindType != 'Modify'}"
@@ -60,7 +60,7 @@
 								/>
 								
 								<div v-if="bindType != 'Modify'">
-									<!-- <div class="login_form_title marign_top30">{{ $t('account.Name') }}</div>
+									<!-- <div class="login_form_title marign_top30">{{ $t('account.Name') }}<span class="must">*</span></div>
 									<div style="display: flex;justify-content: space-between;">
 										<a-select
 											class="gallerySelect"
@@ -77,7 +77,7 @@
 										<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.occupation}" :disabled="!!userDetail.occupation" type="text" :placeholder="$t('account.plaseFirst')" v-model="surname">
 										<input class="login_form_input" style="width: 30%;" :class="{active:!!userDetail.occupation}" :disabled="!!userDetail.occupation" type="text" :placeholder="$t('account.plaseLast')" v-model="givenName">
 									</div> -->
-									<div class="login_form_title marign_top30">{{$t('account.Country')}}:</div>
+									<div class="login_form_title marign_top30">{{$t('account.Country')}}:<span class="must">*</span></div>
 									<div class="login_form_select">
 										<a-select
 											class="gallerySelect"
@@ -93,7 +93,7 @@
 										></a-select>
 									</div>
 									
-									<div class="login_form_title marign_top30">{{$t('account.CompanyName')}}:</div>
+									<div class="login_form_title marign_top30">{{$t('account.CompanyName')}}:<span class="must">*</span></div>
 									<input class="login_form_input" :class="{active:!!userDetail.occupation}" :disabled="!!userDetail.occupation" type="text" :placeholder="$t('account.plaseEmail')" v-model="CompanyName">
 								</div>
 						
@@ -229,6 +229,15 @@ export default defineComponent({
 		watch(userEmail,(newValue:any,oldValue)=>{
 			register.email = newValue == '-------------'?'':newValue
 		})
+		watch(userSex,(newValue,oldValue)=>{
+			register.selectSex = newValue?newValue:'Mr'
+		})
+		watch(userSurname,(newValue,oldValue)=>{
+			register.surname = newValue
+		})
+		watch(userGivenName,(newValue,oldValue)=>{
+			register.givenName = newValue
+		})
         return{
 			router,
 			store,
@@ -448,6 +457,11 @@ export default defineComponent({
 }
 </style>
 <style lang="less" scoped>
+.bindEmail{
+	:deep(.ant-modal-mask){
+		background: #666666db;
+	}
+}
 .generalModel_btn{
 	&.back{
 		.generalModel_closeIcon{
@@ -543,6 +557,12 @@ export default defineComponent({
                     display: flex;
                     justify-content: space-between;
                     box-sizing: border-box;
+					> .must{
+						color: red;
+						margin-right: auto;
+						margin-left: 2px;
+						margin-top: -1%;
+					}
 					label{
 						display: flex;
 						span{
diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts
index c568a249..2a3438e1 100644
--- a/src/store/userHabit/userHabit.ts
+++ b/src/store/userHabit/userHabit.ts
@@ -189,8 +189,6 @@ const userHabit : Module<UserHabit,RootState> = {
 				country:'',//国家
 				
 			}
-			console.log(123);
-			
 			state.bindEmail = {
 				isBindEmail:false,
 				type:''
@@ -213,6 +211,8 @@ const userHabit : Module<UserHabit,RootState> = {
 			state.userDetail.occupation = data.occupation//头像
 			state.userDetail.usernameModify = data.usernameModify//当月剩余修改次数
 			state.userDetail.isBeginner = data.isBeginner == 1 ? true : false;//是否完成新手指引
+			// state.bindEmail.isBindEmail = true
+
 			if(
 				(!data.email && state.userDetail.email == '-------------') || 
 				(!data.country && !state.userDetail.country) || 
diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue
index 6553f226..15024014 100644
--- a/src/views/HomeView/Works.vue
+++ b/src/views/HomeView/Works.vue
@@ -7,8 +7,8 @@
 			<div v-show="isScroll" v-for="item in worksType" :key="item" class="gallery_btn white" @click="setWorksSelect(item)" :class="{active:item.value == worksSelect}">
 				{{ item.name }}
 			</div>
-			<div v-show="!isScroll" class="modal_title_text_assistant" :class="{active:'all' == worksSelect}" @click="setWorksSelect({value:'all'})">All</div>
-			<div v-show="!isScroll" class="modal_title_text_assistant" :class="{active:'NewYear_2025' == worksSelect}" @click="setWorksSelect({value:'NewYear_2025'})">NewYear_2025</div>
+			<div v-show="!isScroll" class="modal_title_text_assistant gallery_btn white" :class="{active:'all' == worksSelect}" @click="setWorksSelect({value:'all'})">All</div>
+			<div v-show="!isScroll" class="modal_title_text_assistant gallery_btn white" :class="{active:'NewYear_2025' == worksSelect}" @click="setWorksSelect({value:'NewYear_2025'})">NewYear_2025</div>
 			<!-- <div class="modal_search_menu">
 				<generalMenu :dataList="menuList" @setprintModel="setprintModel" :item="selectMenu"></generalMenu>
 			</div> -->