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

Merge branch 'dev-sws' into dev-yxl

v1.0.0
于肖磊 2024-10-16 10:43:26 +08:00
parent 6deb44b003 2b4c912e8b
commit 08c109d6f2
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/model-coupon/index.vue
View File

@ -283,8 +283,8 @@ const theme_7_background_style = computed(() => {
flex-basis: auto; flex-basis: auto;
flex-shrink: 0; flex-shrink: 0;
background: v-bind('theme_style.background'); background: v-bind('theme_style.background');
width: 9rem; width: 8.4rem;
height: 9rem; height: 8.4rem;
border-radius: 1rem; border-radius: 1rem;
margin-top: 1rem; margin-top: 1rem;
.name { .name {
@ -327,7 +327,7 @@ const theme_7_background_style = computed(() => {
background: v-bind('theme_style.btn_background'); background: v-bind('theme_style.btn_background');
border-radius: 2.3rem; border-radius: 2.3rem;
position: relative; position: relative;
top: -0.2rem; top: -0.5rem;
} }
} }
} }
@ -685,8 +685,8 @@ const theme_7_background_style = computed(() => {
flex-shrink: 0; flex-shrink: 0;
border-radius: 1.2rem; border-radius: 1.2rem;
padding: 0.6rem; padding: 0.6rem;
width: 14rem; width: 13.4rem;
height: 10rem; height: 9.4rem;
position: relative; position: relative;
background: v-bind('theme_style.background'); background: v-bind('theme_style.background');
.top { .top {
@ -747,12 +747,12 @@ const theme_7_background_style = computed(() => {
} }
} }
.bottom { .bottom {
margin-top: 0.6rem; margin-top: 0.4rem;
text-align: center; text-align: center;
.coupon-btn { .coupon-btn {
color: v-bind('theme_style.btn_color'); color: v-bind('theme_style.btn_color');
position: relative; position: relative;
font-size: 1.6rem; font-size: 1.4rem;
line-height: 2.2rem; line-height: 2.2rem;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;

1
src/components/model-rich-text/index.vue
View File

@ -26,6 +26,7 @@ watch(
content.value = new_content.html; content.value = new_content.html;
style_container.value = common_styles_computer(new_style.common_style); style_container.value = common_styles_computer(new_style.common_style);
style_img_container.value = common_img_computer(new_style.common_style); style_img_container.value = common_img_computer(new_style.common_style);
console.log(new_content.html);
}, },
{ immediate: true, deep: true } { immediate: true, deep: true }
); );

2
src/components/model-rich-text/model-rich-text-content.vue
View File

@ -102,6 +102,8 @@ onBeforeUnmount(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.rich-text-content { .rich-text-content {
position: relative;
z-index: 999;
.editor { .editor {
position: relative; position: relative;
height: calc(100vh - 42.5rem) !important; height: calc(100vh - 42.5rem) !important;