Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

# Conflicts: # src/components/DiyEditor/components/ComponentContainer.vue
2025-08-08 15:11:52 +08:00 · 2023-11-18 20:39:31 +08:00
parent c1a92ba22a 538783ce2d
commit 7c5ae17d04
59 changed files with 5154 additions and 238 deletions
--- a/src/views/mall/statistics/member/components/MemberFunnelCard.vue
+++ b/src/views/mall/statistics/member/components/MemberFunnelCard.vue
@@ -110,9 +110,11 @@ const handleTimeRangeChange = async (times: [dayjs.ConfigType, dayjs.ConfigType]
 .trapezoid1 {
  transform: perspective(5em) rotateX(-11deg);
 }
+
 .trapezoid2 {
  transform: perspective(7em) rotateX(-20deg);
 }
+
 .trapezoid3 {
  transform: perspective(3em) rotateX(-13deg);
 }
--- a/src/views/mall/trade/delivery/pickUpOrder/index.vue
+++ b/src/views/mall/trade/delivery/pickUpOrder/index.vue
@@ -316,6 +316,7 @@ onMounted(() => {
 :deep(.order-table-col > .cell) {
  padding: 0;
 }
+
 .summary {
  .el-col {
    margin-bottom: 1rem;