订单区分商品订单和虚拟订单

seller/src/views/order/order/orderDetail.vue

@@ -94,7 +94,7 @@
           <div class="div-item-right">{{ orderInfo.order.remark }}</div>
         </div>
 
-      <div class="div-item">
+      <div class="div-item" v-if="orderInfo.order.orderType != 'VIRTUAL'">
         <div class="div-item-left">配送方式：</div>
         <div class="div-item-right">
           {{
@@ -521,6 +521,7 @@ export default {
     },
     //弹出订单核销框
     orderTake() {
+      this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode
       this.orderTakeModal = true;
     },
     //订单核销提交

seller/src/views/order/order/orderList.vue

@@ -16,7 +16,6 @@
               <Option value="UNDELIVERED">待发货</Option>
               <Option value="DELIVERED">已发货</Option>
               <Option value="COMPLETED">已完成</Option>
-              <Option value="TAKE">待核验</Option>
               <Option value="CANCELLED">已取消</Option>
             </Select>
           </Form-item>
@@ -27,7 +26,12 @@
           <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
-      <Table class="padding-row" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <div>
+        <Button type="primary" class="export" @click="expressOrderDeliver">
+          批量发货
+        </Button>
+      </div>
+      <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>

seller/src/views/order/order/virtualOrderList.vue

@@ -13,8 +13,6 @@
             <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>
@@ -28,16 +26,12 @@
         </Form>
       </Row>
       <div>
-        <Button type="primary" class="export" @click="expressOrderDeliver">
-          批量发货
-          <Icon type="ios-arrow-down"></Icon>
-        </Button>
         <Poptip @keydown.enter.native="orderVerification" placement="bottom-start" width="400">
           <Button class="export">
             核验订单
           </Button>
           <div class="api" slot="content">
-            <h2>核验订单号</h2>
+            <h2>核验码</h2>
             <div style="margin:10px 0;">
               <Input v-model="orderCode" style="width:300px; margin-right:10px;" />
               <Button style="primary" @click="orderVerification">核验</Button>
@@ -214,14 +208,6 @@ export default {
         });
       }
     },
-    /**
-     * 批量发货
-     */
-    expressOrderDeliver() {
-      this.$router.push({
-        path: "/export-order-deliver",
-      });
-    },
     init() {
       this.getDataList();
     },