diff --git a/mes-ui/mini-app/src/pages/receivingGoods/receivingGoods.vue b/mes-ui/mini-app/src/pages/receivingGoods/receivingGoods.vue
index 6bdf2600..1b1e4585 100644
--- a/mes-ui/mini-app/src/pages/receivingGoods/receivingGoods.vue
+++ b/mes-ui/mini-app/src/pages/receivingGoods/receivingGoods.vue
@@ -1,620 +1,703 @@
 <script setup lang="ts">
-import {onMounted, ref, } from "vue";
-import {
-  getReceivingGoods, postOperateAPI, receiveGoods, verification,
-} from "@/services/productionReport";
-import { useLoginStore } from "@/stores/modules/login";
+	import { onMounted, ref, } from "vue";
+	import {
+		getReceivingGoods, postOperateAPI, receiveGoods, verification,
+	} from "@/services/productionReport";
+	import { useLoginStore } from "@/stores/modules/login";
 
-const userStore = useLoginStore();
-const userId = userStore.userInfo.userId;
-const popup = ref<UniHelper.UniPopupInstance>()
+	const userStore = useLoginStore();
+	const userId = userStore.userInfo.userId;
+	const popup = ref<UniHelper.UniPopupInstance>()
+	const showPop = ref<UniHelper.UniPopupInstance>()
+	// 是否分页结束
+	const isFinish = ref(false);
+	// 是否触发下拉刷新
+	const isTriggered = ref(false);
+	const noticeMsg = ref("");
 
-// 是否分页结束
-const isFinish = ref(false);
-// 是否触发下拉刷新
-const isTriggered = ref(false);
-const noticeMsg = ref("");
+	const purchaseRemAmounts = ref("")
+	const estimatedPrice = ref("")
+	// 是否加载中标记，用于防止滚动触底触发多次请求
+	const isLoading = ref(false);
+	// 请求参
+	const queryParams : Required<any> = {
+		pageNo: 1,
+		pageSize: 5,
+		subOrDetailName: "",
+		projectName: undefined,
+		projectSubName: undefined,
+		supplierName: undefined,
+		boomName: undefined,
+		procedureName: undefined,
+		blueprintNo: undefined,
+	};
+	const dataList = ref([]);
+	const list = ref([]);
+	const getListData = async () => {
+		// 如果数据出于加载中，退出函数
+		if (isLoading.value) return;
+		if (isFinish.value === true) {
+			return uni.showToast({ icon: "none", title: "没有更多数据~" });
+		}
+		isLoading.value = true;
+		// 发送请求
+		const data = await getReceivingGoods(queryParams);
+		isLoading.value = false;
 
-const purchaseRemAmounts = ref("")
-const estimatedPrice = ref("")
-// 是否加载中标记，用于防止滚动触底触发多次请求
-const isLoading = ref(false);
-// 请求参
-const queryParams: Required<any> = {
-  pageNo: 1,
-  pageSize: 5,
-  subOrDetailName:"",
-  projectName:undefined,
-  projectSubName:undefined,
-  supplierName:undefined,
-  boomName:undefined,
-  procedureName:undefined,
-  blueprintNo:undefined,
-};
-const dataList = ref([]);
-const list = ref([]);
-const getListData = async () => {
-  // 如果数据出于加载中，退出函数
-  if (isLoading.value) return;
-  if (isFinish.value === true) {
-    return uni.showToast({ icon: "none", title: "没有更多数据~" });
-  }
-  isLoading.value = true;
-  // 发送请求
-  const data = await getReceivingGoods(queryParams);
-  isLoading.value = false;
+		dataList.value.push(...data.list);
+		// 分页条件
+		if (queryParams.pageNo < data.totalPages) {
+			// 页码累加
+			queryParams.pageNo++;
+		} else {
+			// 分页已结束
+			isFinish.value = true;
+		}
+	};
+	const todayStr = ref("");
+	const searchVal = ref("");
+	onMounted(async () => {
+		isFinish.value = false;
+		isLoading.value = false;
+		queryParams.pageNo = 1;
+		await getListData();
+	});
 
-  dataList.value.push(...data.list);
-  // 分页条件
-  if (queryParams.pageNo < data.totalPages) {
-    // 页码累加
-    queryParams.pageNo++;
-  } else {
-    // 分页已结束
-    isFinish.value = true;
-  }
-};
-const todayStr = ref("");
-const searchVal = ref("");
-onMounted(async () => {
-  isFinish.value = false;
-  isLoading.value = false;
-  queryParams.pageNo = 1;
-  await getListData();
-});
+	const isScanning = ref(false)
 
