diff --git a/src/components/HeaderTitle.vue b/src/components/HeaderTitle.vue index 6d44400..7170e9c 100644 --- a/src/components/HeaderTitle.vue +++ b/src/components/HeaderTitle.vue @@ -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); diff --git a/src/components/selectStyle/selectItem.vue b/src/components/selectStyle/selectItem.vue index 1b44ac1..e8dccd0 100644 --- a/src/components/selectStyle/selectItem.vue +++ b/src/components/selectStyle/selectItem.vue @@ -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{ diff --git a/src/views/Workshop/selectStyle.vue b/src/views/Workshop/selectStyle.vue index 834325f..05315e0 100644 --- a/src/views/Workshop/selectStyle.vue +++ b/src/views/Workshop/selectStyle.vue @@ -2,6 +2,7 @@ import { onMounted, onUnmounted, reactive, toRefs, computed, onActivated } from "vue"; import SelectItem from "@/components/selectStyle/selectItem.vue"; import HeaderTitle from '@/components/HeaderTitle.vue' +import FooterNavigation from '@/components/FooterNavigation.vue' import { useRouter } from 'vue-router' import { useGenerateStore, useUserInfoStore } from '@/stores' import { showToast } from 'vant'; @@ -122,14 +123,15 @@ const { styleList, select } = toRefs(data); - + +