fix

2025-01-02 11:47:09 +08:00
parent e20fae0c95
commit d053a8c92b
12 changed files with 77 additions and 50 deletions
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -261,9 +261,11 @@ li {
    transform: rotate(360deg);
  }
 }
+.el-popper.is-pure {
+  border: 1px solid;
+}
 .el-popper {
  padding: 0.5rem 1.1rem;
-  border: 2px solid;
 }
 .el-popper .el-popper__arrow {
  display: none;
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -272,10 +272,11 @@ input:focus{



-
+.el-popper.is-pure{
+	border: 1px solid;
+}
 .el-popper{
 	padding: .5rem 1.1rem;
-	border: 2px solid;
 	.el-popper__arrow{
 		display: none;
 	}
--- a/src/component/Account/frontPage.vue
+++ b/src/component/Account/frontPage.vue
@@ -2,9 +2,9 @@
    <div class="account_frontPage">
 		<a-tabs class="account_frontPage_body" v-model:activeKey="activeKey" @change="changeTabs">
 			<a-tab-pane v-for="item in frontPageList" :key="item.key">
-				<myInformation v-if="item.key == 'myInformation'" :ref="item.key"></myInformation>
-				<bind v-if="item.key == 'bind'" :ref="item.key"></bind>
-				<cancelRenewal v-if="item.key == 'cancelRenewal'" :ref="item.key"></cancelRenewal>
+				<myInformation v-if="item.key == 'myInformation' && activeKey == 'myInformation'" :ref="item.key"></myInformation>
+				<bind v-if="item.key == 'bind' && activeKey == 'bind'" :ref="item.key"></bind>
+				<cancelRenewal v-if="item.key == 'cancelRenewal' && activeKey == 'cancelRenewal'" :ref="item.key"></cancelRenewal>
 				<template #tab>
 					<a-badge :count="0" >
 						<span>{{item.title}}</span>
--- a/src/component/Account/frontPage/bindPage.vue
+++ b/src/component/Account/frontPage/bindPage.vue
@@ -46,7 +46,7 @@
 			<a-spin size="large" />
 		</div>
 		<weiXinModel ref="weiXinModel"></weiXinModel>
-		<bindEmail ref="bindEmail" type="Modify"></bindEmail>
+		<bindEmail ref="bindEmail"></bindEmail>
    </div>
 </template>
 <script>
@@ -129,7 +129,7 @@ export default defineComponent({
 			})
 		}
 		const modifyEmail = ()=>{
-			bindPageDom.bindEmail.init()
+			bindPageDom.bindEmail.init('Modify')

 		}
 		onMounted(async ()=>{
--- a/src/component/Account/frontPage/mylnformation.vue
+++ b/src/component/Account/frontPage/mylnformation.vue
@@ -1,6 +1,7 @@
 <template>
    <div class="accountEdit_page">
 		<div class="accountEdit_page_head">
+			<div>{{ $t('account.UpdateAvatar') }}</div>
 			<div class="upload_item">
 				<div class="upload_file_item">
 					<a-upload
--- a/src/component/HomePage/bindEmail.vue
+++ b/src/component/HomePage/bindEmail.vue
@@ -15,7 +15,7 @@
 		:destroyOnClose="true"
 		:zIndex="9999"
 	>
-		<div class="generalModel_btn" v-if="type == 'Modify'">
+		<div class="generalModel_btn" v-if="bindType == 'Modify'">
 			<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
 				<!-- <i class="fi fi-rr-cross-small"></i> -->
 				<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -37,12 +37,12 @@
 									'login_active',
 								]"
 							>
-								<span v-if="type == 'Modify'">Modify Email</span>
+								<span v-if="bindType == 'Modify'">Modify Email</span>
 								<span v-else>Bind Email</span>
 							</div>
 						</div>
 						<!-- 账号密码登录 start -->
-						<!-- v-show="loginType == 'username'" -->
+						<!-- v-show="login$props.Type == 'username'" -->
 						<div >
 							<div class="login_form_content" :state="emailStap">
 								<div class="login_form_title marign_top30">Email</div>
@@ -95,7 +95,7 @@
 								:state="emailStap"
 								@click="submitPerLogin()"
 							>
-							<span v-if="type == 'Modify'">Modify Email</span>
+							<span v-if="bindType == 'Modify'">Modify Email</span>
 								<span v-else>Bind Email</span>
 							</div>
 						</div>
@@ -126,14 +126,17 @@ export default defineComponent({
    components: {
        VerificationCodeInput,
    },
-	props:['type'],
-    setup(){
+    setup(prop, { emit }){
+		const bindType = ''
        let timer:any =  0;
 		const {locale} = useI18n()
 		const store = useStore();
 		let register = reactive({
 			registerModel:computed(()=>{
-				return store.state.UserHabit.isBindEmail
+				return store.state.UserHabit.bindEmail.isBindEmail
+			}),
+			bindType:computed(()=>{
+				return store.state.UserHabit.bindEmail.type
 			}),
 			registerModelMask:true,
 			pageWidth:'45%'
@@ -165,10 +168,13 @@ export default defineComponent({
        };
    },
    methods: {
-		init(){
-			this.registerModel = true
+		init(type:any){
+			let data =  {
+				type,
+				isBindEmail:true
+			}
+			this.store.commit('setIsBindEmail', data)
 			this.emailLastStepFun()
-			
 		},
       

@@ -297,7 +303,7 @@ export default defineComponent({
            }
        },
 		cancelDsign(){
-			this.registerModel = false
+			this.store.commit('setIsBindEmail', false)
 		}
    },
 });
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -608,6 +608,7 @@ export default {
 		userName:'用户名',
 		email:'邮箱',
 		Submit:'提交',
+		UpdateAvatar:'修改头像',
 		//消息
 		systemMessages:'系统消息',
 		comment:'评论',
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -607,6 +607,7 @@ export default {
 		userName:'User Name',
 		email:'Email',
 		Submit:'Submit',
+		UpdateAvatar:'Update Avatar',
 		//消息
 		systemMessages:'System Messages',
 		comment:'Comment',
--- a/src/store/userHabit/userHabit.ts
+++ b/src/store/userHabit/userHabit.ts
@@ -22,7 +22,7 @@ interface UserHabit{
    messageSystem:any,
    sex:any,
 	userDetail:any,
-	isBindEmail:any,
+	bindEmail:any,
 }

 const userHabit : Module<UserHabit,RootState> = {
@@ -79,7 +79,10 @@ const userHabit : Module<UserHabit,RootState> = {
 			subscriptionType:null,
 			subscriptionId:null,
 		},
-		isBindEmail:false
+		bindEmail : {
+			isBindEmail:false,
+			type:''
+		}
    },
    mutations:{
        res_clothingType(state,data){
@@ -177,12 +180,23 @@ const userHabit : Module<UserHabit,RootState> = {
 				//是否是affiliate用户
 				affiliate:false,
 			}
-			state.isBindEmail = false
+			state.bindEmail = {
+				isBindEmail:false,
+				type:''
+			}
+		},
+		setIsBindEmail(state,data){
+			state.bindEmail.isBindEmail = data.isBindEmail
+			state.bindEmail.type = data.type
+
 		},
 		setUserDetail(state,data){
 			// console.log(data);
 			console.log(data.email,state.userDetail.email);
-			if((!data.email || data.email == '-------------') && state.userDetail.email == '-------------')state.isBindEmail = true
+			if(!data.email && state.userDetail.email == '-------------'){
+				state.bindEmail.isBindEmail = true
+				state.bindEmail.type = ''
+			}
 			// if(!data.email && !state.userDetail.email)state.isBindEmail = true
 			// state.userDetail = data
 			state.userDetail.email = data.email?data.email:'-------------'
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -610,11 +610,11 @@ export default defineComponent({
 	flex-shrink: 0;
    display: flex;
 	// padding: 0 30px;
-	padding: 0 6rem;
+	padding: 2rem 6rem;
    width: 100%;
    height: auto;
    background: rgba(255, 255, 255, 0.2);
-    // border-bottom: 0.1rem solid rgba(3, 3, 3, 0.1);
+    border-bottom: 1px solid #e1e1e1;
    position: relative;
    align-items: center;
 	z-index: 9;
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -4,7 +4,6 @@
 		<!-- <generalCanvas></generalCanvas> -->

 		<div class="page_content">
-			{{ userDetail.systemList }}
 			<div class="userSystem" v-if="userDetail.systemList.indexOf(1) == -1">
 				You can use these features only after becoming a regular user~
 			</div>
@@ -92,19 +91,20 @@
 						</div>
 						<div class="right_content_block_box">
 							<div class="right_content_block">
-								<div class="right_content_header">
-									<div class="content_header_left">
-										<i class="fi fi-rs-comments"></i><span class="content_header_des">
-											{{ $t('HomeView.GeneratedDesign') }}
-											</span>
-									</div>
-								</div>
+								

 								<div class="right_content_body">
+									<div class="right_content_header">
+										<div class="content_header_left">
+											<i class="fi fi-rs-comments"></i><span class="content_header_des">
+												{{ $t('HomeView.GeneratedDesign') }}
+												</span>
+										</div>
+									</div>
 									<div class="right_content_img_block scroll_style Guide_1_17 active" :class="[driver__.driver?'showEvents':'']">
 										<div class="right_content_img_item" ref="designImg">
 										
-											<div class="content_img_block active" :style="collStyle"  @mousedown.stop="designMousedown(getMousePosition($event,false))" @touchstart.passive="designMousedown(getMousePosition($event,true))"
+											<div class="content_img_block content_img_GetWidth active" :style="collStyle"  @mousedown.stop="designMousedown(getMousePosition($event,false))" @touchstart.passive="designMousedown(getMousePosition($event,true))"
 												v-for="(design, index) in likeDesignCollectionList" :key="design.id"
 												@click="designDetail(
 														design,
@@ -126,7 +126,7 @@
 											<div class="content_img_block" v-show="showDesignMark" :style="collStyle">
 												<a-spin size="large" class="content_img_flex"></a-spin>
 											</div>
-											<div class="content_img_block" :style="collStyle" v-for="(
+											<div class="content_img_block content_img_GetWidth" :style="collStyle" v-for="(
 													design, index
 												) in designCollectionList" :key="design?.designItemId" @mousedown.stop="designMousedown(getMousePosition($event,false))" @touchstart.passive="designMousedown(getMousePosition($event,true))">
 													<div class="content_img_flex" 
@@ -157,15 +157,14 @@
 								</div>
 							</div>
 							<div class="right_content_block recycleBin" :class="{recycleBinShow:recycleDomHidden && designCollectionId}">
-								<div class="right_content_header">
-									<div class="content_header_left">
-										<i class="fi fi-rs-comments"></i><span class="content_header_des">
-											{{ $t('HomeView.recycleBin') }}
-											</span>
-									</div>
-								</div>
-
 								<div class="right_content_body">
+									<div class="right_content_header">
+										<div class="content_header_left">
+											<i class="fi fi-rs-comments"></i><span class="content_header_des">
+												{{ $t('HomeView.recycleBin') }}
+												</span>
+										</div>
+									</div>
 									<div class="right_content_img_block scroll_style">
 										<div class="right_content_img_item">
 											<div class="content_img_block" v-for="(
@@ -389,7 +388,7 @@ export default defineComponent({
 		const setDesignImgWidth = ()=>{
 			nextTick(()=>{
 				let width = designImg.value.parentElement.offsetWidth
-				let sonDom = designImg.value.querySelectorAll('.content_img_block')[designImg.value.querySelectorAll('.content_img_block').length - 1]
+				let sonDom = designImg.value.querySelectorAll('.content_img_GetWidth')[0]
 				if(Math.floor(width / (sonDom.offsetWidth+10 + 1)) > (likeDesignCollectionList.value.length + designCollectionList.value.length)){
 					designImg.value.style.width = 100+'%'
 				}else{
@@ -1398,7 +1397,7 @@ export default defineComponent({
 			position: absolute;
 			width: 100%;
 			height: 100%;
-			padding-bottom: 2.1rem;
+			padding-bottom: 4rem;
 			box-sizing: border-box;
 			z-index:1;
 			.home_page_body {
@@ -1666,11 +1665,14 @@ export default defineComponent({
 							// height: calc(50% - 4.5rem);
 							flex: 1;
 							overflow: auto;
+							background: #f6f6fa;
+							border-radius: 2rem;
+							display: flex;
+							flex-direction: column;
 							.right_content_img_block {
 								// overflow-y: auto;
-								background: #f6f6fa;
-								border-radius: 2rem;
 								height: 100%;
+								flex: 1;
 								display: flex;
 								width: auto;
 								// overflow: hidden;
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -229,7 +229,6 @@
                            </div>
 							<div class="right_content_body" v-show="uploadGenerate !='Upload'">
 								<div class="content_body_header content_body_header_generate">
-									<div class="content_body_header_right"></div>
 									<!-- <div v-show="selectCode == 'Printboard' && scene?.value == 'Pattern'" class="printModel">
 										<div @click.stop="PrintModel">{{ printModel.name }}</div>
 										<ul v-show="printModel.optype">
@@ -1766,7 +1765,7 @@ export default defineComponent({
                .library_body_left{
                    // width: 27.5rem;
 					// width: 36.5rem;
-					width: 23rem;
+					width: 25rem;
                    height: 100%;
 					margin-right: 3rem;
 					background: #f7f8fa;
@@ -1965,7 +1964,7 @@ export default defineComponent({
                                    }
                                }
 								&.content_body_header_generate{
-									justify-content: flex-start;
+									// justify-content: flex-start;
 									.checkboxItem {
 										margin-right: 4rem;
 										label {