diff --git a/src/components/layout/HeaderNav.vue b/src/components/layout/HeaderNav.vue
index 1d4ec3b..95e5c84 100644
--- a/src/components/layout/HeaderNav.vue
+++ b/src/components/layout/HeaderNav.vue
@@ -94,10 +94,11 @@
 
         <!-- 电话 -->
         <div class="phone-entry">
-          <div>
+          <div style="display: flex;align-items: center;">
             <img
               src="https://static.ticket.sz-trip.com/shiweisuzhou/pc/login/phone.png"
               alt="联系电话"
+              style="margin-right: 5px;"
             />
             <span>0512-680541</span>
             <span class="cart-count" v-if="cartTotalCount > 0 && false">{{
diff --git a/src/libs/utils.js b/src/libs/utils.js
index 94ec3c9..22b897e 100644
--- a/src/libs/utils.js
+++ b/src/libs/utils.js
@@ -60,7 +60,7 @@ export default {
 				if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
 					return img;
 				} else {
-					return 'https://static.ticket.sz-trip.com' + img;
+					return process.env.VUE_APP_URL + img;
 				}
 			},
 
@@ -73,6 +73,20 @@ export default {
 					}
 				});
 			},
+
+			copyId(value) {
+				const input = document.createElement('input');
+				input.value = value;
+				document.body.appendChild(input);
+				input.select();
+				document.execCommand('copy');
+				document.body.removeChild(input);
+				
+				Vue.prototype.$message({
+					message: '复制成功',
+					type: 'success'
+				});
+			},
 		}
 	}
 }
diff --git a/src/views/Order/Index.vue b/src/views/Order/Index.vue
index 41d80e6..131b115 100644
--- a/src/views/Order/Index.vue
+++ b/src/views/Order/Index.vue
@@ -79,7 +79,7 @@
           <el-option
             v-for="(title, index) in invoiceTitles"
             :key="index"
-            :label="title.name"
+            :label="title.invoice_head"
             :value="title.id"
           ></el-option>
         </el-select>
@@ -364,13 +364,15 @@ export default {
             ...this.titleForm,
           };
 
-          this.post(this.titleForm).then((res) => {
-            if (res.code == 1) {
-              this.getInvoiceList();
-              this.$message.success("发票抬头添加成功");
-              this.invoiceTitleDialogVisible = false;
+          this.post(this.titleForm, "/api/enterprise_invoice/create").then(
+            (res) => {
+              if (res.code == 1) {
+                this.getInvoiceList();
+                this.$message.success("发票抬头添加成功");
+                this.invoiceTitleDialogVisible = false;
+              }
             }
-          });
+          );
         }
       });
     },
diff --git a/src/views/Order/OrderDetail.vue b/src/views/Order/OrderDetail.vue
index 13fc867..22a0a5a 100644
--- a/src/views/Order/OrderDetail.vue
+++ b/src/views/Order/OrderDetail.vue
@@ -33,15 +33,22 @@
           >
         </div>
 
-        <el-button type="primary" size="medium">在线付款</el-button>
-        <el-button type="text" size="small" style="padding: 0"
-          >打印订单</el-button
+        <el-button
+          type="primary"
+          size="medium"
+          v-if="info.state != 'WAIT_COMMENT'"
+          >在线付款</el-button
         >
+        <!-- <el-button type="text" size="small" style="padding: 0"
+          >打印订单</el-button
+        > -->
       </div>
       <div class="order-step">
-        <el-steps :active="2" align-center style="width: 100%">
+        <el-steps :active="activities.length" align-center style="width: 100%">
           <el-step v-for="(item, i) in activities" :key="i">
-            <div class="process-title" slot="title">{{ item.remark }}</div>
+            <div class="process-title" slot="description">
+              {{ item.remark }}
+            </div>
             <div slot="icon">
               <span v-if="i >= 2">{{ i + 1 }}</span>
               <i v-else style="color: #fff" class="el-icon-check"></i>
@@ -61,41 +68,41 @@
     >
       <el-descriptions title="订单信息" :column="1">
         <el-descriptions-item label="订单号">{{
-          orderInfo.orderNumber
+          info.order_id
         }}</el-descriptions-item>
         <el-descriptions-item label="订单状态">{{
-          orderInfo.status
+          info.state_text
         }}</el-descriptions-item>
         <el-descriptions-item label="下单时间">{{
-          orderInfo.orderTime
+          info.create_time
         }}</el-descriptions-item>
       </el-descriptions>
       <el-descriptions title="配送信息" :column="1">
         <el-descriptions-item label="收货人">{{
-          deliveryInfo.receiver
+          info.order_product_list[0].consignee_info.name
         }}</el-descriptions-item>
         <el-descriptions-item label="地址">{{
-          deliveryInfo.address
+          info.order_product_list[0].consignee_info.address
         }}</el-descriptions-item>
         <el-descriptions-item label="手机号码">{{
-          deliveryInfo.phone
+          info.order_product_list[0].consignee_info.tel
         }}</el-descriptions-item>
-        <el-descriptions-item label="配送方式">{{
+        <!-- <el-descriptions-item label="配送方式">{{
           deliveryInfo.deliveryMethod
         }}</el-descriptions-item>
         <el-descriptions-item label="期望送达时间">{{
           deliveryInfo.expectedDeliveryTime
-        }}</el-descriptions-item>
+        }}</el-descriptions-item> -->
       </el-descriptions>
-      <el-descriptions title="支付信息" :column="1" style="border: none">
+      <el-descriptions title="支付信息" :column="1" style="border: none" v-if="info.pay_method_text">
         <el-descriptions-item label="支付方式">{{
-          paymentInfo.paymentMethod
+          info.pay_method_text
         }}</el-descriptions-item>
