From 604a918fd19716c1913b0bd11cd43f1fad0081a9 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 10 Aug 2021 10:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/distribution/distributionGoods.vue  |  2 +-
 .../views/distribution/distributionOrder.vue  |  2 +-
 .../views/goods/goods-seller/draftGoods.vue   |  1 -
 seller/src/views/goods/goods-seller/goods.vue |  2 +-
 seller/src/views/lili-dialog/goods-dialog.vue |  2 +-
 seller/src/views/member/memberComment.vue     |  2 +-
 .../order/after-order/orderComplaint.vue      |  2 +-
 .../order/after-order/returnGoodsOrder.vue    |  2 +-
 .../order/after-order/returnMoneyOrder.vue    | 86 +++++++++----------
 seller/src/views/order/order/orderDetail.vue  |  2 -
 seller/src/views/order/order/orderList.vue    | 58 ++++++-------
 .../views/order/order/virtualOrderList.vue    | 48 +++++------
 .../views/order/receiptManager/receipt.vue    | 42 +++++----
 .../src/views/promotion/fullCut/fullCut.vue   |  9 +-
 .../views/promotion/pintuan/pintuanGoods.vue  |  2 +-
 .../src/views/promotion/seckill/seckill.vue   | 39 ++++-----
 .../views/promotion/seckill/seckillGoods.vue  |  1 -
 seller/src/views/shop/bill/storeBill.vue      |  9 +-
 seller/src/views/shop/ship/logistics.vue      | 25 ++----
 19 files changed, 149 insertions(+), 187 deletions(-)

diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue
index 2b60b06f..cc8e34d1 100644
--- a/seller/src/views/distribution/distributionGoods.vue
+++ b/seller/src/views/distribution/distributionGoods.vue
@@ -6,7 +6,7 @@
           <Form-item label="商品名称" prop="goodsName">
             <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px"/>
           </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
         </Form>
       </Row>
       <Row class="operation padding-row">
diff --git a/seller/src/views/distribution/distributionOrder.vue b/seller/src/views/distribution/distributionOrder.vue
index 533c6257..13206254 100644
--- a/seller/src/views/distribution/distributionOrder.vue
+++ b/seller/src/views/distribution/distributionOrder.vue
@@ -8,7 +8,7 @@
         <Form-item label="订单时间">
           <DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间" style="width: 210px"></DatePicker>
         </Form-item>
-        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
       </Form>
 
       <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table"></Table>
diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue
index 16a95f11..602f6d29 100644
--- a/seller/src/views/goods/goods-seller/draftGoods.vue
+++ b/seller/src/views/goods/goods-seller/draftGoods.vue
@@ -58,7 +58,6 @@
         :data="data"
         ref="table"
         class="mt_10"
-        sortable="custom"
       ></Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index 2bd27468..45e872b0 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -21,7 +21,7 @@
           <Form-item label="商品编号" prop="sn">
             <Input type="text" v-model="searchForm.sn" placeholder="商品编号" clearable style="width: 200px" />
           </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
           <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
diff --git a/seller/src/views/lili-dialog/goods-dialog.vue b/seller/src/views/lili-dialog/goods-dialog.vue
index 9703e8c5..3090f6c5 100644
--- a/seller/src/views/lili-dialog/goods-dialog.vue
+++ b/seller/src/views/lili-dialog/goods-dialog.vue
@@ -4,7 +4,7 @@
       <div class="query-wrapper">
         <div class="query-item">
           <div>搜索范围</div>
-          <Input placeholder="商品名称" @on-clear="goodsData=[]; goodsParams.goodsName='';  getQueryGoodsList()" @on-enter="()=>{goodsData=[]; getQueryGoodsList();}" icon="ios-search" clearable
+          <Input placeholder="商品名称" @on-clear="goodsData=[]; goodsParams.goodsName='';  getQueryGoodsList()" @on-enter="()=>{goodsData=[]; getQueryGoodsList();}" clearable
             style="width: 150px" v-model="goodsParams.goodsName" />
         </div>
         <div class="query-item">
diff --git a/seller/src/views/member/memberComment.vue b/seller/src/views/member/memberComment.vue
index 1d2661d8..b1cd48da 100644
--- a/seller/src/views/member/memberComment.vue
+++ b/seller/src/views/member/memberComment.vue
@@ -38,7 +38,7 @@
             style="width: 200px"
           ></DatePicker>
         </Form-item>
-        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
         <Button @click="handleReset" class="search-btn">重置</Button>
       </Form>
       <Table
