页面调整

This commit is contained in:
X1627315083
2025-07-19 14:04:48 +08:00
parent 22ee9c6cf1
commit 4b694236ee
161 changed files with 2934 additions and 3979 deletions

View File

@@ -31,18 +31,19 @@
</div>
</div>
</div>
<div class="detail" v-else-if="item.value == 'history'">
<div class="detail" v-else-if="item.value == 'history'" style="height: auto;">
<div v-for="historyTypeItem in historyData.updateTimeType" :key="historyTypeItem">
<div class="timeType" v-if="historyTypeItem == 'Todaylist' && item.Todaylist.length>0">{{$t('Header.Today')}}</div>
<div class="timeType" v-if="historyTypeItem == 'Yesterdaylist' && item.Yesterdaylist.length>0">{{$t('Header.Yesterday')}}</div>
<div class="timeType" v-if="historyTypeItem == 'WithinAWeeklist' && item.WithinAWeeklist.length>0">{{$t('Header.WithinAWeek')}}</div>
<div class="timeType" v-if="historyTypeItem == 'EarlierTodaylist' && item.EarlierTodaylist.length>0">{{$t('Header.Earlier')}}</div>
<div class="timeType" v-if="historyTypeItem == 'Earlierlist' && item.Earlierlist.length>0">{{$t('Header.Earlier')}}</div>
<div v-for="childItem,index in item[historyTypeItem]" class="detailItem history" @click="setHistory(item,childItem)" :class="{active:openTypeChild == childItem.id}">
<div class="text" style="width: 100%;">
<span :title="childItem.name" v-show="!childItem.editName">{{ childItem.name }}</span>
<textarea v-model="historyData.historyTextarea" v-show="childItem.editName" @click.stop></textarea>
</div>
<div class="type">{{ childItem.process.replace(/_/g, ' ').toLowerCase().replace(/\b\w/g, char => char.toUpperCase()) }}</div>
<div class="type" v-if="childItem.process == 'THREE_D_PLATE_MAKING'">3D Pattern Making</div>
<div class="type" v-else>{{ childItem.process.replace(/_/g, ' ').toLowerCase().replace(/\b\w/g, char => char.toUpperCase()) }}</div>
<div class="time">{{ childItem.updateTime.replace('T', ' ') }}</div>
<div class="btn">
<i class="fi fi-br-menu-dots-vertical" v-show="!childItem.editName" @click.stop="editHistory(childItem,index,$event,item[historyTypeItem])"></i>
@@ -69,7 +70,6 @@
</div>
</div>
<div v-show="!historyData.isNoData" class="material_content_list_loding">
<span class="historyPage_loading" v-show="!historyData.isShowLoading"></span>
<span v-show="historyData.isShowLoading">
@@ -125,7 +125,7 @@
<i @click="UpgradePlan" title="Purchase" class="fi fi-rr-shop"></i>
</div>
</div>
<div v-if="userDetail.systemUser != 0 || userDetail.systemUser == 3" @click="openUpgradeToPro" class="gallery_btn gallery_btn_radius" style="width: 100%;">Upgrade to Pro</div>
<div v-if="userDetail.systemUser != 0 || userDetail.systemUser == 3" @click="openUpgradeToPro" class="gallery_btn gallery_btn_radius" style="width: 100%;">{{$t('Header.openUpgrade')}}</div>
</div>
</div>
<div class="rightBox">
@@ -139,15 +139,15 @@
</div>
</div>
<div class="trialApproval">
<div class="message_iconItem">
<div class="message_iconItem" style="display: flex;margin-left: .5rem">
<a-badge :count="messageNum">
<i class="fi fi-rr-envelope" @click="openMessage"></i>
<i class="fi fi-rr-envelope" style="font-size: 2rem" @click="openMessage"></i>
</a-badge>
</div>
<div class="message_iconItem">
<div class="message_iconItem" style="display: flex;margin-left: .5rem">
<a-badge :count="messageType?.newPosted">
<!-- <i class="fi fi-rr-envelope" @click="openMessage"></i> -->
<i class="fi fi-rr-bell" @click.stop="openNewPosted"></i>
<i class="fi fi-rr-bell" style="font-size: 2rem" @click.stop="openNewPosted"></i>
</a-badge>
<div class="message_iconItem_value select_block" v-show="isNewPosted" style="width: 40rem">
<newPosted ref="newPosted"></newPosted>
@@ -302,11 +302,11 @@ export default defineComponent({
projectSetting:null,
historyData:{
isNoData:false,
isShowLoading:true,
isShowLoading:false,
isNull:false,
searchCollectionName:'',
historyTextarea:'',
updateTimeType:['Todaylist','Yesterdaylist','WithinAWeeklist','EarlierTodaylist'],
updateTimeType:['Todaylist','Yesterdaylist','WithinAWeeklist','Earlierlist'],
selectHistoryId:-1,
page:1,
size:10,
@@ -320,6 +320,18 @@ export default defineComponent({
const historyData = reactive({
})
const getIdExistToHistory = async ()=>{
return await new Promise((resolve, reject) => {
let value = {
id:Number(route.query?.id || route.query?.history),
}
Https.axiosPost( Https.httpUrls.historyProject, value)
.then((rv)=>{
resolve(rv.content.length > 0)
}).catch(()=>{resolve(false)})
})
}
watch(() => route.query,
(query, oldQuery) => {
nextTick(()=>{
@@ -331,16 +343,20 @@ export default defineComponent({
}else{
homeMainData.openType = Object.keys(query)[0]
homeMainData.openTypeChild = query[Object.keys(query)[0]]
}
}else{
homeMainData.openType = ''
homeMainData.openTypeChild = ''
}
if(query.create == 'true')settingGetHistory()
if(query.create == 'true' || query?.source == 'batch')settingGetHistory()
})
},
{ immediate: true } // 立即触发一次以处理初始参数
);
watch(()=>homeMainData.openTypeList,()=>{
homeMainData.historyData.page = 1
})
let userDetail= computed(()=>{
return store.state.UserHabit.userDetail
})
@@ -419,6 +435,9 @@ export default defineComponent({
renew.value.init()
}
onMounted(async ()=>{
if((route.query?.id || route.query?.history) && !await getIdExistToHistory()){
router.push('/home')
}
let test = getCookie('isTest')
let isTest =JSON.parse(test)
//判断账号剩余时间是否太短
@@ -519,9 +538,11 @@ export default defineComponent({
homeMainData.openTypeList.history.Todaylist = []
homeMainData.openTypeList.history.Yesterdaylist = []
homeMainData.openTypeList.history.WithinAWeeklist = []
homeMainData.openTypeList.history.EarlierTodaylist = []
homeMainData.openTypeList.history.Earlierlist = []
homeMainData.historyData.isShowLoading = false
homeMainData.historyData.isNoData = false
isFound = 0//表示是否找到当前id的记录
existToHistoryIndex = -1
}
provide('settingGetHistory',settingGetHistory)
const categorizeDate = (inputDate) => {
@@ -541,8 +562,34 @@ export default defineComponent({
return "Earlier";
}
}
let isFound = 0
let existToHistoryIndex = -1
const setScrollTop = ()=>{
setTimeout(()=>{
let historyDateList = ['Todaylist','Yesterdaylist','WithinAWeeklist','Earlierlist']
let num = 0
let dateIndex = -1 //表示某个时间段
let parent = document.querySelectorAll('.homeMain_max .navList .history .detail')
let imgParent = document.querySelectorAll('.homeMain_max .navList .history .detail>div')
if(existToHistoryIndex == -1){
parent[0].parentNode.scrollTop = parent[0].offsetHeight
}else{
isFound++
historyDateList.forEach((item,dateItemIndex)=>{
let length = homeMainData.openTypeList.history[item].length
if(existToHistoryIndex > length + num){
num += length
}else{
if(dateIndex == -1)dateIndex = dateItemIndex
}
})
let dateEl = imgParent[dateIndex].querySelectorAll('.history')
parent[0].parentNode.scrollTop = dateEl[existToHistoryIndex - num-1].offsetTop
}
},0)
}
const getHistory = ()=>{
console.log(123)
if(homeMainData.historyData.isShowLoading && !homeMainData.historyData.isNoData)return
homeMainData.historyData.isShowLoading = true
let data = {
@@ -557,19 +604,22 @@ export default defineComponent({
}
Https.axiosPost( Https.httpUrls.historyProject, data).then(
// Https.axiosPost( Https.httpUrls.queryUserGroup, data).then(
(rv) => {
(rv) => {
if(data.page == 1 && rv.content.length == 0){
homeMainData.historyData.isNull = true
}else{
homeMainData.historyData.isNull = false
}
if (rv.content.length > 0) {
rv.content.forEach((item)=>{
rv.content.forEach((item,index)=>{
let str = categorizeDate(item.updateTime) + 'list'
homeMainData.openTypeList.history[str].push(item)
if(item.id == (route.query?.id || route.query?.history)){
existToHistoryIndex = rv.page * rv.size + index + 1 - rv.size
}
})
homeMainData.historyData.isNull = false
// homeMainData.openTypeList.history.list.push(...rv.content)
if((route.query?.id || route.query?.history) && isFound < 1)setScrollTop()
} else {
homeMainData.historyData.isNoData = true
}
@@ -612,7 +662,7 @@ export default defineComponent({
const editName = (item)=>{
homeMainData.historyData.selectHistoryId = -1
for (const key in homeMainData.openTypeList.history) {
let list = ['EarlierTodaylist','Todaylist','WithinAWeeklist','Yesterdaylist']
let list = ['Earlierlist','Todaylist','WithinAWeeklist','Yesterdaylist']
if(list.indexOf(key) == -1)continue
homeMainData.openTypeList.history[key].forEach((item)=>{
item.editName = false
@@ -657,7 +707,7 @@ export default defineComponent({
const bathGeneration = (item)=>{
homeMainData.openType = ''
homeMainData.historyData.selectHistoryId = -1
router.push(`/home/cloud?type=creation&id=${item.id}&name=${item.name}`)
router.push(`/home/cloud?type=creation&id=${item.id}&name=${item.name}&process=${item.process}`)
}
return {
store,
@@ -979,7 +1029,10 @@ export default defineComponent({
margin-top: 2rem;
}
.marginB2{
margin-bottom: 1rem;
// margin-bottom: 1rem;
&.active{
margin-bottom: 1rem;
}
}
.list{
display: flex;
@@ -1062,7 +1115,10 @@ export default defineComponent({
border-radius: .8rem;
display: flex;
align-items: center;
flex-wrap: wrap;
// flex-wrap: wrap;
flex-wrap: nowrap;
> .time{
font-size: 1.2rem;
opacity: .5;
@@ -1072,9 +1128,12 @@ export default defineComponent({
display: flex;
}
> .text{
flex: 1;
overflow: hidden;
> span{
//只在一行显示
width: 100%;
display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -1522,7 +1581,9 @@ export default defineComponent({
&:hover {
background: #f3f3f6;
}
.fi{
font-size: 1.8rem;
}
.iconfont ,.fi-rr-book-user {
// font-size: 1.4rem;
}
@@ -1572,9 +1633,9 @@ export default defineComponent({
cursor: pointer;
}
.attention_item_active:hover{
color: #39215b;
color: #000;
span{
color: #39215b;
color: #000;
}
}
div{

View File

@@ -1,43 +1,6 @@
<template>
<div class="homeRecommend_max">
<div class="left">
<img src="@/assets/images/homePage/squareLeftImg.png" alt="">
<!-- <div class="comment">
<div class="item">
123123123123123123123123123123123123
<div>2312321</div>
</div>
<div class="item right">
1231231231231231231231231231231231233123123123
<div>2312321</div>
</div>
<div class="item">
1231231231231231231231231231231231233123123123
<div>2312321</div>
</div>
<div class="item right">
123123123123123123123123123123123123
<div>2312321</div>
</div>
<div class="item">
1231231231231231231231231231231231233123123123
<div>2312321</div>
</div>
<div class="item right">
123123123123123123123123123123123123
<div>2312321</div>
</div>
<div class="item">
1231231231231231231231231231231231233123123123
<div>2312321</div>
</div>
<div class="item right">
123123123123123123123123123123123123
<div>2312321</div>
</div>
</div> -->
</div>
<div class="right">
<div class="logoBox">
<img
class="aiDalogo"
@@ -48,18 +11,22 @@
</div>
<div class="text">
<div class="title">
Welcome to AiDA<br />
Bloom Your Creativity
<p style="font-weight: 700;">Welcome to AiDA</p>
<p style="font-weight: 500;">Bloom Your Creativity</p>
</div>
<div class="info">
Don't have an account? <span @click="signUp">Sign up</span> for free
</div>
<div class="continue gallery_btn gallery_btn_radius" @click="setLogin" style="min-width: 33rem;">
<div class="continue gallery_btn gallery_btn_radius" @click="setLogin" style="min-width: 14rem;">
Login
<!-- <i class="fi fi-rr-arrow-right"></i> -->
</div>
</div>
</div>
<div class="right">
<img class="model" src="@/assets/images/homePage/squareLeftImgModel.png" alt="">
<img class="text" src="@/assets/images/homePage/squareLeftImgText.png" alt="">
</div>
</div>
</template>
<script >
@@ -197,68 +164,23 @@ export default defineComponent({
width: 100%;
height: 100%;
display: flex;
font-family: Satoshi;
> .left,> .right{
height: 100%;
display: flex;
}
> .left{
width: 60%;
background: #232323;
img{
width: 100%;
height: 100%;
object-fit: cover;
}
> .comment{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
> .item{
padding: 2rem;
border-radius: 4rem;
font-size: 2rem;
background: #fff;
text-align: center;
width: auto;
position: relative;
margin: 1rem 0;
font-weight: 600;
&:nth-child(1){left: -10rem;}
&:nth-child(2){left: 15rem;}
&:nth-child(3){left: -15rem;}
&:nth-child(4){left: 10rem;}
> div{
position: absolute;
padding: 1.5rem;
border-radius: 4rem;
left: 1rem;
top: 0;
transform: translateY(-60%);
background: rgba(175, 175, 175,.6);
backdrop-filter: blur(13px);
-webkit-backdrop-filter: blur(13px);
}
&.right{
position: relative;
> div{
left: auto;
right: 1rem;
}
}
}
}
}
> .right{
width: 40%;
// width: 79rem;
width: 45%;
// position: absolute;
// right: 0;
align-items: center;
justify-content: center;
position: relative;
> .logoBox{
height: 4rem;
position: absolute;
right: 2rem;
left: 2rem;
top: 2rem;
img{
height: 100%;
@@ -269,16 +191,21 @@ export default defineComponent({
}
}
> .text{
width: 60rem;
width: 68rem;
> .title{
font-size: 4rem;
// font-size: 4rem;
font-size: 6.4rem;
font-weight: 900;
line-height: 1.2;
margin-bottom: 2rem;
margin-bottom: 3.2rem;
p{
margin-bottom: 0;
}
}
> .info{
font-size: 2rem;
margin-bottom: 4rem;
font-size: 2.4rem;
// margin-bottom: 4rem;
margin-bottom: 1.6rem;
line-height: 1.2;
> span{
color: #0070c9;
@@ -289,11 +216,33 @@ export default defineComponent({
}
}
> .continue{
font-size: 2.4rem;
> i{
margin-left: 1rem;
}
}
}
}
> .right{
// width: 58%;
position: relative;
width: 55%;
background: #d7d6d5;
display: flex;
align-items: center;
justify-content: flex-end;
> img{
object-fit: cover;
}
> .model{
height: 100%;
position: absolute;
left: 0;
}
> .text{
height: 45rem;
text-align: right;
}
}
}
</style>

View File

@@ -295,7 +295,7 @@ export default defineComponent({
{ immediate: true } // 立即触发一次以处理初始参数
);
onMounted (()=>{
if(window.innerWidth < 1200)filter.failWidth = 120
if(window.innerWidth < 1200)filter.failWidth = 240
nextTick(()=>{
setPorfolioDom()
})

View File

@@ -110,7 +110,7 @@
></template>
</a-select>
</div>
<div class="generalModel_state_item smail" v-if="selectCode == 'Models'">
<div class="generalModel_state_item smail" v-if="selectCode == 'Models' || selectCode == 'Sketchboard'">
<a-select
ref="select"
v-model:value="ageGroup"
@@ -341,6 +341,7 @@
:data="{
...upload,
gender:sex,
ageGroup:ageGroup,
}"
:headers="{Authorization:token}"
v-model:file-list="selectGenerateList"
@@ -388,6 +389,7 @@
:data="{
...upload,
gender:sex,
ageGroup:ageGroup,
}"
:maxCount='1'
:headers="{ Authorization: token }"
@@ -779,7 +781,7 @@ export default defineComponent({
level1Type:selectCode.value,
level2Type:design,
page:1,
ageGroup:selectCode.value == 'Models'?pageData.ageGroup:'',
ageGroup:(selectCode.value == 'Models' || selectCode.value == 'Sketchboard')?pageData.ageGroup:'',
modelSex:sex.value?sex.value:'',
pictureName:searchPictureName.value,
size:pageSize.value,
@@ -1371,6 +1373,7 @@ export default defineComponent({
sex:this.selectCode == 'Sketchboard' ? this.sex:'',
modelType:'',
checkMd5:1,
ageGroup:this.ageGroup,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}
this.isShowMark = true
@@ -1879,6 +1882,7 @@ export default defineComponent({
let param = new FormData();
param.append('inPin','0')
param.append('gender',this.sex)
param.append('ageGroup',this.workspace.ageGroup)
param.append('level1Type',this.selectCode)
param.append('timeZone',Intl.DateTimeFormat().resolvedOptions().timeZone)
param.append('file',e.clipboardData.files[0]);

View File

@@ -2,8 +2,7 @@
<div class="loginPage">
<div class="left">
<div class="imgBox">
<img src="@/assets/images/homePage/loginLeftImg1.png" alt="">
<img src="@/assets/images/homePage/loginLeftImg2.png" alt="">
<img src="@/assets/images/homePage/loginLeftImg.png" alt="">
</div>
<!-- <Works :autoscroll="true" :position="'login'"></Works>
<div class="mask" v-show="isMask" @click="() => (isMask = !isMask)">
@@ -18,22 +17,25 @@
</div>
<div class="right">
<div class="Text" v-show="!loginType">
<div class="title">Welcome to AiDA <br />Bloom Your Creativity</div>
<div class="title">
<p style="font-weight: 700;">Welcome to AiDA</p>
<p style="font-weight: 400;">Bloom Your Creativity</p>
</div>
<div class="info">
AiDA, a first-to-market technology that empowers fashion designers, based on their creative inspirations, to work with AI to create original designs.
</div>
</div>
<div class="loginBox">
<div class="selectType" v-show="!loginType">
<div class="text">Continue with one of these</div>
<div class="text">Continue with one of these:</div>
<div class="typeList">
<div class="gallery_btn white" @click="setLoginType('personal')">
<div class="gallery_btn" @click="setLoginType('personal')">
Individual
</div>
<div class="gallery_btn white" @click="setLoginType('school')">
<div class="gallery_btn" @click="setLoginType('school')">
Enterprise
</div>
<div class="gallery_btn white" @click="setLoginType('enterprise')">
<div class="gallery_btn" @click="setLoginType('enterprise')">
Academic
</div>
</div>
@@ -113,25 +115,25 @@ export default defineComponent({
height: 100%;
position: relative;
display: flex;
font-family: 'Satoshi';
background: #000;
> .left,
> .right {
height: 100%;
}
> .left {
width: 60%;
width: 57%;
// width: 55%;
background: #f7f8fa;
position: relative;
background: #fff;
background: #000;
> .imgBox{
width: 70%;
background: #fff;
margin: 0 auto;
background: #000;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
width: 100%;
> img{
width: 100%;
height: 100%;
}
}
> .mask {
@@ -180,23 +182,34 @@ export default defineComponent({
}
> .right {
display: flex;
width: 40%;
width: 45%;
position: absolute;
right: 0;
align-items: center;
justify-content: center;
flex-direction: column;
background: #d9d9d9;
border-radius: 7rem 0 0 7rem;
overflow: hidden;
> .Text {
width: 60rem;
width: 65rem;
text-align: center;
> .title {
font-size: 4rem;
font-weight: 900;
line-height: 1.2;
margin-bottom: 2rem;
font-size: 6.4rem;
font-weight: 900;
line-height: 1.2;
margin-bottom: 3.2rem;
p{
margin-bottom: 0;
}
}
> .info {
font-size: 1.8rem;
margin-bottom: 2rem;
line-height: 1.2;
font-size: 2rem;
// margin-bottom: 4rem;
margin-bottom: 0rem;
font-weight: 300;
line-height: 1.2;
letter-spacing:-.5px;
}
> .continue {
> i {
@@ -205,24 +218,35 @@ export default defineComponent({
}
}
> .loginBox {
width: 60rem;
width: 44rem;
margin-top: 7rem;
> .selectType {
width: 100%;
text-align: center;
> .text {
font-size: 2.5rem;
font-weight: 600;
font-size: 3.2rem;
font-weight: 500;
margin-bottom: 2rem;
}
> .typeList {
> .gallery_btn{
}
> div {
margin: 0 auto;
width: 33rem;
margin-top: 0.8rem;
border-radius: 1rem;
width: 100%;
background: transparent;
border-radius: 9rem;
border: 2px solid;
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 2rem;
color: #000;
&:hover{
background: #000;
color: #fff;
}
}
}
}

View File

@@ -26,11 +26,12 @@
</div>
</div>
</div>
<div class="homeRecommend_right">
<!-- <div class="homeRecommend_right">
<div class="gallery_btn" v-if="userDetail.systemList.indexOf(1) > -1 && !isMoblie" @click="goHome">Home</div>
<div class="gallery_btn white" v-if="userDetail.systemUser != -1" @click="logout">log off</div>
</div>
<div class="homeRecommend_right" v-if="userDetail.systemUser == -1">
</div> -->
<div class="homeRecommend_right">
<!-- <div class="homeRecommend_right" v-if="userDetail.systemUser == -1"> -->
<div class="cutLangue">
<div @click="()=>isSelectSuccessively = !isSelectSuccessively">
<i class="fi fi-rr-globe"></i>
@@ -183,7 +184,7 @@ export default defineComponent({
.gallery_btn{
// color: #000;
// background: #fff;
// border: 2px solid #39215b;
// border: 2px solid #000;
// margin-left: 2rem;
width: 13rem;
text-align: center;

View File

@@ -82,7 +82,7 @@ export default defineComponent({
display: flex;
align-items: center;
span{
background: #39215b;
background: #000;
width: 8rem;
height: 8rem;
border-radius: 50%;

View File

@@ -961,7 +961,7 @@ export default defineComponent({
#submit {
background: green;
background: #39215b;
background: #000;
border: none;
border-radius: 10px;

View File

@@ -846,7 +846,7 @@ export default defineComponent({
#submit {
background: green;
background: #39215b;
background: #000;
border: none;
border-radius: 10px;