-        <el-descriptions-item label="支付状态">{{
+        <!-- <el-descriptions-item label="支付状态">{{
           paymentInfo.paymentStatus
-        }}</el-descriptions-item>
+        }}</el-descriptions-item> -->
         <el-descriptions-item label="支付时间">{{
-          paymentInfo.paymentTime
+          info.pay_at
         }}</el-descriptions-item>
       </el-descriptions>
     </div>
@@ -106,24 +113,32 @@
       <el-table-column prop="name" label="商品名称" align="center">
         <template slot-scope="{ row }">
           <div style="display: flex; align-items: center">
-            <img :src="row.image" class="product-image" :alt="row.name" />
-            <div>{{ row.name }}</div>
+            <img
+              :src="row.product_img"
+              class="product-image"
+              :alt="row.product_title"
+            />
+            <div>{{ row.product_title }}</div>
           </div>
         </template>
       </el-table-column>
       <el-table-column
-        prop="spec"
+        prop="sku_name"
         label="规格"
         align="center"
       ></el-table-column>
       <el-table-column
-        prop="price"
+        prop="product_price"
         label="单价(元)"
         align="center"
         width="200"
-      ></el-table-column>
+      >
+        <template slot-scope="{ row }">
+          <div>{{ row.product_price / 100 }}</div>
+        </template>
+      </el-table-column>
       <el-table-column
-        prop="quantity"
+        prop="product_num"
         label="数量"
         align="center"
         width="100"
@@ -135,7 +150,7 @@
         width="200"
       >
         <template slot-scope="{ row }">
-          <div style="color: #ff1111">￥{{ row.subtotal }}</div>
+          <div style="color: #ff1111">￥{{ row.paid_money / 100 }}</div>
         </template>
       </el-table-column>
     </el-table>
@@ -144,14 +159,14 @@
     <div class="common-card normal-margin-bottom total-card">
       <el-descriptions :column="1">
         <el-descriptions-item label="商品总价"
-          >￥{{ totalPrice.productTotal }}</el-descriptions-item
+          >￥{{ info.total_money / 100 }}</el-descriptions-item
         >
         <el-descriptions-item label="运费"
-          >￥{{ totalPrice.shippingFee }}</el-descriptions-item
+          >￥{{ info.total_post_fee / 100 }}</el-descriptions-item
         >
         <el-descriptions-item label="实付款">
           <span style="font-size: 16px; font-weight: bold; color: #ff1111"
-            >￥{{ totalPrice.actualPayment }}</span
+            >￥{{ info.paid_money / 100 }}</span
           >
         </el-descriptions-item>
       </el-descriptions>
@@ -183,24 +198,7 @@ export default {
         paymentStatus: "已支付",
         paymentTime: "2025-08-01 15:35:00",
       },
