sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-yxl' into dev-sws

v1.0.0
sws 2024-09-05 15:02:05 +08:00
parent a890ed9a9f a339a694b6
commit be7bdaee54
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/model-data-magic/model-data-magic-content.vue
View File

@ -6,7 +6,7 @@
<el-form-item label="选择风格"> <el-form-item label="选择风格">
<div class="flex align-c flex-wrap gap-10"> <div class="flex align-c flex-wrap gap-10">
<div v-for="(item, index) in style_list" :key="index" :class="['flex-item', {'flex-item-actived': form.style_actived === index }]" @click="style_click(index)"> <div v-for="(item, index) in style_list" :key="index" :class="['flex-item', {'flex-item-actived': form.style_actived === index }]" @click="style_click(index)">
<icon :name="item" :color="`${ form.style_actived === index ? '#E1EEF9' : '#EDEDED'}`" size="48"></icon> <icon :name="item" :color="`${ form.style_actived === index ? '#E1EEF9' : '#EDEDED'}`" size="30"></icon>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
@ -213,8 +213,8 @@ const is_show_title = computed(() => !(form.value.style_actived == 7 && ![0, 1].
} }
} }
.flex-item { .flex-item {
width: 7.6rem; width: 4.7rem;
height: 7.6rem; height: 4.7rem;
background: #F7F7F7; background: #F7F7F7;
border-radius: 0.4rem; border-radius: 0.4rem;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;

6
src/components/model-img-magic/model-img-magic-content.vue
View File

@ -6,7 +6,7 @@
<el-form-item label="选择风格"> <el-form-item label="选择风格">
<div class="flex align-c flex-wrap gap-10"> <div class="flex align-c flex-wrap gap-10">
<div v-for="(item, index) in style_list" :key="index" :class="['flex-item', {'flex-item-actived': form.style_actived === index }]" @click="style_click(index)"> <div v-for="(item, index) in style_list" :key="index" :class="['flex-item', {'flex-item-actived': form.style_actived === index }]" @click="style_click(index)">
<icon :name="item" :color="`${ form.style_actived === index ? '#E1EEF9' : '#EDEDED'}`" size="48"></icon> <icon :name="item" :color="`${ form.style_actived === index ? '#E1EEF9' : '#EDEDED'}`" size="30"></icon>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
@ -136,8 +136,8 @@ const selected_click = (index: number) => {
} }
} }
.flex-item { .flex-item {
width: 7.6rem; width: 4.7rem;
height: 7.6rem; height: 4.7rem;
background: #F7F7F7; background: #F7F7F7;
border-radius: 0.4rem; border-radius: 0.4rem;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;

10
src/views/layout/components/main/index.vue
View File

@ -272,12 +272,12 @@ const model_class = computed(() => {
const model_style = computed(() => { const model_style = computed(() => {
return (item: { id: string; key: string }) => { return (item: { id: string; key: string }) => {
// window.innerHeight(当前页面高度) - 80(顶部高度) - 844 // window.innerHeight(当前页面高度) - 60(顶部高度) - 846(中间高度)
const height = (window.innerHeight - 924) / 2; const height = (window.innerHeight - 906) / 2;
let bottom = parseInt(float_bottom[item.id]) + height; let bottom = parseInt(float_bottom[item.id]) + height;
// 容器自身高度是60 775-60 = 695 // 容器自身高度是60 846-60 = 786
if (parseInt(float_bottom[item.id]) > 695) { if (parseInt(float_bottom[item.id]) > 786) {
bottom = 695 + height; bottom = 786 + height;
} }
return item.key == 'float-window' ? `bottom: ${((bottom / window.innerHeight) * 100).toFixed(4) + '%'};` : ''; return item.key == 'float-window' ? `bottom: ${((bottom / window.innerHeight) * 100).toFixed(4) + '%'};` : '';
}; };