diff --git a/seller/src/views/order/after-order/orderComplaint.vue b/seller/src/views/order/after-order/orderComplaint.vue
index 6fc64dea..a3d7f6e5 100644
--- a/seller/src/views/order/after-order/orderComplaint.vue
+++ b/seller/src/views/order/after-order/orderComplaint.vue
@@ -32,7 +32,7 @@
 
             </Select>
           </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
           <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue
index 5e998e8b..b14af29a 100644
--- a/seller/src/views/order/after-order/returnGoodsOrder.vue
+++ b/seller/src/views/order/after-order/returnGoodsOrder.vue
@@ -42,7 +42,7 @@
               style="width: 200px"
             ></DatePicker>
           </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
           <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue
index 90f5c5bd..a4970667 100644
--- a/seller/src/views/order/after-order/returnMoneyOrder.vue
+++ b/seller/src/views/order/after-order/returnMoneyOrder.vue
@@ -1,51 +1,49 @@
 <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="goodsName">
-            <Input
-              type="text"
-              v-model="searchForm.goodsName"
-              clearable
-              placeholder="请输入商品名称"
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="会员名称" prop="memberName">
-            <Input
-              type="text"
-              v-model="searchForm.memberName"
-              clearable
-              placeholder="请输入会员名称"
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="订单编号" prop="orderSn">
-            <Input
-              type="text"
-              v-model="searchForm.orderSn"
-              clearable
-              placeholder="请输入订单编号"
-              style="width: 200px"
-            />
-          </Form-item>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+        <Form-item label="商品" prop="goodsName">
+          <Input
+            type="text"
+            v-model="searchForm.goodsName"
+            clearable
+            placeholder="请输入商品名称"
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="会员名称" prop="memberName">
+          <Input
+            type="text"
+            v-model="searchForm.memberName"
+            clearable
+            placeholder="请输入会员名称"
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="订单编号" prop="orderSn">
+          <Input
+            type="text"
+            v-model="searchForm.orderSn"
+            clearable
+            placeholder="请输入订单编号"
+            style="width: 200px"
+          />
+        </Form-item>
 
-          <Form-item label="申请时间">
-            <DatePicker
-              v-model="selectDate"
-              type="datetimerange"
-              format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              @on-change="selectDateRange"
-              placeholder="选择起始时间"
-              style="width: 200px"
-            ></DatePicker>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          <Button @click="handleReset" class="search-btn">重置</Button>
-        </Form>
-      </Row>
+        <Form-item label="申请时间">
+          <DatePicker
+            v-model="selectDate"
+            type="datetimerange"
+            format="yyyy-MM-dd HH:mm:ss"
+            clearable
+            @on-change="selectDateRange"
+            placeholder="选择起始时间"
+            style="width: 200px"
+          ></DatePicker>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
+        <Button @click="handleReset" class="search-btn">重置</Button>
+      </Form>
 
       <Table
         :loading="loading"
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 65b6c710..84d63465 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -157,7 +157,6 @@
         :columns="columns"
         :data="data"
         ref="table"
-        sortable="custom"
       >
         <!-- 商品栏目格式化 -->
         <template slot="goodsSlot" slot-scope="{ row }">
@@ -384,7 +383,6 @@
           :columns="orderLogColumns"
           :data="orderLogData"
           ref="table"
-          sortable="custom"
         ></Table>
       </div>
 
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index a3f1f32b..4458cff5 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -1,33 +1,31 @@
 <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" clearable placeholder="请输入订单编号" style="width: 160px" />
-          </Form-item>
-          <Form-item label="会员名称" prop="buyerName">
-            <Input type="text" v-model="searchForm.buyerName" clearable placeholder="请输入会员名称" style="width: 160px" />
-          </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="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>
-          <Button @click="handleReset" class="search-btn">重置</Button>
-        </Form>
-      </Row>
-      <div>
-        <Button type="primary" class="export" @click="expressOrderDeliver">
+      <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: 160px" />
+        </Form-item>
+        <Form-item label="会员名称" prop="buyerName">
+          <Input type="text" v-model="searchForm.buyerName" clearable placeholder="请输入会员名称" style="width: 160px" />
+        </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="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" class="search-btn">搜索</Button>
+        <Button @click="handleReset" class="search-btn">重置</Button>
+      </Form>
+      <div  class="export">
+        <Button type="primary" class="mr_10" @click="expressOrderDeliver">
           批量发货
         </Button>
         <download-excel
