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

Merge branch 'master' of https://gitee.com/lvYeJu/lane-crawford-3

Browse Source
This commit is contained in:
李志鹏
2025-10-10 17:01:21 +08:00
parent 31cf5ad135 bd9dece91f
commit ea0a213935
7 changed files with 146 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/css/woff/Satoshi/Satoshi-Medium.ttf Normal file
View File

Binary file not shown.

BIN
public/css/woff/Satoshi/Satoshi-Medium.woff Normal file
View File

Binary file not shown.

7
public/css/woff/fontFamily.css
View File

@@ -13,6 +13,13 @@
src: url("./Satoshi/Satoshi-Bold.ttf") format('woff2'), url("./Satoshi/Satoshi-Bold.woff") format('woff2');
/* unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; */
}
@font-face {
font-family: 'satoshiMedium';
font-style: italic;
font-weight: 700;
src: url("./Satoshi/Satoshi-Medium.ttf") format('woff2'), url("./Satoshi/Satoshi-Medium.woff") format('woff2');
/* unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; */
}
@font-face {
font-family: 'mazzardHRegular';
font-style: italic;

5
src/assets/icons/Return.svg
View File

@@ -1,3 +1,2 @@
<svg width="22" height="34" viewBox="0 0 22 34" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22 31.2213L18.728 34L0.906497 18.856C0.619223 18.6133 0.391239 18.3248 0.235665 18.0069C0.0800915 17.6891 -2.93095e-08 17.3482 -2.87279e-08 17.0039C-2.81463e-08 16.6597 0.0800915 16.3188 0.235665 16.001C0.391239 15.6831 0.619223 15.3946 0.906497 15.1519L18.728 0L21.9969 2.77872L5.27014 17L22 31.2213Z" fill="black"/>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="512" height="512"><g id="_01_align_center" data-name="01 align center"><path d="M16.752,23.994,6.879,14.121a3,3,0,0,1,0-4.242L16.746.012,18.16,1.426,8.293,11.293a1,1,0,0,0,0,1.414l9.873,9.873Z"/></g></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 B

After

Width:  |  Height:  |  Size: 312 B

40
src/views/Workshop/selectModel.vue
View File

@@ -1,5 +1,8 @@
<script setup lang="ts">
import { onMounted, onUnmounted, reactive, toRefs } from "vue";
import HeaderTitle from '@/components/HeaderTitle.vue'
import { useRouter } from 'vue-router'
const router = useRouter()
//const props = defineProps({
//})
//const emit = defineEmits([
@@ -39,7 +42,9 @@ let data = reactive({
const setSelectedModelId = (item)=>{
data.selectedModelId = item.id;
}
const toSelectModelContinue = ()=>{
router.push({ path: 'selectModelContinue' })
}
onMounted(()=>{
})
onUnmounted(()=>{
@@ -48,6 +53,7 @@ defineExpose({})
const { modelList, selectedModelId } = toRefs(data);
</script>
<template>
<header-title />
<div class="selectModel">
<div class="text">
<div class="title">
@@ -68,11 +74,14 @@ const { modelList, selectedModelId } = toRefs(data);
</div>
</div>
</div>
<div class="footer">
<button @click.stop="toSelectModelContinue">Continue</button>
</div>
</template>
<style lang="less" scoped>
.selectModel{
width: 100%;
height: 100%;
// height: 100%;
position: relative;
display: flex;
flex-direction: column;
@@ -126,4 +135,31 @@ const { modelList, selectedModelId } = toRefs(data);
}
}
}
.footer {
position: fixed;
width: 100%;
bottom: 0;
left: 0;
height: 11.2rem;
background-color: #000;
display: flex;
align-items: center;
justify-content: flex-end;
> button {
width: 24.6rem;
height: 5.9rem;
border-radius: 0.7rem;
box-sizing: content-box;
border: 0.3rem solid #fff;
background: transparent;
font-family: satoshiRegular;
font-weight: 400;
font-size: 4rem;
color: #fff;
margin-right: 5rem;
&:active {
opacity: 0.7;
}
}
}
</style>

65
src/views/Workshop/selectModelContinue.vue
View File

@@ -1,5 +1,6 @@
<script setup lang="ts">
import { onMounted, onUnmounted, reactive, toRefs } from "vue";
import HeaderTitle from '@/components/HeaderTitle.vue'
//const props = defineProps({
//})
//const emit = defineEmits([
@@ -24,6 +25,7 @@ defineExpose({})
// const { modelList, selectedModelId } = toRefs(data);
</script>
<template>
<header-title />
<div class="selectModelContinue">
<div class="router">
<div>Home</div>
@@ -39,20 +41,33 @@ defineExpose({})
<div class="modelBox">
<div></div>
<div class="model">
<img src="" alt="">
<img src="https://www.minio-api.aida.com.hk/aida-results/result_6868d8ba-a423-11f0-a36f-0242c0a87002.png?response-content-type=image%2Fpng&response-content-disposition=inline&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20251009%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20251009T012529Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=5806e009f9ee9c901694efcf72dce690f447857c24a0f30d7a8559ee5a53bc5a" alt="">
<div class="operation">
<div class="iconItem">
<SvgIcon name="noLike" size="30" />
</div>
<div class="iconItem">
<SvgIcon name="noLike" size="30" />
</div>
<div class="iconItem">
<SvgIcon name="noLike" size="30" />
</div>
</div>
</div>
</div>
<div class="again">
Re-try with a new model?
</div>
</div>
</div>
<div class="footer">
<button>Continue</button>
</div>
</template>
<style lang="less" scoped>
.selectModelContinue{
width: 100%;
height: 100%;
// height: 100%;
position: relative;
display: flex;
flex-direction: column;
@@ -89,17 +104,31 @@ defineExpose({})
> .history{
}
> .model{
> .modelBox{
margin-top: 2.5rem;
> .model{
border: 2px solid #D9D9D9;
height: 79.8rem;
position: relative;
width: 100%;
> img{
width: 100%;
height: 100%;
object-fit: contain;
}
> .operation{
position: absolute;
display: flex;
bottom: 2rem;
right: 0rem;
> .iconItem{
border-radius: .96rem;
font-weight: 600;
padding: 1.2rem;
border: 2px solid #000;
margin-right: 1.4rem;
}
}
}
}
> .again{
@@ -112,7 +141,33 @@ defineExpose({})
border-radius: 10rem;
font-size: 4.8rem;
}
}
}
.footer {
position: fixed;
width: 100%;
bottom: 0;
left: 0;
height: 11.2rem;
background-color: #000;
display: flex;
align-items: center;
justify-content: flex-end;
> button {
width: 24.6rem;
height: 5.9rem;
border-radius: 0.7rem;
box-sizing: content-box;
border: 0.3rem solid #fff;
background: transparent;
font-family: satoshiRegular;
font-weight: 400;
font-size: 4rem;
color: #fff;
margin-right: 5rem;
&:active {
opacity: 0.7;
}
}
}
</style>

40
src/views/Workshop/selectStyle.vue
View File

@@ -1,6 +1,10 @@
<script setup lang="ts">
import { onMounted, onUnmounted, reactive, toRefs } from "vue";
import SelectItem from "@/components/selectStyle/selectItem.vue";
import HeaderTitle from '@/components/HeaderTitle.vue'
import { useRouter } from 'vue-router'
const router = useRouter()
//const props = defineProps({
//})
//const emit = defineEmits([
@@ -54,6 +58,9 @@ let data = reactive({
},
]
})
const toSelectModel = ()=>{
router.push({ path: 'selectModel' })
}
onMounted(()=>{
})
onUnmounted(()=>{
@@ -62,6 +69,7 @@ defineExpose({})
const { selectList } = toRefs(data);
</script>
<template>
<header-title />
<div class="selectStyle">
<div class="text">
<div class="title">
@@ -75,11 +83,14 @@ const { selectList } = toRefs(data);
<SelectItem :selectList="selectList" />
</div>
</div>
<div class="footer">
<button @click.stop="toSelectModel">Continue</button>
</div>
</template>
<style lang="less" scoped>
.selectStyle{
width: 100%;
height: 100%;
// height: 100%;
position: relative;
> .text{
text-align: center;
@@ -103,4 +114,31 @@ const { selectList } = toRefs(data);
padding: 0 4rem;
}
}
.footer {
position: fixed;
width: 100%;
bottom: 0;
left: 0;
height: 11.2rem;
background-color: #000;
display: flex;
align-items: center;
justify-content: flex-end;
> button {
width: 24.6rem;
height: 5.9rem;
border-radius: 0.7rem;
box-sizing: content-box;
border: 0.3rem solid #fff;
background: transparent;
font-family: satoshiRegular;
font-weight: 400;
font-size: 4rem;
color: #fff;
margin-right: 5rem;
&:active {
opacity: 0.7;
}
}
}
</style>