+
diff --git a/src/layout/components/Footer/src/Footer.vue b/src/layout/components/Footer/src/Footer.vue
index 3eede386..62302fca 100644
--- a/src/layout/components/Footer/src/Footer.vue
+++ b/src/layout/components/Footer/src/Footer.vue
@@ -17,7 +17,7 @@ const title = computed(() => appStore.getTitle)
diff --git a/src/layout/components/Menu/src/Menu.vue b/src/layout/components/Menu/src/Menu.vue
index 77f9a307..94a1da4a 100644
--- a/src/layout/components/Menu/src/Menu.vue
+++ b/src/layout/components/Menu/src/Menu.vue
@@ -195,6 +195,16 @@ $prefix-cls: #{$namespace}-menu;
}
}
+ // 垂直菜单
+ &__vertical {
+ :deep(.#{$elNamespace}-menu--vertical) {
+ &:not(.#{$elNamespace}-menu--collapse) .#{$elNamespace}-sub-menu__title,
+ .#{$elNamespace}-menu-item {
+ padding-right: 0;
+ }
+ }
+ }
+
// 水平菜单
&__horizontal {
height: calc(var(--top-tool-height)) !important;
diff --git a/src/layout/components/TabMenu/src/TabMenu.vue b/src/layout/components/TabMenu/src/TabMenu.vue
index b70464c1..efad6a67 100644
--- a/src/layout/components/TabMenu/src/TabMenu.vue
+++ b/src/layout/components/TabMenu/src/TabMenu.vue
@@ -139,7 +139,7 @@ export default defineComponent({
id={`${variables.namespace}-menu`}
class={[
prefixCls,
- 'relative bg-[var(--left-menu-bg-color)] top-1px layout-border__right',
+ 'relative bg-[var(--left-menu-bg-color)] layout-border__right',
{
'w-[var(--tab-menu-max-width)]': !unref(collapse),
'w-[var(--tab-menu-min-width)]': unref(collapse)
@@ -147,7 +147,7 @@ export default defineComponent({
]}
onMouseleave={mouseleave}
>
-
+
{() => {
return unref(tabRouters).map((v) => {
@@ -199,7 +199,7 @@ export default defineComponent({
{
'!left-[var(--tab-menu-min-width)]': unref(collapse),
'!left-[var(--tab-menu-max-width)]': !unref(collapse),
- '!w-[calc(var(--left-menu-max-width)+1px)]': unref(showMenu) || unref(fixedMenu),
+ '!w-[var(--left-menu-max-width)]': unref(showMenu) || unref(fixedMenu),
'!w-0': !unref(showMenu) && !unref(fixedMenu)
}
]}
diff --git a/src/layout/components/TagsView/src/TagsView.vue b/src/layout/components/TagsView/src/TagsView.vue
index 6061d1fe..09af596a 100644
--- a/src/layout/components/TagsView/src/TagsView.vue
+++ b/src/layout/components/TagsView/src/TagsView.vue
@@ -280,7 +280,7 @@ watch(
-
+
-
+
{
'layout-border__bottom absolute',
{
'!fixed top-0 left-0 z-10': fixedHeader.value,
- 'w-[calc(100%-var(--left-menu-min-width))] !left-[var(--left-menu-min-width)] mt-[calc(var(--logo-height)+1px)]':
+ 'w-[calc(100%-var(--left-menu-min-width))] !left-[var(--left-menu-min-width)] mt-[var(--logo-height)]':
collapse.value && fixedHeader.value,
- 'w-[calc(100%-var(--left-menu-max-width))] !left-[var(--left-menu-max-width)] mt-[calc(var(--logo-height)+1px)]':
+ 'w-[calc(100%-var(--left-menu-max-width))] !left-[var(--left-menu-max-width)] mt-[var(--logo-height)]':
!collapse.value && fixedHeader.value
}
]}
@@ -190,24 +190,14 @@ export const useRenderLayout = () => {
-
+
@@ -216,7 +206,7 @@ export const useRenderLayout = () => {
class={[
'layout-border__bottom layout-border__top relative',
{
- '!fixed w-full top-[calc(var(--top-tool-height)+1px)] left-0': fixedHeader.value
+ '!fixed w-full top-[var(--top-tool-height)] left-0': fixedHeader.value
}
]}
style="transition: width var(--transition-time-02), left var(--transition-time-02);"
@@ -238,7 +228,7 @@ export const useRenderLayout = () => {
-
+
{
{tagsView.value ? (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流转评论
+
+
+
+
+
+
+
+
diff --git a/src/views/infra/druid/index.vue b/src/views/infra/druid/index.vue
index bc047d76..2ac99d23 100644
--- a/src/views/infra/druid/index.vue
+++ b/src/views/infra/druid/index.vue
@@ -2,8 +2,8 @@
-
+
+
diff --git a/src/views/mall/promotion/discountActivity/discountActivity.data.ts b/src/views/mall/promotion/discountActivity/discountActivity.data.ts
index d79dcab7..a4c93ffb 100644
--- a/src/views/mall/promotion/discountActivity/discountActivity.data.ts
+++ b/src/views/mall/promotion/discountActivity/discountActivity.data.ts
@@ -72,17 +72,6 @@ const crudSchemas = reactive([
width: 120
}
},
- {
- label: '优惠类型',
- field: 'discountType',
- dictType: DICT_TYPE.PROMOTION_DISCOUNT_TYPE,
- dictClass: 'number',
- isSearch: true,
- form: {
- component: 'Radio',
- value: 1
- }
- },
{
label: '活动商品',
field: 'spuId',
diff --git a/src/views/mall/promotion/discountActivity/index.vue b/src/views/mall/promotion/discountActivity/index.vue
index 7d73b514..1841603a 100644
--- a/src/views/mall/promotion/discountActivity/index.vue
+++ b/src/views/mall/promotion/discountActivity/index.vue
@@ -70,17 +70,17 @@
~ {{ formatDate(scope.row.endTime, 'YYYY-MM-DD') }}
-
-
-
-
(item: KeFuMessageRespVO, index: number) => {
border-left: 5px solid transparent;
border-bottom: 5px solid transparent;
border-top: 5px solid transparent;
- border-right: 5px solid #ffffff;
+ border-right: 5px solid var(--app-content-bg-color);
}
}
}
@@ -412,7 +413,7 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
right: -19px;
top: calc(50% - 10px);
position: absolute;
- border-left: 5px solid #ffffff;
+ border-left: 5px solid var(--app-content-bg-color);
border-bottom: 5px solid transparent;
border-top: 5px solid transparent;
border-right: 5px solid transparent;
@@ -422,9 +423,9 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
// 消息气泡
.kefu-message {
- color: #333;
+ color: #A9A9A9;
border-radius: 5px;
- box-shadow: 3px 5px 15px rgba(0, 0, 0, 0.2);
+ box-shadow: 3px 3px 5px rgba(220,220,220, 0.1);
padding: 5px 10px;
width: auto;
max-width: 50%;
@@ -432,7 +433,7 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
display: inline-block !important;
position: relative;
word-break: break-all;
- background-color: #ffffff;
+ background-color: var(--app-content-bg-color);
transition: all 0.2s;
&:hover {
@@ -454,7 +455,7 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
.chat-tools {
width: 100%;
- border: #e4e0e0 solid 1px;
+ border: var(--el-border-color) solid 1px;
border-radius: 10px;
height: 44px;
}
diff --git a/src/views/mall/promotion/kefu/components/history/ProductBrowsingHistory.vue b/src/views/mall/promotion/kefu/components/history/ProductBrowsingHistory.vue
index c9bff188..8bc4aeaf 100644
--- a/src/views/mall/promotion/kefu/components/history/ProductBrowsingHistory.vue
+++ b/src/views/mall/promotion/kefu/components/history/ProductBrowsingHistory.vue
@@ -1,6 +1,7 @@
-
编号：{{ id }}
+
+
+
+ {{ processInstance.name }}
+
+
+
+
+ 
+ {{ processInstance?.startUser?.nickname }}
+
+
+ {{ processInstance?.startUser?.nickname }}
+ {{ formatDate(processInstance.startTime) }} 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ processInstance?.startUser.nickname }}
+
+ {{ processInstance?.startUser.deptName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 通过
+
+ 取消
+
+
+
+
+
+
+ {{ processInstance?.startUser.nickname }}
+
+ {{ processInstance?.startUser.deptName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 拒绝
+
+ 取消
+
+
+
+
+
+
+
+
+ 发起
+
+ 发起人：{{ processInstance?.startUser?.nickname }}
+
+ 发起时间：{{ formatDate(processInstance.startTime) }}
+
+
+
+
+
+ 审批人：{{ activity.assigneeUser?.nickname }}
+
+ 接收时间：{{ formatDate(activity.receiveTime) }}
+
+
+ 审批时间：{{ formatDate(activity.createTime) }}
+
+
+
+ 审批意见：
+
+ {{ activity.opinion }}
+
+
+
typeof props.message !== 'undefined' ? jsonParse(props!.message!.content) : props.order
)
+/** 查看订单详情 */
+const openDetail = (id: number) => {
+ console.log(getMessageContent)
+ push({ name: 'TradeOrderDetail', params: { id } })
+}
+
/**
* 格式化订单状态的颜色
*
@@ -97,7 +106,7 @@ function formatOrderStatus(order: any) {
.order-list-card-box {
border-radius: 10px;
padding: 10px;
- border: 1px #6a6a6a solid;
+ border: 1px var(--el-border-color) solid;
background-color: var(--app-content-bg-color);
.order-card-header {
diff --git a/src/views/mall/promotion/kefu/components/message/ProductItem.vue b/src/views/mall/promotion/kefu/components/message/ProductItem.vue
index 8c58df2e..4e59365b 100644
--- a/src/views/mall/promotion/kefu/components/message/ProductItem.vue
+++ b/src/views/mall/promotion/kefu/components/message/ProductItem.vue
@@ -1,5 +1,5 @@
-
订单号：{{ getMessageContent.no }}
@@ -9,6 +9,7 @@
+
import { fenToYuan } from '@/utils'
+const { push } = useRouter()
+
defineOptions({ name: 'ProductItem' })
const props = defineProps({
+ spuId: {
+ type: Number,
+ default: 0
+ },
picUrl: {
type: String,
default: 'https://img1.baidu.com/it/u=1601695551,235775011&fm=26&fmt=auto'
@@ -107,13 +114,19 @@ const skuString = computed(() => {
}
return props.skuText
})
+
+/** 查看商品详情 */
+const openDetail = (spuId: number) => {
+ console.log(props.spuId)
+ push({ name: 'ProductSpuDetail', params: { id: spuId } })
+}
diff --git a/src/views/report/goview/index.vue b/src/views/report/goview/index.vue
index dd10cca0..03ed4e64 100644
--- a/src/views/report/goview/index.vue
+++ b/src/views/report/goview/index.vue
@@ -2,7 +2,9 @@
+
+
diff --git a/src/views/system/role/RoleAssignMenuForm.vue b/src/views/system/role/RoleAssignMenuForm.vue
index c3294a52..7c81ef79 100644
--- a/src/views/system/role/RoleAssignMenuForm.vue
+++ b/src/views/system/role/RoleAssignMenuForm.vue
@@ -8,7 +8,7 @@
{{ formData.code }}
-
+
全选/全不选:
{
}
}
-
diff --git a/src/views/system/role/RoleDataPermissionForm.vue b/src/views/system/role/RoleDataPermissionForm.vue
index 476a623c..758d47ad 100644
--- a/src/views/system/role/RoleDataPermissionForm.vue
+++ b/src/views/system/role/RoleDataPermissionForm.vue
@@ -1,5 +1,5 @@
-