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

修改显示逻辑

v1.3.0
于肖磊 2025-03-11 11:41:17 +08:00
parent 0d58cc2022
commit 416ec1db60
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/model-binding/components/goods-index.vue
View File

@ -81,9 +81,6 @@
<el-form-item label="背景">
<background-common v-model:color_list="form.goods_content_style.color_list" v-model:direction="form.goods_content_style.direction" v-model:img_style="form.goods_content_style.background_img_style" v-model:img="form.goods_content_style.background_img" @mult_color_picker_event="mult_color_picker_event" />
</el-form-item>
<!-- <el-form-item label="组合间距">
<margin :value="form.goods_content_style.outer_margin"></margin>
</el-form-item> -->
<el-form-item label="外间距">
<margin :value="form.goods_content_style"></margin>
</el-form-item>

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

@ -65,7 +65,6 @@
</div>
</div>
<!-- 商品信息区域 -->
<!-- <div class="oh" :style="margin_computer(new_style.goods_content_style.outer_margin)"> -->
<div v-if="form.is_default_show_goods == '1'" :style="goods_content_style">
<div :style="goods_content_img_style">
<div :class="outer_class" :style="onter_style">
@ -134,12 +133,11 @@
</div>
</div>
</div>
<!-- </div> -->
<!-- 底部展开收起按钮区域 -->
<div :style="bottom_button_style">
<div class="flex-row align-c jc-sb" :style="bottom_button_img_style">
<span class="expand-retract">{{ form.is_default_show_goods == '1' ? '收起' : '展开'}}组合商品</span>
<icon :name="form.is_default_show_goods == '1' ? 'arrow-top' : 'arrow-bottom'" color="#999" size="12"></icon>
<span :style="trends_config('button', 'bottom')">{{ form.is_default_show_goods == '1' ? '收起' : '展开'}}组合商品</span>
<icon :name="form.is_default_show_goods == '1' ? 'arrow-top' : 'arrow-bottom'" :color="new_style.bottom_button_icon_color" :size="new_style.bottom_button_icon_size"></icon>
</div>
</div>
</div>
@ -525,12 +523,4 @@ watchEffect(() => {
width: 100%;
height: 100%;
}
.expand-retract {
font-weight: 400;
font-size: 12px;
color: #999999;
line-height: 17px;
text-align: left;
font-style: normal;
}
</style>

6
src/components/model-binding/model-binding-styles.vue
View File

@ -74,6 +74,12 @@
<div class="divider-line"></div>
<card-container class="card-container">
<div class="mb-12">底部按钮样式</div>
<el-form-item label="文字">
<color-text-size-group v-model:color="form.bottom_button_color" v-model:typeface="form.bottom_button_typeface" v-model:size="form.bottom_button_size" default-color="#999"></color-text-size-group>
</el-form-item>
<el-form-item label="图标">
<color-text-size-group v-model:color="form.bottom_button_icon_color" v-model:size="form.bottom_button_icon_size" default-color="#999" :type-list="['color', 'size']"></color-text-size-group>
</el-form-item>
<el-form-item label="背景">
<background-common v-model:color_list="form.bottom_button_style.color_list" v-model:direction="form.bottom_button_style.direction" v-model:img_style="form.bottom_button_style.background_img_style" v-model:img="form.bottom_button_style.background_img" @mult_color_picker_event="bottom_button_mult_color_picker_event" />
</el-form-item>

17
src/config/const/binding.ts
View File

@ -149,6 +149,11 @@ interface defaultRealstore {
interval_time: number;
rolling_fashion: string;
goods_content_style: object,
bottom_button_color: string,
bottom_button_typeface: string,
bottom_button_size: number,
bottom_button_icon_color: string,
bottom_button_icon_size: number,
bottom_button_style: object,
common_style: object;
};
@ -416,14 +421,12 @@ const defaultRealstore: defaultRealstore = {
box_shadow_y: 0,
box_shadow_blur: 0,
box_shadow_spread: 0,
// outer_margin: {
// margin: 0,
// margin_top: 10,
// margin_bottom: 10,
// margin_left: 0,
// margin_right: 0,
// }
},
bottom_button_color: '#999999',
bottom_button_typeface: '400',
bottom_button_size: 12,
bottom_button_icon_color: '#999999',
bottom_button_icon_size: 12,
bottom_button_style: {
color_list: [{ color: '#fff', color_percentage: undefined }],
direction: '180deg',