diff --git a/admin/src/api/decoration.ts b/admin/src/api/decoration.ts index 62945e06..22dc4d93 100644 --- a/admin/src/api/decoration.ts +++ b/admin/src/api/decoration.ts @@ -9,3 +9,13 @@ export function getDecoratePages(params: any) { export function setDecoratePages(params: any) { return request.post({ url: '/decorate/pages/save', params }) } + +// 底部导航详情 +export function getDecorateTabbar(params?: any) { + return request.get({ url: '/decorate/tabbar/detail', params }) +} + +// 底部导航保存 +export function setDecorateTabbar(params: any) { + return request.post({ url: '/decorate/tabbar/save', params }) +} diff --git a/admin/src/components/color-picker/index.vue b/admin/src/components/color-picker/index.vue new file mode 100644 index 00000000..ed0bc3e2 --- /dev/null +++ b/admin/src/components/color-picker/index.vue @@ -0,0 +1,33 @@ + + diff --git a/admin/src/components/footer-btns/index.vue b/admin/src/components/footer-btns/index.vue index 1e70409f..eb5aea2c 100644 --- a/admin/src/components/footer-btns/index.vue +++ b/admin/src/components/footer-btns/index.vue @@ -1,21 +1,24 @@ - diff --git a/admin/src/views/decoration/component/pages/attr-setting.vue b/admin/src/views/decoration/component/pages/attr-setting.vue index c4269335..d4c90f3c 100644 --- a/admin/src/views/decoration/component/pages/attr-setting.vue +++ b/admin/src/views/decoration/component/pages/attr-setting.vue @@ -5,12 +5,14 @@ > {{ widget?.title }} - + + + + + diff --git a/admin/src/views/decoration/component/widgets/customer-service/content.vue b/admin/src/views/decoration/component/widgets/customer-service/content.vue new file mode 100644 index 00000000..854deab4 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/customer-service/content.vue @@ -0,0 +1,38 @@ + + + + diff --git a/admin/src/views/decoration/component/widgets/customer-service/index.ts b/admin/src/views/decoration/component/widgets/customer-service/index.ts new file mode 100644 index 00000000..c776bce3 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/customer-service/index.ts @@ -0,0 +1,8 @@ +import attr from './attr.vue' +import content from './content.vue' +import options from './options' +export default { + attr, + content, + options +} diff --git a/admin/src/views/decoration/component/widgets/customer-service/options.ts b/admin/src/views/decoration/component/widgets/customer-service/options.ts new file mode 100644 index 00000000..3a5efda8 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/customer-service/options.ts @@ -0,0 +1,11 @@ +export default () => ({ + title: '客服设置', + name: 'customer-service', + content: { + title: '添加客服二维码', + time: '', + mobile: '', + qrcode: '' + }, + styles: {} +}) diff --git a/admin/src/views/decoration/component/widgets/index.ts b/admin/src/views/decoration/component/widgets/index.ts index e9043761..20bf4bff 100644 --- a/admin/src/views/decoration/component/widgets/index.ts +++ b/admin/src/views/decoration/component/widgets/index.ts @@ -1,15 +1,14 @@ -const widgets: Record = import.meta.glob('./**/*', { eager: true }) +const widgets: Record = import.meta.glob('./**/index.ts', { eager: true }) interface Widget { attr: any content: any options: any } +console.log(widgets) const exportWidgets: Record = {} Object.keys(widgets).forEach((key) => { const widgetName = key.replace(/^\.\/([\w-]+).*/gi, '$1') - const widgetContent = key.replace(/(.*\/)*([^.]+).*/gi, '$2') as keyof Widget - exportWidgets[widgetName] = exportWidgets[widgetName] ?? {} - exportWidgets[widgetName][widgetContent] = widgets[key]?.default + exportWidgets[widgetName] = widgets[key]?.default }) export default exportWidgets diff --git a/admin/src/views/decoration/component/widgets/my-service/attr.vue b/admin/src/views/decoration/component/widgets/my-service/attr.vue new file mode 100644 index 00000000..a29d8943 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/my-service/attr.vue @@ -0,0 +1,38 @@ + + + + diff --git a/admin/src/views/decoration/component/widgets/my-service/content.vue b/admin/src/views/decoration/component/widgets/my-service/content.vue new file mode 100644 index 00000000..6317bb52 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/my-service/content.vue @@ -0,0 +1,58 @@ + + + + diff --git a/admin/src/views/decoration/component/widgets/my-service/index.ts b/admin/src/views/decoration/component/widgets/my-service/index.ts new file mode 100644 index 00000000..c776bce3 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/my-service/index.ts @@ -0,0 +1,8 @@ +import attr from './attr.vue' +import content from './content.vue' +import options from './options' +export default { + attr, + content, + options +} diff --git a/admin/src/views/decoration/component/widgets/my-service/options.ts b/admin/src/views/decoration/component/widgets/my-service/options.ts new file mode 100644 index 00000000..a69f3558 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/my-service/options.ts @@ -0,0 +1,16 @@ +export default () => ({ + title: '我的服务', + name: 'my-service', + content: { + style: 1, + title: '我的服务', + data: [ + { + image: '', + name: '', + link: {} + } + ] + }, + styles: {} +}) diff --git a/admin/src/views/decoration/component/widgets/nav/attr.vue b/admin/src/views/decoration/component/widgets/nav/attr.vue index f7b0cb3f..3128196d 100644 --- a/admin/src/views/decoration/component/widgets/nav/attr.vue +++ b/admin/src/views/decoration/component/widgets/nav/attr.vue @@ -7,47 +7,21 @@ 停用 - +
-
最多可添加10个,建议图片尺寸:100px*100px
- -
- - - -
- - - - - - -
-
-
+
最多可添加10个,建议图片尺寸:100px*100px
+
- - 添加菜单 - diff --git a/admin/src/views/decoration/component/widgets/nav/index.ts b/admin/src/views/decoration/component/widgets/nav/index.ts new file mode 100644 index 00000000..c776bce3 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/nav/index.ts @@ -0,0 +1,8 @@ +import attr from './attr.vue' +import content from './content.vue' +import options from './options' +export default { + attr, + content, + options +} diff --git a/admin/src/views/decoration/component/widgets/search/index.ts b/admin/src/views/decoration/component/widgets/search/index.ts new file mode 100644 index 00000000..c776bce3 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/search/index.ts @@ -0,0 +1,8 @@ +import attr from './attr.vue' +import content from './content.vue' +import options from './options' +export default { + attr, + content, + options +} diff --git a/admin/src/views/decoration/component/widgets/user-banner/attr.vue b/admin/src/views/decoration/component/widgets/user-banner/attr.vue new file mode 100644 index 00000000..98b4d2ed --- /dev/null +++ b/admin/src/views/decoration/component/widgets/user-banner/attr.vue @@ -0,0 +1,75 @@ + + + + diff --git a/admin/src/views/decoration/component/widgets/user-banner/content.vue b/admin/src/views/decoration/component/widgets/user-banner/content.vue new file mode 100644 index 00000000..9c3ec86d --- /dev/null +++ b/admin/src/views/decoration/component/widgets/user-banner/content.vue @@ -0,0 +1,31 @@ + + + + diff --git a/admin/src/views/decoration/component/widgets/user-banner/index.ts b/admin/src/views/decoration/component/widgets/user-banner/index.ts new file mode 100644 index 00000000..c776bce3 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/user-banner/index.ts @@ -0,0 +1,8 @@ +import attr from './attr.vue' +import content from './content.vue' +import options from './options' +export default { + attr, + content, + options +} diff --git a/admin/src/views/decoration/component/widgets/user-banner/options.ts b/admin/src/views/decoration/component/widgets/user-banner/options.ts new file mode 100644 index 00000000..4adc70e7 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/user-banner/options.ts @@ -0,0 +1,15 @@ +export default () => ({ + title: '个人中心广告图', + name: 'user-banner', + content: { + enabled: 1, + data: [ + { + image: '', + name: '', + link: {} + } + ] + }, + styles: {} +}) diff --git a/admin/src/views/decoration/component/widgets/user-info/attr.vue b/admin/src/views/decoration/component/widgets/user-info/attr.vue new file mode 100644 index 00000000..93f92786 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/user-info/attr.vue @@ -0,0 +1,20 @@ + + + + diff --git a/admin/src/views/decoration/component/widgets/user-info/content.vue b/admin/src/views/decoration/component/widgets/user-info/content.vue new file mode 100644 index 00000000..dca207d9 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/user-info/content.vue @@ -0,0 +1,23 @@ + + + + diff --git a/admin/src/views/decoration/component/widgets/user-info/images/default_avatar.png b/admin/src/views/decoration/component/widgets/user-info/images/default_avatar.png new file mode 100644 index 00000000..de31d02a Binary files /dev/null and b/admin/src/views/decoration/component/widgets/user-info/images/default_avatar.png differ diff --git a/admin/src/views/decoration/component/widgets/user-info/images/my_topbg.png b/admin/src/views/decoration/component/widgets/user-info/images/my_topbg.png new file mode 100644 index 00000000..89844383 Binary files /dev/null and b/admin/src/views/decoration/component/widgets/user-info/images/my_topbg.png differ diff --git a/admin/src/views/decoration/component/widgets/user-info/index.ts b/admin/src/views/decoration/component/widgets/user-info/index.ts new file mode 100644 index 00000000..c776bce3 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/user-info/index.ts @@ -0,0 +1,8 @@ +import attr from './attr.vue' +import content from './content.vue' +import options from './options' +export default { + attr, + content, + options +} diff --git a/admin/src/views/decoration/component/widgets/user-info/options.ts b/admin/src/views/decoration/component/widgets/user-info/options.ts new file mode 100644 index 00000000..b3468292 --- /dev/null +++ b/admin/src/views/decoration/component/widgets/user-info/options.ts @@ -0,0 +1,7 @@ +export default () => ({ + title: '用户信息', + name: 'user-info', + disabled: 1, + content: {}, + styles: {} +}) diff --git a/admin/src/views/decoration/pages/index.vue b/admin/src/views/decoration/pages/index.vue index 2411e388..4d9b83cd 100644 --- a/admin/src/views/decoration/pages/index.vue +++ b/admin/src/views/decoration/pages/index.vue @@ -1,17 +1,13 @@