Merge branch 'dev-sws'

v1.0.0
gongfuxiang 2024-08-27 18:12:57 +08:00
commit efaeb02bf9
2 changed files with 11 additions and 4 deletions

View File

@ -33,7 +33,12 @@
</el-form-item>
<el-form-item :label="scoped.row.data_type == 'micro_page' ? '微页面' : '商品分类'" class="w mb-0">
<!-- <el-input v-model="scoped.row.classify" placeholder="请选择页面" /> -->
<url-value v-model="scoped.row.classify"></url-value>
<template v-if="scoped.row.data_type == 'micro_page'">
<url-value v-model="scoped.row.micro_page_list"></url-value>
</template>
<template v-else>
<url-value v-model="scoped.row.classify" :type="[ 'goods-category' ]"></url-value>
</template>
</el-form-item>
</div>
</template>
@ -70,6 +75,7 @@ const add = () => {
data_type: 'micro_page',
classify: {},
micro_page: '',
micro_page_list: [],
category_list: []
})
}

View File

@ -7,6 +7,7 @@ interface tabs_page {
data_type: string;
classify: object;
micro_page: string;
micro_page_list: string[];
category_list: string[];
}
interface defaultTabs {
@ -32,9 +33,9 @@ const defaultTabs: defaultTabs = {
tabs_theme: '0',
tabs_top_up: true,
tabs_list: [
{ id: get_math(), title: '热门推荐', desc: '简介', data_type: 'micro_page', classify: {}, micro_page: '', category_list: [] },
{ id: get_math(), title: '测试一', desc: '简介', data_type: 'micro_page', classify: {}, micro_page: '', category_list: [] },
{ id: get_math(), title: '测试二', desc: '简介', data_type: 'micro_page', classify: {}, micro_page: '', category_list: [] },
{ id: get_math(), title: '热门推荐', desc: '简介', data_type: 'micro_page', classify: {}, micro_page: '', micro_page_list: [], category_list: [] },
{ id: get_math(), title: '测试一', desc: '简介', data_type: 'micro_page', classify: {}, micro_page: '', micro_page_list: [], category_list: [] },
{ id: get_math(), title: '测试二', desc: '简介', data_type: 'micro_page', classify: {}, micro_page: '', micro_page_list: [], category_list: [] },
],
},
style: {