diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js
index d650d2a7..b937df34 100644
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -71,7 +71,7 @@ service.interceptors.request.use(
       let jwtData = JSON.parse(
         decodeURIComponent(escape(window.atob(accessToken.split(".")[1])))
       );
-      if (jwtData.exp < new Date().getTime() / 1000) {
+      if (jwtData.exp < Math.round(new Date() / 1000)) {
         refresh()
       }
     }
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index e3112e29..19bb9905 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -1,47 +1,58 @@
 <template>
   <div class="search">
 
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="订单号" prop="orderSn">
-              <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="会员名称" prop="buyerName">
-              <Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="订单状态" prop="orderStatus">
-              <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
-                <Option value="UNPAID">未付款</Option>
-                <Option value="PAID">已付款</Option>
-                <Option value="UNDELIVERED">待发货</Option>
-                <Option value="DELIVERED">已发货</Option>
-                <Option value="COMPLETED">已完成</Option>
-                <Option value="TAKE">待核验</Option>
-                <Option value="CANCELLED">已取消</Option>
-              </Select>
-            </Form-item>
+    <Card>
 
-            <Form-item label="下单时间">
-              <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-            </Form-item>
-            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单号" prop="orderSn">
+            <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 160px" />
+          </Form-item>
+          <Form-item label="会员名称" prop="buyerName">
+            <Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 160px" />
+          </Form-item>
 
-            <download-excel class="export-excel-wrapper" :data="data" :fields="fields"  name="商品订单.xls">
-               <Button type="primary" ghost class="search-btn">导出Excel</Button>
-            </download-excel>
+          <Form-item label="订单类型" prop="orderType">
+            <Select v-model="searchForm.orderType" placeholder="请选择" clearable style="width: 160px">
+              <Option value="NORMAL">普通订单</Option>
+              <Option value="PINTUAN">拼团订单</Option>
+              <Option value="GIFT">赠品订单</Option>
+              <Option value="VIRTUAL">核验订单</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="订单状态" prop="orderStatus">
+            <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 160px">
+              <Option value="UNPAID">未付款</Option>
+              <Option value="PAID">已付款</Option>
+              <Option value="UNDELIVERED">待发货</Option>
+              <Option value="DELIVERED">已发货</Option>
+              <Option value="COMPLETED">已完成</Option>
+              <Option value="TAKE">待核验</Option>
+              <Option value="CANCELLED">已取消</Option>
+            </Select>
+          </Form-item>
 
+          <Form-item label="下单时间">
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 160px"></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <div>
+        <download-excel class="export-excel-wrapper" :data="data" :fields="fields" name="商品订单.xls">
+          <Button type="primary" class="export">
+            导出Excel
+          </Button>
+        </download-excel>
+      </div>
 
-          </Form>
-        </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
 
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-            size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
 
   </div>
 </template>
@@ -57,49 +68,53 @@ export default {
   data() {
     return {
       // 表格的表头以及内容
-      fields:{
-        "订单编号":"sn",
-        "下单时间":"createTime",
-        "客户名称":"memberName",
-        "客户账号":"",
-        "收货人":"",
-        "收货人手机号":"",
-        "收货人地址":"",
-        "支付方式":{
+      fields: {
+        订单编号: "sn",
+        下单时间: "createTime",
+        客户名称: "memberName",
+        客户账号: "",
+        收货人: "",
+        收货人手机号: "",
+        收货人地址: "",
+        支付方式: {
           field: "clientType",
-          callback:value=>{
+          callback: (value) => {
             if (value == "H5") {
-              return "移动端"
+              return "移动端";
             } else if (value == "PC") {
-              return "PC端"
-            } else if (value== "WECHAT_MP") {
-              return "小程序端"
+              return "PC端";
+            } else if (value == "WECHAT_MP") {
+              return "小程序端";
             } else if (value == "APP") {
-              return "移动应用端"
+              return "移动应用端";
             } else {
               return value;
             }
-          }
+          },
         },
-        "配送方式":"",
-        "配送费用":"",
-        "订单商品金额":"",
-        "订单优惠金额":"",
-        "订单应付金额":"",
-        "商品SKU编号":"",
-        "商品数量":"groupNum",
-        "买家备注":"",
-        "订单状态":"",
-        "付款状态":{
-          field:"payStatus",
-          callback:value=>{
-            return  value == "UNPAID" ? "未付款" : value == "PAID" ? "已付款" : ""
-          }
+        配送方式: "",
+        配送费用: "",
+        订单商品金额: "",
+        订单优惠金额: "",
+        订单应付金额: "",
+        商品SKU编号: "",
+        商品数量: "groupNum",
+        买家备注: "",
+        订单状态: "",
+        付款状态: {
+          field: "payStatus",
+          callback: (value) => {
+            return value == "UNPAID"
+              ? "未付款"
+              : value == "PAID"
+              ? "已付款"
+              : "";
+          },
         },
-        "发货状态":"",
-        "发票类型":"",
-        "发票抬头":"",
-        "店铺":"storeName",
+        发货状态: "",
+        发票类型: "",
+        发票抬头: "",
+        店铺: "storeName",
       },
       loading: true, // 表单加载状态
       searchForm: {
@@ -123,18 +138,14 @@ export default {
         {
           title: "订单号",
           key: "sn",
-          minWidth: 230,
+          minWidth: 240,
           tooltip: true,
         },
-        {
-          title: "下单时间",
-          key: "createTime",
-          width: 200,
-        },
+
         {
           title: "订单来源",
           key: "clientType",
-          width: 95,
+          width: 120,
           render: (h, params) => {
             if (params.row.clientType == "H5") {
               return h("div", {}, "移动端");
@@ -149,15 +160,34 @@ export default {
             }
           },
         },
+        {
+          title: "订单类型",
+          key: "orderType",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.orderType == "NORMAL") {
+              return h("div", [h("span", {}, "普通订单")]);
+            } else if (params.row.orderType == "PINTUAN") {
+              return h("div", [h("span", {}, "拼团订单")]);
+            } else if (params.row.orderType == "GIFT") {
+              return h("div", [h("span", {}, "赠品订单")]);
+            } else if (params.row.orderType == "VIRTUAL") {
+              return h("div", [h("tag", {}, "核验订单")]);
+            }
+          },
+        },
         {
           title: "买家名称",
           key: "memberName",
-          width: 130,
+          minWidth: 130,
+          tooltip: true,
         },
+
         {
           title: "订单金额",
           key: "flowPrice",
-          minWidth: 120,
+          minWidth: 100,
+          tooltip: true,
           render: (h, params) => {
             return h(
               "div",
@@ -169,7 +199,7 @@ export default {
         {
           title: "订单状态",
           key: "orderStatus",
-          width: 95,
+          minWidth: 100,
           render: (h, params) => {
             if (params.row.orderStatus == "UNPAID") {
               return h("div", [h("span", {}, "未付款")]);
@@ -188,12 +218,19 @@ export default {
             }
           },
         },
+        {
+          title: "下单时间",
+          key: "createTime",
+          width: 170,
+          sortable: true,
+          sortType: "desc",
+        },
 
         {
           title: "操作",
           key: "action",
           align: "center",
-          width: 180,
+          width: 100,
           render: (h, params) => {
             return h("div", [
               h(
@@ -337,4 +374,11 @@ export default {
 <style lang="scss" scoped>
 // 建议引入通用样式 可删除下面样式代码
 @import "@/styles/table-common.scss";
+.export {
+  margin: 10px 20px 10px 0;
+}
+.export-excel-wrapper {
+  display: inline;
+}
+
 </style>
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
index c49959e7..9e439e8b 100644
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -232,9 +232,7 @@ export default {
   methods: {
     // 选中优惠券 父级传值
     check(val,index) {
-
       this.data[index].___selected = !this.data[index].___selected
-
       this.$emit("selected", val);
     },
     init() {
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index dfcac8cc..fc7417d4 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -381,6 +381,7 @@
             </Collapse>
           </div>
         </div>
+        </div>
       </Form>
     </div>
     <div class="content-goods-publish" v-show="activestep === 2">
diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue
index cac35602..2340a62b 100644
--- a/seller/src/views/order/order/exportOrderDeliver.vue
+++ b/seller/src/views/order/order/exportOrderDeliver.vue
@@ -17,8 +17,8 @@
       </div>
       <!-- 上传 -->
       <div v-if="item.checked && index ==1" class="tpl">
-        <Upload style="width:50%; height:400px;" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" multiple type="drag"
-          action="//jsonplaceholder.typicode.com/posts/">
+        <Upload name="file" style="width:50%; height:400px;" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" multiple type="drag" :action="action"
+          :headers="accessToken">
           <div style="padding: 50px 0">
             <Icon type="ios-cloud-upload" size="102" style="color: #3399ff"></Icon>
             <h2>选择或拖拽文件上传</h2>
@@ -42,12 +42,15 @@
 <script>
 import JsonExcel from "vue-json-excel";
 import { getLogisticsChecked } from "@/api/order.js";
+import { baseUrl } from "@/libs/axios.js";
 export default {
   components: {
     "download-excel": JsonExcel,
   },
   data() {
     return {
+      action: baseUrl + "/orders/batchDeliver", // 上传接口
+      accessToken: {}, // 验证token
       // 步骤集合
       stepList: [
         {
@@ -68,7 +71,9 @@ export default {
       ],
     };
   },
-  mounted() {},
+  mounted() {
+       this.accessToken.accessToken =this.getStore("accessToken");
+  },
   methods: {
     // 点击选择步骤
     handleCheckStep(val) {
@@ -78,9 +83,8 @@ export default {
       val.checked = true;
     },
 
-   async downLoad() {
-     let res = await  getLogisticsChecked()
-
+    async downLoad() {
+      let res = await getLogisticsChecked();
     },
   },
 };
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 9451e16f..bbda4d7d 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -4,13 +4,21 @@
       <Row @keydown.enter.native="handleSearch">
         <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
           <Form-item label="订单编号" prop="orderSn">
-            <Input type="text" v-model="searchForm.orderSn" clearable placeholder="请输入订单编号" style="width: 200px" />
+            <Input type="text" v-model="searchForm.orderSn" clearable placeholder="请输入订单编号" style="width: 160px" />
           </Form-item>
           <Form-item label="会员名称" prop="buyerName">
-            <Input type="text" v-model="searchForm.buyerName" clearable placeholder="请输入会员名称" style="width: 200px" />
+            <Input type="text" v-model="searchForm.buyerName" clearable placeholder="请输入会员名称" style="width: 160px" />
+          </Form-item>
+              <Form-item label="订单类型" prop="orderType">
+            <Select v-model="searchForm.orderType" placeholder="请选择" clearable style="width: 160px">
+              <Option value="NORMAL">普通订单</Option>
+              <Option value="PINTUAN">拼团订单</Option>
+              <Option value="GIFT">赠品订单</Option>
+              <Option value="VIRTUAL">核验订单</Option>
+            </Select>
           </Form-item>
           <Form-item label="订单状态" prop="orderStatus">
-            <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
+            <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 160px">
               <Option value="UNPAID">未付款</Option>
               <Option value="PAID">已付款</Option>
               <Option value="UNDELIVERED">待发货</Option>
@@ -21,7 +29,7 @@
             </Select>
           </Form-item>
           <Form-item label="下单时间">
-            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 160px"></DatePicker>
           </Form-item>
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
           <Button @click="handleReset" class="search-btn">重置</Button>