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

 Conflicts:

	src/views/member/user/detail/UserPointList.vue

src/components/Dialog/src/Dialog.vue

@@ -67,6 +67,7 @@ const dialogStyle = computed(() => {
     lock-scroll
     draggable
     top="0"
+    class="com-dialog"
     :show-close="false"
   >
     <template #header="{ close }">
@@ -107,32 +108,34 @@ const dialogStyle = computed(() => {
 </template>
 
 <style lang="scss">
-.#{$elNamespace}-overlay-dialog {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.#{$elNamespace}-dialog {
-  margin: 0 !important;
-
-  &__header {
-    height: 54px;
-    padding: 0;
-    margin-right: 0 !important;
-    border-bottom: 1px solid var(--el-border-color);
+.com-dialog {
+  .#{$elNamespace}-overlay-dialog {
+    display: flex;
+    justify-content: center;
+    align-items: center;
   }
 
-  &__body {
-    padding: 15px !important;
-  }
+  .#{$elNamespace}-dialog {
+    margin: 0 !important;
 
-  &__footer {
-    border-top: 1px solid var(--el-border-color);
-  }
+    &__header {
+      height: 54px;
+      padding: 0;
+      margin-right: 0 !important;
+      border-bottom: 1px solid var(--el-border-color);
+    }
 
-  &__headerbtn {
-    top: 0;
+    &__body {
+      padding: 15px !important;
+    }
+
+    &__footer {
+      border-top: 1px solid var(--el-border-color);
+    }
+
+    &__headerbtn {
+      top: 0;
+    }
   }
 }
 </style>

src/components/Pagination/index.vue

@@ -8,6 +8,7 @@
     :page-sizes="[10, 20, 30, 50, 100]"
     :pager-count="pagerCount"
     :total="total"
+    :small="isSmall"
     class="float-right mt-15px mb-15px"
     layout="total, sizes, prev, pager, next, jumper"
     @size-change="handleSizeChange"
@@ -15,10 +16,19 @@
   />
 </template>
 <script lang="ts" setup>
-import { computed } from 'vue'
+import { computed, watchEffect } from 'vue'
+import { useAppStore } from '@/store/modules/app'
 
 defineOptions({ name: 'Pagination' })
 
+// 此处解决了当全局size为small的时候分页组件样式太大的问题
+const appStore = useAppStore()
+const layoutCurrentSize = computed(() => appStore.currentSize)
+const isSmall = ref<boolean>(layoutCurrentSize.value === 'small')
+watchEffect(() => {
+  isSmall.value = layoutCurrentSize.value === 'small'
+})
+
 const props = defineProps({
   // 总条目数
   total: {

src/views/member/point/record/index.vue

@@ -111,7 +111,7 @@
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
-import * as RecordApi from '@/api//member/point/record'
+import * as RecordApi from '@/api/member/point/record'
 
 defineOptions({ name: 'PointRecord' })