diff --git a/apps/web-antd/src/views/mp/components/wx-material-select/wx-material-select.vue b/apps/web-antd/src/views/mp/components/wx-material-select/wx-material-select.vue index ea767382b..1ca1417ef 100644 --- a/apps/web-antd/src/views/mp/components/wx-material-select/wx-material-select.vue +++ b/apps/web-antd/src/views/mp/components/wx-material-select/wx-material-select.vue @@ -34,6 +34,7 @@ const emit = defineEmits<{ (e: 'selectMaterial', item: any): void; }>(); +// TODO @dlyan @AI:这里是不是应该都用 grid; const loading = ref(false); // 遮罩层 const total = ref(0); // 总条数 const list = ref([]); // 数据列表 diff --git a/apps/web-antd/src/views/mp/components/wx-msg/card.scss b/apps/web-antd/src/views/mp/components/wx-msg/card.scss deleted file mode 100644 index 639f4ca8e..000000000 --- a/apps/web-antd/src/views/mp/components/wx-msg/card.scss +++ /dev/null @@ -1,116 +0,0 @@ -.mp-card { - &__item { - box-sizing: border-box; - height: 200px; - margin-bottom: 16px; - font-size: 14px; - font-feature-settings: 'tnum'; - font-variant: tabular-nums; - line-height: 1.5; - color: rgb(0 0 0 / 65%); - cursor: pointer; - list-style: none; - background-color: #fff; - border: 1px solid #e8e8e8; - - &:hover { - border-color: rgb(0 0 0 / 9%); - box-shadow: 0 2px 8px rgb(0 0 0 / 9%); - } - - &--add { - display: flex; - align-items: center; - justify-content: center; - width: 100%; - font-size: 16px; - color: rgb(0 0 0 / 45%); - background-color: #fff; - border: 1px dashed #000; - border-color: #d9d9d9; - border-radius: 2px; - - i { - margin-right: 10px; - } - - &:hover { - color: #40a9ff; - background-color: #fff; - border-color: #40a9ff; - } - } - } - - &__body { - display: flex; - padding: 24px; - } - - &__detail { - flex: 1; - } - - &__avatar { - width: 48px; - height: 48px; - margin-right: 12px; - overflow: hidden; - border-radius: 48px; - - img { - width: 100%; - height: 100%; - } - } - - &__title { - margin-bottom: 12px; - font-size: 16px; - color: rgb(0 0 0 / 85%); - - &:hover { - color: #1890ff; - } - } - - &__info { - display: -webkit-box; - height: 64px; - overflow: hidden; - -webkit-line-clamp: 3; - color: rgb(0 0 0 / 45%); - -webkit-box-orient: vertical; - } - - &__menu { - display: flex; - justify-content: space-around; - height: 50px; - line-height: 50px; - color: rgb(0 0 0 / 45%); - text-align: center; - background: #f7f9fa; - - &:hover { - color: #1890ff; - } - } -} - -/** joolun 额外加的 */ -.mp-comment__main { - flex: unset !important; - margin: 0 8px !important; - border-radius: 5px !important; -} - -.mp-comment__header { - border-top-left-radius: 5px; - border-top-right-radius: 5px; -} - -.mp-comment__body { - border-bottom-right-radius: 5px; - border-bottom-left-radius: 5px; -} diff --git a/apps/web-antd/src/views/mp/components/wx-msg/comment.scss b/apps/web-antd/src/views/mp/components/wx-msg/comment.scss deleted file mode 100644 index 98e137d4b..000000000 --- a/apps/web-antd/src/views/mp/components/wx-msg/comment.scss +++ /dev/null @@ -1,109 +0,0 @@ -/* 来自 https://github.com/nmxiaowei/avue/blob/master/styles/src/element-ui/comment.scss */ -.mp-comment { - display: flex; - align-items: flex-start; - margin-bottom: 30px; - - &--reverse { - flex-direction: row-reverse; - - .mp-comment__main { - &::before, - &::after { - right: -8px; - left: auto; - border-width: 8px 0 8px 8px; - } - - &::before { - border-left-color: #dedede; - } - - &::after { - margin-right: 1px; - margin-left: auto; - border-left-color: #f8f8f8; - } - } - } - - &__avatar { - box-sizing: border-box; - width: 48px; - height: 48px; - vertical-align: middle; - border: 1px solid transparent; - border-radius: 50%; - } - - &__header { - display: flex; - align-items: center; - justify-content: space-between; - padding: 5px 15px; - background: #f8f8f8; - border-bottom: 1px solid #eee; - } - - &__author { - font-size: 14px; - font-weight: 700; - color: #999; - } - - &__main { - position: relative; - flex: 1; - margin: 0 20px; - border: 1px solid #dedede; - border-radius: 2px; - - &::before, - &::after { - position: absolute; - top: 10px; - right: 100%; - left: -8px; - display: block; - width: 0; - height: 0; - pointer-events: none; - content: ' '; - border-color: transparent; - border-style: solid solid outset; - border-width: 8px 8px 8px 0; - } - - &::before { - z-index: 1; - border-right-color: #dedede; - } - - &::after { - z-index: 2; - margin-left: 1px; - border-right-color: #f8f8f8; - } - } - - &__body { - padding: 15px; - overflow: hidden; - font-family: - 'Segoe UI', 'Lucida Grande', Helvetica, Arial, 'Microsoft YaHei', - FreeSans, Arimo, 'Droid Sans', 'wenquanyi micro hei', 'Hiragino Sans GB', - 'Hiragino Sans GB W3', FontAwesome, sans-serif; - font-size: 14px; - color: #333; - background: #fff; - } - - blockquote { - padding: 1px 0 1px 15px; - margin: 0; - font-family: - Georgia, 'Times New Roman', Times, Kai, 'Kaiti SC', KaiTi, BiauKai, - FontAwesome, serif; - border-left: 4px solid #ddd; - } -} diff --git a/apps/web-antd/src/views/mp/material/index.vue b/apps/web-antd/src/views/mp/material/index.vue index 062b8aeff..7f82c7930 100644 --- a/apps/web-antd/src/views/mp/material/index.vue +++ b/apps/web-antd/src/views/mp/material/index.vue @@ -29,6 +29,7 @@ const total = ref(0); // 总条数 const accountId = ref(-1); provide('accountId', accountId); +// TODO @dlyan @AI:这里是不是应该都用 grid;类似 yudao-ui-admin-vben-v5/apps/web-ele/src/views/mp/autoReply/index.vue const queryParams = reactive({ accountId, pageNo: 1, diff --git a/apps/web-antd/src/views/mp/material/modules/image-table.vue b/apps/web-antd/src/views/mp/material/modules/image-table.vue index 040c82c24..10b8f2db9 100644 --- a/apps/web-antd/src/views/mp/material/modules/image-table.vue +++ b/apps/web-antd/src/views/mp/material/modules/image-table.vue @@ -6,6 +6,7 @@ import { nextTick, onMounted, watch } from 'vue'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { useImageGridColumns } from './data'; +import {$t} from '@vben/locales'; const props = defineProps<{ list: MpMaterialApi.Material[]; @@ -105,7 +106,7 @@ onMounted(async () => { ['col }, ]; } - diff --git a/apps/web-ele/src/views/mp/modules/wx-msg/card.scss b/apps/web-ele/src/views/mp/modules/wx-msg/card.scss deleted file mode 100644 index 639f4ca8e..000000000 --- a/apps/web-ele/src/views/mp/modules/wx-msg/card.scss +++ /dev/null @@ -1,116 +0,0 @@ -.mp-card { - &__item { - box-sizing: border-box; - height: 200px; - margin-bottom: 16px; - font-size: 14px; - font-feature-settings: 'tnum'; - font-variant: tabular-nums; - line-height: 1.5; - color: rgb(0 0 0 / 65%); - cursor: pointer; - list-style: none; - background-color: #fff; - border: 1px solid #e8e8e8; - - &:hover { - border-color: rgb(0 0 0 / 9%); - box-shadow: 0 2px 8px rgb(0 0 0 / 9%); - } - - &--add { - display: flex; - align-items: center; - justify-content: center; - width: 100%; - font-size: 16px; - color: rgb(0 0 0 / 45%); - background-color: #fff; - border: 1px dashed #000; - border-color: #d9d9d9; - border-radius: 2px; - - i { - margin-right: 10px; - } - - &:hover { - color: #40a9ff; - background-color: #fff; - border-color: #40a9ff; - } - } - } - - &__body { - display: flex; - padding: 24px; - } - - &__detail { - flex: 1; - } - - &__avatar { - width: 48px; - height: 48px; - margin-right: 12px; - overflow: hidden; - border-radius: 48px; - - img { - width: 100%; - height: 100%; - } - } - - &__title { - margin-bottom: 12px; - font-size: 16px; - color: rgb(0 0 0 / 85%); - - &:hover { - color: #1890ff; - } - } - - &__info { - display: -webkit-box; - height: 64px; - overflow: hidden; - -webkit-line-clamp: 3; - color: rgb(0 0 0 / 45%); - -webkit-box-orient: vertical; - } - - &__menu { - display: flex; - justify-content: space-around; - height: 50px; - line-height: 50px; - color: rgb(0 0 0 / 45%); - text-align: center; - background: #f7f9fa; - - &:hover { - color: #1890ff; - } - } -} - -/** joolun 额外加的 */ -.mp-comment__main { - flex: unset !important; - margin: 0 8px !important; - border-radius: 5px !important; -} - -.mp-comment__header { - border-top-left-radius: 5px; - border-top-right-radius: 5px; -} - -.mp-comment__body { - border-bottom-right-radius: 5px; - border-bottom-left-radius: 5px; -} diff --git a/apps/web-ele/src/views/mp/modules/wx-msg/comment.scss b/apps/web-ele/src/views/mp/modules/wx-msg/comment.scss deleted file mode 100644 index 98e137d4b..000000000 --- a/apps/web-ele/src/views/mp/modules/wx-msg/comment.scss +++ /dev/null @@ -1,109 +0,0 @@ -/* 来自 https://github.com/nmxiaowei/avue/blob/master/styles/src/element-ui/comment.scss */ -.mp-comment { - display: flex; - align-items: flex-start; - margin-bottom: 30px; - - &--reverse { - flex-direction: row-reverse; - - .mp-comment__main { - &::before, - &::after { - right: -8px; - left: auto; - border-width: 8px 0 8px 8px; - } - - &::before { - border-left-color: #dedede; - } - - &::after { - margin-right: 1px; - margin-left: auto; - border-left-color: #f8f8f8; - } - } - } - - &__avatar { - box-sizing: border-box; - width: 48px; - height: 48px; - vertical-align: middle; - border: 1px solid transparent; - border-radius: 50%; - } - - &__header { - display: flex; - align-items: center; - justify-content: space-between; - padding: 5px 15px; - background: #f8f8f8; - border-bottom: 1px solid #eee; - } - - &__author { - font-size: 14px; - font-weight: 700; - color: #999; - } - - &__main { - position: relative; - flex: 1; - margin: 0 20px; - border: 1px solid #dedede; - border-radius: 2px; - - &::before, - &::after { - position: absolute; - top: 10px; - right: 100%; - left: -8px; - display: block; - width: 0; - height: 0; - pointer-events: none; - content: ' '; - border-color: transparent; - border-style: solid solid outset; - border-width: 8px 8px 8px 0; - } - - &::before { - z-index: 1; - border-right-color: #dedede; - } - - &::after { - z-index: 2; - margin-left: 1px; - border-right-color: #f8f8f8; - } - } - - &__body { - padding: 15px; - overflow: hidden; - font-family: - 'Segoe UI', 'Lucida Grande', Helvetica, Arial, 'Microsoft YaHei', - FreeSans, Arimo, 'Droid Sans', 'wenquanyi micro hei', 'Hiragino Sans GB', - 'Hiragino Sans GB W3', FontAwesome, sans-serif; - font-size: 14px; - color: #333; - background: #fff; - } - - blockquote { - padding: 1px 0 1px 15px; - margin: 0; - font-family: - Georgia, 'Times New Roman', Times, Kai, 'Kaiti SC', KaiTi, BiauKai, - FontAwesome, serif; - border-left: 4px solid #ddd; - } -}