aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
WangXiaoDong
2024-06-27 22:23:28 +08:00
parent 67250edba6
commit cc7b636421
9 changed files with 249 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dev
View File

@@ -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.7:5567'
# 海波 # 海波
VUE_APP_BASE_URL = 'http://192.168.1.9:5567' # VUE_APP_BASE_URL = 'http://192.168.1.9:5567'

4
src/component/HomePage/Material.vue
View File

@@ -437,6 +437,7 @@ export default defineComponent({
top: 0; top: 0;
z-index: 2; z-index: 2;
.my_material_header_left{ .my_material_header_left{
margin-right: auto;
.select_block{ .select_block{
border: calc(0.1rem* 1.2) solid #F1F1F1; border: calc(0.1rem* 1.2) solid #F1F1F1;
margin-right: calc(2.3rem*1.2); margin-right: calc(2.3rem*1.2);
@@ -474,7 +475,8 @@ export default defineComponent({
.search_icon_block{ .search_icon_block{
width: calc(5rem*1.2); width: calc(5rem*1.2);
height: calc(3rem*1.2); // height: calc(3rem*1.2);
height: 100%;
line-height: calc(3rem*1.2); line-height: calc(3rem*1.2);
text-align: center; text-align: center;
background: #343579; background: #343579;

4
src/component/HomePage/selectImgList.vue
View File

@@ -86,8 +86,8 @@ setup(props,{emit}) {
cleardata() cleardata()
} }
let setOk= ()=>{ let setOk= ()=>{
let data = selectImgListData.imgList.filter((item:any)=>item.isChecked); let data = selectImgListData.imgList.filter((item:any)=>!item.isChecked);
if(data.legnth > 0){ if(data.length > 0){
emit('setImgGetColor',data[0]) emit('setImgGetColor',data[0])
} }
cleardata() cleardata()

458
src/views/RegisterPage.vue → src/component/Login/registerModel.vue
View File

@@ -1,232 +1,233 @@
<template> <template>
<div class="login_page"> <a-modal
<div class="page_content"> class="registerModel_modal generalModel"
<img v-model:visible="registerModel"
class="login_logo" :footer="null"
src="@/assets/images/loginPage/aida_Logo_login.png" width="50%"
/> :maskClosable="false"
<!-- 账号密码和邮箱登录 start--> :centered="true"
<div class="login_content" v-if="isLogin === 1"> :closable="false"
<div class="login_content_left"> :mask="registerModelMask"
<div class="login_type_list"> :keyboard="false"
<div :destroyOnClose="true"
:class="[ :zIndex="1050"
'login_type_item','username_login_item', >
'login_active', <div class="generalModel_btn">
]" <div class="generalModel_closeIcon" @click.stop="cancelDsign()">
> <i class="fi fi-rr-cross-small"></i>
Register AiDA 3.0 </div>
</div> </div>
</div> <div class="login_page">
<!-- 账号密码登录 start --> <div class="page_content">
<!-- v-show="loginType == 'username'" --> <!-- 账号密码和邮箱登录 start-->
<div > <div class="login_content" v-if="isLogin === 1">
<div class="login_form_content" :state="emailStap"> <div class="login_content_left">
<div class="login_form_title">Name</div> <div class="login_type_list">
<input <div
class="login_form_input" :class="[
placeholder="Enter your username" 'login_type_item','username_login_item',
v-model="username" 'login_active',
/> ]"
>
<div class="login_form_title marign_top30"> Register AiDA 3.0
<div>Password</div>
<!-- <div class="tip_content" @click="changeIsLogin(2)">
Forgot password？
</div> -->
</div> </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 <input
class="login_form_input" class="login_form_input"
:type="passwordType" placeholder="Enter your username"
placeholder="Enter your password" v-model="username"
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">
<div class="login_form_title marign_top30">Email</div> <div>Password</div>
<input <!-- <div class="tip_content" @click="changeIsLogin(2)">
class="login_form_input" Forgot password？
placeholder="Enter your email address" </div> -->
v-model="email" </div>
@keydown.enter="submitPerLogin()" <div class="password_input_block">
/> <input
class="login_form_input"
<!-- 邮箱登录 start --> :type="passwordType"
<div class="login_form_email" :class="{active:emailStap===2}"> placeholder="Enter your password"
<!-- <div v-show="loginType == 'email'" class="login_form_email"> --> v-model="password"
<!-- <div v-show="emailStap === 1" class="forget_password_content"> @keydown.enter="submitPerLogin()"
<div class="forget_password_content_block" @click="changeLoginType('username')"> />
<span class="icon iconfont fi-br-arrow-left"></span <div class="icon iconfont icon-yanjing_yincang_o password_show_icon" @click="changePasswordType()"></div>
><span class="forget_password_content_title" </div>
>Log on to AiDA</span <div class="login_form_title marign_top30">Email</div>
>
</div>
<div class="login_form_content">
<div class="login_form_title">Email</div>
<input <input
class="login_form_input" class="login_form_input"
placeholder="Enter your email address" placeholder="Enter your email address"
v-model="email" 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"> <!-- 邮箱登录 start -->
<div class="login_form_email" :class="{active:emailStap===2}">
<div class="email_last_step_block" > <!-- <div v-show="loginType == 'email'" class="login_form_email"> -->
<span class="email_last_step_content" <!-- <div v-show="emailStap === 1" class="forget_password_content">
>Verify with one-time verification code</span <div class="forget_password_content_block" @click="changeLoginType('username')">
> <span class="icon iconfont fi-br-arrow-left"></span
<i class="fi fi-br-cross email_last_step_block_icon" @click="emailLastStepFun()"></i> ><span class="forget_password_content_title"
</div> >Log on to AiDA</span
<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>
</div> <div class="login_form_content">
<VerificationCodeInput <div class="login_form_title">Email</div>
:ct="emailCode" <input
@sendCaptcha="submitEmailLogin($event)" class="login_form_input"
></VerificationCodeInput> 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 v-show="emailStap === 2" class="email_last_step">
<div class="sent_email_content email_tip_content">
Please check the junk box if you haven't received verification code <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>
</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> </div>
</div>
<div class="login_form_title marign_top30"> <div v-show="frogetPasswordStep === 3">
<label :class="{active:emailStap == 2}"> <div class="forget_passored_form_content">
<input :state="emailStap" type="checkbox" v-model="checked"> <div class="forget_passored_form_title">Password</div>
<span>I agree to all Term, Privacy Policy and Fees</span> <input
</label> class="forget_passored_form_input"
placeholder="Enter a new password"
v-model="newPassword"
@keydown.enter="submitResetPassword()"
/>
</div> </div>
<div <div
class="login_submit_button marign_top40" :state="emailStap" class="forget_submit_button marign_top40"
@click="submitPerLogin()" @click="submitResetPassword()"
> >
Register Submit
</div> </div>
<!-- <div class="login_text" >
<div class="forget_password_text" @click="changeIsLogin(2)">Forgot your password</div>
</div> -->
</div> </div>
<!-- 账号密码登录 end -->
</div> </div>
<!-- 忘记密码 end -->
<!-- 邮箱登录 end -->
<div class="login_content_right"> </div>
<img </div>
src="@/assets/images/loginPage/aida_logo_centent.jpg" </a-modal>
/>
<!-- <img src="https://www.aida.com.hk/download/aida_V2_images/image/login-right-image.jpg" alt=""> -->
</div>
</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 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> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent,ref ,onMounted} from "vue"; import { defineComponent,ref,reactive,toRefs ,onMounted} from "vue";
import { Https } from "@/tool/https"; import { Https } from "@/tool/https";
import { isEmail } from "@/tool/util"; import { isEmail } from "@/tool/util";
import { setCookie ,WriteCookie } from "@/tool/cookie"; import { setCookie ,WriteCookie } from "@/tool/cookie";
@@ -244,9 +245,14 @@ export default defineComponent({
let timer:any = 0; let timer:any = 0;
const {locale} = useI18n() const {locale} = useI18n()
const store = useStore(); const store = useStore();
let register = reactive({
registerModel:false,
registerModelMask:false,
})
return{ return{
store, store,
timer, timer,
...toRefs(register),
locale locale
} }
}, },
@@ -274,6 +280,9 @@ export default defineComponent({
}; };
}, },
methods: { methods: {
init(){
this.registerModel = true
},
changeLoginType(type: string) { changeLoginType(type: string) {
this.loginType = type; this.loginType = type;
}, },
@@ -551,14 +560,6 @@ export default defineComponent({
height: 100%; height: 100%;
.page_content { .page_content {
// position: relative; // position: relative;
.login_logo {
position: absolute;
left: 4rem;
top: 2.5rem;
width: 11rem;
}
.login_content { .login_content {
position: absolute; position: absolute;
@@ -566,7 +567,7 @@ export default defineComponent({
left: 50%; left: 50%;
transform: translate(-50%,-50%); transform: translate(-50%,-50%);
// width: 60rem; // width: 60rem;
width: 150rem; width: 70%;
background: #FFFFFF; background: #FFFFFF;
// box-shadow: -0.3rem 2rem 5.9rem 0px rgba(200,200,200,0.3); // box-shadow: -0.3rem 2rem 5.9rem 0px rgba(200,200,200,0.3);
border-radius: 1rem; border-radius: 1rem;
@@ -577,7 +578,7 @@ export default defineComponent({
align-items: center; align-items: center;
.login_content_left{ .login_content_left{
width: 40%; width: 100%;
.login_form_email{ .login_form_email{
position: absolute; position: absolute;
left: 0; left: 0;
@@ -601,12 +602,6 @@ export default defineComponent({
transform: scale(1); transform: scale(1);
} }
} }
.login_content_right{
width: 40%;
img{
width: 100%;
}
}
.login_type_list { .login_type_list {
width: 100%; width: 100%;
display: flex; 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 { .marign_top20 {
margin-top: 2rem; margin-top: 2rem;

1
src/component/WorksPage/Falls.vue
View File

@@ -150,7 +150,6 @@ export default defineComponent({
this.gap_y = 0 this.gap_y = 0
this.poss = [] this.poss = []
this.loading = false this.loading = false
this.computedHeight = 0
this.list = [] this.list = []
this.resize() this.resize()
}, },

19
src/component/WorksPage/newScaleImage.vue
View File

@@ -575,19 +575,34 @@ export default defineComponent({
}, },
directives:{ directives:{
commentUnfold:{ commentUnfold:{
updated (el,binding) { mounted (el,binding) {
let parent = el.parentNode let parent = el.parentNode
let commentBtn = parent.querySelector('.left_content_item_unfold') let commentBtn = parent.querySelector('.left_content_item_unfold')
let commentDomSon = el.querySelector('div') let commentDomSon = el.querySelector('div')
let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0]) let maxHeight = Number((window.getComputedStyle(el).maxHeight).split('px')[0])
console.log(commentDomSon.offsetHeight , maxHeight);
if(commentDomSon.offsetHeight > maxHeight){ if(commentDomSon.offsetHeight > maxHeight){
commentBtn.style.display = 'block' commentBtn.style.display = 'block'
}else if(!binding.value.detailUnfold){ }else if(!binding.value.detailUnfold){
commentBtn.style.display = 'none' 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:{ mousewheel:{
mounted (el,binding:any) { mounted (el,binding:any) {

10
src/router/index.ts
View File

@@ -21,11 +21,11 @@ const routes: Array<RouteRecordRaw> = [
name: 'login', name: 'login',
component: _import('LoginPage') component: _import('LoginPage')
}, },
{ // {
path: '/register', // path: '/register',
name: 'register', // name: 'register',
component: _import('RegisterPage') // component: _import('RegisterPage')
}, // },
{ {
path: '/upgrade', path: '/upgrade',
name: 'upgrade', name: 'upgrade',

9
src/views/HomeRecommend.vue
View File

@@ -51,6 +51,7 @@
<div class="homeRecommend_content_adminTop" @click="setAdminUp"> <div class="homeRecommend_content_adminTop" @click="setAdminUp">
<i class="fi fi-rr-arrow-small-up"></i> <i class="fi fi-rr-arrow-small-up"></i>
</div> </div>
<registerModel ref="registerModel"></registerModel>
</div> </div>
</template> </template>
@@ -70,15 +71,18 @@ import { useI18n } from "vue-i18n";
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { gsap, TweenMax } from "gsap"; import { gsap, TweenMax } from "gsap";
import { ScrollTrigger } from "gsap/ScrollTrigger"; import { ScrollTrigger } from "gsap/ScrollTrigger";
import registerModel from '@/component/Login/registerModel.vue'
export default defineComponent({ export default defineComponent({
components: { components: {
VerificationCodeInput, VerificationCodeInput,
Habit, Habit,
Works, Works,
registerModel,
}, },
setup(){ setup(){
const store = useStore(); const store = useStore();
const router = useRouter(); const router = useRouter();
let registerModel = ref()
let systemUser = computed(()=>{ let systemUser = computed(()=>{
return store.state.UserHabit.systemUser return store.state.UserHabit.systemUser
}) })
@@ -86,7 +90,9 @@ export default defineComponent({
router.push("/login"); router.push("/login");
} }
let setRegister = () =>{ let setRegister = () =>{
router.push("/register"); // ler
registerModel.value.init()
// router.push("/register");
} }
let setAdminUp = ()=>{ let setAdminUp = ()=>{
let scrollDom = document.querySelector('.homeRecommend_content_body') let scrollDom = document.querySelector('.homeRecommend_content_body')
@@ -110,6 +116,7 @@ export default defineComponent({
return { return {
systemUser, systemUser,
setLogin, setLogin,
registerModel,
setRegister, setRegister,
setAdminUp, setAdminUp,
logout, logout,

3
src/views/HomeView/Works.vue
View File

@@ -131,6 +131,7 @@ export default defineComponent({
} }
filter.getListDate.page = 0 filter.getListDate.page = 0
fall.value.clearData() fall.value.clearData()
filter.isShowMark = false
filter.isNoData = false filter.isNoData = false
// getPorfolio() // getPorfolio()
} }
@@ -192,6 +193,8 @@ export default defineComponent({
// 如果不是相交，则直接返回 // 如果不是相交，则直接返回
// console.log(entries[0]); // console.log(entries[0]);
if (!entries[0].intersectionRatio) return; if (!entries[0].intersectionRatio) return;
console.log(123123);
filter.getListDate.page += 1 filter.getListDate.page += 1
getPorfolio() getPorfolio()
}, },