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

# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue

src/views/member/level/index.vue

@@ -45,7 +45,7 @@
         <template #default="scope">
           <el-image
             :src="scope.row.icon"
-            class="w-30px h-30px"
+            class="h-30px w-30px"
             :preview-src-list="[scope.row.icon]"
           />
         </template>
@@ -54,7 +54,7 @@
         <template #default="scope">
           <el-image
             :src="scope.row.backgroundUrl"
-            class="w-30px h-30px"
+            class="h-30px w-30px"
             :preview-src-list="[scope.row.backgroundUrl]"
           />
         </template>

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

@@ -54,6 +54,7 @@ const { user } = defineProps<{ user: UserApi.UserVO }>()
 .cell-item {
   display: inline;
 }
+
 .cell-item::after {
   content: ':';
 }

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

@@ -69,12 +69,13 @@ import UserSignList from './UserSignList.vue'
 import UserExperienceRecordList from './UserExperienceRecordList.vue'
 import { CardTitle } from '@/components/Card/index'
 import UserOrderList from '@/views/member/user/detail/UserOrderList.vue'
+import { ElMessage } from 'element-plus'
 
 defineOptions({ name: 'MemberDetail' })
 
 const activeName = ref('point') // 账户明细 选中的 tabs
 const loading = ref(true) // 加载中
-let user = ref<UserApi.UserVO>({})
+const user = ref<UserApi.UserVO>()
 
 /** 添加/修改操作 */
 const formRef = ref()
@@ -110,10 +111,12 @@ onMounted(() => {
 .detail-info-item:first-child {
   padding-left: 0 !important;
 }
+
 /* first-child 不生效有没有大佬给看下q.q */
 .detail-info-item:nth-child(2) {
   padding-right: 0 !important;
 }
+
 .card-header {
   display: flex;
   justify-content: space-between;