Merge branch 'main' of http://18.167.251.121:10003/aidlab/lanecarford_front
All checks were successful
git提交控制 AiDA WEB-Node.js main 分支构建部署 / build (20.19.0) (push) Has been skipped
All checks were successful
git提交控制 AiDA WEB-Node.js main 分支构建部署 / build (20.19.0) (push) Has been skipped
This commit is contained in:
@@ -179,7 +179,7 @@ const onContinue = () => {
|
||||
|
||||
<template>
|
||||
<div class="creation-list">
|
||||
<div class="title" @click="handleOpenShare">Your Creation</div>
|
||||
<div class="title">Your Creation</div>
|
||||
<div class="list">
|
||||
<my-list v-model:loading="loading" v-model:finish="finish" @load="onLoad">
|
||||
<div class="item" v-for="(v, i) in list" :key="i" @click="onItem(v)">
|
||||
@@ -230,7 +230,7 @@ const onContinue = () => {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
> .title {
|
||||
font-family: satoshiRegular;
|
||||
font-family: 'satoshiRegular';
|
||||
font-size: 9rem;
|
||||
text-align: center;
|
||||
line-height: 124%;
|
||||
@@ -284,8 +284,9 @@ const onContinue = () => {
|
||||
}
|
||||
> .ai {
|
||||
color: #646464;
|
||||
background: linear-gradient(
|
||||
137.95deg,
|
||||
background: linear-gradient(0deg, rgba(230, 219, 219, 0.5), rgba(230, 219, 219, 0.5)),
|
||||
linear-gradient(
|
||||
165.5deg,
|
||||
#7a96ac 2.28%,
|
||||
#eaeff3 19.8%,
|
||||
#c2d4e1 32.94%,
|
||||
@@ -293,8 +294,7 @@ const onContinue = () => {
|
||||
#d4dee5 62.15%,
|
||||
#abbdc8 78.69%,
|
||||
#bccad7 95.24%
|
||||
),
|
||||
linear-gradient(0deg, rgba(230, 219, 219, 0.5), rgba(230, 219, 219, 0.5));
|
||||
);
|
||||
}
|
||||
}
|
||||
> .icons {
|
||||
@@ -309,7 +309,7 @@ const onContinue = () => {
|
||||
width: 5rem;
|
||||
height: 5rem;
|
||||
border-radius: 1rem;
|
||||
border: 0.2rem solid #000;
|
||||
border: 0.2rem solid rgba(0, 0, 0, 0.5);
|
||||
--svg-icon-color: #000;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@@ -151,7 +151,7 @@ const { isLoading } = toRefs(data);
|
||||
</div>
|
||||
<div class="again">
|
||||
<!-- <div @click="changeModel">Change Model</div> -->
|
||||
<button @click="onContinue" class="general_button smail" style="margin-left: auto;">Continue</button>
|
||||
<button class="flex flex-center" @click="onContinue" style="margin-left: auto;">Continue</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -199,6 +199,7 @@ const { isLoading } = toRefs(data);
|
||||
font-weight: 700;
|
||||
font-size: 9.6rem;
|
||||
line-height: 124%;
|
||||
color: #000;
|
||||
}
|
||||
}
|
||||
> .selectContent{
|
||||
@@ -261,8 +262,18 @@ const { isLoading } = toRefs(data);
|
||||
margin-top: 4.4rem;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
> div{
|
||||
margin-right: 3.9rem;
|
||||
> button{
|
||||
border-radius: .7rem;
|
||||
border: 3px solid #000;
|
||||
background-color: #000;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
font-family: satoshiMedium;
|
||||
font-size: 3.6rem;
|
||||
width: 24.6rem;
|
||||
line-height: 6.7rem;
|
||||
height: 6.7rem;
|
||||
box-sizing: border-box;
|
||||
&:last-child{
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
@@ -118,14 +118,14 @@ const { styleList, select } = toRefs(data);
|
||||
Select the outfit that matches you the most.
|
||||
</div>
|
||||
</div>
|
||||
<div class="selectContent">
|
||||
<div class="selectContent flex-1">
|
||||
<SelectItem :selectList="styleList" v-model:select="select" @selectItem="selectItem" @updateStyle="updateStyle" />
|
||||
</div>
|
||||
<div class="footer">
|
||||
<button class="flex flex-center" @click.stop="toProduct">Continue</button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="footer placeholder"></div> -->
|
||||
<div class="footer">
|
||||
<button class="general_button smail" @click.stop="toProduct">Continue</button>
|
||||
</div>
|
||||
<footer-navigation is-placeholder />
|
||||
</template>
|
||||
<style lang="less" scoped>
|
||||
@@ -144,40 +144,59 @@ const { styleList, select } = toRefs(data);
|
||||
> .text{
|
||||
text-align: center;
|
||||
width: 100%;
|
||||
margin-top: 3.4rem;
|
||||
margin-top: 3rem;
|
||||
margin-bottom: 4.9rem;
|
||||
> .title{
|
||||
font-family: satoshiBold;
|
||||
font-weight: 700;
|
||||
font-size: 9.6rem;
|
||||
line-height: 124%;
|
||||
color: #000;
|
||||
}
|
||||
> .info{
|
||||
font-size: 4rem;
|
||||
font-weight: 400;
|
||||
line-height: 124%;
|
||||
margin-top: 1.3rem;
|
||||
color: rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
}
|
||||
.selectContent{
|
||||
padding: 0 4rem;
|
||||
flex: 1;
|
||||
overflow: auto;
|
||||
}
|
||||
}
|
||||
.footer {
|
||||
// position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
// margin-top: 4.4rem;
|
||||
// padding: 4rem 4rem 0 0;
|
||||
margin-top: auto;
|
||||
margin-bottom: 5.6rem;
|
||||
margin-right: 4rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
background-color: #f6f6f6;
|
||||
// position: absolute;
|
||||
// right: 4rem;
|
||||
// bottom: 4rem;
|
||||
height: 6.7rem;
|
||||
// background-color: #f6f6f6;
|
||||
&.placeholder{
|
||||
position: relative;
|
||||
}
|
||||
> button {
|
||||
margin-right: 5rem;
|
||||
// margin-right: 5rem;
|
||||
border-radius: .7rem;
|
||||
border: 3px solid #000;
|
||||
background-color: #000;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
font-family: satoshiMedium;
|
||||
font-size: 3.6rem;
|
||||
width: 24.6rem;
|
||||
height: 6.7rem;
|
||||
box-sizing: border-box;
|
||||
line-height: 6.7rem;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -45,10 +45,10 @@
|
||||
</p>
|
||||
</div>
|
||||
<div class="btns">
|
||||
<button class="sandblasted-blurred" @click="handleUploadFace">
|
||||
<button class="sandblasted-blurred flex flex-center" @click="handleUploadFace">
|
||||
<span>Upload Face</span>
|
||||
</button>
|
||||
<button class="sandblasted-blurred" @click="handleFinish" v-if="!isDemo"><span>Finish</span></button>
|
||||
<button class="sandblasted-blurred flex flex-center" @click="handleFinish" v-if="!isDemo"><span>Finish</span></button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -91,10 +91,14 @@
|
||||
justify-content: center;
|
||||
bottom: 19.7rem;
|
||||
> button {
|
||||
width: 40rem;
|
||||
width: 35rem;
|
||||
height: 8.3rem;
|
||||
box-sizing: border-box;
|
||||
border-radius: 0.7rem;
|
||||
margin: 0 1.8rem;
|
||||
&.sandblasted-blurred {
|
||||
border-width: 0.2rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user