Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/lanecarford_front

This commit is contained in:
X1627315083
2025-11-17 14:37:16 +08:00
17 changed files with 183 additions and 120 deletions

View File

@@ -31,7 +31,7 @@
.catch(() => {})
}
const navs = [
{ label: 'Home', icon: 'home', size: 73, path: '/stylist/customer', on: onHome },
{ label: 'Home', icon: 'home', size: 73, path: '/homeNav' },
{ label: 'Library', icon: 'library', size: 53, path: '/workshop/library' },
{ label: 'Profile', icon: 'profile', size: 55, path: '/workshop/profile' }
]

View File

@@ -5,7 +5,7 @@
defineProps({
title: { type: String, default: 'AI STYLING ASSISTANT' },
hasSetting: { type: Boolean, default: false },
styleType: { type: String, default: '1' },//1低 2高
styleType: { type: String, default: '1' },//1低 2高 3-12rem
isPlaceholder: { type: Boolean, default: true },
})
@@ -36,6 +36,10 @@
--header-title-border-bottom-width: 0.2rem;
--header-title-return-left: 7.8rem;
}
&[style-type="3"] {
--header-title-height: 12rem;
--header-title-border-bottom-width: 0.2rem;
}
> div {
width: 100%;
height: var(--header-title-height, 9.9rem);

View File

@@ -28,7 +28,7 @@
<div class="footer">
<p v-show="!loading" class="placeholder" ref="placeholder"></p>
<span class="loading" v-show="loading">Loading...</span>
<span class="nomore" v-show="finish">Mo more</span>
<span class="nomore" v-show="finish">No more</span>
</div>
</div>
</template>

View File

@@ -88,11 +88,11 @@ const {} = toRefs(data);
> .item{
width: calc(50% - 3.1rem / 2);
position: relative;
margin-bottom: 3.3rem;
// margin-bottom: 3.3rem;
display: flex;
flex-direction: column;
> .title{
font-size: 3.6rem;
font-size: 3.44rem;
font-weight: 700;
color: #000;
font-family: 'satoshiMedium';
@@ -102,7 +102,7 @@ const {} = toRefs(data);
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
height: 47.2rem;
height: 45rem;
margin: 2.4rem 0;
background-color: #fff;
justify-content: center;
@@ -148,8 +148,8 @@ const {} = toRefs(data);
color: #000;
margin-right: 1.2rem;
border-radius: 50%;
width: 6.6rem;
height: 6.6rem;
width: 5.2rem;
height: 5.2rem;
padding: 1rem;
background-color: #fff;
&:last-child{