diff --git a/.env.dev b/.env.dev
index 7d4cc729..d5d9d7c0 100644
--- a/.env.dev
+++ b/.env.dev
@@ -9,4 +9,4 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # 佩佩
 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
 # 海波
-VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
+# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
diff --git a/src/component/HomePage/Material.vue b/src/component/HomePage/Material.vue
index 44dd44bb..6d5e9089 100644
--- a/src/component/HomePage/Material.vue
+++ b/src/component/HomePage/Material.vue
@@ -437,6 +437,7 @@ export default defineComponent({
 		top: 0;
 		z-index: 2;
 		.my_material_header_left{
+			margin-right: auto;
 			.select_block{
 				border: calc(0.1rem* 1.2) solid #F1F1F1;
 				margin-right: calc(2.3rem*1.2);
@@ -474,7 +475,8 @@ export default defineComponent({
 
                 .search_icon_block{
                     width: calc(5rem*1.2);
-                    height: calc(3rem*1.2);
+                    // height: calc(3rem*1.2);
+					height: 100%;
                     line-height: calc(3rem*1.2);
                     text-align: center;
                     background: #343579;
diff --git a/src/component/HomePage/selectImgList.vue b/src/component/HomePage/selectImgList.vue
index 087e5988..2de24e65 100644
--- a/src/component/HomePage/selectImgList.vue
+++ b/src/component/HomePage/selectImgList.vue
@@ -86,8 +86,8 @@ setup(props,{emit}) {
 		cleardata()
 	}
 	let setOk= ()=>{
-		let data = selectImgListData.imgList.filter((item:any)=>item.isChecked);
-		if(data.legnth > 0){
+		let data = selectImgListData.imgList.filter((item:any)=>!item.isChecked);
+		if(data.length > 0){
 			emit('setImgGetColor',data[0])
 		}
 		cleardata()
diff --git a/src/views/RegisterPage.vue b/src/component/Login/registerModel.vue
similarity index 68%
rename from src/views/RegisterPage.vue
rename to src/component/Login/registerModel.vue
index 5938d1a9..ad83ee79 100644
--- a/src/views/RegisterPage.vue
+++ b/src/component/Login/registerModel.vue
@@ -1,232 +1,233 @@
 <template>
-    <div class="login_page">
-        <div class="page_content">
-            <img
-                class="login_logo"
-                src="@/assets/images/loginPage/aida_Logo_login.png"
-            />
-            <!-- 账号密码和邮箱登录  start-->
-            <div class="login_content" v-if="isLogin === 1">
-				<div class="login_content_left">
-					<div class="login_type_list">
-						<div
-							:class="[
-								'login_type_item','username_login_item',
-								'login_active',
-							]"
-						>
-							Register  AiDA 3.0
-						</div>
-					</div>
-					<!-- 账号密码登录 start -->
-					<!-- v-show="loginType == 'username'" -->
-					<div >
-						<div class="login_form_content" :state="emailStap">
-								<div class="login_form_title">Name</div>
-							<input
-								class="login_form_input"
-								placeholder="Enter your username"
-								v-model="username"
-							/>
-							
-							<div class="login_form_title marign_top30">
-								<div>Password</div>
-								<!-- <div class="tip_content" @click="changeIsLogin(2)">
-									Forgot password？
-								</div> -->
+	<a-modal
+		class="registerModel_modal generalModel"
+		v-model:visible="registerModel"
+		:footer="null"
+		width="50%"
+		:maskClosable="false"
+		:centered="true"
+		:closable="false"
+		:mask="registerModelMask"
+		:keyboard="false"
+		:destroyOnClose="true"
+		:zIndex="1050"
+	>
+		<div class="generalModel_btn">
+			<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
+				<i class="fi fi-rr-cross-small"></i>
+			</div>
+		</div>
+		<div class="login_page">
+			<div class="page_content">
+				<!-- 账号密码和邮箱登录  start-->
+				<div class="login_content" v-if="isLogin === 1">
+					<div class="login_content_left">
+						<div class="login_type_list">
+							<div
+								:class="[
+									'login_type_item','username_login_item',
+									'login_active',
+								]"
+							>
+								Register  AiDA 3.0
 							</div>
-							<div class="password_input_block">
+						</div>
+						<!-- 账号密码登录 start -->
+						<!-- v-show="loginType == 'username'" -->
+						<div >
+							<div class="login_form_content" :state="emailStap">
+									<div class="login_form_title">Name</div>
 								<input
 									class="login_form_input"
-									:type="passwordType"
-									placeholder="Enter your password"
-									v-model="password"
-									@keydown.enter="submitPerLogin()"
+									placeholder="Enter your username"
+									v-model="username"
 								/>
-								<div class="icon iconfont icon-yanjing_yincang_o password_show_icon" @click="changePasswordType()"></div>
-							</div>
-							<div class="login_form_title marign_top30">Email</div>
-							<input
-								class="login_form_input"
-								placeholder="Enter your email address"
-								v-model="email"
-								@keydown.enter="submitPerLogin()"
-							/>
-
-						<!-- 邮箱登录 start -->
-							<div class="login_form_email" :class="{active:emailStap===2}">
-					<!-- <div v-show="loginType == 'email'" class="login_form_email"> -->
-						<!-- <div v-show="emailStap === 1" class="forget_password_content">
-							<div class="forget_password_content_block" @click="changeLoginType('username')">
-								<span class="icon iconfont fi-br-arrow-left"></span
-								><span class="forget_password_content_title"
-									>Log on to AiDA</span
-								>
-							</div>
-							<div class="login_form_content">
-								<div class="login_form_title">Email</div>
+								
+								<div class="login_form_title marign_top30">
+									<div>Password</div>
+									<!-- <div class="tip_content" @click="changeIsLogin(2)">
+										Forgot password？
+									</div> -->
+								</div>
+								<div class="password_input_block">
+									<input
+										class="login_form_input"
+										:type="passwordType"
+										placeholder="Enter your password"
+										v-model="password"
+										@keydown.enter="submitPerLogin()"
+									/>
+									<div class="icon iconfont icon-yanjing_yincang_o password_show_icon" @click="changePasswordType()"></div>
+								</div>
+								<div class="login_form_title marign_top30">Email</div>
 								<input
 									class="login_form_input"
 									placeholder="Enter your email address"
 									v-model="email"
-									@keydown.enter="emailNextStepFun()"
+									@keydown.enter="submitPerLogin()"
 								/>
-							</div>
-							<div
-								class="login_submit_button marign_top40"
-								@click="emailNextStepFun()"
-							>
-								Sign In
-							</div>
-						</div> -->
 
-						<div v-show="emailStap === 2"  class="email_last_step">
-							
-							<div class="email_last_step_block" >
-								<span class="email_last_step_content"
-									>Verify with one-time verification code</span
-								>
-								<i class="fi fi-br-cross email_last_step_block_icon" @click="emailLastStepFun()"></i>
-							</div>
-							<div class="email_last_step_bottom">
-								<div class="email_last_step_des">
-								<div class="sent_email_content">
-									Sent to {{ email }}
-								</div>
-								<div class="tip_content">
-									<span v-show="time">{{ time }}s</span>
-									<span v-show="!time" @click="emailNextStepFun()"
-										>Resend</span
+							<!-- 邮箱登录 start -->
+								<div class="login_form_email" :class="{active:emailStap===2}">
+						<!-- <div v-show="loginType == 'email'" class="login_form_email"> -->
+							<!-- <div v-show="emailStap === 1" class="forget_password_content">
+								<div class="forget_password_content_block" @click="changeLoginType('username')">
+									<span class="icon iconfont fi-br-arrow-left"></span
+									><span class="forget_password_content_title"
+										>Log on to AiDA</span
 									>
 								</div>
-							</div>
-							<VerificationCodeInput
-								:ct="emailCode"
-								@sendCaptcha="submitEmailLogin($event)"
-							></VerificationCodeInput>
+								<div class="login_form_content">
+									<div class="login_form_title">Email</div>
+									<input
+										class="login_form_input"
+										placeholder="Enter your email address"
+										v-model="email"
+										@keydown.enter="emailNextStepFun()"
+									/>
+								</div>
+								<div
+									class="login_submit_button marign_top40"
+									@click="emailNextStepFun()"
+								>
+									Sign In
+								</div>
+							</div> -->
 
-							<div class="email_last_step_des">
-								<div class="sent_email_content email_tip_content">
-								Please check the junk box if you haven't received verification code
+							<div v-show="emailStap === 2"  class="email_last_step">
+								
+								<div class="email_last_step_block" >
+									<span class="email_last_step_content"
+										>Verify with one-time verification code</span
+									>
+									<i class="fi fi-br-cross email_last_step_block_icon" @click="emailLastStepFun()"></i>
+								</div>
+								<div class="email_last_step_bottom">
+									<div class="email_last_step_des">
+									<div class="sent_email_content">
+										Sent to {{ email }}
+									</div>
+									<div class="tip_content">
+										<span v-show="time">{{ time }}s</span>
+										<span v-show="!time" @click="emailNextStepFun()"
+											>Resend</span
+										>
+									</div>
+								</div>
+								<VerificationCodeInput
+									:ct="emailCode"
+									@sendCaptcha="submitEmailLogin($event)"
+								></VerificationCodeInput>
+
+								<div class="email_last_step_des">
+									<div class="sent_email_content email_tip_content">
+									Please check the junk box if you haven't received verification code
+									</div>
+								</div>
 								</div>
 							</div>
+						</div>
+							</div>
+
+							<div  class="login_form_title marign_top30">
+								<label :class="{active:emailStap == 2}">
+									<input :state="emailStap" type="checkbox" v-model="checked">
+									<span>I agree to all Term, Privacy Policy and Fees</span>
+								</label>
+							</div>
+							
+							<div
+								class="login_submit_button marign_top40" :state="emailStap"
+								@click="submitPerLogin()"
+							>
+							Register
+							</div>
+							
+							<!-- <div class="login_text"  >
+								<div class="forget_password_text" @click="changeIsLogin(2)">Forgot your password</div>
+							</div> -->
+
+						</div>
+						<!-- 账号密码登录 end -->
+						
+					</div>
+					
+					<!-- 邮箱登录 end -->
+				</div>
+
+				<!-- 忘记密码 start -->
+				<div class="forget_password_content" v-else>
+					<div class="forget_password_content_block" @click="forgetPasswordLastStepFun()">
+						<!-- <span class="icon iconfont fi-br-arrow-left"></span
+						> -->
+						<i class="fi fi-br-arrow-left"></i>
+						<span class="forget_password_content_title"
+							>Retrieve password</span
+						>
+					</div>
+					<div v-show="frogetPasswordStep === 1">
+						<div class="forget_passored_form_content">
+							<div class="forget_passored_form_title">Email</div>
+							<input
+								class="forget_passored_form_input"
+								placeholder="Enter your email"
+								v-model="forgetPasswordEmail"
+								@keydown.enter="forgetPasswordNextStepFun()"
+							/>
+						</div>
+						<div
+							class="forget_submit_button marign_top40"
+							@click="forgetPasswordNextStepFun()"
+						>
+							Next step
+						</div>
+					</div>
+
+					<div v-show="frogetPasswordStep === 2">
+						<div class="forget_verif_code_des">Verification Code</div>
+						<div class="email_last_step_des">
+							<div class="sent_email_content">
+								Sent to {{ forgetPasswordEmail }}
+							</div>
+							<div class="tip_content">
+								<span v-show="time">{{ time }}s</span>
+								<span
+									v-show="!time"
+									@click="forgetPasswordNextStepFun()"
+									>Resend</span
+								>
 							</div>
 						</div>
 					</div>
-						</div>
 
-						<div  class="login_form_title marign_top30">
-							<label :class="{active:emailStap == 2}">
-								<input :state="emailStap" type="checkbox" v-model="checked">
-								<span>I agree to all Term, Privacy Policy and Fees</span>
-							</label>
+					<div v-show="frogetPasswordStep === 3">
+						<div class="forget_passored_form_content">
+							<div class="forget_passored_form_title">Password</div>
+							<input
+								class="forget_passored_form_input"
+								placeholder="Enter a new password"
+								v-model="newPassword"
+								@keydown.enter="submitResetPassword()"
+							/>
 						</div>
-						
 						<div
-							class="login_submit_button marign_top40" :state="emailStap"
-							@click="submitPerLogin()"
+							class="forget_submit_button marign_top40"
+							@click="submitResetPassword()"
 						>
-						Register
+							Submit
 						</div>
-						
-						<!-- <div class="login_text"  >
-							<div class="forget_password_text" @click="changeIsLogin(2)">Forgot your password</div>
-						</div> -->
-
 					</div>
-					<!-- 账号密码登录 end -->
-					
 				</div>
-                
-                <!-- 邮箱登录 end -->
-				<div class="login_content_right">
-					<img
-						src="@/assets/images/loginPage/aida_logo_centent.jpg"
-					/>
-					<!-- <img src="https://www.aida.com.hk/download/aida_V2_images/image/login-right-image.jpg" alt=""> -->
-				</div>
-            </div>
+				<!-- 忘记密码 end -->
+			
+			</div>
+		</div>
+	</a-modal>
 
-            <!-- 忘记密码 start -->
-            <div class="forget_password_content" v-else>
-                <div class="forget_password_content_block" @click="forgetPasswordLastStepFun()">
-                    <!-- <span class="icon iconfont fi-br-arrow-left"></span
-                    > -->
-					<i class="fi fi-br-arrow-left"></i>
-					<span class="forget_password_content_title"
-                        >Retrieve password</span
-                    >
-                </div>
-                <div v-show="frogetPasswordStep === 1">
-                    <div class="forget_passored_form_content">
-                        <div class="forget_passored_form_title">Email</div>
-                        <input
-                            class="forget_passored_form_input"
-                            placeholder="Enter your email"
-                            v-model="forgetPasswordEmail"
-                            @keydown.enter="forgetPasswordNextStepFun()"
-                        />
-                    </div>
-                    <div
-                        class="forget_submit_button marign_top40"
-                        @click="forgetPasswordNextStepFun()"
-                    >
-                        Next step
-                    </div>
-                </div>
-
-                <div v-show="frogetPasswordStep === 2">
-                    <div class="forget_verif_code_des">Verification Code</div>
-                    <div class="email_last_step_des">
-                        <div class="sent_email_content">
-                            Sent to {{ forgetPasswordEmail }}
-                        </div>
-                        <div class="tip_content">
-                            <span v-show="time">{{ time }}s</span>
-                            <span
-                                v-show="!time"
-                                @click="forgetPasswordNextStepFun()"
-                                >Resend</span
-                            >
-                        </div>
-                    </div>
-                </div>
-
-                <div v-show="frogetPasswordStep === 3">
-                    <div class="forget_passored_form_content">
-                        <div class="forget_passored_form_title">Password</div>
-                        <input
-                            class="forget_passored_form_input"
-                            placeholder="Enter a new password"
-                            v-model="newPassword"
-                            @keydown.enter="submitResetPassword()"
-                        />
-                    </div>
-                    <div
-                        class="forget_submit_button marign_top40"
-                        @click="submitResetPassword()"
-                    >
-                        Submit
-                    </div>
-                </div>
-            </div>
-            <!-- 忘记密码 end -->
-           
-        </div>
-
-        <div class="login_footer">
-            <div class="login_footer_item"><div class="login_footer_item_text">©2024 Code-Create Limited</div></div>
-            <div class="login_footer_item">
-                <div class="login_footer_item_text footer_item_text_pointer" @click="turnToWindow('https://code-create.com.hk/aida-terms-and-conditions/')">Terms&Conditions</div>
-                <div class="login_footer_line"></div>
-                <div class="login_footer_item_text footer_item_text_pointer" @click="turnToWindow('https://code-create.com.hk/aida-subscription-agreement/')">Privacy Policy</div>
-            </div>
-        </div>
-    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent,ref ,onMounted} from "vue";
+import { defineComponent,ref,reactive,toRefs ,onMounted} from "vue";
 import { Https } from "@/tool/https";
 import { isEmail } from "@/tool/util";
 import { setCookie ,WriteCookie } from "@/tool/cookie";
@@ -244,9 +245,14 @@ export default defineComponent({
         let timer:any =  0;
 		const {locale} = useI18n()
 		const store = useStore();
+		let register = reactive({
+			registerModel:false,
+			registerModelMask:false,
+		})
         return{
 			store,
             timer,
+			...toRefs(register),
 			locale
         }
     },
@@ -274,6 +280,9 @@ export default defineComponent({
         };
     },
     methods: {
+		init(){
+			this.registerModel = true
+		},
         changeLoginType(type: string) {
             this.loginType = type;
         },
@@ -551,14 +560,6 @@ export default defineComponent({
     height: 100%;
     .page_content {
         // position: relative;
-
-        .login_logo {
-            position: absolute;
-            left: 4rem;
-            top: 2.5rem;
-            width: 11rem;
-        }
-
         .login_content {
 			
             position: absolute;
@@ -566,7 +567,7 @@ export default defineComponent({
             left: 50%;
             transform: translate(-50%,-50%);
             // width: 60rem;
-			width: 150rem;
+			width: 70%;
             background: #FFFFFF;
             // box-shadow: -0.3rem 2rem 5.9rem 0px rgba(200,200,200,0.3);
             border-radius: 1rem;
@@ -577,7 +578,7 @@ export default defineComponent({
 			align-items: center;
 
 			.login_content_left{
-				width: 40%;
+				width: 100%;
 				.login_form_email{
 					position: absolute;
 					left: 0;
@@ -601,12 +602,6 @@ export default defineComponent({
 					transform: scale(1);
 				}
 			}
-			.login_content_right{
-				width: 40%;
-				img{
-					width: 100%;
-				}
-			}
             .login_type_list {
                 width: 100%;
                 display: flex;
@@ -835,39 +830,6 @@ export default defineComponent({
         }
     }
 
-    .login_footer{
-        position: absolute;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        left: 0;
-        bottom: 3.5rem;
-        width: 100%;
-        padding: 0 4rem;
-
-        .login_footer_item{
-            display: flex;
-            align-items: center;
-
-            .login_footer_item_text{
-                font-size: 1.3rem;
-                color: #151515;
-            }
-
-            .footer_item_text_pointer{
-                cursor: pointer;
-            }
-
-            .login_footer_line{
-                width: 0.1rem;
-                height: 2rem;
-                margin: 0 2rem;
-                background: #B9B9B9;
-            }
-        }
-
-    }
-
 
     .marign_top20 {
         margin-top: 2rem;
diff --git a/src/component/WorksPage/Falls.vue b/src/component/WorksPage/Falls.vue
index 7eb8c920..d551c9b4 100644
--- a/src/component/WorksPage/Falls.vue
+++ b/src/component/WorksPage/Falls.vue
@@ -150,7 +150,6 @@ export default defineComponent({
 				this.gap_y = 0
 				this.poss = []
 				this.loading = false
-				this.computedHeight = 0
 				this.list = []
 				this.resize()
 			},
diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue
index 935d2167..9d6e0cef 100644
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -575,19 +575,34 @@ export default defineComponent({
     },
 	directives:{
 		commentUnfold:{
-			updated (el,binding) {
+			mounted (el,binding) {
 				let parent = el.parentNode
 				let commentBtn = parent.querySelector('.left_content_item_unfold')
 				let commentDomSon = el.querySelector('div')
 				let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0])
+				console.log(commentDomSon.offsetHeight , maxHeight);
+				
 				if(commentDomSon.offsetHeight > maxHeight){
 					commentBtn.style.display = 'block'
 				}else if(!binding.value.detailUnfold){
 					commentBtn.style.display = 'none'
 				}
+			},
+			// updated (el,binding) {
+			// 	let parent = el.parentNode
+			// 	let commentBtn = parent.querySelector('.left_content_item_unfold')
+			// 	let commentDomSon = el.querySelector('div')
+			// 	let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0])
+			// 	console.log(commentDomSon.offsetHeight , maxHeight);
+				
+			// 	if(commentDomSon.offsetHeight > maxHeight){
+			// 		commentBtn.style.display = 'block'
+			// 	}else if(!binding.value.detailUnfold){
+			// 		commentBtn.style.display = 'none'
+			// 	}
 				
 				
-			}
+			// }
 		},
 		mousewheel:{
 			mounted (el,binding:any) {
diff --git a/src/router/index.ts b/src/router/index.ts
index d51660b5..373751ea 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -21,11 +21,11 @@ const routes: Array<RouteRecordRaw> = [
 		name: 'login',
 		component: _import('LoginPage')
 	},
-	{
-		path: '/register',
-		name: 'register',
-		component: _import('RegisterPage')
-	},
+	// {
+	// 	path: '/register',
+	// 	name: 'register',
+	// 	component: _import('RegisterPage')
+	// },
 	{
 		path: '/upgrade',
 		name: 'upgrade',
diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue
index c19cc5ae..1ac93114 100644
--- a/src/views/HomeRecommend.vue
+++ b/src/views/HomeRecommend.vue
@@ -51,6 +51,7 @@
 		<div class="homeRecommend_content_adminTop" @click="setAdminUp">
 			<i class="fi fi-rr-arrow-small-up"></i>
 		</div>
+		<registerModel ref="registerModel"></registerModel>
     </div>
 	
 </template>
@@ -70,15 +71,18 @@ import { useI18n } from "vue-i18n";
 import { useRouter } from 'vue-router';
 import { gsap, TweenMax } from "gsap";
 import { ScrollTrigger } from "gsap/ScrollTrigger";
+import registerModel from '@/component/Login/registerModel.vue'
 export default defineComponent({
     components: {
         VerificationCodeInput,
 		Habit,
 		Works,
+		registerModel,
     },
 	setup(){
         const store = useStore();
 		const router = useRouter();
+		let registerModel = ref()
 		let systemUser = computed(()=>{
 			return store.state.UserHabit.systemUser
 		})
@@ -86,7 +90,9 @@ export default defineComponent({
 			router.push("/login");
 		}
 		let setRegister = () =>{
-			router.push("/register");
+			// ler
+			registerModel.value.init()
+			// router.push("/register");
 		}
 		let setAdminUp = ()=>{
 			let scrollDom = document.querySelector('.homeRecommend_content_body')
@@ -110,6 +116,7 @@ export default defineComponent({
 		return {
 			systemUser,
 			setLogin,
+			registerModel,
 			setRegister,
 			setAdminUp,
 			logout,
diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue
index efbc6c14..5fd1565d 100644
--- a/src/views/HomeView/Works.vue
+++ b/src/views/HomeView/Works.vue
@@ -131,6 +131,7 @@ export default defineComponent({
 			}
 			filter.getListDate.page = 0
 			fall.value.clearData()
+			filter.isShowMark = false
 			filter.isNoData = false
 			// getPorfolio()
 		}
@@ -192,6 +193,8 @@ export default defineComponent({
 					// 如果不是相交，则直接返回
 					// console.log(entries[0]);
 					if (!entries[0].intersectionRatio) return;
+					console.log(123123);
+					
 					filter.getListDate.page += 1
 					getPorfolio()
 				},