修复bug

2024-06-27 22:23:28 +08:00
parent 67250edba6
commit cc7b636421
9 changed files with 249 additions and 261 deletions
--- 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'
--- 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;
--- 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()
--- a/src/component/Login/registerModel.vue
+++ b/src/component/Login/registerModel.vue
@@ -1,10 +1,24 @@
 <template>
+	<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">
-            <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">
@@ -139,12 +153,6 @@
 					</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>

 				<!-- 忘记密码 start -->
@@ -213,20 +221,13 @@
 				<!-- 忘记密码 end -->
 			
 			</div>
+		</div>
+	</a-modal>

-        <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;
--- 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()
 			},
--- 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) {
--- 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',
--- 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,
--- 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()
 				},