diff --git a/api/index.ts b/api/index.ts
index f9fd46f..70dd680 100644
--- a/api/index.ts
+++ b/api/index.ts
@@ -109,11 +109,20 @@ export function fetchAddTodo(data : {}) {
 	});
 }
 
-// 待办列表
+// 订单列表
 export function fetchOrderList(data : {}) {
 	return request({
 		url: '/index/orders',
 		data: data,
 		method: 'POST'
 	});
+}
+
+// 订单列表
+export function fetchDayOrderList(data : {}) {
+	return request({
+		url: '/index/dayOrder',
+		data: data,
+		method: 'POST'
+	});
 }
\ No newline at end of file
diff --git a/api/request.ts b/api/request.ts
index a83a554..ec2337a 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -1,50 +1,3 @@
-// import { ref } from "vue";
-// import config from "../config";
-// import { goToLoginPage } from "../utils/helper";
-// interface Options {
-// 	url : string,
-// 	method ?: 'GET' | 'POST',
-// 	data ?: any,
-// 	params ?: any,
-// 	dataType ?: string,
-// 	responseType ?: string
-// }
-// interface Response {
-// 	code : number;
-// 	msg ?: string;
-// 	data : any;
-// }
-// export const getUploadImageUrl = () => {
-// 	return config.api_base_url + '/upload/image' + '&wxapp_id=' + config.wxapp_id + '&token=' + uni.getStorageSync('token');
-// }
-// export const request = (options : Options) => {
-// 	return new Promise((resolve, reject) => {
-// 		uni.request({
-// 			url: config.api_base_url + options.url + '&wxapp_id=' + config.wxapp_id + '&token=' + uni.getStorageSync('token'),
-// 			method: options.method || 'GET',
-// 			data: options.data || options.params || {},
-// 			dataType: options.dataType || "json",
-// 			responseType: options.responseType || "text",
-// 			success(res) {
-// 				const ret : Response = res.data
-// 				if (ret.code === -1) {
-// 					goToLoginPage()
-// 				} else if (ret.code === 1) {
-// 					resolve(ret.data)
-// 				} else if (ret.code === 0) {
-// 					uni.showToast({
-// 						title:ret.msg,
-// 						icon:'none'
-// 					})
-// 				}
-// 			},
-// 			fail(err) {
-// 				reject(err)
-// 			},
-
-// 		})
-// 	})
-// }
 
 import config from '@/config';
 import { goToLoginPage } from '@/utils/helper';
@@ -66,14 +19,6 @@ interface Response {
 	data : any;
 }
 
