Merge branch 'dev' into release

src/components/ProTable/index.vue

@@ -46,6 +46,7 @@
 					<el-button v-if="exportLoading" :loading="exportLoading">导出中，请稍后。。。</el-button>
 				</slot>
 				<slot name="description"> </slot>
+				<slot name="tableBtn"></slot>
 			</div>
 		</div>
 		<!-- 表格主体 -->

src/layout/lockScreen/index.vue

@@ -58,7 +58,7 @@
 </template>
 
 <script setup lang="ts" name="layoutLockScreen">
-import {nextTick, onMounted, onBeforeUnmount, reactive, ref} from 'vue';
+import { nextTick, onMounted, onBeforeUnmount, reactive, ref, computed } from 'vue';
 import {formatDate} from '@/utils/formatTime';
 import {Cookie, Local, Session} from '@/utils/storage';
 import {storeToRefs} from 'pinia';
@@ -66,6 +66,7 @@ import {useThemeConfig} from '@/stores/themeConfig';
 import {useUserInfo} from '@/stores/userInfo';
 import {ElMessage, ElMessageBox} from 'element-plus';
 import { getImageUrl } from "@/utils/tools";
+import { getCurrentCityConfig } from '@/utils/appConfig';
 
 // 定义接口来定义对象的类型
 interface LockScreenState {
@@ -220,7 +221,8 @@ onBeforeUnmount(() => {
 	window.clearInterval(state.isShowLockScreenIntervalTime);
 });
 
-let bgImg = themeConfig.value.loginImage ?? `url(${getImageUrl('login/login_bg.png')})`;
+const { loginBg } = getCurrentCityConfig();
+const bgImg = `url(${getImageUrl(loginBg)}`;
 </script>
 
 <style scoped lang="scss">

src/views/home/component/ToDo.vue

@@ -1,14 +1,5 @@
 <template>
-	<el-card shadow="never" class="mb20" style="position: relative" v-loading="state.tableLoading">
-		<el-button
-			link
-			type="primary"
-			style="position: absolute; right: 20px; top: 32px; z-index: 2"
-			@click="linkList"
-			v-auths="['home:orderTodo', 'home:orderSeatTodo']"
-		>
-			更多<SvgIcon name="ele-ArrowRight" />
-		</el-button>
+	<el-card shadow="never" class="mb20">
 		<el-tabs v-model="activeName" @tab-change="handleChange" v-if="auths(['home:orderTodo', 'home:orderSeatTodo'])">
 			<el-tab-pane name="0" v-if="auth('home:orderTodo')">
 				<template #label>
@@ -31,10 +22,13 @@
 				:columns="columns"
 				:data="state.tableData"
 				@updateTable="handleChange(activeName)"
-				:loading="state.loading"
+				:loading="state.tableLoading"
 				:pagination="false"
 				:key="Math.random()"
 			>
+				<template #tableBtn>
+						<el-button link type="primary" @click="linkList">更多<SvgIcon name="ele-ArrowRight" /></el-button>
+				</template>
 				<template #expiredStatusText="{ row }">
 					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>