diff --git a/admin/.eslintrc.cjs b/admin/.eslintrc.cjs index 44a42f0b..fa81252d 100644 --- a/admin/.eslintrc.cjs +++ b/admin/.eslintrc.cjs @@ -34,7 +34,8 @@ module.exports = { 'no-prototype-builtins': 'off', 'prefer-spread': 'off', '@typescript-eslint/no-non-null-assertion': 'off', - '@typescript-eslint/no-non-null-asserted-optional-chain': 'off' + '@typescript-eslint/no-non-null-asserted-optional-chain': 'off', + 'vue/no-mutating-props': 'off' }, globals: { module: 'readonly' diff --git a/admin/src/api/decoration.ts b/admin/src/api/decoration.ts new file mode 100644 index 00000000..62945e06 --- /dev/null +++ b/admin/src/api/decoration.ts @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +// 页面装修详情 +export function getDecoratePages(params: any) { + return request.get({ url: '/decorate/pages/detail', params }) +} + +// 页面装修保存 +export function setDecoratePages(params: any) { + return request.post({ url: '/decorate/pages/save', params }) +} diff --git a/admin/src/components/image-contain/index.vue b/admin/src/components/image-contain/index.vue index fc42a46a..3625cce8 100644 --- a/admin/src/components/image-contain/index.vue +++ b/admin/src/components/image-contain/index.vue @@ -1,5 +1,11 @@ diff --git a/admin/src/components/link/index.ts b/admin/src/components/link/index.ts new file mode 100644 index 00000000..8e12a67a --- /dev/null +++ b/admin/src/components/link/index.ts @@ -0,0 +1,11 @@ +export enum LinkTypeEnum { + 'SHOP_PAGES' = 'shop', + 'CUSTOM_LINK' = 'custom' +} + +export interface Link { + path: string + name?: string + type: string + params?: Record +} diff --git a/admin/src/components/link/index.vue b/admin/src/components/link/index.vue new file mode 100644 index 00000000..700305d3 --- /dev/null +++ b/admin/src/components/link/index.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/admin/src/components/link/picker.vue b/admin/src/components/link/picker.vue new file mode 100644 index 00000000..b65a8a5c --- /dev/null +++ b/admin/src/components/link/picker.vue @@ -0,0 +1,53 @@ + + + diff --git a/admin/src/components/link/shop-pages.vue b/admin/src/components/link/shop-pages.vue new file mode 100644 index 00000000..4012dfbb --- /dev/null +++ b/admin/src/components/link/shop-pages.vue @@ -0,0 +1,42 @@ + + + diff --git a/admin/src/components/material/picker.vue b/admin/src/components/material/picker.vue index 0f6f6162..6fd96e1f 100644 --- a/admin/src/components/material/picker.vue +++ b/admin/src/components/material/picker.vue @@ -41,7 +41,8 @@ v-show="showUpload" :class="{ 'is-disabled': disabled, - 'is-one': limit == 1 + 'is-one': limit == 1, + [uploadClass]: true }" > @@ -123,6 +124,10 @@ export default defineComponent({ hiddenUpload: { type: Boolean, default: false + }, + uploadClass: { + type: String, + default: '' } }, @@ -269,8 +274,8 @@ export default defineComponent({ } } .material-upload { - .upload-btn { - @apply box-border rounded border-br border-dashed border flex flex-col justify-center items-center; + :deep(.upload-btn) { + @apply text-tx-secondary box-border rounded border-br border-dashed border flex flex-col justify-center items-center; } } } diff --git a/admin/src/layout/default/components/sidebar/menu.vue b/admin/src/layout/default/components/sidebar/menu.vue index 67c38922..a94dcc03 100644 --- a/admin/src/layout/default/components/sidebar/menu.vue +++ b/admin/src/layout/default/components/sidebar/menu.vue @@ -1,5 +1,9 @@