@@ -37,12 +35,10 @@
           :fetch="exportOrder"
           name="待发货订单.xls"
         >
-          <Button type="success">
-            导出待发货订单
-          </Button>
+          <Button type="success">导出待发货订单</Button>
         </download-excel>
       </div>
-      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table"></Table>
       <Row type="flex" justify="end" class="mt_10">
         <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>
diff --git a/seller/src/views/order/order/virtualOrderList.vue b/seller/src/views/order/order/virtualOrderList.vue
index 21ee00c5..0ae8f247 100644
--- a/seller/src/views/order/order/virtualOrderList.vue
+++ b/seller/src/views/order/order/virtualOrderList.vue
@@ -1,30 +1,28 @@
 <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" clearable placeholder="请输入订单编号" style="width: 160px" />
-          </Form-item>
-          <Form-item label="会员名称" prop="buyerName">
-            <Input type="text" v-model="searchForm.buyerName" clearable placeholder="请输入会员名称" style="width: 160px" />
-          </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="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>
-          <Button @click="handleReset" class="search-btn">重置</Button>
-        </Form>
-      </Row>
+      <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: 160px" />
+        </Form-item>
+        <Form-item label="会员名称" prop="buyerName">
+          <Input type="text" v-model="searchForm.buyerName" clearable placeholder="请输入会员名称" style="width: 160px" />
+        </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="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" class="search-btn">搜索</Button>
+        <Button @click="handleReset" class="search-btn">重置</Button>
+      </Form>
       <div>
         <Poptip @keydown.enter.native="orderVerification" placement="bottom-start" width="400">
           <Button class="export">
@@ -40,7 +38,7 @@
         </Poptip>
 
       </div>
-      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort"></Table>
       <Row type="flex" justify="end" class="mt_10">
         <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>
diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue
index 90350be4..8d6d0958 100644
--- a/seller/src/views/order/receiptManager/receipt.vue
+++ b/seller/src/views/order/receiptManager/receipt.vue
@@ -1,28 +1,26 @@
 <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" clearable placeholder="请输入订单编号" style="width: 200px" />
-          </Form-item>
-          <Form-item label="会员名称" prop="memberName">
-            <Input type="text" v-model="searchForm.memberName" clearable placeholder="请输入会员名称" style="width: 200px" />
-          </Form-item>
-          <Form-item label="发票抬头" prop="receiptTitle">
-            <Input type="text" v-model="searchForm.receiptTitle" clearable placeholder="请输入发票抬头" style="width: 200px" />
-          </Form-item>
-          <Form-item label="状态" prop="receiptStatus">
-            <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
-              <Option :value="0">未开票</Option>
-              <Option :value="1">已开票</Option>
-            </Select>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          <Button @click="handleReset" class="search-btn">重置</Button>
-        </Form>
-      </Row>
-      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+      <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" />
+        </Form-item>
+        <Form-item label="会员名称" prop="memberName">
+          <Input type="text" v-model="searchForm.memberName" clearable placeholder="请输入会员名称" style="width: 200px" />
+        </Form-item>
+        <Form-item label="发票抬头" prop="receiptTitle">
+          <Input type="text" v-model="searchForm.receiptTitle" clearable placeholder="请输入发票抬头" style="width: 200px" />
+        </Form-item>
+        <Form-item label="状态" prop="receiptStatus">
+          <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
+            <Option :value="0">未开票</Option>
+            <Option :value="1">已开票</Option>
+          </Select>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
+        <Button @click="handleReset" class="search-btn">重置</Button>
+      </Form>
+      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table">
         <!-- 订单详情格式化 -->
         <template slot="orderSlot" slot-scope="scope">
           <a @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
diff --git a/seller/src/views/promotion/fullCut/fullCut.vue b/seller/src/views/promotion/fullCut/fullCut.vue
index 4b169333..5520e50c 100644
--- a/seller/src/views/promotion/fullCut/fullCut.vue
+++ b/seller/src/views/promotion/fullCut/fullCut.vue
@@ -1,13 +1,7 @@
 <template>
   <div class="search">
     <Card>
-      <Form
-        ref="searchForm"
-        :model="searchForm"
-        inline
-        :label-width="70"
-        class="search-form"
-      >
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
         <Form-item label="活动名称">
           <Input
             type="text"
@@ -53,7 +47,6 @@
         :columns="columns"
         :data="data"
         ref="table"
-        sortable="custom"
       >
         <template slot-scope="{ row }" slot="applyEndTime">
           {{ unixDate(row.applyEndTime) }}
diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue
index 7e8cb6af..74bd01dd 100644
--- a/seller/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue
@@ -16,7 +16,7 @@
         </Alert>
       </Row>
       <h3 class="act-goods">活动商品</h3>
-      <Table class="mt_10" :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+      <Table class="mt_10" :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" @on-selection-change="changeSelect">
         <template slot-scope="{ row, index }" slot="price">
           <Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
         </template>
diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue
index 828254da..30ec1e06 100644
--- a/seller/src/views/promotion/seckill/seckill.vue
+++ b/seller/src/views/promotion/seckill/seckill.vue
@@ -1,26 +1,24 @@
 <template>
   <div class="seckill">
     <Card>
-      <Row>
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="活动名称" prop="goodsName">
-            <Input type="text" v-model="searchForm.promotionName" placeholder="请输入活动名称" clearable style="width: 200px" />
-          </Form-item>
-          <Form-item label="活动状态" prop="promotionStatus">
-            <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
-              <Option value="NEW">未开始</Option>
-              <Option value="START">已开始/上架</Option>
-              <Option value="END">已结束/下架</Option>
-              <Option value="CLOSE">紧急关闭/作废</Option>
-            </Select>
-          </Form-item>
-          <Form-item label="活动时间">
-            <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px"></DatePicker>
-          </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          <Button @click="handleReset" class="ml_10">重置</Button>
-        </Form>
-      </Row>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+        <Form-item label="活动名称" prop="goodsName">
+          <Input type="text" v-model="searchForm.promotionName" placeholder="请输入活动名称" clearable style="width: 200px" />
+        </Form-item>
+        <Form-item label="活动状态" prop="promotionStatus">
+          <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
+            <Option value="NEW">未开始</Option>
+            <Option value="START">已开始/上架</Option>
+            <Option value="END">已结束/下架</Option>
+            <Option value="CLOSE">紧急关闭/作废</Option>
+          </Select>
+        </Form-item>
+        <Form-item label="活动时间">
+          <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px"></DatePicker>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
+        <Button @click="handleReset" class="ml_10">重置</Button>
+      </Form>
 
       <Table
         :loading="loading"
@@ -29,7 +27,6 @@
         :data="data"
         ref="table"
         class="mt_10"
-        sortable="custom"
       >
         <template slot-scope="{ row }" slot="applyEndTime">
           {{ unixDate(row.applyEndTime) }}
diff --git a/seller/src/views/promotion/seckill/seckillGoods.vue b/seller/src/views/promotion/seckill/seckillGoods.vue
index abc4e101..6f61d4cc 100644
--- a/seller/src/views/promotion/seckill/seckillGoods.vue
+++ b/seller/src/views/promotion/seckill/seckillGoods.vue
@@ -30,7 +30,6 @@
               :columns="goodsColumns"
               :data="tab.list"
               :ref="'table' + tabIndex"
-              sortable="custom"
               @on-selection-change="changeSelect"
             >
               <template slot-scope="{ row }" slot="originalPrice">
diff --git a/seller/src/views/shop/bill/storeBill.vue b/seller/src/views/shop/bill/storeBill.vue
index 5ce48433..6689f87c 100644
--- a/seller/src/views/shop/bill/storeBill.vue
+++ b/seller/src/views/shop/bill/storeBill.vue
@@ -1,13 +1,10 @@
 <template>
   <div class="store-bill">
     <Card>
-      <Form
-        ref="searchForm"
+      <Form ref="searchForm"
         :model="searchForm"
         inline
-        :label-width="70"
-        class="search-form"
-        @keydown.enter.native="handleSearch"
+        :label-width="70" class="search-form" @keydown.enter.native="handleSearch"
       >
         <Form-item label="开始时间" prop="startDay">
           <DatePicker
@@ -37,7 +34,7 @@
             <Option value="COMPLETE">已完成</Option>
           </Select>
         </Form-item>
-        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
         <Button @click="handleReset" class="search-btn">重置</Button>
       </Form>
       <Table
diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue
index 826e3b9c..8d80103d 100644
--- a/seller/src/views/shop/ship/logistics.vue
+++ b/seller/src/views/shop/ship/logistics.vue
@@ -1,15 +1,13 @@
 <template>
   <div class="logistics">
     <Card>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-        ></Table>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+      ></Table>
     </Card>
   </div>
 </template>
@@ -110,15 +108,6 @@
       init() {
         this.getDataList();
       },
-      // 变更排序
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
       // 获取数据
       getDataList() {
         this.loading = true;