-const isScanning = ref(false)
-
-// 自定义下拉刷新被触发
-const onRefresherrefresh = async () => {
-  // 开始动画
-  isTriggered.value = true;
-  // 重置数据
-  queryParams.pageNo = 1;
-  dataList.value = [];
-  isFinish.value = false;
-  // 加载数据
-  await getListData();
-  // 关闭动画
-  isTriggered.value = false;
-};
+	// 自定义下拉刷新被触发
+	const onRefresherrefresh = async () => {
+		// 开始动画
+		isTriggered.value = true;
+		// 重置数据
+		queryParams.pageNo = 1;
+		dataList.value = [];
+		isFinish.value = false;
+		// 加载数据
+		await getListData();
+		// 关闭动画
+		isTriggered.value = false;
+	};
 
 
-const handleSearch = async (e) => {
-  // 重置状态
-  queryParams.pageNo = 1;
-  isFinish.value = false;
-  dataList.value = [];
+	const handleSearch = async (e) => {
+		// 重置状态
+		queryParams.pageNo = 1;
+		isFinish.value = false;
+		dataList.value = [];
 
-  // 设置搜索词
-  queryParams.subOrDetailName = e.inputValue;
-  searchVal.value = e.inputaVlue; // 同步输入框值
-  try {
-    await getListData();
-  } catch (error) {
-    console.error('搜索请求失败:', error);
-  }
-};
-const popUp = async (data) => {
-  estimatedPrice.value=data.estimatedPrice
-  purchaseRemAmounts.value=data.purchaseRemAmounts
-  list.value.push(data)
-  popup.value?.open()
-}
-const handleOk = async () => {
-  if (estimatedPrice.value==null||estimatedPrice.value==""||estimatedPrice.value==undefined||estimatedPrice.value==''||estimatedPrice.value<=0){
-    uni.showToast({
-      title: '预估总价不能为空',
-      icon: 'none',
-      duration: 2000
-    });
-    return
-  }
-  if (purchaseRemAmounts.value==null||purchaseRemAmounts.value==""||purchaseRemAmounts.value==undefined||purchaseRemAmounts.value<=0||purchaseRemAmounts.value==''){
-  uni.showToast({
-    title: '入库数量不能为空或为0',
-    icon: 'none',
-    duration: 2000
-  });
-    return
-  }
-  list.value[0].estimatedPrice=estimatedPrice.value
-  list.value[0].purchaseRemAmounts=purchaseRemAmounts.value
-  await verification(list.value[0])
-  const res = await Promise.race([
-  receiveGoods(list.value[0]),
-    new Promise((_, reject) =>
-        setTimeout(() => reject(new Error("请求超时")), 30000)
-    )
-  ]);
-  uni.showToast({
-    title: '收货成功',
-    icon: 'none',
-    duration: 2000
-  });
-  list.value=[]
-  estimatedPrice.value=""
-  purchaseRemAmounts.value=""
-  popup.value?.close()
-  await  getListData()
+		// 设置搜索词
+		queryParams.subOrDetailName = e.inputValue;
+		searchVal.value = e.inputaVlue; // 同步输入框值
+		try {
+			await getListData();
+		} catch (error) {
+			console.error('搜索请求失败:', error);
+		}
+	};
+	const popUp = async (data) => {
+		estimatedPrice.value = data.estimatedPrice
+		purchaseRemAmounts.value = data.purchaseRemAmounts
+		list.value.push(data)
+		popup.value?.open()
+	}
+	const handleOk = async () => {
+		if (estimatedPrice.value == null || estimatedPrice.value == "" || estimatedPrice.value == undefined || estimatedPrice.value == '' || estimatedPrice.value <= 0) {
+			uni.showToast({
+				title: '预估总价不能为空',
+				icon: 'none',
+				duration: 2000
+			});
+			return
+		}
+		if (purchaseRemAmounts.value == null || purchaseRemAmounts.value == "" || purchaseRemAmounts.value == undefined || purchaseRemAmounts.value <= 0 || purchaseRemAmounts.value == '') {
+			uni.showToast({
+				title: '入库数量不能为空或为0',
+				icon: 'none',
+				duration: 2000
+			});
+			return
+		}
+		list.value[0].estimatedPrice = estimatedPrice.value
+		list.value[0].purchaseRemAmounts = purchaseRemAmounts.value
+		await verification(list.value[0])
+		const res = await Promise.race([
+			receiveGoods(list.value[0]),
+			new Promise((_, reject) =>
+				setTimeout(() => reject(new Error("请求超时")), 30000)
+			)
+		]);
+		uni.showToast({
+			title: '收货成功',
+			icon: 'none',
+			duration: 2000
+		});
+		list.value = []
+		estimatedPrice.value = ""
+		purchaseRemAmounts.value = ""
+		popup.value?.close()
+		await getListData()
 
-}
-const cancel = () => {
-  list.value=[]
-  estimatedPrice.value=""
-  purchaseRemAmounts.value=""
-  popup.value?.close()
-}
+	}
+	const cancel = () => {
+		list.value = []
+		estimatedPrice.value = ""
+		purchaseRemAmounts.value = ""
+		popup.value?.close()
+	}
+	const filterData : Required<any> = ({
+		projectName: '',
+		subProjectName: '',
+		supplier: '',
+		partName: '',
+		process: '',
+		drawingNo: ''
+	})
+	// 切换下拉框显示状态
+	const toggleDropdown = () => {
+		showPop.value?.open()
+	}
+
+	// 取消过滤
+	const cancelFilter = () => {
+		showPop.value?.close()
+	}
+
+	// 确认过滤
+	const confirmFilter = () => {
+		// 清空搜索框内容
+		searchVal.value = '';
+		// 这里可以添加过滤逻辑
+		console.log('过滤数据:', filterData);
+		// 收起下拉区域
+		showPop.value?.close();
+	}
 </script>
 <template>
