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

Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev

master
gongfuxiang 2025-04-28 10:16:29 +08:00
parent eb44252f2b 9c1ed867eb
commit c8d726f2c1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pages/diy/components/diy/custom.vue
View File

@ -95,6 +95,10 @@
type: [String, Number],
default: '',
},
propTabsDataType: {
type: String,
default: 'custom',
},
// 组件渲染的下标
propIndex: {
type: Number,
@ -184,6 +188,9 @@
percentage_count,
isEmpty,
init() {
if (this.propTabsDataType !== 'custom') {
return;
}
const new_form = this.propValue.content;
const new_style = this.propValue.style;
// 不包含新创建的数组时，将历史数据放到手动添加数组中

7
pages/diy/components/diy/data-tabs.vue
View File

@ -19,8 +19,8 @@
</view>
</view>
</template>
<template v-else-if="tabs_data_type == 'custom'">
<component-diy-custom-list :propKey="diy_key" :propValue="tabs_list" :propOuterContainerPadding="outer_container_width" :propIsCommonStyle="false"></component-diy-custom-list>
<template v-show="tabs_data_type == 'custom'">
<component-diy-custom-list :propKey="diy_key" :propTabsDataType="tabs_data_type" :propValue="tabs_list" :propOuterContainerPadding="outer_container_width" :propIsCommonStyle="false"></component-diy-custom-list>
</template>
</view>
</view>
@ -250,9 +250,8 @@
};
const data_content = new_style?.data_content || old_border_and_box_shadow;
const tabs_content = new_style?.tabs_content || old_border_and_box_shadow;
//显示的数据处理
this.tabs_click_event(0);
this.tabs_click_event(this.tabs_index);
this.setData({
top_up: new_content.tabs_top_up,
sticky_top: this.propTop + (new_style?.tabs_margin?.margin_top || 0),