-      productList: [
-        {
-          name: "商品1",
-          spec: "规格1",
-          price: 100,
-          quantity: 1,
-          subtotal: 100,
-          image: "https://picsum.photos/200/200?random=1",
-        },
-        {
-          name: "商品2",
-          spec: "规格2",
-          price: 200,
-          quantity: 2,
-          subtotal: 400,
-          image: "https://picsum.photos/200/200?random=1",
-        },
-      ],
+      productList: [],
       totalPrice: {
         productTotal: 500,
         shippingFee: 0,
@@ -222,6 +220,11 @@ export default {
         "/api/order/query"
       ).then((res) => {
         this.info = res.data;
+        this.productList = this.info.order_product_list;
+        this.info.order_product_list.forEach((item) => {
+          if (item.product_model === "post" && item.consignee_info)
+            item.consignee_info = JSON.parse(item.consignee_info);
+        });
       });
 
       // 订单流程记录
@@ -258,7 +261,7 @@ export default {
   display: flex;
   flex-direction: column;
   align-items: center;
-  justify-content: space-between;
+  justify-content: space-around;
   .order-no {
     color: #999;
     .el-button {
@@ -309,12 +312,12 @@ export default {
     color: #666;
     font-weight: bold;
     font-size: 14px;
-    margin-top: -70px;
+    margin-top: 20px;
   }
   .process-description {
     color: #666;
     font-size: 12px;
-    margin-top: 45px;
+    // margin-top: 45px;
   }
   ::v-deep .is-finish .el-step__icon {
     background: #67c23a;
diff --git a/src/views/User/ContractList.vue b/src/views/User/ContractList.vue
index 548b19f..ba19df7 100644
--- a/src/views/User/ContractList.vue
+++ b/src/views/User/ContractList.vue
@@ -1,27 +1,38 @@
 <template>
   <div class="bg">
-    <div class="notice-bar" >
+    <div class="notice-bar">
       <div class="notice-bar__content">
         <div>说明：</div>
         <div>1.订单提交成功，系统将根据订单内容自动为您创建交易合同。</div>
         <div>2.您可直接“下载合同模板”，线下邮寄盖章使用。</div>
       </div>
-      
     </div>
 
     <div class="filter-bar">
       <el-form :inline="true" :model="filterForm" size="small">
         <el-form-item label="合同号">
-          <el-input v-model="filterForm.orderNo" placeholder="请输入订单编号"></el-input>
+          <el-input
+            v-model="filterForm.contract_number"
+            placeholder="请输入合同号"
+          ></el-input>
         </el-form-item>
         <el-form-item label="订单编号">
-          <el-input v-model="filterForm.orderNo" placeholder="请输入订单编号"></el-input>
+          <el-input
+            v-model="filterForm.order_id"
+            placeholder="请输入订单编号"
+          ></el-input>
         </el-form-item>
         <el-form-item label="下单时间">
-          <el-date-picker v-model="filterForm.createTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" value-format="yyyy-MM-dd"></el-date-picker>
+          <el-date-picker
+            v-model="filterForm.datetime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          ></el-date-picker>
         </el-form-item>
-        <el-form-item label="供应商名称">
+        <!-- <el-form-item label="供应商名称">
           <el-input v-model="filterForm.orderNo" placeholder="请输入订单编号"></el-input>
         </el-form-item>
         <el-form-item label="商品名称">
@@ -31,10 +42,15 @@
           <el-input-number v-model="filterForm.min"></el-input-number>
           至
           <el-input-number v-model="filterForm.max"></el-input-number>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item>
-          <el-button style="background:#6a8a27;border: none;" type="primary" @click="search">搜索</el-button>
+          <el-button
+            style="background: #6a8a27; border: none"
+            type="primary"
+            @click="search"
+            >搜索</el-button
+          >
         </el-form-item>
         <el-form-item>
           <el-button @click="reset">重置</el-button>
@@ -42,453 +58,407 @@
       </el-form>
     </div>
 
-    <el-table :data="orders" border style="width: 100%;">
-            <el-table-column prop="createTime" label="下单时间" width="200"></el-table-column>
-            <el-table-column prop="orderNo" label="订单号" min-width="120"></el-table-column>
-            <el-table-column prop="status" label="商品信息" width="120"></el-table-column>
-            <el-table-column prop="totalAmount" label="合同号" width="120"></el-table-column>
-            <el-table-column prop="orderNo" label="合同金额" min-width="120"></el-table-column>
-            <el-table-column label="操作" width="200">
-                <template slot-scope="scope">
-                <el-button size="mini" @click="handleEdit(scope.row)">查看</el-button>
-                <el-button size="mini" type="danger" @click="handleDelete(scope.row)">下载合同模板</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div style="text-align: right; margin-top: 20px;">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="filterForm.currentPage"
-            :page-sizes="[5, 10, 20]"
-            :page-size="filterForm.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="filterForm.total"
-          ></el-pagination>
-        </div>
+    <el-table :data="orders" border style="width: 100%">
+      <el-table-column
+        prop="create_time"
+        label="下单时间"
+        width="160"
+      ></el-table-column>
+      <el-table-column
+        prop="order_id"
+        label="订单号"
+        min-width="100"
+      ></el-table-column>
+      <el-table-column prop="status" label="商品信息" min-width="200">
+        <template slot-scope="scope">
+          <div class="product-info">
+            <img
+              :src="util.showImg(scope.row.product_headimg)"
+              class="product-img"
+            />
+            <div class="product-name">
+              {{ scope.row.product_title }}
+              {{
+                scope.row.child_order_num > 1
+                  ? "等" + scope.row.child_order_num + "款"
+                  : ""
+              }}
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="contract_number"
+        label="合同号"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="paid_money"
+        label="合同金额"
+        min-width="70"
+      ></el-table-column>
+      <el-table-column label="操作" width="130">
+        <template slot-scope="scope" v-if="scope.row.contract_number">
+          <!-- <el-button size="mini" @click="handlePreview(scope.row.contract_url)"
+            >查看</el-button
+          > -->
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDownload(scope.row)"
+            >下载合同模板</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="text-align: right; margin-top: 20px">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-sizes="[5, 10, 20]"
+        :page-size="filterForm.limit"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="filterForm.total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'OrderList',
-   data () {
-     return {
-        activeTab: 'all',
-        currentPage: 1,
-        pageSize: 10,
-        filterForm: {
-          goodsName: '',
-          orderNo: '',
-          createTime: '',
-          merchantName: '',
-          tradeStatus: ''
-        },
-        // 订单数据 - 按商家合并商品
-        orders: [
-          {
-            id: 1,
-            orderNo: '209907091214560078',
-            createTime: '2099-07-09 10:47:49',
-            status: 'pendingPayment',
-            totalAmount: 937,
-            freight: 15,
-            isReviewed: false,
-            merchant: {
-              id: 101,
-              name: '花艺生活馆',
-              isOfficial: true
-            },
-            products: [
-              {
-                id: 1001,
-                name: '深情挚爱/卡罗拉玫瑰',
-                image: 'https://picsum.photos/200/200?random=1',
-                spec: '卡罗拉玫瑰33枝',
-                price: 349,
-                quantity: 1,
-                status: 'pendingPayment'
-              },
-              {
-                id: 1002,
-                name: '精美包装纸',
-                image: 'https://picsum.photos/200/200?random=4',
-                spec: '粉色',
-                price: 38,
-                quantity: 2,
-                status: 'pendingPayment'
-              }
-            ]
-          },
-          {
-            id: 2,
-            orderNo: '209907091214560079',
-            createTime: '2099-07-09 10:48:49',
-            status: 'pendingDelivery',
-            totalAmount: 199,
-            freight: 0,
-            isReviewed: false,
-            merchant: {
-              id: 102,
-              name: '北欧家居旗舰店',
-              isOfficial: true
-            },
-            products: [
-              {
-                id: 2001,
-                name: '北欧花艺素雅仿真花',
-                image: 'https://picsum.photos/200/200?random=2',
-                spec: '白色',
-                price: 199,
-                quantity: 1,
-                status: 'pendingDelivery'
-              }
-            ]
-          },
-          {
-            id: 3,
-            orderNo: '209907091214560080',
-            createTime: '2099-07-09 10:49:49',
-            status: 'delivering',
-            totalAmount: 389,
-            freight: 10,
-            isReviewed: false,
-            merchant: {
-              id: 101,
-              name: '花艺生活馆',
-              isOfficial: true
-            },
-            products: [
-              {
-                id: 3001,
-                name: '香槟玫瑰+白玫瑰混搭',
-                image: 'https://picsum.photos/200/200?random=3',
-                spec: '混搭',
-                price: 389,
-                quantity: 1,
-                status: 'delivering'
-              }
-            ]
-          }
-        ]
-    }
+  name: "OrderList",
+  data() {
+    return {
+      activeTab: "all",
+      currentPage: 1,
+      filterForm: {
+        contract_number: "",
+        datetime: "",
+        order_id: "",
+        limit: 10,
+      },
+      orders: [],
+    };
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    // 查看合同（预览PDF）
+    handlePreview(pdfUrl) {
+      window.open(pdfUrl, "_blank");
     },
-    computed: {
-    // 过滤后的订单列表
-    filteredOrders() {
-        let result = [...this.orders];
-        
-        // 根据当前标签页过滤
-        if (this.activeTab !== 'all') {
-        result = result.filter(order => order.status === this.activeTab);
-        }
-        
-        // 根据商品名称过滤
-        if (this.filterForm.goodsName) {
-        const keyword = this.filterForm.goodsName.toLowerCase();
-        result = result.filter(order => {
-            return order.products.some(product => 
-            product.name.toLowerCase().includes(keyword)
-            );
-        });
-        }
-        
-        // 根据订单编号过滤
-        if (this.filterForm.orderNo) {
-        result = result.filter(order => 
-            order.orderNo.includes(this.filterForm.orderNo)
-        );
-        }
-        
-        // 根据商家名称过滤
-        if (this.filterForm.merchantName) {
-        const keyword = this.filterForm.merchantName.toLowerCase();
-        result = result.filter(order => 
-            order.merchant.name.toLowerCase().includes(keyword)
-        );
-        }
-        
-        // 根据交易状态过滤
-        if (this.filterForm.tradeStatus) {
-        result = result.filter(order => 
-            order.status === this.filterForm.tradeStatus
-        );
-        }
-        
-        return result;
-    }
+
+    // 下载合同
+    handleDownload(row) {
+      const downloadUrl = this.util.showImg(row.contract_url);
+      // 创建隐藏的下载链接并触发点击
+      const link = document.createElement("a");
+      link.href = downloadUrl;
+      link.download = `合同${row.contract_number}.pdf`;
+      link.style.display = "none";
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+
+      this.$message({
+        message: `合同 ${row.contract_number} 开始下载`,
+        type: "success",
+      });
+    },
+    // 获取合同列表
+    getList() {
+      this.get(
+        {
+          offset: (this.currentPage - 1) * this.filterForm.limit,
+          ...this.filterForm,
+        },
+        "/api/order/orderContract"
+      ).then((res) => {
+        this.orders = res.data;
+      });
     },
-    methods: {
     // 搜索
     search() {
-        this.currentPage = 1; // 重置到第一页
-        this.$message({
-        message: '搜索条件已应用',
-        type: 'info'
-        });
+      this.currentPage = 1; // 重置到第一页
+      this.getList()
     },
-    
+
     // 重置
     reset() {
-        this.filterForm = {
-        goodsName: '',
-        orderNo: '',
-        createTime: '',
-        merchantName: '',
-        tradeStatus: ''
-        };
-        this.activeTab = 'all';
-        this.currentPage = 1;
+      this.filterForm = {
+        order_id: "",
+        createTime: "",
+        contract_number: "",
+      };
+      this.activeTab = "all";
+      this.currentPage = 1;
     },
-    
+
     // 分页大小改变
     handleSizeChange(val) {
-        this.pageSize = val;
+      this.filterForm.limit = val;
     },
-    
+
     // 当前页改变
     handleCurrentChange(val) {
-        this.currentPage = val;
+      this.currentPage = val;
     },
-    
+
     // 获取状态显示文本
     getStatusText(status) {
-        const statusMap = {
-        pendingPayment: '待付款',
-        pendingDelivery: '待发货',
-        delivering: '配送中',
-        completed: '已完成',
-        cancelled: '已取消'
-        };
-        return statusMap[status] || status;
+      const statusMap = {
+        pendingPayment: "待付款",
+        pendingDelivery: "待发货",
+        delivering: "配送中",
+        completed: "已完成",
+        cancelled: "已取消",
+      };
+      return statusMap[status] || status;
     },
-    
+
     // 获取状态标签类型
     getStatusTagType(status) {
-        const typeMap = {
-        pendingPayment: 'warning',
-        pendingDelivery: 'info',
-        delivering: 'primary',
-        completed: 'success',
-        cancelled: 'danger'
-        };
-        return typeMap[status] || 'default';
+      const typeMap = {
+        pendingPayment: "warning",
+        pendingDelivery: "info",
+        delivering: "primary",
+        completed: "success",
+        cancelled: "danger",
+      };
+      return typeMap[status] || "default";
     },
-    
+
     // 去付款
     payOrder(orderId) {
-        this.$message({
+      this.$message({
         message: `订单 ${orderId} 去付款`,
-        type: 'info'
-        });
+        type: "info",
+      });
     },
-    
+
     // 提醒发货
     remindDelivery(orderId) {
-        this.$message({
+      this.$message({
         message: `已提醒订单 ${orderId} 发货`,
-        type: 'success'
-        });
+        type: "success",
+      });
     },
-    
+
     // 查看物流
     checkLogistics(orderId) {
-        this.$message({
+      this.$message({
         message: `查看订单 ${orderId} 物流`,
-        type: 'info'
-        });
+        type: "info",
+      });
     },
-    
+
     // 去评价
     gotoReview(orderId) {
-        this.$message({
+      this.$message({
         message: `去评价订单 ${orderId}`,
-        type: 'info'
-        });
+        type: "info",
+      });
     },
-    
+
     // 查看订单详情
     viewOrderDetail(orderId) {
-        this.$router.push({
-        name: 'OrderDetail',
-        });
-    }
-    }
-}
+      this.$router.push({
+        name: "OrderDetail",
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-.bg{
+.bg {
   display: flex;
   flex-direction: column;
-  
+
   ::v-deep .el-button--text {
     color: #6a8a27;
   }
-  ::v-deep .el-tabs__item.is-active{
+  ::v-deep .el-tabs__item.is-active {
     color: #6a8a27;
   }
-  ::v-deep .el-tabs__active-bar{
-    background-color: #6a8a27
+  ::v-deep .el-tabs__active-bar {
+    background-color: #6a8a27;
   }
-  ::v-deep .el-tabs__item:hover{
+  ::v-deep .el-tabs__item:hover {
     color: #6a8a27;
   }
 }
-    .filter-bar {
-      margin-bottom: 20px;
-
-      ::v-deep .el-input-number__decrease{
-        display: none;
-      }
-      ::v-deep .el-input-number__increase{
-        display: none;
-      }
-      ::v-deep .el-input-number .el-input__inner{
-        padding-left: 10px;
-        padding-right: 10px;
-      }
-    }
-
-
-    /* 订单卡片样式 */
-    .order-card {
-      border: 1px solid #eee;
-      border-radius: 4px;
-      margin-bottom: 20px;
-      overflow: hidden;
-    }
-
-    /* 订单头部 - 包含商家信息 */
-    .order-header {
-      background-color: #f8f9fa;
-      padding: 12px 20px;
-      display: flex;
-      align-items: center;
-      border-bottom: 1px solid #eee;
-      color: #666;
-      font-size: 14px;
-    }
-
-
-
-    /* 订单商品列表 */
-    .order-products {
-      padding: 10px 20px;
-    }
-
-    .product-item {
-      display: flex;
-      align-items: center;
-      padding: 15px 0;
-      border-bottom: 1px dashed #eee;
-      font-size: 14px;
-    }
-
-    .product-item:last-child {
-      border-bottom: none;
-    }
-
-    .product-image {
-      width: 80px;
-      height: 80px;
-      object-fit: cover;
-      margin-right: 15px;
-      border-radius: 4px;
-    }
-
-    .product-details {
-      flex: 1;
-    }
-
-    .product-name {
-      color: #333;
-      margin-bottom: 5px;
-    }
-
-    .product-spec {
-      color: #999;
-      font-size: 12px;
-    }
-
-    .product-price {
-      width: 120px;
-      text-align: center;
-      color: #333;
-    }
-
-    .product-quantity {
-      width: 100px;
-      text-align: center;
-      color: #666;
-    }
-
-    .product-total {
-      width: 120px;
-      text-align: center;
-      color: #333;
-      font-weight: 500;
-    }
-
-    .product-status {
-      width: 150px;
-      text-align: center;
-    }
-
-    .product-actions {
-      width: 150px;
-      text-align: center;
-    }
-
-    /* 订单底部 - 金额和操作 */
-    .order-footer {
-      background-color: #f8f9fa;
-      padding: 15px 20px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      border-top: 1px solid #eee;
-    }
-
-    .order-summary {
-      text-align: right;
-    }
-
-    .order-amount {
-      color: #333;
-      margin-bottom: 5px;
-    }
-
-    .order-amount strong {
-      color: #ff4d4f;
-      font-size: 16px;
-    }
-
-    .order-tips {
-      font-size: 12px;
-      color: #999;
-    }
-
-    .order-actions {
-      display: flex;
-      gap: 10px;
-    }
-
-        /* 通知栏样式 */
-    .notice-bar {
-      background-color: #fffbe6;
-      border: 1px solid #ffe58f;
-      padding: 12px 16px;
-      border-radius: 4px;
-      margin-bottom: 20px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      color: #fa8c16;
-      font-size: 14px;
-      line-height: 1.5;
-    }
-    
+.filter-bar {
+  margin-bottom: 20px;
+
+  ::v-deep .el-input-number__decrease {
+    display: none;
+  }
+  ::v-deep .el-input-number__increase {
+    display: none;
+  }
+  ::v-deep .el-input-number .el-input__inner {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+}
+
+/* 订单卡片样式 */
+.order-card {
+  border: 1px solid #eee;
+  border-radius: 4px;
+  margin-bottom: 20px;
+  overflow: hidden;
+}
+
+/* 订单头部 - 包含商家信息 */
+.order-header {
+  background-color: #f8f9fa;
+  padding: 12px 20px;
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #eee;
+  color: #666;
+  font-size: 14px;
+}
+
+/* 订单商品列表 */
+.order-products {
+  padding: 10px 20px;
+}
+
+.product-item {
+  display: flex;
+  align-items: center;
+  padding: 15px 0;
+  border-bottom: 1px dashed #eee;
+  font-size: 14px;
+}
+
+.product-item:last-child {
+  border-bottom: none;
+}
+
+.product-image {
+  width: 80px;
+  height: 80px;
+  object-fit: cover;
+  margin-right: 15px;
+  border-radius: 4px;
+}
+
+.product-details {
+  flex: 1;
+}
+
+.product-name {
+  color: #333;
+  margin-bottom: 5px;
+}
+
+.product-spec {
+  color: #999;
+  font-size: 12px;
+}
+
+.product-price {
+  width: 120px;
+  text-align: center;
+  color: #333;
+}
+
+.product-quantity {
+  width: 100px;
+  text-align: center;
+  color: #666;
+}
+
+.product-total {
+  width: 120px;
+  text-align: center;
+  color: #333;
+  font-weight: 500;
+}
+
+.product-status {
+  width: 150px;
+  text-align: center;
+}
+
+.product-actions {
+  width: 150px;
+  text-align: center;
+}
+
+/* 订单底部 - 金额和操作 */
+.order-footer {
+  background-color: #f8f9fa;
+  padding: 15px 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-top: 1px solid #eee;
+}
+
+.order-summary {
+  text-align: right;
+}
+
+.order-amount {
+  color: #333;
+  margin-bottom: 5px;
+}
+
+.order-amount strong {
+  color: #ff4d4f;
+  font-size: 16px;
+}
+
+.order-tips {
+  font-size: 12px;
+  color: #999;
+}
+
+.order-actions {
+  display: flex;
+  gap: 10px;
+}
+
+/* 通知栏样式 */
+.notice-bar {
+  background-color: #fffbe6;
+  border: 1px solid #ffe58f;
+  padding: 12px 16px;
+  border-radius: 4px;
+  margin-bottom: 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: #fa8c16;
+  font-size: 14px;
+  line-height: 1.5;
+}
+
+.product-info {
+  display: flex;
+  align-items: center;
+  padding: 5px 0;
+
+  .product-img {
+    width: 50px;
+    height: 50px;
+    object-fit: cover;
+    border-radius: 4px;
+    margin-right: 10px;
+    border: 1px solid #eee;
+  }
+
+  .product-name {
+    color: #333;
+  }
+}
 </style>
 
 
diff --git a/src/views/User/Index.vue b/src/views/User/Index.vue
index 0f25887..e12e95f 100644
--- a/src/views/User/Index.vue
+++ b/src/views/User/Index.vue
@@ -27,7 +27,7 @@ export default {
 
 
         // {title: '我的收藏' ,path:""},
-        {title: '我的足迹',path:"/User/ViewHistory" },
+        // {title: '我的足迹',path:"/User/ViewHistory" },
         {title: '消息中心',path:"/User/MessageList" },
         {title: '个人信息',path:"/User/UserInfo" },
         {title: '采购人信息',path:"/User/PurchaserAdd" },
diff --git a/src/views/User/OrderList.vue b/src/views/User/OrderList.vue
index 647c2b7..37113d8 100644
--- a/src/views/User/OrderList.vue
+++ b/src/views/User/OrderList.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="bg">
-    <el-tabs v-model="activeTab">
+    <!-- <el-tabs v-model="activeTab">
       <el-tab-pane label="所有订单" name="all"></el-tab-pane>
       <el-tab-pane label="待付款" name="pendingPayment"></el-tab-pane>
       <el-tab-pane label="待发货" name="pendingDelivery"></el-tab-pane>
       <el-tab-pane label="配送中" name="delivering"></el-tab-pane>
       <el-tab-pane label="待评价" name="pendingReview"></el-tab-pane>
-    </el-tabs>
+    </el-tabs> -->
 
     <div class="filter-bar">
       <el-form :inline="true" :model="filterForm" size="small">
@@ -40,7 +40,7 @@
         </el-form-item>
         <el-form-item label="交易状态">
           <el-select
-            v-model="filterForm.tradeStatus"
+            v-model="filterForm.state"
             placeholder="请选择"
             style="width: 200px"
           >
@@ -228,9 +228,10 @@ export default {
         start_date: "",
         end_date: "",
         total: 1,
+        state: ''
       },
       typeList: [
-        { name: "全部", id: "ALL" },
+        { name: "全部", id: "" },
         { name: "待付款", id: "WAIT_PAYMENT" },
         { name: "待发货", id: "WAIT_POST" },
         { name: "待使用/出行", id: "WAIT_USE" },
@@ -260,10 +261,25 @@ export default {
     },
 
     // 搜索
-    search() {},
+    search() {
+      this.filterForm.currentPage = 1
+      this.getList()
+    },
 
     // 重置
-    reset() {},
+    reset() {
+      this.filterForm = {
+        keywords: "",
+        currentPage: 1,
+        limit: 10,
+        order_id: "",
+        createTime: null,
+        start_date: "",
+        end_date: "",
+        total: 1,
+      }
+      this.getList()
+    },
 
     // 分页大小改变
     handleSizeChange(val) {
diff --git a/src/views/User/UserCenter.vue b/src/views/User/UserCenter.vue
index a67b026..f66c2eb 100644
--- a/src/views/User/UserCenter.vue
+++ b/src/views/User/UserCenter.vue
@@ -9,38 +9,44 @@
         <i class="el-icon-close"></i>
       </div>
     </div>
-    
+
     <!-- 快速设置卡片 -->
     <el-card>
       <el-row :gutter="20">
-        <el-col :xs="24" :sm="8" :md="8" v-for="(item,i) in headFun" :key="i">
-          <router-link :to="item.path" class="feature-item" >
+        <el-col :xs="24" :sm="8" :md="8" v-for="(item, i) in headFun" :key="i">
+          <router-link :to="item.path" class="feature-item">
             <div class="feature-icon">
               <i :class="item.icon"></i>
             </div>
             <span class="feature-name">{{ item.title }}</span>
-            <el-button type="text" size="mini" style="margin-top: 5px;">去设置</el-button>
+            <el-button type="text" size="mini" style="margin-top: 5px"
+              >去设置</el-button
+            >
           </router-link>
         </el-col>
       </el-row>
     </el-card>
-    
+
     <!-- 个人信息卡片 -->
     <el-card v-if="userInfo">
       <div slot="header">个人信息</div>
       <div class="user-info">
-        <img :src="userInfo.avatar"  alt="用户头像" class="user-avatar">
+        <img :src="userInfo.avatar" alt="用户头像" class="user-avatar" />
         <div class="user-details">
           <div>
-              <div class="user-name">{{ userInfo.nickname }}</div>
-              <div class="user-other-info">
-                ID: {{ userInfo.user_id }}
-                <el-button type="text" size="mini" @click="copyId">复制</el-button>
-              </div>
-              <div class="user-other-info">手机号: {{ userInfo.mobile }}</div>
+            <div class="user-name">{{ userInfo.nickname }}</div>
+            <div class="user-other-info">
+              ID: {{ userInfo.user_id }}
+              <el-button
+                type="text"
+                size="mini"
+                @click="util.copyId(userInfo.user_id)"
+                >复制</el-button
+              >
+            </div>
+            <div class="user-other-info">手机号: {{ userInfo.mobile }}</div>
           </div>
 
-
           <div class="login-info">
             <div class="login-section">
               <div class="login-section-title">当前登录信息</div>
@@ -57,22 +63,25 @@
           </div>
         </div>
         <div>
-          <el-button @click="goPath('/User/UserInfo')" type="primary" size="mini" style="background-color: #6a8a27;border: none;">
+          <el-button
+            @click="goPath('/User/UserInfo')"
+            type="primary"
+            size="mini"
+            style="background-color: #6a8a27; border: none"
+          >
             <i class="el-icon-edit"></i> 编辑个人信息
           </el-button>
         </div>
       </div>
-      
-
     </el-card>
-    
+
     <!-- 订单管理卡片 -->
-     <div class="flex-center">
-      <el-card style="flex: 1;">
+    <div class="flex-center">
+      <el-card style="flex: 1">
         <div slot="header">我的议价</div>
-        <div class="feature-grid" >
-          <div class="feature-item" v-for="(item,i) in bargaining" :key="i">
-            <el-badge v-if="item.value" :value="item.value" type="danger" >
+        <div class="feature-grid">
+          <div class="feature-item" v-for="(item, i) in bargaining" :key="i">
+            <el-badge v-if="item.value" :value="item.value" type="danger">
               <div class="feature-icon"><i :class="item.icon"></i></div>
             </el-badge>
             <div v-else class="feature-icon"><i :class="item.icon"></i></div>
@@ -80,12 +89,12 @@
           </div>
         </div>
       </el-card>
-      <div style="width: 20px;flex-shrink: 0;"></div>
-      <el-card style="flex: 1;">
+      <div style="width: 20px; flex-shrink: 0"></div>
+      <el-card style="flex: 1">
         <div slot="header">我的订单</div>
-        <div class="feature-grid" >
-          <div class="feature-item" v-for="(item,i) in order" :key="i">
-            <el-badge v-if="item.value" :value="item.value" type="danger" >
+        <div class="feature-grid">
+          <div class="feature-item" v-for="(item, i) in order" :key="i">
+            <el-badge v-if="item.value" :value="item.value" type="danger">
               <div class="feature-icon"><i :class="item.icon"></i></div>
             </el-badge>
             <div v-else class="feature-icon"><i :class="item.icon"></i></div>
@@ -93,232 +102,222 @@
           </div>
         </div>
       </el-card>
-     </div>
-    
-    
-
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'UserCenter',
+  name: "UserCenter",
   data() {
     return {
       showNotice: true,
-      userId: '200901071124',
+      userId: "200901071124",
       headFun: [
-        {icon: "el-icon-location", title: "设置收货地址", path: "/User/UserAddress"},
-        {icon: "el-icon-document", title: "设置发票抬头", path: "/User/UserInvoice"},
-        {icon: "el-icon-user", title: "设置采购人信息", path: "/User/PurchaserAdd"},
+        {
+          icon: "el-icon-location",
+          title: "设置收货地址",
+          path: "/User/UserAddress",
+        },
+        {
+          icon: "el-icon-document",
+          title: "设置发票抬头",
+          path: "/User/UserInvoice",
+        },
+        {
+          icon: "el-icon-user",
+          title: "设置采购人信息",
+          path: "/User/PurchaserAdd",
+        },
       ],
       bargaining: [
-        {icon: "el-icon-time", title: "待回复", path: "", value: 2},
-        {icon: "el-icon-truck", title: "已取消", path: "", value: 2},
-        {icon: "el-icon-menu", title: "已成交", path: "", value: 2},
+        { icon: "el-icon-time", title: "待回复", path: "", value: 2 },
+        { icon: "el-icon-truck", title: "已取消", path: "", value: 2 },
+        { icon: "el-icon-menu", title: "已成交", path: "", value: 2 },
       ],
       order: [
-        {icon: "el-icon-time", title: "待付款", path: "", value: 2},
-        {icon: "el-icon-truck", title: "未发货", path: "", value: 2},
-        {icon: "el-icon-menu", title: "全部订单", path: "", value: 2},
+        { icon: "el-icon-time", title: "待付款", path: "", value: 2 },
+        { icon: "el-icon-truck", title: "未发货", path: "", value: 2 },
+        { icon: "el-icon-menu", title: "全部订单", path: "", value: 2 },
       ],
 
       userInfo: null,
-
-
-    }
-  },
-  computed: {
-    
+    };
   },
+  computed: {},
   mounted() {
     this.getUserInfo();
   },
   methods: {
     getUserInfo() {
       // 获取用户信息
-      this.post({},"/api/uservice/user/getMyInfo").then(res=>{
+      this.post({}, "/api/uservice/user/getMyInfo").then((res) => {
         this.userInfo = res.data;
-        console.log(this.userInfo)
-      })
+        console.log(this.userInfo);
+      });
     },
 
     goPath(path) {
       this.$router.push(path);
     },
-
-    // 复制用户ID
-    copyId() {
-      const input = document.createElement('input');
-      input.value = this.userId;
-      document.body.appendChild(input);
-      input.select();
-      document.execCommand('copy');
-      document.body.removeChild(input);
-      
-      this.$message({
-        message: 'ID已复制',
-        type: 'success'
-      });
-    },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-.bg{
+.bg {
   display: flex;
   flex-direction: column;
   ::v-deep .el-button--text {
     color: #6a8a27;
   }
 }
-    /* 卡片通用样式 */
-    .el-card {
-      margin-bottom: 20px;
-      border-radius: 6px;
-      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
-      border: none;
-    }
-    
-    .el-card__header {
-      padding: 16px 20px;
-      border-bottom: 1px solid #f0f0f0;
-      background-color: #fff;
-      font-size: 16px;
-      font-weight: 500;
-    }
-    
-    .el-card__body {
-      padding: 20px;
-    }
-    
-    /* 通知栏样式 */
-    .notice-bar {
-      background-color: #fffbe6;
-      border: 1px solid #ffe58f;
-      padding: 12px 16px;
-      border-radius: 4px;
-      margin-bottom: 20px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      color: #fa8c16;
-      font-size: 14px;
-    }
-    
-    .notice-bar__content {
-      display: flex;
-      align-items: center;
-    }
-    
-    .notice-bar__content i {
-      margin-right: 8px;
-    }
-    
-    .notice-bar__close {
-      cursor: pointer;
-      transition: color 0.2s;
-    }
-    
-    .notice-bar__close:hover {
-      color: #fa8c16;
-    }
-    
-    /* 用户信息样式 */
-    .user-info {
-      display: flex;
-      align-items: flex-start;
-      padding: 10px 0;
-    }
-    
-    .user-avatar {
-      width: 100px;
-      height: 100px;
-      border-radius: 50%;
-      margin-right: 20px;
-      border: 4px solid #f5f7fa;
-      object-fit: cover;
-    }
-    
-    .user-details {
-      flex: 1;
-    }
-    
-    .user-name {
-      font-size: 20px;
-      font-weight: 500;
-      margin-bottom: 10px;
-      color: #1f2329;
-    }
-    
-    .user-other-info {
-      color: #4e5969;
-      margin-bottom: 6px;
-      font-size: 14px;
-    }
-    
-    /* 登录信息样式 */
-    .login-info {
-      display: flex;
-      padding-top: 20px;
-    }
-    
-    .login-section {
-      flex: 1;
-    }
-    
-    .login-section-title {
-      font-weight: 500;
-      margin-bottom: 10px;
-      color: #1f2329;
-      font-size: 15px;
-    }
-    
-    .login-detail {
-      color: #4e5969;
-      font-size: 14px;
-      margin-bottom: 6px;
-    }
-    
-    /* 功能图标区域 */
-    .feature-grid {
-      display: grid;
-      grid-template-columns: repeat(3, 1fr);
-      gap: 15px;
-      margin-top: 15px;
-    }
-    
-    .feature-item {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding: 15px 10px;
-      border-radius: 6px;
-      transition: all 0.2s;
-      cursor: pointer;
-    }
-    
-    .feature-item:hover {
-      background-color: #f5f7fa;
-    }
-    
-    .feature-icon {
-      width: 48px;
-      height: 48px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 50%;
-      margin-bottom: 10px;
-      font-size: 20px;
-      color: #6a8a27;
-      background-color: rgba(106, 138, 39, 0.1);
-    }
-    
-    .feature-name {
-      font-size: 14px;
-      color: #4e5969;
-    }
+/* 卡片通用样式 */
+.el-card {
+  margin-bottom: 20px;
+  border-radius: 6px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
+  border: none;
+}
+
+.el-card__header {
+  padding: 16px 20px;
+  border-bottom: 1px solid #f0f0f0;
+  background-color: #fff;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.el-card__body {
+  padding: 20px;
+}
+
+/* 通知栏样式 */
+.notice-bar {
+  background-color: #fffbe6;
+  border: 1px solid #ffe58f;
+  padding: 12px 16px;
+  border-radius: 4px;
+  margin-bottom: 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: #fa8c16;
+  font-size: 14px;
+}
+
+.notice-bar__content {
+  display: flex;
+  align-items: center;
+}
+
+.notice-bar__content i {
+  margin-right: 8px;
+}
+
+.notice-bar__close {
+  cursor: pointer;
+  transition: color 0.2s;
+}
+
+.notice-bar__close:hover {
+  color: #fa8c16;
+}
+
+/* 用户信息样式 */
+.user-info {
+  display: flex;
+  align-items: flex-start;
+  padding: 10px 0;
+}
+
+.user-avatar {
+  width: 100px;
+  height: 100px;
+  border-radius: 50%;
+  margin-right: 20px;
+  border: 4px solid #f5f7fa;
+  object-fit: cover;
+}
+
+.user-details {
+  flex: 1;
+}
+
+.user-name {
+  font-size: 20px;
+  font-weight: 500;
+  margin-bottom: 10px;
+  color: #1f2329;
+}
+
+.user-other-info {
+  color: #4e5969;
+  margin-bottom: 6px;
+  font-size: 14px;
+}
+
+/* 登录信息样式 */
+.login-info {
+  display: flex;
+  padding-top: 20px;
+}
+
+.login-section {
+  flex: 1;
+}
+
+.login-section-title {
+  font-weight: 500;
+  margin-bottom: 10px;
+  color: #1f2329;
+  font-size: 15px;
+}
+
+.login-detail {
+  color: #4e5969;
+  font-size: 14px;
+  margin-bottom: 6px;
+}
+
+/* 功能图标区域 */
+.feature-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 15px;
+  margin-top: 15px;
+}
+
+.feature-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 15px 10px;
+  border-radius: 6px;
+  transition: all 0.2s;
+  cursor: pointer;
+}
+
+.feature-item:hover {
+  background-color: #f5f7fa;
+}
+
+.feature-icon {
+  width: 48px;
+  height: 48px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  margin-bottom: 10px;
+  font-size: 20px;
+  color: #6a8a27;
+  background-color: rgba(106, 138, 39, 0.1);
+}
+
+.feature-name {
+  font-size: 14px;
+  color: #4e5969;
+}
 </style>