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

Merge branch 'dev-sws' into dev-yxl

master
于肖磊 2024-09-24 16:30:57 +08:00
parent f57adb5859 11562048ea
commit 3e2d76d277
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/diy/header.vue
View File

@ -3,7 +3,7 @@
<view class="header-content flex-row">
<view class="model-top flex-1" :style="position">
<view class="roll pr z-i" :style="roll_style">
<view class="model-head tc pr padding-horizontal-sm flex-row align-c">
<view class="model-head tc pr padding-horizontal-sm flex-row align-c" :style="'max-width:' + header_width">
<view class="flex-row align-c jc-sb gap-16 wh-auto padding-horizontal-main pr">
<view v-if="['1', '2', '3'].includes(form.content.theme)" class="flex-1 flex-row align-c jc-c ht-auto gap-16" :style="text_style + 'justify-content:' + form.content.indicator_location || 'center'">
<template v-if="['2', '3'].includes(form.content.theme)">
@ -73,6 +73,7 @@
position: '',
roll_style: '',
text_style: '',
header_width: '100%',
};
},
created() {
@ -95,11 +96,17 @@
} else {
new_roll_style += `background: transparent;`;
}
// 小程序下，获取小程序胶囊的宽度
let menuButtonInfo = '100%';
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
menuButtonInfo = `calc(100% - ${uni.getMenuButtonBoundingClientRect().width + 130}rpx);`;
// #endif
this.setData({
form: this.value,
position: (new_style.up_slide_display == '1' ? 'position:absolute;' : 'position:relative;') + 'top:' + bar_height + 'rpx;',
roll_style: new_roll_style,
text_style: `font-weight:${new_style.header_background_title_typeface}; font-size: ${new_style.header_background_title_size * 2}rpx; color: ${new_style.header_background_title_color};`,
header_width: menuButtonInfo,
});
},
},

2
components/diy/search.vue
View File

@ -64,13 +64,11 @@
form: this.value.content,
new_style: this.value.style,
});
console.log(this.value);
this.init();
},
methods: {
isEmpty,
init() {
console.log(this.new_style);
const { search_button_radius, common_style } = this.new_style;
this.setData({
style: this.get_style(), // 内部样式