diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 4ffe379..1041d46 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -28,14 +28,40 @@ button.sandblasted-blurred::after { button.sandblasted-blurred:active { opacity: 0.7; } -html:root { - --van-dialog-width: 90rem; - --van-dialog-font-size: 5rem; - --van-dialog-header-line-height: 150%; - --van-dialog-message-font-size: 3.5rem; - --van-dialog-message-line-height: 150%; - --van-button-default-font-size: 4rem; - --van-dialog-button-height: 9rem; - --van-dialog-message-padding: 3rem 2.5rem; - --van-dialog-has-title-message-padding-top: 2.5rem; +@media (prefers-color-scheme: dark) { + :root, + body { + background: white !important; + color: black !important; + } +} +html:root { + --van-overlay-background: rgba(0, 0, 0, 0.4); + --van-dialog-width: 45rem; + --van-dialog-font-size: 2.83rem; + --van-dialog-header-font-weight: 600; + --van-dialog-header-line-height: 95%; + --van-text-color: #000; + --van-dialog-header-padding-top: 3rem; + --van-dialog-message-font-size: 2rem; + --van-dialog-message-line-height: 130%; + --van-dialog-has-title-message-text-color: #000; + --van-button-default-font-size: 2.8rem; + --van-dialog-button-height: 6.8rem; + --van-dialog-message-padding: 3.5rem; + --van-dialog-has-title-message-padding-top: 2.5rem; + --van-button-default-color: #1B73E7; + --van-dialog-confirm-button-text-color: #1B73E7; +} +.van-toast__text { + font-size: 4rem; + height: 5rem; + line-height: 5rem; + padding: 0 2rem; +} +.van-toast__text { + font-size: 4rem; + height: 5rem; + line-height: 5rem; + padding: 0 2rem; } diff --git a/src/assets/css/style.less b/src/assets/css/style.less index c4ff8a9..85626d2 100644 --- a/src/assets/css/style.less +++ b/src/assets/css/style.less @@ -23,6 +23,7 @@ button.sandblasted-blurred { &::before { backdrop-filter: blur(9.5rem); } + &::after { opacity: 0.1; background: url('@/assets/images/customer_form_bg.png'); @@ -34,23 +35,38 @@ button.sandblasted-blurred { } } +//只使用浅色模式 +@media (prefers-color-scheme: dark) { + :root, body { + background: white !important; + color: black !important; + } +} // vant dialog html:root { - --van-dialog-width: 90rem; - --van-dialog-font-size: 5rem; - --van-dialog-header-line-height: 150%; - --van-dialog-message-font-size: 3.5rem; - --van-dialog-message-line-height: 150%; - --van-button-default-font-size: 4rem; - --van-dialog-button-height: 9rem; - --van-dialog-message-padding: 3rem 2.5rem; + --van-overlay-background: rgba(0, 0, 0, 0.4); + --van-dialog-width: 45rem; + --van-dialog-font-size: 2.83rem; + --van-dialog-header-font-weight: 600; + --van-dialog-header-line-height: 95%; + --van-text-color: #000; + --van-dialog-header-padding-top: 3rem; + --van-dialog-message-font-size: 2rem; + --van-dialog-message-line-height: 130%; + --van-dialog-has-title-message-text-color: #000; + --van-button-default-font-size: 2.8rem; + --van-dialog-button-height: 6.8rem; + --van-dialog-message-padding: 3.5rem; --van-dialog-has-title-message-padding-top: 2.5rem; + --van-button-default-color: #1B73E7; + --van-dialog-confirm-button-text-color: #1B73E7; } + .van-toast__text { - font-size: 4rem; - height: 5rem; - line-height: 5rem; - padding: 0 2rem; + font-size: 4rem; + height: 5rem; + line-height: 5rem; + padding: 0 2rem; } \ No newline at end of file diff --git a/src/components/FooterNavigation.vue b/src/components/FooterNavigation.vue index 700ddfb..3a62bd3 100644 --- a/src/components/FooterNavigation.vue +++ b/src/components/FooterNavigation.vue @@ -18,8 +18,10 @@ } const onHome = (nav) => { showConfirmDialog({ - title: 'Tip', - message: 'The current page has not been saved. Do you want to return to the home page?' + title: 'Return to Home Page?', + message: 'You have unsaved changes. Your progress will be lost.', + confirmButtonText: 'Yes', + cancelButtonText: 'Cancel', }) .then(() => { nav.path && router.push(nav.path) diff --git a/src/components/selectStyle/selectItem.vue b/src/components/selectStyle/selectItem.vue index b052897..74ab178 100644 --- a/src/components/selectStyle/selectItem.vue +++ b/src/components/selectStyle/selectItem.vue @@ -64,10 +64,10 @@ const {} = toRefs(data);
-
+
@@ -75,9 +75,9 @@ const {} = toRefs(data);
--> -
+
diff --git a/src/router/index.ts b/src/router/index.ts index 5954606..2ce18b0 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -107,7 +107,7 @@ const router = createRouter({ // creation path: '/workshop/creation', name: 'creation', - component: () => import('../views/Workshop/creation.vue'), + component: () => import('../views/Workshop/creation/index.vue'), }, { // 完成创建 diff --git a/src/views/Workshop/creation.vue b/src/views/Workshop/creation.vue deleted file mode 100644 index 2c6dc49..0000000 --- a/src/views/Workshop/creation.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - - - diff --git a/src/views/Workshop/creation/creation-details.vue b/src/views/Workshop/creation/creation-details.vue new file mode 100644 index 0000000..81f6b42 --- /dev/null +++ b/src/views/Workshop/creation/creation-details.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/Workshop/creation/creation-list.vue b/src/views/Workshop/creation/creation-list.vue new file mode 100644 index 0000000..8b4004e --- /dev/null +++ b/src/views/Workshop/creation/creation-list.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/views/Workshop/creation/index.vue b/src/views/Workshop/creation/index.vue new file mode 100644 index 0000000..0d77b92 --- /dev/null +++ b/src/views/Workshop/creation/index.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/views/Workshop/customize.vue b/src/views/Workshop/customize.vue index 5f6ec23..48b5de1 100644 --- a/src/views/Workshop/customize.vue +++ b/src/views/Workshop/customize.vue @@ -27,7 +27,7 @@ const onRetry = () => { router.back() } - const onContinue = () => { + const onFinish = () => { router.push({ name: 'creation' }) } @@ -49,20 +49,19 @@
-
+
-
+
- - +
@@ -88,13 +87,14 @@ font-family: satoshiRegular; font-size: 3.74rem; line-height: 124%; + color: rgba(0, 0, 0, 0.6); } > .input-box { - margin-top: 7.3rem; + margin-top: 6rem; width: 87.5rem; height: 8.3rem; border-radius: 0.5rem; - border: 0.4rem solid #000000; + border: 0.3rem solid #000000; box-sizing: content-box; display: flex; align-items: center; @@ -127,9 +127,9 @@ } } > .card { - margin-top: 6.9rem; - width: 79.8rem; - height: 107.4rem; + margin-top: 6.4rem; + width: 72.9rem; + height: 102.3rem; border-radius: 2rem; // box-shadow: 1.3rem 1.4rem 2rem 0.2rem #0000004d; border: 0.2rem solid #d9d9d9; @@ -181,20 +181,21 @@ } } > .btns { - margin-top: 2.5rem; + margin-top: 5.6rem; width: 100%; display: flex; justify-content: center; > button { box-sizing: content-box; font-family: satoshiRegular; - margin: 0 2rem; - width: 35rem; - height: 6rem; + // margin: 0 1.8rem; + margin: 0 5.2rem 0 auto; + width: 23.8rem; + height: 6.9rem; border-radius: 1.3rem; background: #000; font-weight: 400; - font-size: 3.6rem; + font-size: 3.89rem; color: #fff; &:active { opacity: 0.7; diff --git a/src/views/Workshop/library.vue b/src/views/Workshop/library.vue index c7593b8..6e48626 100644 --- a/src/views/Workshop/library.vue +++ b/src/views/Workshop/library.vue @@ -3,6 +3,7 @@ import HeaderTitle from '@/components/HeaderTitle.vue' import FooterNavigation from '@/components/FooterNavigation.vue' import MyList from '@/components/myList.vue' + import router from '@/router' const emit = defineEmits(['view-type']) onMounted(() => { @@ -25,10 +26,11 @@ } loading.value = false if (list.length >= 50) finish.value = true - }, 1500) + }, 500) } - const onRetrieveItem = (i: number) => { - console.log('检索' + i) + const onDetailsItem = (v) => { + // console.log('检索' + i) + router.push({ name: 'creation', query: { date: v.datetime } }) } const deleteItem = (i: number) => { @@ -47,10 +49,10 @@
- User ID: {{ v.userID }} + {{ v.datetime }} Last opened {{ v.lastopened }} - +
diff --git a/src/views/Workshop/selectModelContinue.vue b/src/views/Workshop/selectModelContinue.vue index 45aad9d..49a6447 100644 --- a/src/views/Workshop/selectModelContinue.vue +++ b/src/views/Workshop/selectModelContinue.vue @@ -3,38 +3,47 @@ import { onMounted, onUnmounted, reactive, toRefs } from "vue"; import HeaderTitle from '@/components/HeaderTitle.vue' import FooterNavigation from '@/components/FooterNavigation.vue' import { useRouter } from 'vue-router' +import GenerateLoading from '@/views/asistant/components/GenerateLoading.vue' const router = useRouter() //const props = defineProps({ //}) const emit = defineEmits(['view-type']) -// let data = reactive({ -// modelList: -// [ +let data = reactive({ + modelList: + [ -// ], -// selectedModelId: null, -// }) + ], + isLoading: false, +}) // const setSelectedModelId = (item)=>{ // data.selectedModelId = item.id; // } + const onContinue = ()=>{ router.push('uploadFace') +} +const changeModel = ()=>{ + router.push('selectModel') } onMounted(() => { emit('view-type', 1) + data.isLoading = true; + setTimeout(()=>{ + data.isLoading = false; + }, 2000) }) onUnmounted(()=>{ }) defineExpose({}) -// const { modelList, selectedModelId } = toRefs(data); +const { isLoading } = toRefs(data); \ No newline at end of file diff --git a/src/views/Workshop/selectStyle.vue b/src/views/Workshop/selectStyle.vue index 95c7f77..d5992c4 100644 --- a/src/views/Workshop/selectStyle.vue +++ b/src/views/Workshop/selectStyle.vue @@ -66,8 +66,8 @@ let data = reactive({ } }) -const toSelectModel = ()=>{ - router.push({ path: 'selectModel' }) +const toSelectModelContinue = ()=>{ + router.push({ path: 'selectModelContinue' }) } onMounted(()=>{ emit('view-type', 1) @@ -94,7 +94,7 @@ const { selectList, select } = toRefs(data);
- +