diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 4ffe379..db545b6 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -28,6 +28,13 @@ button.sandblasted-blurred::after { button.sandblasted-blurred:active { opacity: 0.7; } +@media (prefers-color-scheme: dark) { + :root, + body { + background: white !important; + color: black !important; + } +} html:root { --van-dialog-width: 90rem; --van-dialog-font-size: 5rem; @@ -39,3 +46,9 @@ html:root { --van-dialog-message-padding: 3rem 2.5rem; --van-dialog-has-title-message-padding-top: 2.5rem; } +.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..8ebce53 100644 --- a/src/assets/css/style.less +++ b/src/assets/css/style.less @@ -34,6 +34,13 @@ button.sandblasted-blurred { } } +//只使用浅色模式 +@media (prefers-color-scheme: dark) { + :root, body { + background: white !important; + color: black !important; + } +} // vant dialog html:root { 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/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);