-// /**
-//  * 获取图片上传的完整URL
-//  * @returns {string} 完整的图片上传URL，包含基础URL、wxapp_id和token参数
-//  */
-// export const getUploadImageUrl = () => {
-// 	return config.api_base_url + '/upload/image' + '&wxapp_id=' + config.wxapp_id + '&token=' + uni.getStorageSync('token');
-// };
-
 /**
  * 封装uni.request的通用请求方法
  * @param {Options} options 请求配置项
diff --git a/pages/data/index.vue b/pages/data/index.vue
index 90137c8..661e60f 100644
--- a/pages/data/index.vue
+++ b/pages/data/index.vue
@@ -66,7 +66,6 @@
 
 
 	onLoad((options) => {
-		// current_tab_idx.value = parseInt(options.tab)
 	})
 
 	/**
diff --git a/pages/data/list.vue b/pages/data/list.vue
index 02409e3..1427b06 100644
--- a/pages/data/list.vue
+++ b/pages/data/list.vue
@@ -1,8 +1,285 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
+<template>
+	<view class="page-content">
+	
+
+		<z-paging ref="paging" :fixed="false" style="height: 88vh;" class="order-list" v-model="dataList"
+			@query="queryList">
+			<view class="order-inner" v-for="(order,index) in dataList" :key="index">
+				<view class="order-inner-header">
+					<nut-tag v-if="order.order_type == 1" plain type="primary">房间订单</nut-tag>
+					<nut-tag v-else="order.order_type == 2" plain type="warning">商品订单</nut-tag>
+					<nut-tag v-if="order.order_type == 1" custom-color="#ffc209">{{order?.rooms?.room_name}}</nut-tag>
+					<nut-tag plain type="danger" v-if="order?.status?.value == 1">{{order?.status?.text}}</nut-tag>
+					<nut-tag plain type="success"
+						v-else-if="order?.status?.value == 2">{{order?.status?.text}}</nut-tag>
+				</view>
+				<view class="goods-info-row" v-if="order.order_type == 1 && order?.fee_type?.value != 0">
+					<view class="left-text">
+						<view class="goods-name">
+							<nut-tag plain custom-color="#fa2400">{{order?.fee_type?.text}}</nut-tag>
+							<text style="margin-left: 10rpx;"
+								v-if="order?.fee_type?.value == 0 || order?.fee_type?.value == 3"></text>
+							<text style="margin-left: 10rpx;"
+								v-else-if="order?.fee_type?.value == 1 || order?.fee_type?.value == 2 ">{{order?.fee_combo_name}}</text>
+						</view>
+					</view>
+					<view class="price" v-if="order?.fee_type?.value == 0 || order?.fee_type?.value == 3">
+						¥{{order?.fee_amount}}
+					</view>
+					<view class="price" v-else-if="order?.fee_type?.value == 1 || order?.fee_type?.value == 2 ">
+						¥{{order?.fee_combo_price}}
+					</view>
+					<view class="goods-pay-status">
+						{{order?.fee_pay_status?.text}}
+					</view>
+				</view>
+
+				<view class="goods-info-row" v-if="order.over_often>0">
+					<view class="left-text">
+						<view class="goods-name">
+							<nut-tag plain custom-color="#fa2400">超时</nut-tag>
+							<text style="margin-left: 10rpx;">{{order?.over_often}}小时</text>
+						</view>
+					</view>
+					<view class="price">
+						¥{{order?.over_amount}}
+					</view>
+					<view class="goods-pay-status">
+						{{order?.over_pay_status?.text}}
+					</view>
+				</view>
+				<view class="goods-info-row" v-for="(goods,iidx) in order.goods" :key="iidx">
+					<view class="left-text">
+						<view class="goods-name">
+							<nut-tag plain custom-color="#fa2400">{{goods.goods_type_name}}</nut-tag>
+							<text style="margin-left: 10rpx;">{{goods.goods_name}}</text>
+						</view>
+					</view>
+					<view class="price">
+						¥{{goods?.goods_price}}
+					</view>
+					<view class="goods-pay-status">
+						{{goods?.goods_pay_status_txt}}
+					</view>
+				</view>
+				<view class="footer">
+					<view class="order-inner-price">
+						<view style="display: flex;">优惠：
+							<view style="color: #fa2c19;font-size: 26rpx;">
+								¥{{order?.discount_amount}}
+							</view>
+						</view>
+						<view style="display: flex;">总计：
+							<view style="color: #fa2c19;font-size: 26rpx;">
+								¥{{order?.discount_amount}}
+							</view>
+						</view>
+					</view>
+					<view v-if="order.remarks" style="padding-left:20rpx;font-size: 26rpx;">备注</view>
+					<view v-if="order.remarks" class="remarks">
+						{{order.remarks}}
+					</view>
+					<view class="order-inner-price">
+						<view style="color: rgba(0, 0, 0, .5);font-size: 24rpx;">订单时间:{{order.create_time}}</view>
+						<view style="color: rgba(0, 0, 0, .5);font-size: 24rpx;">员工:{{order?.user?.staff_name}}</view>
+					</view>
+				</view>
+
+
+			</view>
+		</z-paging>
+	</view>
+</template>
+<script setup>
+	import {
+		onMounted,
+		reactive,
+		ref
+	} from 'vue';
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app';
+	import {
+		navigateTo,
+	} from '@/utils/helper';
+	import {
+		fetchDayOrderList,
+	} from '@/api/index';
+	const date = ref('');
+
+	onLoad((options) => {
+		date.value = options.date
+		console.log(date.value);
+	})
+
+
+	// 订单列表数据
+	const dataList = ref([]);
+	// zp
+	const paging = ref(null);
+
+	
+
+	// 获取订单列表
+	const queryList = (pageNo = 1, pageSize = 10) => {
+		console.log(date.value);
+		const params = {
+			page: pageNo,
+			pageSize: 10,
+			date: date.value,
+		}
+		fetchDayOrderList(params).then(res => {
+			console.log(res);
+			paging.value.complete(res.list);
+		}).catch(res => {
+			paging.value.complete(false);
+		})
+	}
+
+	/**
+	 * 页面显示生命周期钩子
+	 * 每次页面显示时都会执行
+	 */
+	onShow(() => {
+		// 获取配置
+		// getConfig()
+		if (paging.value) {
+			// paging.value.pageNo = 1; 
+			paging.value.refresh();
+			// paging.value.refreshToPage(1)
+			// paging.value.reload();
+		}
+	})
+</script>
+
+
+
+<style scoped lang="scss">
+	.page-content {
+		min-height: 100vh;
+		background-color: #f2f3f5;
+	}
+
+	.title-list {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		width: 100%;
+
+		.title-item {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+			position: relative;
+		}
+
+		.tabs-active {
+			font-weight: bold;
+			color: $tabs-titles-item-active-color;
+			opacity: $tabs-titles-item-line-opacity;
+			transition: width 0.3s ease;
+
+			.item__line {
+				position: absolute;
+				bottom: -10%;
+				left: 50%;
+				overflow: hidden;
+				content: ' ';
+				border-radius: $tabs-titles-item-line-border-radius;
+				opacity: $tabs-titles-item-line-opacity;
+				transition: width 0.3s ease;
+				transform: translate(-50%, 0);
+				width: $tabs-horizontal-titles-item-active-line-width;
+				height: 3px;
+				content: ' ';
+				background: $tabs-horizontal-tab-line-color;
+			}
+		}
+	}
+
+
+	.order-list {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+
+	}
+
+	.order-inner {
+		display: flex;
+		flex-direction: column;
+		background: #fff;
+		border-radius: 15rpx;
+		overflow: hidden;
+		margin: 20rpx;
+
+		.order-inner-header {
+			display: flex;
+			align-items: center;
+
+			font-size: 24rpx;
+			justify-content: space-between;
+			line-height: 45rpx;
+			padding: 15rpx 20rpx;
+			border-bottom: 2rpx solid #f2f3f5;
+		}
+
+
+		/* 信息行布局 */
+		.goods-info-row {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx;
+			border-bottom: 2rpx solid #f2f3f5;
+
+			/* 左侧文字样式 */
+			.left-text {
+				flex: 1;
+			}
+
+			.goods-name {
+				font-size: 26rpx;
+				color: #000000;
+				display: block;
+			}
+
+			/* 右侧价格样式 */
+			.price {
+				font-size: 26rpx;
+				margin-left: 20rpx;
+				align-self: center;
+				color: #fa2c19;
+				/* 垂直居中在两行文字之间 */
+			}
+
+			.goods-pay-status {
+				font-size: 26rpx;
+				margin-left: 20rpx;
+				align-self: center;
+			}
+
+		}
+
+
+		.footer {
+			display: flex;
+			flex-direction: column;
+
+			.order-inner-price {
+				display: flex;
+				justify-content: space-evenly;
+				padding: 20rpx;
+				font-size: 24rpx;
+				align-items: center;
+			}
+
+			.remarks {
+				padding: 20rpx;
+				color: rgba(0, 0, 0, .5);
+				font-size: 24rpx;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/api/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/api/index.js.map
index c35fbe1..5f7563f 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/api/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/api/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["api/index.ts"],"sourcesContent":["import { request } from \"./request\";\n\n// export function fetchNavList () {\n// \treturn request({\n// \t\turl:'/index/nav_list'\n// \t})\n// }\n\nexport function fetchLogin(data : {}) {\n\treturn request({\n\t\turl: '/index/login',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t})\n}\n\n\n\n// 获取商品\nexport function fetchGoods () {\n\treturn request({\n\t\turl:'/index/goods',\n\t})\n}\n// 获取套餐\nexport function fetchCombos(data : {}) {\n\treturn request({\n\t\turl: '/index/combos',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 获取房间\nexport function fetchRooms(data : {}) {\n\treturn request({\n\t\turl: '/index/rooms',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 预约\nexport function fetchBooking(data : {}) {\n\treturn request({\n\t\turl: '/index/booking',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 取消预约\nexport function fetchUnBooking(data : {}) {\n\treturn request({\n\t\turl: '/index/unbooking',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 开台/商品订单\nexport function fetchAddOrder(data : {}) {\n\treturn request({\n\t\turl: '/index/addOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 开台/商品订单\nexport function fetchEditOrder(data : {}) {\n\treturn request({\n\t\turl: '/index/editOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 房间订单详情\r\nexport function fetchRoomOrder(roomId : Number) {\r\n\treturn request({\r\n\t\turl: '/index/roomOrder',\r\n\t\tdata: { roomId: roomId },\r\n\t})\r\n}\r\n\n\n// 待办列表\nexport function fetchTodoList(data : {}) {\n\treturn request({\n\t\turl: '/index/todoList',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 编辑待办\nexport function fetchEditTodo(data : {}) {\n\treturn request({\n\t\turl: '/index/editTodo',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 编辑待办\nexport function fetchAddTodo(data : {}) {\n\treturn request({\n\t\turl: '/index/addTodo',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 待办列表\nexport function fetchOrderList(data : {}) {\n\treturn request({\n\t\turl: '/index/orders',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}"],"names":["request"],"mappings":";;AAQO,SAAS,WAAW,MAAW;AACrC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAKO,SAAS,aAAc;AAC7B,SAAOA,oBAAQ;AAAA,IACd,KAAI;AAAA,EAAA,CACJ;AACF;AAEO,SAAS,YAAY,MAAW;AACtC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,WAAW,MAAW;AACrC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,aAAa,MAAW;AACvC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,QAAiB;AAC/C,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL,MAAM,EAAE,OAAe;AAAA,EAAA,CACvB;AACF;AAIO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,aAAa,MAAW;AACvC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;;;;;;;;;;;;;;"}
\ No newline at end of file
+{"version":3,"file":"index.js","sources":["api/index.ts"],"sourcesContent":["import { request } from \"./request\";\n\n// export function fetchNavList () {\n// \treturn request({\n// \t\turl:'/index/nav_list'\n// \t})\n// }\n\nexport function fetchLogin(data : {}) {\n\treturn request({\n\t\turl: '/index/login',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t})\n}\n\n\n\n// 获取商品\nexport function fetchGoods () {\n\treturn request({\n\t\turl:'/index/goods',\n\t})\n}\n// 获取套餐\nexport function fetchCombos(data : {}) {\n\treturn request({\n\t\turl: '/index/combos',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 获取房间\nexport function fetchRooms(data : {}) {\n\treturn request({\n\t\turl: '/index/rooms',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 预约\nexport function fetchBooking(data : {}) {\n\treturn request({\n\t\turl: '/index/booking',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 取消预约\nexport function fetchUnBooking(data : {}) {\n\treturn request({\n\t\turl: '/index/unbooking',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 开台/商品订单\nexport function fetchAddOrder(data : {}) {\n\treturn request({\n\t\turl: '/index/addOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 开台/商品订单\nexport function fetchEditOrder(data : {}) {\n\treturn request({\n\t\turl: '/index/editOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 房间订单详情\r\nexport function fetchRoomOrder(roomId : Number) {\r\n\treturn request({\r\n\t\turl: '/index/roomOrder',\r\n\t\tdata: { roomId: roomId },\r\n\t})\r\n}\r\n\n\n// 待办列表\nexport function fetchTodoList(data : {}) {\n\treturn request({\n\t\turl: '/index/todoList',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 编辑待办\nexport function fetchEditTodo(data : {}) {\n\treturn request({\n\t\turl: '/index/editTodo',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 编辑待办\nexport function fetchAddTodo(data : {}) {\n\treturn request({\n\t\turl: '/index/addTodo',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 订单列表\nexport function fetchOrderList(data : {}) {\n\treturn request({\n\t\turl: '/index/orders',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 订单列表\nexport function fetchDayOrderList(data : {}) {\n\treturn request({\n\t\turl: '/index/dayOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}"],"names":["request"],"mappings":";;AAQO,SAAS,WAAW,MAAW;AACrC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAKO,SAAS,aAAc;AAC7B,SAAOA,oBAAQ;AAAA,IACd,KAAI;AAAA,EAAA,CACJ;AACF;AAEO,SAAS,YAAY,MAAW;AACtC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,WAAW,MAAW;AACrC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,aAAa,MAAW;AACvC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,QAAiB;AAC/C,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL,MAAM,EAAE,OAAe;AAAA,EAAA,CACvB;AACF;AAIO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,aAAa,MAAW;AACvC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,kBAAkB,MAAW;AAC5C,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;;;;;;;;;;;;;;;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/api/request.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/api/request.js.map
index 81b3aa3..1c2501c 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/api/request.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/api/request.js.map
@@ -1 +1 @@
-{"version":3,"file":"request.js","sources":["api/request.ts"],"sourcesContent":["// import { ref } from \"vue\";\n// import config from \"../config\";\n// import { goToLoginPage } from \"../utils/helper\";\n// interface Options {\n// \turl : string,\n// \tmethod ?: 'GET' | 'POST',\n// \tdata ?: any,\n// \tparams ?: any,\n// \tdataType ?: string,\n// \tresponseType ?: string\n// }\n// interface Response {\n// \tcode : number;\n// \tmsg ?: string;\n// \tdata : any;\n// }\n// export const getUploadImageUrl = () => {\n// \treturn config.api_base_url + '/upload/image' + '&wxapp_id=' + config.wxapp_id + '&token=' + uni.getStorageSync('token');\n// }\n// export const request = (options : Options) => {\n// \treturn new Promise((resolve, reject) => {\n// \t\tuni.request({\n// \t\t\turl: config.api_base_url + options.url + '&wxapp_id=' + config.wxapp_id + '&token=' + uni.getStorageSync('token'),\n// \t\t\tmethod: options.method || 'GET',\n// \t\t\tdata: options.data || options.params || {},\n// \t\t\tdataType: options.dataType || \"json\",\n// \t\t\tresponseType: options.responseType || \"text\",\n// \t\t\tsuccess(res) {\n// \t\t\t\tconst ret : Response = res.data\n// \t\t\t\tif (ret.code === -1) {\n// \t\t\t\t\tgoToLoginPage()\n// \t\t\t\t} else if (ret.code === 1) {\n// \t\t\t\t\tresolve(ret.data)\n// \t\t\t\t} else if (ret.code === 0) {\n// \t\t\t\t\tuni.showToast({\n// \t\t\t\t\t\ttitle:ret.msg,\n// \t\t\t\t\t\ticon:'none'\n// \t\t\t\t\t})\n// \t\t\t\t}\n// \t\t\t},\n// \t\t\tfail(err) {\n// \t\t\t\treject(err)\n// \t\t\t},\n\n// \t\t})\n// \t})\n// }\n\nimport config from '@/config';\nimport { goToLoginPage } from '@/utils/helper';\n\n// 定义请求参数接口\ninterface Options {\n\turl : string; // 请求路径（不包含基础URL）\n\tmethod ?: 'GET' | 'POST'; // 请求方法，默认为GET\n\tdata ?: any; // POST请求体数据\n\tparams ?: any; // GET请求参数（与data二选一）\n\tdataType ?: string; // 返回数据格式，默认json\n\tresponseType ?: string; // 响应数据类型，默认text\n}\n\n// 定义响应数据结构接口\ninterface Response {\n\tcode : number;\n\tmsg ?: string;\n\tdata : any;\n}\n\n// /**\n//  * 获取图片上传的完整URL\n//  * @returns {string} 完整的图片上传URL，包含基础URL、wxapp_id和token参数\n//  */\n// export const getUploadImageUrl = () => {\n// \treturn config.api_base_url + '/upload/image' + '&wxapp_id=' + config.wxapp_id + '&token=' + uni.getStorageSync('token');\n// };\n\n/**\n * 封装uni.request的通用请求方法\n * @param {Options} options 请求配置项\n * @returns {Promise} 返回Promise对象\n *\n * 功能说明：\n * 1. 自动拼接基础URL和认证参数\n * 2. 统一处理登录状态（code=-1跳转登录页）\n * 3. 统一处理错误提示（code=0显示Toast）\n * 4. 成功时返回data字段（code=1）\n */\nexport const request = (options : Options) => {\n\treturn new Promise((resolve, reject) => {\n\t\tuni.request({\n\t\t\t// 拼接完整请求URL（基础URL + 路径 + 固定参数）\n\t\t\turl: config.api_base_url + options.url + '&wxapp_id=' + config.wxapp_id + '&token=' + uni.getStorageSync('token'),\n\n\t\t\tmethod: options.method || 'GET', // 默认GET方法\n\t\t\tdata: options.data || options.params || {}, // 兼容data/params传参\n\t\t\tdataType: options.dataType || 'json', // 默认json格式\n\t\t\tresponseType: options.responseType || 'text', // 默认text类型\n\n\t\t\t// 请求成功回调\n\t\t\tsuccess(res) {\n\t\t\t\tconst ret : Response = res.data;\n\t\t\t\t// console.log(ret);\n\n\t\t\t\t// 状态码处理\n\t\t\t\tswitch (ret.code) {\n\t\t\t\t\tcase -1: // 未登录状态\n\t\t\t\t\t\tgoToLoginPage();\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 1: // 成功状态\n\t\t\t\t\t\t// console.log(options.url);\n\t\t\t\t\t\t// if (options.url === '/parts.order/preview') {\n\t\t\t\t\t\t// \tconsole.log('ressss', ret);\n\t\t\t\t\t\t// \tresolve(ret);\n\t\t\t\t\t\t// \tbreak;\n\t\t\t\t\t\t// }\n\t\t\t\t\t\tresolve(ret.data); // 返回data字段\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 0: // 失败状态\n\t\t\t\t\t\t// console.log(options.url);\n\t\t\t\t\t\t// if (options.url === '/parts.order/preview') {\n\t\t\t\t\t\t// \tconsole.log('ressss', ret);\n\t\t\t\t\t\t// \tresolve(ret);\n\t\t\t\t\t\t// \tbreak;\n\t\t\t\t\t\t// }\n\t\t\t\t\t\tuni.showToast({\n\t\t\t\t\t\t\ttitle: ret.msg || '操作失败', // 显示错误信息\n\t\t\t\t\t\t\ticon: 'none', // 不显示图标\n\t\t\t\t\t\t});\n\t\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t},\n\n\t\t\t// 请求失败回调\n\t\t\tfail(err) {\n\t\t\t\tuni.$emit('z-paging-error-emit');\n\t\t\t\treject(err); // 返回错误对象\n\t\t\t\tuni.showToast({\n\t\t\t\t\ttitle: '网络请求失败',\n\t\t\t\t\ticon: 'none',\n\t\t\t\t});\n\t\t\t},\n\t\t});\n\t});\n};"],"names":["uni","config","goToLoginPage"],"mappings":";;;;AAuFa,MAAA,UAAU,CAAC,YAAsB;AAC7C,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACvCA,kBAAAA,MAAI,QAAQ;AAAA;AAAA,MAEX,KAAKC,OAAO,OAAA,eAAe,QAAQ,MAAM,eAAeA,OAAA,OAAO,WAAW,YAAYD,oBAAI,eAAe,OAAO;AAAA,MAEhH,QAAQ,QAAQ,UAAU;AAAA;AAAA,MAC1B,MAAM,QAAQ,QAAQ,QAAQ,UAAU,CAAC;AAAA;AAAA,MACzC,UAAU,QAAQ,YAAY;AAAA;AAAA,MAC9B,cAAc,QAAQ,gBAAgB;AAAA;AAAA;AAAA,MAGtC,QAAQ,KAAK;AACZ,cAAM,MAAiB,IAAI;AAI3B,gBAAQ,IAAI,MAAM;AAAA,UACjB,KAAK;AACUE,yBAAAA;AACd;AAAA,UACD,KAAK;AAOJ,oBAAQ,IAAI,IAAI;AAChB;AAAA,UACD,KAAK;AAOJF,0BAAAA,MAAI,UAAU;AAAA,cACb,OAAO,IAAI,OAAO;AAAA;AAAA,cAClB,MAAM;AAAA;AAAA,YAAA,CACN;AACD;AAAA,QACF;AAAA,MACD;AAAA;AAAA,MAGA,KAAK,KAAK;AACTA,4BAAI,MAAM,qBAAqB;AAC/B,eAAO,GAAG;AACVA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO;AAAA,UACP,MAAM;AAAA,QAAA,CACN;AAAA,MACF;AAAA,IAAA,CACA;AAAA,EAAA,CACD;AACF;;"}
\ No newline at end of file
+{"version":3,"file":"request.js","sources":["api/request.ts"],"sourcesContent":["\nimport config from '@/config';\nimport { goToLoginPage } from '@/utils/helper';\n\n// 定义请求参数接口\ninterface Options {\n\turl : string; // 请求路径（不包含基础URL）\n\tmethod ?: 'GET' | 'POST'; // 请求方法，默认为GET\n\tdata ?: any; // POST请求体数据\n\tparams ?: any; // GET请求参数（与data二选一）\n\tdataType ?: string; // 返回数据格式，默认json\n\tresponseType ?: string; // 响应数据类型，默认text\n}\n\n// 定义响应数据结构接口\ninterface Response {\n\tcode : number;\n\tmsg ?: string;\n\tdata : any;\n}\n\n/**\n * 封装uni.request的通用请求方法\n * @param {Options} options 请求配置项\n * @returns {Promise} 返回Promise对象\n *\n * 功能说明：\n * 1. 自动拼接基础URL和认证参数\n * 2. 统一处理登录状态（code=-1跳转登录页）\n * 3. 统一处理错误提示（code=0显示Toast）\n * 4. 成功时返回data字段（code=1）\n */\nexport const request = (options : Options) => {\n\treturn new Promise((resolve, reject) => {\n\t\tuni.request({\n\t\t\t// 拼接完整请求URL（基础URL + 路径 + 固定参数）\n\t\t\turl: config.api_base_url + options.url + '&wxapp_id=' + config.wxapp_id + '&token=' + uni.getStorageSync('token'),\n\n\t\t\tmethod: options.method || 'GET', // 默认GET方法\n\t\t\tdata: options.data || options.params || {}, // 兼容data/params传参\n\t\t\tdataType: options.dataType || 'json', // 默认json格式\n\t\t\tresponseType: options.responseType || 'text', // 默认text类型\n\n\t\t\t// 请求成功回调\n\t\t\tsuccess(res) {\n\t\t\t\tconst ret : Response = res.data;\n\t\t\t\t// console.log(ret);\n\n\t\t\t\t// 状态码处理\n\t\t\t\tswitch (ret.code) {\n\t\t\t\t\tcase -1: // 未登录状态\n\t\t\t\t\t\tgoToLoginPage();\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 1: // 成功状态\n\t\t\t\t\t\t// console.log(options.url);\n\t\t\t\t\t\t// if (options.url === '/parts.order/preview') {\n\t\t\t\t\t\t// \tconsole.log('ressss', ret);\n\t\t\t\t\t\t// \tresolve(ret);\n\t\t\t\t\t\t// \tbreak;\n\t\t\t\t\t\t// }\n\t\t\t\t\t\tresolve(ret.data); // 返回data字段\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 0: // 失败状态\n\t\t\t\t\t\t// console.log(options.url);\n\t\t\t\t\t\t// if (options.url === '/parts.order/preview') {\n\t\t\t\t\t\t// \tconsole.log('ressss', ret);\n\t\t\t\t\t\t// \tresolve(ret);\n\t\t\t\t\t\t// \tbreak;\n\t\t\t\t\t\t// }\n\t\t\t\t\t\tuni.showToast({\n\t\t\t\t\t\t\ttitle: ret.msg || '操作失败', // 显示错误信息\n\t\t\t\t\t\t\ticon: 'none', // 不显示图标\n\t\t\t\t\t\t});\n\t\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t},\n\n\t\t\t// 请求失败回调\n\t\t\tfail(err) {\n\t\t\t\tuni.$emit('z-paging-error-emit');\n\t\t\t\treject(err); // 返回错误对象\n\t\t\t\tuni.showToast({\n\t\t\t\t\ttitle: '网络请求失败',\n\t\t\t\t\ticon: 'none',\n\t\t\t\t});\n\t\t\t},\n\t\t});\n\t});\n};"],"names":["uni","config","goToLoginPage"],"mappings":";;;;AAgCa,MAAA,UAAU,CAAC,YAAsB;AAC7C,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACvCA,kBAAAA,MAAI,QAAQ;AAAA;AAAA,MAEX,KAAKC,OAAO,OAAA,eAAe,QAAQ,MAAM,eAAeA,OAAA,OAAO,WAAW,YAAYD,oBAAI,eAAe,OAAO;AAAA,MAEhH,QAAQ,QAAQ,UAAU;AAAA;AAAA,MAC1B,MAAM,QAAQ,QAAQ,QAAQ,UAAU,CAAC;AAAA;AAAA,MACzC,UAAU,QAAQ,YAAY;AAAA;AAAA,MAC9B,cAAc,QAAQ,gBAAgB;AAAA;AAAA;AAAA,MAGtC,QAAQ,KAAK;AACZ,cAAM,MAAiB,IAAI;AAI3B,gBAAQ,IAAI,MAAM;AAAA,UACjB,KAAK;AACUE,yBAAAA;AACd;AAAA,UACD,KAAK;AAOJ,oBAAQ,IAAI,IAAI;AAChB;AAAA,UACD,KAAK;AAOJF,0BAAAA,MAAI,UAAU;AAAA,cACb,OAAO,IAAI,OAAO;AAAA;AAAA,cAClB,MAAM;AAAA;AAAA,YAAA,CACN;AACD;AAAA,QACF;AAAA,MACD;AAAA;AAAA,MAGA,KAAK,KAAK;AACTA,4BAAI,MAAM,qBAAqB;AAC/B,eAAO,GAAG;AACVA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO;AAAA,UACP,MAAM;AAAA,QAAA,CACN;AAAA,MACF;AAAA,IAAA,CACA;AAAA,EAAA,CACD;AACF;;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/index.js.map
index 6f26e0a..7b7bac3 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["pages/data/index.vue","pages/data/index.vue?type=page"],"sourcesContent":["<template>\r\n\t<view class=\"page-content\">\r\n\t\t<nut-calendar title=\"选择想要的日期\" :show-sub-title=\"false\" :poppable=\"false\" :default-value=\"date\"\r\n\t\t\t:start-date=\"startDate\" :end-date=\"endDate\" @choose=\"onChoose\" @select=\"onSelect\"></nut-calendar>\r\n\t</view>\r\n</template>\r\n<script setup>\r\n\timport {\r\n\t\tonMounted,\r\n\t\treactive,\r\n\t\tref\r\n\t} from 'vue';\r\n\timport {\r\n\t\tonLoad,\r\n\t\tonShow\r\n\t} from '@dcloudio/uni-app';\r\n\timport {\r\n\t\tnavigateTo,\r\n\t} from '@/utils/helper';\r\n\timport {\r\n\t\tfetchOrderList,\r\n\t} from '@/api/index';\r\n\r\n\r\n\r\n\t// 获取上月的第一天\r\n\tconst getLastMonthFirstDay = () => {\r\n\t\tconst date = new Date();\r\n\t\tdate.setMonth(date.getMonth() - 1); // 设置为上个月\r\n\t\tdate.setDate(1); // 设置为本月的第一天\r\n\t\treturn formatDate(date);\r\n\t};\r\n\r\n\t// 获取本月的最后一天\r\n\tconst getCurrentMonthLastDay = () => {\r\n\t\tconst date = new Date();\r\n\t\tdate.setMonth(date.getMonth() + 1); // 设置为下个月\r\n\t\tdate.setDate(0); // 设置为下个月的最后一天\r\n\t\treturn formatDate(date);\r\n\t};\r\n\r\n\t// 格式化日期为 Y-m-d 格式\r\n\tconst formatDate = (date) => {\r\n\t\tconst year = date.getFullYear();\r\n\t\tconst month = (date.getMonth() + 1).toString().padStart(2, '0'); // 获取月份并确保是两位数\r\n\t\tconst day = date.getDate().toString().padStart(2, '0'); // 获取日期并确保是两位数\r\n\t\treturn `${year}-${month}-${day}`;\r\n\t};\r\n\r\n\t// 获取上月的第一天和本月的最后一天\r\n\tconst startDate = ref(getLastMonthFirstDay());\r\n\tconst endDate = ref(getCurrentMonthLastDay());\r\n\t// const date = ref(formatDate(new Date())); // 获取今天的日期并格式化为 Y-m-d 格式\r\n\tconst date = ref('');\r\n\r\n\tconst onChoose = (e) => {\r\n\t\tconsole.log('onChoose', e);\r\n\t}\r\n\tconst onSelect = (e) => {\r\n\t\tconsole.log('onSelect', e);\r\n\t\tuni.navigateTo({\r\n\t\t\turl: `/pages/data/list?date=${e[3]}`\r\n\t\t})\r\n\t}\r\n\r\n\r\n\r\n\tonLoad((options) => {\r\n\t\t// current_tab_idx.value = parseInt(options.tab)\r\n\t})\r\n\r\n\t/**\r\n\t * 页面显示生命周期钩子\r\n\t * 每次页面显示时都会执行\r\n\t */\r\n\tonShow(() => {\r\n\t\t// 获取配置\r\n\t\t// getConfig()\r\n\t\t// if (paging.value) {\r\n\t\t// \t// paging.value.pageNo = 1; \r\n\t\t// \tpaging.value.refresh();\r\n\t\t// \t// paging.value.refreshToPage(1)\r\n\t\t// \t// paging.value.reload();\r\n\t\t// }\r\n\t})\r\n</script>\r\n\r\n\r\n\r\n<style scoped lang=\"scss\">\r\n\t.page-content {\r\n\t\tmin-height: 100vh;\r\n\t\tbackground-color: #f2f3f5;\r\n\t}\r\n</style>","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/data/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["date","ref","uni","onLoad","onShow"],"mappings":";;;;;;;;;;;;;AA0BC,UAAM,uBAAuB,MAAM;AAClC,YAAMA,QAAO,oBAAI;AACjB,MAAAA,MAAK,SAASA,MAAK,SAAU,IAAG,CAAC;AACjC,MAAAA,MAAK,QAAQ,CAAC;AACd,aAAO,WAAWA,KAAI;AAAA,IACxB;AAGC,UAAM,yBAAyB,MAAM;AACpC,YAAMA,QAAO,oBAAI;AACjB,MAAAA,MAAK,SAASA,MAAK,SAAU,IAAG,CAAC;AACjC,MAAAA,MAAK,QAAQ,CAAC;AACd,aAAO,WAAWA,KAAI;AAAA,IACxB;AAGC,UAAM,aAAa,CAACA,UAAS;AAC5B,YAAM,OAAOA,MAAK;AAClB,YAAM,SAASA,MAAK,aAAa,GAAG,SAAQ,EAAG,SAAS,GAAG,GAAG;AAC9D,YAAM,MAAMA,MAAK,QAAS,EAAC,SAAQ,EAAG,SAAS,GAAG,GAAG;AACrD,aAAO,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG;AAAA,IAChC;AAGC,UAAM,YAAYC,cAAAA,IAAI,qBAAoB,CAAE;AAC5C,UAAM,UAAUA,cAAAA,IAAI,uBAAsB,CAAE;AAE5C,UAAM,OAAOA,kBAAI,EAAE;AAEnB,UAAM,WAAW,CAAC,MAAM;AACvBC,oBAAY,MAAA,MAAA,OAAA,8BAAA,YAAY,CAAC;AAAA,IACzB;AACD,UAAM,WAAW,CAAC,MAAM;AACvBA,oBAAY,MAAA,MAAA,OAAA,8BAAA,YAAY,CAAC;AACzBA,oBAAAA,MAAI,WAAW;AAAA,QACd,KAAK,yBAAyB,EAAE,CAAC,CAAC;AAAA,MACrC,CAAG;AAAA,IACD;AAIDC,kBAAM,OAAC,CAAC,YAAY;AAAA,IAErB,CAAE;AAMDC,kBAAAA,OAAO,MAAM;AAAA,IASd,CAAE;;;;;;;;;;;;;;;;;;ACnFF,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"index.js","sources":["pages/data/index.vue","pages/data/index.vue?type=page"],"sourcesContent":["<template>\r\n\t<view class=\"page-content\">\r\n\t\t<nut-calendar title=\"选择想要的日期\" :show-sub-title=\"false\" :poppable=\"false\" :default-value=\"date\"\r\n\t\t\t:start-date=\"startDate\" :end-date=\"endDate\" @choose=\"onChoose\" @select=\"onSelect\"></nut-calendar>\r\n\t</view>\r\n</template>\r\n<script setup>\r\n\timport {\r\n\t\tonMounted,\r\n\t\treactive,\r\n\t\tref\r\n\t} from 'vue';\r\n\timport {\r\n\t\tonLoad,\r\n\t\tonShow\r\n\t} from '@dcloudio/uni-app';\r\n\timport {\r\n\t\tnavigateTo,\r\n\t} from '@/utils/helper';\r\n\timport {\r\n\t\tfetchOrderList,\r\n\t} from '@/api/index';\r\n\r\n\r\n\r\n\t// 获取上月的第一天\r\n\tconst getLastMonthFirstDay = () => {\r\n\t\tconst date = new Date();\r\n\t\tdate.setMonth(date.getMonth() - 1); // 设置为上个月\r\n\t\tdate.setDate(1); // 设置为本月的第一天\r\n\t\treturn formatDate(date);\r\n\t};\r\n\r\n\t// 获取本月的最后一天\r\n\tconst getCurrentMonthLastDay = () => {\r\n\t\tconst date = new Date();\r\n\t\tdate.setMonth(date.getMonth() + 1); // 设置为下个月\r\n\t\tdate.setDate(0); // 设置为下个月的最后一天\r\n\t\treturn formatDate(date);\r\n\t};\r\n\r\n\t// 格式化日期为 Y-m-d 格式\r\n\tconst formatDate = (date) => {\r\n\t\tconst year = date.getFullYear();\r\n\t\tconst month = (date.getMonth() + 1).toString().padStart(2, '0'); // 获取月份并确保是两位数\r\n\t\tconst day = date.getDate().toString().padStart(2, '0'); // 获取日期并确保是两位数\r\n\t\treturn `${year}-${month}-${day}`;\r\n\t};\r\n\r\n\t// 获取上月的第一天和本月的最后一天\r\n\tconst startDate = ref(getLastMonthFirstDay());\r\n\tconst endDate = ref(getCurrentMonthLastDay());\r\n\t// const date = ref(formatDate(new Date())); // 获取今天的日期并格式化为 Y-m-d 格式\r\n\tconst date = ref('');\r\n\r\n\tconst onChoose = (e) => {\r\n\t\tconsole.log('onChoose', e);\r\n\t}\r\n\tconst onSelect = (e) => {\r\n\t\tconsole.log('onSelect', e);\r\n\t\tuni.navigateTo({\r\n\t\t\turl: `/pages/data/list?date=${e[3]}`\r\n\t\t})\r\n\t}\r\n\r\n\r\n\r\n\tonLoad((options) => {\r\n\t})\r\n\r\n\t/**\r\n\t * 页面显示生命周期钩子\r\n\t * 每次页面显示时都会执行\r\n\t */\r\n\tonShow(() => {\r\n\t\t// 获取配置\r\n\t\t// getConfig()\r\n\t\t// if (paging.value) {\r\n\t\t// \t// paging.value.pageNo = 1; \r\n\t\t// \tpaging.value.refresh();\r\n\t\t// \t// paging.value.refreshToPage(1)\r\n\t\t// \t// paging.value.reload();\r\n\t\t// }\r\n\t})\r\n</script>\r\n\r\n\r\n\r\n<style scoped lang=\"scss\">\r\n\t.page-content {\r\n\t\tmin-height: 100vh;\r\n\t\tbackground-color: #f2f3f5;\r\n\t}\r\n</style>","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/data/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["date","ref","uni","onLoad","onShow"],"mappings":";;;;;;;;;;;;;AA0BC,UAAM,uBAAuB,MAAM;AAClC,YAAMA,QAAO,oBAAI;AACjB,MAAAA,MAAK,SAASA,MAAK,SAAU,IAAG,CAAC;AACjC,MAAAA,MAAK,QAAQ,CAAC;AACd,aAAO,WAAWA,KAAI;AAAA,IACxB;AAGC,UAAM,yBAAyB,MAAM;AACpC,YAAMA,QAAO,oBAAI;AACjB,MAAAA,MAAK,SAASA,MAAK,SAAU,IAAG,CAAC;AACjC,MAAAA,MAAK,QAAQ,CAAC;AACd,aAAO,WAAWA,KAAI;AAAA,IACxB;AAGC,UAAM,aAAa,CAACA,UAAS;AAC5B,YAAM,OAAOA,MAAK;AAClB,YAAM,SAASA,MAAK,aAAa,GAAG,SAAQ,EAAG,SAAS,GAAG,GAAG;AAC9D,YAAM,MAAMA,MAAK,QAAS,EAAC,SAAQ,EAAG,SAAS,GAAG,GAAG;AACrD,aAAO,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG;AAAA,IAChC;AAGC,UAAM,YAAYC,cAAAA,IAAI,qBAAoB,CAAE;AAC5C,UAAM,UAAUA,cAAAA,IAAI,uBAAsB,CAAE;AAE5C,UAAM,OAAOA,kBAAI,EAAE;AAEnB,UAAM,WAAW,CAAC,MAAM;AACvBC,oBAAY,MAAA,MAAA,OAAA,8BAAA,YAAY,CAAC;AAAA,IACzB;AACD,UAAM,WAAW,CAAC,MAAM;AACvBA,oBAAY,MAAA,MAAA,OAAA,8BAAA,YAAY,CAAC;AACzBA,oBAAAA,MAAI,WAAW;AAAA,QACd,KAAK,yBAAyB,EAAE,CAAC,CAAC;AAAA,MACrC,CAAG;AAAA,IACD;AAIDC,kBAAM,OAAC,CAAC,YAAY;AAAA,IACrB,CAAE;AAMDC,kBAAAA,OAAO,MAAM;AAAA,IASd,CAAE;;;;;;;;;;;;;;;;;;AClFF,GAAG,WAAW,eAAe;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/list.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/list.js.map
index 64c7d09..d9630b7 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/list.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/list.js.map
@@ -1 +1 @@
-{"version":3,"file":"list.js","sources":["pages/data/list.vue?type=page"],"sourcesContent":["import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/data/list.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;AACA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"list.js","sources":["pages/data/list.vue","pages/data/list.vue?type=page"],"sourcesContent":["<template>\r\n\t<view class=\"page-content\">\r\n\t\r\n\r\n\t\t<z-paging ref=\"paging\" :fixed=\"false\" style=\"height: 88vh;\" class=\"order-list\" v-model=\"dataList\"\r\n\t\t\t@query=\"queryList\">\r\n\t\t\t<view class=\"order-inner\" v-for=\"(order,index) in dataList\" :key=\"index\">\r\n\t\t\t\t<view class=\"order-inner-header\">\r\n\t\t\t\t\t<nut-tag v-if=\"order.order_type == 1\" plain type=\"primary\">房间订单</nut-tag>\r\n\t\t\t\t\t<nut-tag v-else=\"order.order_type == 2\" plain type=\"warning\">商品订单</nut-tag>\r\n\t\t\t\t\t<nut-tag v-if=\"order.order_type == 1\" custom-color=\"#ffc209\">{{order?.rooms?.room_name}}</nut-tag>\r\n\t\t\t\t\t<nut-tag plain type=\"danger\" v-if=\"order?.status?.value == 1\">{{order?.status?.text}}</nut-tag>\r\n\t\t\t\t\t<nut-tag plain type=\"success\"\r\n\t\t\t\t\t\tv-else-if=\"order?.status?.value == 2\">{{order?.status?.text}}</nut-tag>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"goods-info-row\" v-if=\"order.order_type == 1 && order?.fee_type?.value != 0\">\r\n\t\t\t\t\t<view class=\"left-text\">\r\n\t\t\t\t\t\t<view class=\"goods-name\">\r\n\t\t\t\t\t\t\t<nut-tag plain custom-color=\"#fa2400\">{{order?.fee_type?.text}}</nut-tag>\r\n\t\t\t\t\t\t\t<text style=\"margin-left: 10rpx;\"\r\n\t\t\t\t\t\t\t\tv-if=\"order?.fee_type?.value == 0 || order?.fee_type?.value == 3\"></text>\r\n\t\t\t\t\t\t\t<text style=\"margin-left: 10rpx;\"\r\n\t\t\t\t\t\t\t\tv-else-if=\"order?.fee_type?.value == 1 || order?.fee_type?.value == 2 \">{{order?.fee_combo_name}}</text>\r\n\t\t\t\t\t\t</view>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"price\" v-if=\"order?.fee_type?.value == 0 || order?.fee_type?.value == 3\">\r\n\t\t\t\t\t\t¥{{order?.fee_amount}}\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"price\" v-else-if=\"order?.fee_type?.value == 1 || order?.fee_type?.value == 2 \">\r\n\t\t\t\t\t\t¥{{order?.fee_combo_price}}\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"goods-pay-status\">\r\n\t\t\t\t\t\t{{order?.fee_pay_status?.text}}\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\r\n\t\t\t\t<view class=\"goods-info-row\" v-if=\"order.over_often>0\">\r\n\t\t\t\t\t<view class=\"left-text\">\r\n\t\t\t\t\t\t<view class=\"goods-name\">\r\n\t\t\t\t\t\t\t<nut-tag plain custom-color=\"#fa2400\">超时</nut-tag>\r\n\t\t\t\t\t\t\t<text style=\"margin-left: 10rpx;\">{{order?.over_often}}小时</text>\r\n\t\t\t\t\t\t</view>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"price\">\r\n\t\t\t\t\t\t¥{{order?.over_amount}}\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"goods-pay-status\">\r\n\t\t\t\t\t\t{{order?.over_pay_status?.text}}\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"goods-info-row\" v-for=\"(goods,iidx) in order.goods\" :key=\"iidx\">\r\n\t\t\t\t\t<view class=\"left-text\">\r\n\t\t\t\t\t\t<view class=\"goods-name\">\r\n\t\t\t\t\t\t\t<nut-tag plain custom-color=\"#fa2400\">{{goods.goods_type_name}}</nut-tag>\r\n\t\t\t\t\t\t\t<text style=\"margin-left: 10rpx;\">{{goods.goods_name}}</text>\r\n\t\t\t\t\t\t</view>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"price\">\r\n\t\t\t\t\t\t¥{{goods?.goods_price}}\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"goods-pay-status\">\r\n\t\t\t\t\t\t{{goods?.goods_pay_status_txt}}\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"footer\">\r\n\t\t\t\t\t<view class=\"order-inner-price\">\r\n\t\t\t\t\t\t<view style=\"display: flex;\">优惠：\r\n\t\t\t\t\t\t\t<view style=\"color: #fa2c19;font-size: 26rpx;\">\r\n\t\t\t\t\t\t\t\t¥{{order?.discount_amount}}\r\n\t\t\t\t\t\t\t</view>\r\n\t\t\t\t\t\t</view>\r\n\t\t\t\t\t\t<view style=\"display: flex;\">总计：\r\n\t\t\t\t\t\t\t<view style=\"color: #fa2c19;font-size: 26rpx;\">\r\n\t\t\t\t\t\t\t\t¥{{order?.discount_amount}}\r\n\t\t\t\t\t\t\t</view>\r\n\t\t\t\t\t\t</view>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view v-if=\"order.remarks\" style=\"padding-left:20rpx;font-size: 26rpx;\">备注</view>\r\n\t\t\t\t\t<view v-if=\"order.remarks\" class=\"remarks\">\r\n\t\t\t\t\t\t{{order.remarks}}\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"order-inner-price\">\r\n\t\t\t\t\t\t<view style=\"color: rgba(0, 0, 0, .5);font-size: 24rpx;\">订单时间:{{order.create_time}}</view>\r\n\t\t\t\t\t\t<view style=\"color: rgba(0, 0, 0, .5);font-size: 24rpx;\">员工:{{order?.user?.staff_name}}</view>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\r\n\r\n\t\t\t</view>\r\n\t\t</z-paging>\r\n\t</view>\r\n</template>\r\n<script setup>\r\n\timport {\r\n\t\tonMounted,\r\n\t\treactive,\r\n\t\tref\r\n\t} from 'vue';\r\n\timport {\r\n\t\tonLoad,\r\n\t\tonShow\r\n\t} from '@dcloudio/uni-app';\r\n\timport {\r\n\t\tnavigateTo,\r\n\t} from '@/utils/helper';\r\n\timport {\r\n\t\tfetchDayOrderList,\r\n\t} from '@/api/index';\r\n\tconst date = ref('');\r\n\r\n\tonLoad((options) => {\r\n\t\tdate.value = options.date\r\n\t\tconsole.log(date.value);\r\n\t})\r\n\r\n\r\n\t// 订单列表数据\r\n\tconst dataList = ref([]);\r\n\t// zp\r\n\tconst paging = ref(null);\r\n\r\n\t\r\n\r\n\t// 获取订单列表\r\n\tconst queryList = (pageNo = 1, pageSize = 10) => {\r\n\t\tconsole.log(date.value);\r\n\t\tconst params = {\r\n\t\t\tpage: pageNo,\r\n\t\t\tpageSize: 10,\r\n\t\t\tdate: date.value,\r\n\t\t}\r\n\t\tfetchDayOrderList(params).then(res => {\r\n\t\t\tconsole.log(res);\r\n\t\t\tpaging.value.complete(res.list);\r\n\t\t}).catch(res => {\r\n\t\t\tpaging.value.complete(false);\r\n\t\t})\r\n\t}\r\n\r\n\t/**\r\n\t * 页面显示生命周期钩子\r\n\t * 每次页面显示时都会执行\r\n\t */\r\n\tonShow(() => {\r\n\t\t// 获取配置\r\n\t\t// getConfig()\r\n\t\tif (paging.value) {\r\n\t\t\t// paging.value.pageNo = 1; \r\n\t\t\tpaging.value.refresh();\r\n\t\t\t// paging.value.refreshToPage(1)\r\n\t\t\t// paging.value.reload();\r\n\t\t}\r\n\t})\r\n</script>\r\n\r\n\r\n\r\n<style scoped lang=\"scss\">\r\n\t.page-content {\r\n\t\tmin-height: 100vh;\r\n\t\tbackground-color: #f2f3f5;\r\n\t}\r\n\r\n\t.title-list {\r\n\t\tdisplay: flex;\r\n\t\tjustify-content: space-around;\r\n\t\talign-items: center;\r\n\t\twidth: 100%;\r\n\r\n\t\t.title-item {\r\n\t\t\tdisplay: flex;\r\n\t\t\tjustify-content: space-around;\r\n\t\t\talign-items: center;\r\n\t\t\tposition: relative;\r\n\t\t}\r\n\r\n\t\t.tabs-active {\r\n\t\t\tfont-weight: bold;\r\n\t\t\tcolor: $tabs-titles-item-active-color;\r\n\t\t\topacity: $tabs-titles-item-line-opacity;\r\n\t\t\ttransition: width 0.3s ease;\r\n\r\n\t\t\t.item__line {\r\n\t\t\t\tposition: absolute;\r\n\t\t\t\tbottom: -10%;\r\n\t\t\t\tleft: 50%;\r\n\t\t\t\toverflow: hidden;\r\n\t\t\t\tcontent: ' ';\r\n\t\t\t\tborder-radius: $tabs-titles-item-line-border-radius;\r\n\t\t\t\topacity: $tabs-titles-item-line-opacity;\r\n\t\t\t\ttransition: width 0.3s ease;\r\n\t\t\t\ttransform: translate(-50%, 0);\r\n\t\t\t\twidth: $tabs-horizontal-titles-item-active-line-width;\r\n\t\t\t\theight: 3px;\r\n\t\t\t\tcontent: ' ';\r\n\t\t\t\tbackground: $tabs-horizontal-tab-line-color;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\r\n\t.order-list {\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\twidth: 100%;\r\n\r\n\t}\r\n\r\n\t.order-inner {\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\tbackground: #fff;\r\n\t\tborder-radius: 15rpx;\r\n\t\toverflow: hidden;\r\n\t\tmargin: 20rpx;\r\n\r\n\t\t.order-inner-header {\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\r\n\t\t\tfont-size: 24rpx;\r\n\t\t\tjustify-content: space-between;\r\n\t\t\tline-height: 45rpx;\r\n\t\t\tpadding: 15rpx 20rpx;\r\n\t\t\tborder-bottom: 2rpx solid #f2f3f5;\r\n\t\t}\r\n\r\n\r\n\t\t/* 信息行布局 */\r\n\t\t.goods-info-row {\r\n\t\t\tdisplay: flex;\r\n\t\t\tjustify-content: space-between;\r\n\t\t\talign-items: center;\r\n\t\t\tpadding: 20rpx;\r\n\t\t\tborder-bottom: 2rpx solid #f2f3f5;\r\n\r\n\t\t\t/* 左侧文字样式 */\r\n\t\t\t.left-text {\r\n\t\t\t\tflex: 1;\r\n\t\t\t}\r\n\r\n\t\t\t.goods-name {\r\n\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\tcolor: #000000;\r\n\t\t\t\tdisplay: block;\r\n\t\t\t}\r\n\r\n\t\t\t/* 右侧价格样式 */\r\n\t\t\t.price {\r\n\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\tmargin-left: 20rpx;\r\n\t\t\t\talign-self: center;\r\n\t\t\t\tcolor: #fa2c19;\r\n\t\t\t\t/* 垂直居中在两行文字之间 */\r\n\t\t\t}\r\n\r\n\t\t\t.goods-pay-status {\r\n\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\tmargin-left: 20rpx;\r\n\t\t\t\talign-self: center;\r\n\t\t\t}\r\n\r\n\t\t}\r\n\r\n\r\n\t\t.footer {\r\n\t\t\tdisplay: flex;\r\n\t\t\tflex-direction: column;\r\n\r\n\t\t\t.order-inner-price {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\tjustify-content: space-evenly;\r\n\t\t\t\tpadding: 20rpx;\r\n\t\t\t\tfont-size: 24rpx;\r\n\t\t\t\talign-items: center;\r\n\t\t\t}\r\n\r\n\t\t\t.remarks {\r\n\t\t\t\tpadding: 20rpx;\r\n\t\t\t\tcolor: rgba(0, 0, 0, .5);\r\n\t\t\t\tfont-size: 24rpx;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n</style>","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/data/list.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","onLoad","uni","fetchDayOrderList","onShow"],"mappings":";;;;;;;;;;;;;;;;AA4GC,UAAM,OAAOA,kBAAI,EAAE;AAEnBC,kBAAM,OAAC,CAAC,YAAY;AACnB,WAAK,QAAQ,QAAQ;AACrBC,oBAAA,MAAA,MAAA,OAAA,8BAAY,KAAK,KAAK;AAAA,IACxB,CAAE;AAID,UAAM,WAAWF,kBAAI,CAAA,CAAE;AAEvB,UAAM,SAASA,kBAAI,IAAI;AAKvB,UAAM,YAAY,CAAC,SAAS,GAAG,WAAW,OAAO;AAChDE,oBAAA,MAAA,MAAA,OAAA,8BAAY,KAAK,KAAK;AACtB,YAAM,SAAS;AAAA,QACd,MAAM;AAAA,QACN,UAAU;AAAA,QACV,MAAM,KAAK;AAAA,MACX;AACDC,gBAAAA,kBAAkB,MAAM,EAAE,KAAK,SAAO;AACrCD,sBAAAA,MAAY,MAAA,OAAA,8BAAA,GAAG;AACf,eAAO,MAAM,SAAS,IAAI,IAAI;AAAA,MACjC,CAAG,EAAE,MAAM,SAAO;AACf,eAAO,MAAM,SAAS,KAAK;AAAA,MAC9B,CAAG;AAAA,IACD;AAMDE,kBAAAA,OAAO,MAAM;AAGZ,UAAI,OAAO,OAAO;AAEjB,eAAO,MAAM;MAGb;AAAA,IACH,CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACvJF,GAAG,WAAW,eAAe;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/api/index.js b/unpackage/dist/dev/mp-weixin/api/index.js
index d8ce128..f47ea24 100644
--- a/unpackage/dist/dev/mp-weixin/api/index.js
+++ b/unpackage/dist/dev/mp-weixin/api/index.js
@@ -88,10 +88,18 @@ function fetchOrderList(data) {
     method: "POST"
   });
 }
+function fetchDayOrderList(data) {
+  return api_request.request({
+    url: "/index/dayOrder",
+    data,
+    method: "POST"
+  });
+}
 exports.fetchAddOrder = fetchAddOrder;
 exports.fetchAddTodo = fetchAddTodo;
 exports.fetchBooking = fetchBooking;
 exports.fetchCombos = fetchCombos;
+exports.fetchDayOrderList = fetchDayOrderList;
 exports.fetchEditOrder = fetchEditOrder;
 exports.fetchEditTodo = fetchEditTodo;
 exports.fetchGoods = fetchGoods;
diff --git a/unpackage/dist/dev/mp-weixin/pages/data/list.js b/unpackage/dist/dev/mp-weixin/pages/data/list.js
index 248d9c2..9a0bc8b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/data/list.js
+++ b/unpackage/dist/dev/mp-weixin/pages/data/list.js
@@ -1,9 +1,163 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
-const _sfc_main = {};
-function _sfc_render(_ctx, _cache) {
-  return {};
+const api_index = require("../../api/index.js");
+if (!Array) {
+  const _easycom_nut_tag2 = common_vendor.resolveComponent("nut-tag");
+  const _easycom_z_paging2 = common_vendor.resolveComponent("z-paging");
+  (_easycom_nut_tag2 + _easycom_z_paging2)();
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+const _easycom_nut_tag = () => "../../uni_modules/nutui-uni/components/tag/tag.js";
+const _easycom_z_paging = () => "../../uni_modules/z-paging/components/z-paging/z-paging.js";
+if (!Math) {
+  (_easycom_nut_tag + _easycom_z_paging)();
+}
+const _sfc_main = {
+  __name: "list",
+  setup(__props) {
+    const date = common_vendor.ref("");
+    common_vendor.onLoad((options) => {
+      date.value = options.date;
+      common_vendor.index.__f__("log", "at pages/data/list.vue:113", date.value);
+    });
+    const dataList = common_vendor.ref([]);
+    const paging = common_vendor.ref(null);
+    const queryList = (pageNo = 1, pageSize = 10) => {
+      common_vendor.index.__f__("log", "at pages/data/list.vue:126", date.value);
+      const params = {
+        page: pageNo,
+        pageSize: 10,
+        date: date.value
+      };
+      api_index.fetchDayOrderList(params).then((res) => {
+        common_vendor.index.__f__("log", "at pages/data/list.vue:133", res);
+        paging.value.complete(res.list);
+      }).catch((res) => {
+        paging.value.complete(false);
+      });
+    };
+    common_vendor.onShow(() => {
+      if (paging.value) {
+        paging.value.refresh();
+      }
+    });
+    return (_ctx, _cache) => {
+      return {
+        a: common_vendor.f(dataList.value, (order, index, i0) => {
+          var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C;
+          return common_vendor.e({
+            a: order.order_type == 1
+          }, order.order_type == 1 ? {
+            b: "2c2d73a5-1-" + i0 + ",2c2d73a5-0",
+            c: common_vendor.p({
+              plain: true,
+              type: "primary"
+            })
+          } : {
+            e: "2c2d73a5-2-" + i0 + ",2c2d73a5-0",
+            f: common_vendor.p({
+              plain: true,
+              type: "warning"
+            })
+          }, {
+            d: order.order_type == 2,
+            g: order.order_type == 1
+          }, order.order_type == 1 ? {
+            h: common_vendor.t((_a = order == null ? void 0 : order.rooms) == null ? void 0 : _a.room_name),
+            i: "2c2d73a5-3-" + i0 + ",2c2d73a5-0",
+            j: common_vendor.p({
+              ["custom-color"]: "#ffc209"
+            })
+          } : {}, {
+            k: ((_b = order == null ? void 0 : order.status) == null ? void 0 : _b.value) == 1
+          }, ((_c = order == null ? void 0 : order.status) == null ? void 0 : _c.value) == 1 ? {
+            l: common_vendor.t((_d = order == null ? void 0 : order.status) == null ? void 0 : _d.text),
+            m: "2c2d73a5-4-" + i0 + ",2c2d73a5-0",
+            n: common_vendor.p({
+              plain: true,
+              type: "danger"
+            })
+          } : ((_e = order == null ? void 0 : order.status) == null ? void 0 : _e.value) == 2 ? {
+            p: common_vendor.t((_f = order == null ? void 0 : order.status) == null ? void 0 : _f.text),
+            q: "2c2d73a5-5-" + i0 + ",2c2d73a5-0",
+            r: common_vendor.p({
+              plain: true,
+              type: "success"
+            })
+          } : {}, {
+            o: ((_g = order == null ? void 0 : order.status) == null ? void 0 : _g.value) == 2,
+            s: order.order_type == 1 && ((_h = order == null ? void 0 : order.fee_type) == null ? void 0 : _h.value) != 0
+          }, order.order_type == 1 && ((_i = order == null ? void 0 : order.fee_type) == null ? void 0 : _i.value) != 0 ? common_vendor.e({
+            t: common_vendor.t((_j = order == null ? void 0 : order.fee_type) == null ? void 0 : _j.text),
+            v: "2c2d73a5-6-" + i0 + ",2c2d73a5-0",
+            w: common_vendor.p({
+              plain: true,
+              ["custom-color"]: "#fa2400"
+            }),
+            x: ((_k = order == null ? void 0 : order.fee_type) == null ? void 0 : _k.value) == 0 || ((_l = order == null ? void 0 : order.fee_type) == null ? void 0 : _l.value) == 3
+          }, ((_m = order == null ? void 0 : order.fee_type) == null ? void 0 : _m.value) == 0 || ((_n = order == null ? void 0 : order.fee_type) == null ? void 0 : _n.value) == 3 ? {} : ((_o = order == null ? void 0 : order.fee_type) == null ? void 0 : _o.value) == 1 || ((_p = order == null ? void 0 : order.fee_type) == null ? void 0 : _p.value) == 2 ? {
+            z: common_vendor.t(order == null ? void 0 : order.fee_combo_name)
+          } : {}, {
+            y: ((_q = order == null ? void 0 : order.fee_type) == null ? void 0 : _q.value) == 1 || ((_r = order == null ? void 0 : order.fee_type) == null ? void 0 : _r.value) == 2,
+            A: ((_s = order == null ? void 0 : order.fee_type) == null ? void 0 : _s.value) == 0 || ((_t = order == null ? void 0 : order.fee_type) == null ? void 0 : _t.value) == 3
+          }, ((_u = order == null ? void 0 : order.fee_type) == null ? void 0 : _u.value) == 0 || ((_v = order == null ? void 0 : order.fee_type) == null ? void 0 : _v.value) == 3 ? {
+            B: common_vendor.t(order == null ? void 0 : order.fee_amount)
+          } : ((_w = order == null ? void 0 : order.fee_type) == null ? void 0 : _w.value) == 1 || ((_x = order == null ? void 0 : order.fee_type) == null ? void 0 : _x.value) == 2 ? {
+            D: common_vendor.t(order == null ? void 0 : order.fee_combo_price)
+          } : {}, {
+            C: ((_y = order == null ? void 0 : order.fee_type) == null ? void 0 : _y.value) == 1 || ((_z = order == null ? void 0 : order.fee_type) == null ? void 0 : _z.value) == 2,
+            E: common_vendor.t((_A = order == null ? void 0 : order.fee_pay_status) == null ? void 0 : _A.text)
+          }) : {}, {
+            F: order.over_often > 0
+          }, order.over_often > 0 ? {
+            G: "2c2d73a5-7-" + i0 + ",2c2d73a5-0",
+            H: common_vendor.p({
+              plain: true,
+              ["custom-color"]: "#fa2400"
+            }),
+            I: common_vendor.t(order == null ? void 0 : order.over_often),
+            J: common_vendor.t(order == null ? void 0 : order.over_amount),
+            K: common_vendor.t((_B = order == null ? void 0 : order.over_pay_status) == null ? void 0 : _B.text)
+          } : {}, {
+            L: common_vendor.f(order.goods, (goods, iidx, i1) => {
+              return {
+                a: common_vendor.t(goods.goods_type_name),
+                b: "2c2d73a5-8-" + i0 + "-" + i1 + ",2c2d73a5-0",
+                c: common_vendor.t(goods.goods_name),
+                d: common_vendor.t(goods == null ? void 0 : goods.goods_price),
+                e: common_vendor.t(goods == null ? void 0 : goods.goods_pay_status_txt),
+                f: iidx
+              };
+            }),
+            M: common_vendor.t(order == null ? void 0 : order.discount_amount),
+            N: common_vendor.t(order == null ? void 0 : order.discount_amount),
+            O: order.remarks
+          }, order.remarks ? {} : {}, {
+            P: order.remarks
+          }, order.remarks ? {
+            Q: common_vendor.t(order.remarks)
+          } : {}, {
+            R: common_vendor.t(order.create_time),
+            S: common_vendor.t((_C = order == null ? void 0 : order.user) == null ? void 0 : _C.staff_name),
+            T: index
+          });
+        }),
+        b: common_vendor.p({
+          plain: true,
+          ["custom-color"]: "#fa2400"
+        }),
+        c: common_vendor.sr(paging, "2c2d73a5-0", {
+          "k": "paging"
+        }),
+        d: common_vendor.o(queryList),
+        e: common_vendor.o(($event) => dataList.value = $event),
+        f: common_vendor.p({
+          fixed: false,
+          modelValue: dataList.value
+        })
+      };
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-2c2d73a5"]]);
 wx.createPage(MiniProgramPage);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/data/list.js.map
diff --git a/unpackage/dist/dev/mp-weixin/pages/data/list.json b/unpackage/dist/dev/mp-weixin/pages/data/list.json
index bb7a7c4..9d6adf7 100644
--- a/unpackage/dist/dev/mp-weixin/pages/data/list.json
+++ b/unpackage/dist/dev/mp-weixin/pages/data/list.json
@@ -1,5 +1,8 @@
 {
   "navigationBarTitleText": "运营数据-数据看板",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "nut-tag": "../../uni_modules/nutui-uni/components/tag/tag",
+    "z-paging": "../../uni_modules/z-paging/components/z-paging/z-paging"
+  }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/data/list.wxml b/unpackage/dist/dev/mp-weixin/pages/data/list.wxml
index e69de29..7ef77bc 100644
--- a/unpackage/dist/dev/mp-weixin/pages/data/list.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/data/list.wxml
@@ -0,0 +1 @@
+<view class="page-content data-v-2c2d73a5"><z-paging wx:if="{{f}}" u-s="{{['d']}}" u-r="paging" style="height:88vh" class="order-list r data-v-2c2d73a5" bindquery="{{d}}" u-i="2c2d73a5-0" bind:__l="__l" bindupdateModelValue="{{e}}" u-p="{{f}}"><view wx:for="{{a}}" wx:for-item="order" wx:key="T" class="order-inner data-v-2c2d73a5"><view class="order-inner-header data-v-2c2d73a5"><nut-tag wx:if="{{order.a}}" class="data-v-2c2d73a5" u-s="{{['d']}}" u-i="{{order.b}}" bind:__l="__l" u-p="{{order.c}}">房间订单</nut-tag><nut-tag wx:else class="data-v-2c2d73a5" u-s="{{['d']}}" u-i="{{order.e}}" bind:__l="__l" u-p="{{order.f||''}}">商品订单</nut-tag><nut-tag wx:if="{{order.g}}" class="data-v-2c2d73a5" u-s="{{['d']}}" u-i="{{order.i}}" bind:__l="__l" u-p="{{order.j}}">{{order.h}}</nut-tag><nut-tag wx:if="{{order.k}}" class="data-v-2c2d73a5" u-s="{{['d']}}" u-i="{{order.m}}" bind:__l="__l" u-p="{{order.n}}">{{order.l}}</nut-tag><nut-tag wx:elif="{{order.o}}" class="data-v-2c2d73a5" u-s="{{['d']}}" u-i="{{order.q}}" bind:__l="__l" u-p="{{order.r}}">{{order.p}}</nut-tag></view><view wx:if="{{order.s}}" class="goods-info-row data-v-2c2d73a5"><view class="left-text data-v-2c2d73a5"><view class="goods-name data-v-2c2d73a5"><nut-tag wx:if="{{order.w}}" class="data-v-2c2d73a5" u-s="{{['d']}}" u-i="{{order.v}}" bind:__l="__l" u-p="{{order.w}}">{{order.t}}</nut-tag><text wx:if="{{order.x}}" class="data-v-2c2d73a5" style="margin-left:10rpx"></text><text wx:elif="{{order.y}}" class="data-v-2c2d73a5" style="margin-left:10rpx">{{order.z}}</text></view></view><view wx:if="{{order.A}}" class="price data-v-2c2d73a5"> ¥{{order.B}}</view><view wx:elif="{{order.C}}" class="price data-v-2c2d73a5"> ¥{{order.D}}</view><view class="goods-pay-status data-v-2c2d73a5">{{order.E}}</view></view><view wx:if="{{order.F}}" class="goods-info-row data-v-2c2d73a5"><view class="left-text data-v-2c2d73a5"><view class="goods-name data-v-2c2d73a5"><nut-tag wx:if="{{order.H}}" class="data-v-2c2d73a5" u-s="{{['d']}}" u-i="{{order.G}}" bind:__l="__l" u-p="{{order.H}}">超时</nut-tag><text class="data-v-2c2d73a5" style="margin-left:10rpx">{{order.I}}小时</text></view></view><view class="price data-v-2c2d73a5"> ¥{{order.J}}</view><view class="goods-pay-status data-v-2c2d73a5">{{order.K}}</view></view><view wx:for="{{order.L}}" wx:for-item="goods" wx:key="f" class="goods-info-row data-v-2c2d73a5"><view class="left-text data-v-2c2d73a5"><view class="goods-name data-v-2c2d73a5"><nut-tag wx:if="{{b}}" class="data-v-2c2d73a5" u-s="{{['d']}}" u-i="{{goods.b}}" bind:__l="__l" u-p="{{b}}">{{goods.a}}</nut-tag><text class="data-v-2c2d73a5" style="margin-left:10rpx">{{goods.c}}</text></view></view><view class="price data-v-2c2d73a5"> ¥{{goods.d}}</view><view class="goods-pay-status data-v-2c2d73a5">{{goods.e}}</view></view><view class="footer data-v-2c2d73a5"><view class="order-inner-price data-v-2c2d73a5"><view class="data-v-2c2d73a5" style="display:flex">优惠： <view class="data-v-2c2d73a5" style="color:#fa2c19;font-size:26rpx"> ¥{{order.M}}</view></view><view class="data-v-2c2d73a5" style="display:flex">总计： <view class="data-v-2c2d73a5" style="color:#fa2c19;font-size:26rpx"> ¥{{order.N}}</view></view></view><view wx:if="{{order.O}}" class="data-v-2c2d73a5" style="padding-left:20rpx;font-size:26rpx">备注</view><view wx:if="{{order.P}}" class="remarks data-v-2c2d73a5">{{order.Q}}</view><view class="order-inner-price data-v-2c2d73a5"><view class="data-v-2c2d73a5" style="color:rgba(0, 0, 0, .5);font-size:24rpx">订单时间:{{order.R}}</view><view class="data-v-2c2d73a5" style="color:rgba(0, 0, 0, .5);font-size:24rpx">员工:{{order.S}}</view></view></view></view></z-paging></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/data/list.wxss b/unpackage/dist/dev/mp-weixin/pages/data/list.wxss
new file mode 100644
index 0000000..fc19c8d
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/data/list.wxss
@@ -0,0 +1,155 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.page-content.data-v-2c2d73a5 {
+  min-height: 100vh;
+  background-color: #f2f3f5;
+}
+.title-list.data-v-2c2d73a5 {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  width: 100%;
+}
+.title-list .title-item.data-v-2c2d73a5 {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  position: relative;
+}
+.title-list .tabs-active.data-v-2c2d73a5 {
+  font-weight: bold;
+  color: var(--nut-tabs-titles-item-active-color, var(--nut-title-color, #1a1a1a));
+  opacity: var(--nut-tabs-titles-item-line-opacity, 1);
+  transition: width 0.3s ease;
+}
+.title-list .tabs-active .item__line.data-v-2c2d73a5 {
+  position: absolute;
+  bottom: -10%;
+  left: 50%;
+  overflow: hidden;
+  content: " ";
+  border-radius: var(--nut-tabs-titles-item-line-border-radius, 0);
+  opacity: var(--nut-tabs-titles-item-line-opacity, 1);
+  transition: width 0.3s ease;
+  transform: translate(-50%, 0);
+  width: var(--nut-tabs-horizontal-titles-item-active-line-width, 40px);
+  height: 3px;
+  content: " ";
+  background: var(--nut-tabs-horizontal-tab-line-color, linear-gradient(90deg, var(--nut-primary-color, #fa2c19) 0%, rgba(250, 44, 25, 0.15) 100%));
+}
+.order-list.data-v-2c2d73a5 {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+.order-inner.data-v-2c2d73a5 {
+  display: flex;
+  flex-direction: column;
+  background: #fff;
+  border-radius: 15rpx;
+  overflow: hidden;
+  margin: 20rpx;
+  /* 信息行布局 */
+}
+.order-inner .order-inner-header.data-v-2c2d73a5 {
+  display: flex;
+  align-items: center;
+  font-size: 24rpx;
+  justify-content: space-between;
+  line-height: 45rpx;
+  padding: 15rpx 20rpx;
+  border-bottom: 2rpx solid #f2f3f5;
+}
+.order-inner .goods-info-row.data-v-2c2d73a5 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx;
+  border-bottom: 2rpx solid #f2f3f5;
+  /* 左侧文字样式 */
+  /* 右侧价格样式 */
+}
+.order-inner .goods-info-row .left-text.data-v-2c2d73a5 {
+  flex: 1;
+}
+.order-inner .goods-info-row .goods-name.data-v-2c2d73a5 {
+  font-size: 26rpx;
+  color: #000000;
+  display: block;
+}
+.order-inner .goods-info-row .price.data-v-2c2d73a5 {
+  font-size: 26rpx;
+  margin-left: 20rpx;
+  align-self: center;
+  color: #fa2c19;
+  /* 垂直居中在两行文字之间 */
+}
+.order-inner .goods-info-row .goods-pay-status.data-v-2c2d73a5 {
+  font-size: 26rpx;
+  margin-left: 20rpx;
+  align-self: center;
+}
+.order-inner .footer.data-v-2c2d73a5 {
+  display: flex;
+  flex-direction: column;
+}
+.order-inner .footer .order-inner-price.data-v-2c2d73a5 {
+  display: flex;
+  justify-content: space-evenly;
+  padding: 20rpx;
+  font-size: 24rpx;
+  align-items: center;
+}
+.order-inner .footer .remarks.data-v-2c2d73a5 {
+  padding: 20rpx;
+  color: rgba(0, 0, 0, 0.5);
+  font-size: 24rpx;
+}
\ No newline at end of file