-  <view class="cont">
-    <view class="search">
-      <view
-          style="
-          width: 90%;
-          display: flex;
-          align-items: center;
-          background: #e2f3ff;
-          border-radius: 20rpx;
-          padding: 0 8rpx;
-          height: 50px;
-        "
-      >
-        <input
-            class="uni-input"
-            v-model="searchVal"
-            placeholder="请输入物料名称、图号、工序"
-            :placeholder-style="'color:#28A0F8;'"
-            style="
-            flex: 1;
-            background: transparent;
-            border: none;
-            outline: none;
-            font-size: 25rpx;
-            color: #28a0f8;
+<view class="cont">
+    <view class="search" style="display: flex; align-items: center;">
+        <view style="
+            width: 90%;
+            display: flex;
+            align-items: center;
+            background: #e2f3ff;
+            border-radius: 20rpx;
+            padding: 0 8rpx;
             height: 50px;
-            line-height: 50px;
-          "
-            @input="handleSearch({ inputValue: searchVal })"
-            clearable
-        />
-      </view>
-
+        ">
+            <input class="uni-input" v-model="searchVal" placeholder="请输入物料名称、图号、工序"
+                :placeholder-style="'color:#28A0F8;'" style="
+                flex: 1;
+                background: transparent;
+                border: none;
+                outline: none;
+                font-size: 25rpx;
+                color: #28a0f8;
+                height: 50px;
+                line-height: 50px;
+            " @input="handleSearch({ inputValue: searchVal })" clearable />
+        </view>
+        <view class="filter-btn" @click="toggleDropdown" style="margin-left: 10px;">
+            <image src="/static/images/shalou.jpeg" mode="aspectFit" class="filter-icon"></image>
+        </view>
     </view>
