Merge branch 'dev-jcq' of https://s-20coaj910c.zht2.com/cmy/data-marketing-platform into dev-ly

# Conflicts:
#	.env

src/components/Pagination/index.vue

@@ -33,7 +33,7 @@ const props = defineProps({
 	pageSizes: {
 		type: Array as () => number[],
 		default: () => {
-			return [1, 10, 20, 50, 100, 200];
+			return [5, 10, 20, 50, 100, 200];
 		},
 	},
 	layout: {

src/views/marketing/rules/index.vue

@@ -44,9 +44,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="延时推送" prop="delayPush" show-overflow-tooltip width="100">
-					<template #default="{ row }">
-						{{ row.delayPush }}s
-					</template>
+					<template #default="{ row }"> {{ row.delayPush }}s </template>
 				</el-table-column>
 				<el-table-column label="备注" prop="remark" show-overflow-tooltip width="200"></el-table-column>
 				<el-table-column label="操作" width="100" fixed="right">
@@ -66,7 +64,13 @@
 					</div>
 				</template>
 			</el-dialog>
-			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"> </pagination>
+			<pagination
+				@current-change="currentChangeHandle"
+				@size-change="sizeChangeHandle"
+				:pageSizes="[5, 10, 20, 50, 100, 200]"
+				v-bind="state.pagination"
+			>
+			</pagination>
 		</div>
 	</div>
 </template>
@@ -91,7 +95,7 @@ const formatNum = (value: string | number = 0) => {
 	if (num > 0 && num < 1) {
 		return (num * 100).toFixed(0) + '%';
 	} else if (num >= 1 && num < 10000) {
-		return '每'+num+'次推送';
+		return '每' + num + '次推送';
 	}
 	return '--';
 };
@@ -107,6 +111,12 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 	},
 	selectObjs: [],
 	pageList: pageListIp,
+	pagination: {
+		current: 1,
+		size: 10,
+		total: 0,
+		pageSizes: [5, 10, 20, 50, 100],
+	},
 });
 
 //  table hook