-    <scroll-view
-        enable-back-to-top
-        scroll-y
-        class="data-list"
-        refresher-enabled
-        :refresher-triggered="isTriggered"
-        @refresherrefresh="onRefresherrefresh"
-        @scrolltolower="getListData"
-    >
-      <view
-          class="item"
-          v-for="item in dataList"
-          :key="item.id"
-      >
-        <view class="hd">
-          <view class="num">图号：</view>
-          <view class="num">{{
+
+		<scroll-view enable-back-to-top scroll-y class="data-list" refresher-enabled :refresher-triggered="isTriggered"
+			@refresherrefresh="onRefresherrefresh" @scrolltolower="getListData">
+			<view class="item" v-for="item in dataList" :key="item.id">
+				<view class="hd">
+					<view class="num">图号：</view>
+					<view class="num">{{
            item.blueprintNo
             }}</view>
-          <view class="statusText1"  @click="popUp(item)" >
-            收货
-          </view>
-        </view>
-        <view class="md">
-          <view class="product-row">
-            <view class="row-item">
-              <view class="label">零件名称: {{ item.boomName }}</view>
-            </view>
-            <view class="row-item">
-              <view class="label" >派工工序: {{ item.procedureName }}</view>
-            </view>
-          </view>
-          <view class="product-row">
-            <view class="row-item">
-              <view class="label">采购数量: {{ item.purchaseAmount }}</view>
-            </view>
-            <view class="row-item">
-              <view class="label" >剩余数量: {{ item.purchaseRemAmount }}</view>
-            </view>
-          </view>
-          <view class="product-row">
-            <view class="row-item">
-              <view class="label">收货状态: {{ item.receivingStatus==1?"未收货":"收货中" }}</view>
-            </view>
-            <view class="row-item">
-              <view class="label" >物料类型: {{ item.goodsType==1?"物料":"加工件" }}</view>
-            </view>
-          </view>
-          <view class="product-row">
-            <view class="row-item">
-              <view class="label">完成日期: {{ item.requireTimes }}</view>
-            </view>
-            <view class="row-item">
-              <view class="label" >供应商: {{ item.supplierName }}</view>
-            </view>
-          </view>
-          <view class="product-row">
-            <view >
-              <view class="label">子项目编码: {{ item.projectSubCode }}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <!-- 底部提示文字 -->
+					<view class="statusText1" @click="popUp(item)">
+						收货
+					</view>
+				</view>
+				<view class="md">
+					<view class="product-row">
+						<view class="row-item">
+							<view class="label">零件名称: {{ item.boomName }}</view>
+						</view>
+						<view class="row-item">
+							<view class="label">派工工序: {{ item.procedureName }}</view>
+						</view>
+					</view>
+					<view class="product-row">
+						<view class="row-item">
+							<view class="label">采购数量: {{ item.purchaseAmount }}</view>
+						</view>
+						<view class="row-item">
+							<view class="label">剩余数量: {{ item.purchaseRemAmount }}</view>
+						</view>
+					</view>
+					<view class="product-row">
+						<view class="row-item">
+							<view class="label">收货状态: {{ item.receivingStatus==1?"未收货":"收货中" }}</view>
+						</view>
+						<view class="row-item">
+							<view class="label">物料类型: {{ item.goodsType==1?"物料":"加工件" }}</view>
+						</view>
+					</view>
+					<view class="product-row">
+						<view class="row-item">
+							<view class="label">完成日期: {{ item.requireTimes }}</view>
+						</view>
+						<view class="row-item">
+							<view class="label">供应商: {{ item.supplierName }}</view>
+						</view>
+					</view>
+					<view class="product-row">
+						<view>
+							<view class="label">子项目编码: {{ item.projectSubCode }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 底部提示文字 -->
 
 
-      <view
-          class="loading-text"
-          :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }"
-      >
-        {{ isFinish ? "没有更多数据~" : "正在加载..." }}
-      </view>
-      <uni-popup class="popup" ref="popup" :mask-click="false" type="bottom" background-color="#fff">
-        <view class="title">
-          <view class="text">填写信息</view>
-        </view>
-        <view class="cont">
-          <view class="item">
-            <view class="label"><span class="star">*</span>入库数量：</view>
-            <uni-easyinput class="val" type="digit" v-model="purchaseRemAmounts"
-                           placeholder="请输入本次入库数量"></uni-easyinput>
-          </view>
-          <view class="item">
-            <view class="label"><span class="star">*</span>预估总价：</view>
-            <uni-easyinput class="val" type="number" v-model="estimatedPrice"
-                           placeholder="请输入本次预估总价"></uni-easyinput>
-          </view>
-        </view>
-        <view class="button-group">
-          <view class="ok" @click="handleOk">确定</view>
-          <view class="cancel" @click="cancel">取消</view>
-        </view>
+			<view class="loading-text" :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }">
+				{{ isFinish ? "没有更多数据~" : "正在加载..." }}
+			</view>
+			<uni-popup class="popup" ref="popup" :mask-click="false" type="bottom" background-color="#fff">
+				<view class="title">
+					<view class="text">填写信息</view>
+				</view>
+				<view class="cont">
+					<view class="item">
+						<view class="label"><span class="star">*</span>入库数量：</view>
+						<uni-easyinput class="val" type="digit" v-model="purchaseRemAmounts"
+							placeholder="请输入本次入库数量"></uni-easyinput>
+					</view>
+					<view class="item">
+						<view class="label"><span class="star">*</span>预估总价：</view>
+						<uni-easyinput class="val" type="number" v-model="estimatedPrice"
+							placeholder="请输入本次预估总价"></uni-easyinput>
+					</view>
+				</view>
+				<view class="button-group">
+					<view class="ok" @click="handleOk">确定</view>
+					<view class="cancel" @click="cancel">取消</view>
+				</view>
 
-      </uni-popup>
-    </scroll-view>
-  </view>
+			</uni-popup>
+		</scroll-view>
+		<uni-popup class="popup" ref="showPop" :mask-click="false" type="top" background-color="#fff">
+			<view style="margin-top: 6%;">
+				<uni-forms  :modelValue="filterData">
+					<uni-forms-item label="姓名" name="projectName">
+						<uni-easyinput type="text" v-model="filterData.projectName" placeholder="请输入项目名称" />
+					</uni-forms-item>
+					<uni-forms-item label="年龄" name="subProjectName">
+						<uni-easyinput type="text" v-model="filterData.subProjectName" placeholder="请输入子项目名称" />
+					</uni-forms-item>
+					<uni-forms-item name="supplier" label="供应商">
+						<uni-easyinput type="text" v-model="filterData.supplier" placeholder="请输入供应商" />
+					</uni-forms-item>
+					<uni-forms-item label="姓名" name="partName">
+						<uni-easyinput type="text" v-model="filterData.partName" placeholder="请输入零件名称" />
+					</uni-forms-item>
+					<uni-forms-item label="年龄" name="process">
+						<uni-easyinput type="text" v-model="filterData.process" placeholder="请输入工序" />
+					</uni-forms-item>
+					<uni-forms-item name="drawingNo" label="图号">
+						<uni-easyinput type="text" v-model="filterData.drawingNo" placeholder="请输入图号" />
+					</uni-forms-item>
+				</uni-forms>
+			</view>
+		
+		
+			<view class="filter-buttons">
+				<view class="cancel" @click="cancelFilter">取消</view>
+				<view class="ok" @click="confirmFilter">确认</view>
+			</view>
+		
+		</uni-popup>
+	</view>
 </template>
 
 <style lang="scss">
+	.filter-buttons {
+		display: flex;
+		width: 100%;
+		justify-content: space-between;
+	}
+	.filter-btn {
+		padding: 10rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-left: auto; /* Push the filter button to the right */
+	
+		.filter-icon {
+			width: 40rpx;
+			height: 40rpx;
+		}
+	}
+	.filter-buttons .cancel {
+		background-color: white;
+		color: #333;
+		flex: 1;
+		text-align: center;
+		padding: 10px;
+		border: 1px solid #ddd;
+	}
+	
+	.filter-buttons .ok {
+		background-color: #007aff;
+		color: white;
+		flex: 1;
+		text-align: center;
+		padding: 10px;
+	}
+	// 订单列表
+	.search {
+		padding: 0rpx;
+		width: 90%;
+		margin: auto;
+		margin-top: 20rpx;
+		position: relative;
 
-// 订单列表
-.search {
-  padding: 0rpx;
-  width: 90%;
-  margin: auto;
-  margin-top: 20rpx;
-  position: relative;
-  .uni-input {
-    border: 1px solid #d1d6db;
-    height: 60rpx;
-    line-height: 60rpx;
-    padding: 4rpx 10rpx;
-    font-size: 32rpx;
-    border-radius: 10rpx;
-  }
-  .icons {
-    width: 30rpx;
-    position: absolute;
-    right: 40rpx;
-    top: 0rpx;
-  }
-}
+		.uni-input {
+			border: 1px solid #d1d6db;
+			height: 60rpx;
+			line-height: 60rpx;
+			padding: 4rpx 10rpx;
+			font-size: 32rpx;
+			border-radius: 10rpx;
+			flex: 1; /* Make the input take the remaining space */
+		}
 
-.data-list {
-  height: 90vh;
+		.icons {
+			width: 30rpx;
+			position: absolute;
+			right: 40rpx;
+			top: 0rpx;
+		}
 
-  .item {
-    position: relative;
-    padding: 20rpx 0;
-    margin: 20rpx 20rpx;
-    border-radius: 10rpx;
-    background-color: #fff;
-    box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
 
-    .hd {
-      padding: 10rpx;
-      font-size: 28rpx;
-      display: flex;
+	
+		
+	}
 
-      .statusLabel {
-        font-size: 24rpx;
-        color: #737d88;
-      }
-    }
+	.data-list {
+		height: 90vh;
 
-    .md {
-      position: relative;
-      padding: 10rpx;
-      min-height: 100rpx;
-      font-size: 28rpx;
-      border-top: 2rpx solid #f2f2f2;
+		.item {
+			position: relative;
+			padding: 20rpx 0;
+			margin: 20rpx 20rpx;
+			border-radius: 10rpx;
+			background-color: #fff;
+			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
 
-      .product-item {
-        margin: 20rpx 0;
-        display: flex;
-        align-items: center;
-        color: #737d88;
-      }
+			.hd {
+				padding: 10rpx;
+				font-size: 28rpx;
+				display: flex;
 
-      .product-row {
-        margin: 20rpx 0;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        color: #737d88;
+				.statusLabel {
+					font-size: 24rpx;
+					color: #737d88;
+				}
+			}
 
-        .row-item {
-          flex: 1;
+			.md {
+				position: relative;
+				padding: 10rpx;
+				min-height: 100rpx;
+				font-size: 28rpx;
+				border-top: 2rpx solid #f2f2f2;
 
-          .label {
-            margin-bottom: 10rpx;
-          }
+				.product-item {
+					margin: 20rpx 0;
+					display: flex;
+					align-items: center;
+					color: #737d88;
+				}
 
-          .val {
-            color: #1d2129;
+				.product-row {
+					margin: 20rpx 0;
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+					color: #737d88;
 
-            &.high-color {
-              color: #00b42a;
-            }
-          }
-        }
-      }
-    }
-    .statusText1 {
-      font-size: 24rpx;
-      position: absolute;
-      right: 30rpx;
-      top: 15rpx;
-      border-radius: 10rpx;
-      font-size: 24rpx;
-      padding: 10rpx 30rpx;
-      border-radius: 10rpx;
-      font-size: 24rpx;
-      background: linear-gradient(149deg, #4CAF50 4%, #388E3C 98%);
-      color: #fff;
+					.row-item {
+						flex: 1;
 
-    }
+						.label {
+							margin-bottom: 10rpx;
+						}
 
-    &:last-child {
-      padding-bottom: 40rpx;
-    }
-  }
+						.val {
+							color: #1d2129;
 
-  .status {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 28rpx;
-    color: #999;
-    margin-bottom: 15rpx;
+							&.high-color {
+								color: #00b42a;
+							}
+						}
+					}
+				}
+			}
 
-    .date {
-      color: #666;
-      flex: 1;
-    }
+			.statusText1 {
+				font-size: 24rpx;
+				position: absolute;
+				right: 30rpx;
+				top: 15rpx;
+				border-radius: 10rpx;
+				font-size: 24rpx;
+				padding: 10rpx 30rpx;
+				border-radius: 10rpx;
+				font-size: 24rpx;
+				background: linear-gradient(149deg, #4CAF50 4%, #388E3C 98%);
+				color: #fff;
 
-    .primary {
-      color: #ff9240;
-    }
+			}
 
-    .icon-delete {
-      line-height: 1;
-      margin-left: 10rpx;
-      padding-left: 10rpx;
-      border-left: 1rpx solid #e3e3e3;
-    }
-  }
+			&:last-child {
+				padding-bottom: 40rpx;
+			}
+		}
 
-  .goods {
-    display: flex;
-    margin-bottom: 20rpx;
+		.status {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			font-size: 28rpx;
+			color: #999;
+			margin-bottom: 15rpx;
 
-    .cover {
-      width: 170rpx;
-      height: 170rpx;
-      margin-right: 20rpx;
-      border-radius: 10rpx;
-      overflow: hidden;
-      position: relative;
+			.date {
+				color: #666;
+				flex: 1;
+			}
 
-      .image {
-        width: 170rpx;
-        height: 170rpx;
-      }
-    }
+			.primary {
+				color: #ff9240;
+			}
 
-    .quantity {
-      position: absolute;
-      bottom: 0;
-      right: 0;
-      line-height: 1;
-      padding: 6rpx 4rpx 6rpx 8rpx;
-      font-size: 24rpx;
-      color: #fff;
-      border-radius: 10rpx 0 0 0;
-      background-color: rgba(0, 0, 0, 0.6);
-    }
+			.icon-delete {
+				line-height: 1;
+				margin-left: 10rpx;
+				padding-left: 10rpx;
+				border-left: 1rpx solid #e3e3e3;
+			}
+		}
 
-    .meta {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-    }
+		.goods {
+			display: flex;
+			margin-bottom: 20rpx;
 
-    .name {
-      height: 80rpx;
-      font-size: 26rpx;
-      color: #444;
-    }
+			.cover {
+				width: 170rpx;
+				height: 170rpx;
+				margin-right: 20rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+				position: relative;
 
-    .type {
-      line-height: 1.8;
-      padding: 0 15rpx;
-      margin-top: 10rpx;
-      font-size: 24rpx;
-      align-self: flex-start;
-      border-radius: 4rpx;
-      color: #888;
-      background-color: #f7f7f8;
-    }
+				.image {
+					width: 170rpx;
+					height: 170rpx;
+				}
+			}
 
-    .more {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 22rpx;
-      color: #333;
-    }
-  }
+			.quantity {
+				position: absolute;
+				bottom: 0;
+				right: 0;
+				line-height: 1;
+				padding: 6rpx 4rpx 6rpx 8rpx;
+				font-size: 24rpx;
+				color: #fff;
+				border-radius: 10rpx 0 0 0;
+				background-color: rgba(0, 0, 0, 0.6);
+			}
 
-  .payment {
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-    line-height: 1;
-    padding: 20rpx 0;
-    text-align: right;
-    color: #999;
-    font-size: 28rpx;
-    border-bottom: 1rpx solid #eee;
+			.meta {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
 
-    .quantity {
-      font-size: 24rpx;
-      margin-right: 16rpx;
-    }
+			.name {
+				height: 80rpx;
+				font-size: 26rpx;
+				color: #444;
+			}
 
-    .amount {
-      color: #444;
-      margin-left: 6rpx;
-    }
+			.type {
+				line-height: 1.8;
+				padding: 0 15rpx;
+				margin-top: 10rpx;
+				font-size: 24rpx;
+				align-self: flex-start;
+				border-radius: 4rpx;
+				color: #888;
+				background-color: #f7f7f8;
+			}
 
-    .symbol {
-      font-size: 20rpx;
-    }
-  }
+			.more {
+				flex: 1;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 22rpx;
+				color: #333;
+			}
+		}
 
-  .action {
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-    padding-top: 20rpx;
+		.payment {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			line-height: 1;
+			padding: 20rpx 0;
+			text-align: right;
+			color: #999;
+			font-size: 28rpx;
+			border-bottom: 1rpx solid #eee;
 
-    .button {
-      width: 180rpx;
-      height: 60rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin-left: 20rpx;
-      border-radius: 60rpx;
-      border: 1rpx solid #ccc;
-      font-size: 26rpx;
-      color: #444;
-    }
+			.quantity {
+				font-size: 24rpx;
+				margin-right: 16rpx;
+			}
 
-    .secondary {
-      color: #3775f6;
-      border-color: #3775f6;
-    }
+			.amount {
+				color: #444;
+				margin-left: 6rpx;
+			}
 
-    .primary {
-      color: #fff;
-      background-color: #3775f6;
-      border-color: #3775f6;
-    }
-  }
+			.symbol {
+				font-size: 20rpx;
+			}
+		}
 
-  .loading-text {
-    text-align: center;
-    font-size: 28rpx;
-    color: #666;
-    padding: 20rpx 0;
-  }
-}
-.popup {
-  .title {
-    line-height: 1;
-    padding: 40rpx;
-    font-size: 32rpx;
-    font-weight: normal;
-    border-bottom: 1rpx solid #ddd;
-    color: #444;
+		.action {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			padding-top: 20rpx;
 
-    .close {
-      position: absolute;
-      right: 24rpx;
-      top: 40rpx;
-      height: 60rpx;
-      width: 60rpx;
-      text-align: center;
-    }
-  }
+			.button {
+				width: 180rpx;
+				height: 60rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-left: 20rpx;
+				border-radius: 60rpx;
+				border: 1rpx solid #ccc;
+				font-size: 26rpx;
+				color: #444;
+			}
 
-  .cont {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin: 40rpx;
-    height: 50vh;
+			.secondary {
+				color: #3775f6;
+				border-color: #3775f6;
+			}
 
-    .item {
-      display: flex;
-      align-items: center;
-      margin: 100rpx 20rpx 0 0;
-      color: #737D88;
-      width: 94%;
+			.primary {
+				color: #fff;
+				background-color: #3775f6;
+				border-color: #3775f6;
+			}
+		}
 
-      .label {
-        font-size: 32rpx;
-        width: 260rpx;
+		.loading-text {
+			text-align: center;
+			font-size: 28rpx;
+			color: #666;
+			padding: 20rpx 0;
+		}
+	}
 
-        .star {
-          color: red
-        }
-      }
+	.popup {
+		.title {
+			line-height: 1;
+			padding: 40rpx;
+			font-size: 32rpx;
+			font-weight: normal;
+			border-bottom: 1rpx solid #ddd;
+			color: #444;
 
-      .val {
-        flex: 1;
-        font-size: 32rpx;
-      }
+			.close {
+				position: absolute;
+				right: 24rpx;
+				top: 40rpx;
+				height: 60rpx;
+				width: 60rpx;
+				text-align: center;
+			}
+		}
 
-      .unit {
-        width: 100rpx;
-        margin-left: 4rpx;
-        text-align: center;
-      }
-    }
-  }
+		.cont {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin: 40rpx;
+			height: 50vh;
 
-  /* 新增按钮组容器样式 */
-  .button-group {
-    display: flex;          /* 开启弹性布局 */
-    justify-content: center; /* 水平居中对齐 */
-    gap: 20rpx;              /* 按钮间距 */
-  }
+			.item {
+				display: flex;
+				align-items: center;
+				margin: 100rpx 20rpx 0 0;
+				color: #737D88;
+				width: 94%;
 
-  /* 修正原有 .ok 样式 */
-  .ok, .cancel {
-    font-size: 32rpx;
-    text-align: center;
-    width: 200rpx;
-    border-radius: 10rpx;
-    padding: 8rpx 0;
-    background-color: #3C8AF7;
-    color: #fff;
-    margin: 20rpx auto 80rpx;
-    /* 移除原有的 margin: 20rpx auto 80rpx; */
-  }
+				.label {
+					font-size: 32rpx;
+					width: 260rpx;
 
-  /* 可选：为取消按钮添加不同样式 */
-  .cancel {
-    background: linear-gradient(157deg, #A9A9A9 -3%, #A9A9A9 90%);
-  }
-}
-</style>import type { stringify } from 'querystring';
+					.star {
+						color: red
+					}
+				}
+
+				.val {
+					flex: 1;
+					font-size: 32rpx;
+				}
+
+				.unit {
+					width: 100rpx;
+					margin-left: 4rpx;
+					text-align: center;
+				}
+			}
+		}
+
+		/* 新增按钮组容器样式 */
+		.button-group {
+			display: flex;
+			/* 开启弹性布局 */
+			justify-content: center;
+			/* 水平居中对齐 */
+			gap: 20rpx;
+			/* 按钮间距 */
+		}
+
+		/* 修正原有 .ok 样式 */
+		.ok,
+		.cancel {
+			font-size: 32rpx;
+			text-align: center;
+			width: 200rpx;
+			border-radius: 10rpx;
+			padding: 8rpx 0;
+			background-color: #3C8AF7;
+			color: #fff;
+			margin: 20rpx auto 80rpx;
+			/* 移除原有的 margin: 20rpx auto 80rpx; */
+		}
+
+		/* 可选：为取消按钮添加不同样式 */
+		.cancel {
+			background: linear-gradient(157deg, #A9A9A9 -3%, #A9A9A9 90%);
+		}
+	}
+</style>