优化部分样式问题，新增部分功能，解决发现的bug，暂未完全测试通过。

2025-12-18 17:05:54 +08:00 · 2021-06-10 18:31:54 +08:00
parent 8b3d19625f
commit c9ea7ba898
30 changed files with 1143 additions and 1131 deletions
--- a/seller/src/api/order.js
+++ b/seller/src/api/order.js
@@ -2,6 +2,19 @@
 import {getRequest, postRequest, putRequest} from '@/libs/axios';


+
+// 下载待发货的订单列表
+export const verificationCode = (verificationCode) => {
+  return getRequest(`/orders/getOrderByVerificationCode/${verificationCode}`)
+}
+
+
+
+// 下载待发货的订单列表
+export const downLoadDeliverExcel = (params) => {
+  return getRequest(`/orders/downLoadDeliverExcel`, params)
+}
+
 // 获取普通订单列表
 export const getOrderList = (params) => {
  return getRequest(`/orders`, params)
@@ -62,8 +75,8 @@ export const getLogisticsChecked = () => {
 }

 // 订单核验
-export const orderTake = (sn, params) => {
-  return postRequest(`/orders/${sn}/take`, params)
+export const orderTake = (sn, verificationCode) => {
+  return putRequest(`/orders/take/${sn}/${verificationCode}`)
 }

 // 售后服务单
--- a/seller/src/assets/download.png
+++ b/seller/src/assets/download.png
--- a/seller/src/assets/goodsType1.png
+++ b/seller/src/assets/goodsType1.png
--- a/seller/src/assets/goodsType2.png
+++ b/seller/src/assets/goodsType2.png
--- a/seller/src/assets/goodsTypeTpl.png
+++ b/seller/src/assets/goodsTypeTpl.png
--- a/seller/src/assets/logo.png
+++ b/seller/src/assets/logo.png
--- a/seller/src/assets/success.png
+++ b/seller/src/assets/success.png
--- a/seller/src/assets/upload.png
+++ b/seller/src/assets/upload.png
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,10 +18,10 @@ export default {
   * @description api请求基础路径
   */
  api_dev: {
-    common: 'https://common-api.pickmall.cn',
-    buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn',
+    // common: 'https://common-api.pickmall.cn',
+    // buyer: 'https://buyer-api.pickmall.cn',
+    // seller: 'https://store-api.pickmall.cn',
+    // manager: 'https://admin-api.pickmall.cn',
    common: 'http://192.168.0.109:8890',
    buyer: 'http://192.168.0.109:8888',
    seller: 'http://192.168.0.109:8889',
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -127,12 +127,19 @@ export const otherRouter = {
      name: "full-cut-detail",
      component: () => import("@/views/promotion/fullCut/newFullCut.vue")
    },
+    {
+      path: "export-order-deliver",
+      title: "发货",
+      name: "export-order-deliver",
+      component: () => import("@/views/order/order/exportOrderDeliver.vue")
+    },
    {
      path: "order-detail",
      title: "订单详情",
      name: "order-detail",
      component: () => import("@/views/order/order/orderDetail.vue")
    },
+
    // {
    //   path: "/*",
    //   name: "error-404",
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -3,22 +3,25 @@
  padding: 15px;
  margin: 0 auto;
  text-align: center;
-  border: 1px solid #ddd;
+  border-radius: 0.8em;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
  background: none repeat 0 0 #fff;

  /*商品品类*/
  .goods-category {
+    min-height: 500px;
+    border-radius: 0.8em;
    text-align: left;
    padding: 10px;
-    background: #fafafa;
-    border: 1px solid #e6e6e6;
+    background: #ededed;

    ul {
-      padding: 8px 4px 8px 8px;
+      padding: 12px 8px;
      list-style: none;
      width: 300px;
      background: none repeat 0 0 #fff;
-      border: 1px solid #e6e6e6;
+      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+      border-radius: 0.4em;
      display: inline-block;
      letter-spacing: normal;
      margin-right: 15px;
@@ -27,7 +30,7 @@

      li {
        line-height: 20px;
-        padding: 5px;
+        padding: 10px 5px;
        cursor: pointer;
        color: #333;
        font-size: 12px;
@@ -42,9 +45,10 @@

  /** 当前品类被选中的样式 */
  .activeClass {
-    background-color: #d9edf7;
-    border: 1px solid #bce8f1;
-    color: #3a87ad;
+    border-radius: 0.4em;
+    background-color: rgba($color: $theme_color, $alpha: 0.2);
+    border: 1px solid rgba($color: $theme_color, $alpha: 0.8);
+    color: #fff;
  }

  /*!*当前选择的商品品类文字*!*/
@@ -215,6 +219,19 @@ div.base-info-item {
  }
 }

+.success {
+  > h1 {
+    font-size: 28px;
+  }
+  > * {
+    margin: 10px;
+  }
+}
+.operation {
+  > * {
+    margin: 10px 0;
+  }
+}
 /*商品描述*/
 .goods-intro {
  line-height: 40;
@@ -223,12 +240,16 @@ div.base-info-item {
 /** 底部步骤 */
 .footer {
  width: 100%;
+  margin-top: 20px;
  padding: 10px;
  background-color: #ffc;
  position: sticky;
  bottom: 0px;
  text-align: center;
-  z-index: 9;
+  z-index: 999;
+  > .ivu-btn {
+    margin: 0 10px;
+  }
 }

 /*图片上传组件第一张图设置封面*/
@@ -261,9 +282,20 @@ div.base-info-item {
  word-break: break-all;
 }

+/deep/ .ivu-steps {
+  width: 100% !important;
+  display: flex;
+}
+.step-list {
+  height: 60px;
+  margin-bottom: 20px;
+  border-radius: 0.8em;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  // box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04)
+}
 .step-view {
-  width: 33%;
-  height: 40px;
+  flex: 1;
+  height: 60px;
  font-size: 19px;
  text-align: center;
  display: flex;
@@ -271,6 +303,14 @@ div.base-info-item {
  justify-content: center;
  align-items: center;
 }
+.step-view:nth-of-type(1) {
+  border-top-left-radius: 0.4em;
+  border-bottom-left-radius: 0.4em;
+}
+.step-view:nth-last-child(1) {
+  border-top-right-radius: 0.4em;
+  border-bottom-right-radius: 0.4em;
+}

 .add-sku-btn {
  margin-top: 10px;
@@ -374,14 +414,61 @@ div.base-info-item {

  right: 0;
  background: rgba(0, 0, 0, 0.6);
+
+  justify-content: space-between;
+  align-items: center;
+  flex-direction: column;
 }
 .demo-upload-list:hover .demo-upload-list-cover {
-  display: block;
+  display:flex;
 }
-.demo-upload-list-cover i {
-  width: 50%;
-  margin-top: 8px;
-  color: #fff;
-  font-size: 20px;
-  cursor: pointer;
+.demo-upload-list-cover div {
+  margin: 10% 0;
+  width: 100%;
+
+  > i {
+    width: 50%;
+    margin-top: 8px;
+    color: #fff;
+    font-size: 20px;
+    cursor: pointer;
+  }
+}
+.active-goods-type {
+  background: #e8e8e8;
+}
+.goods-type-list {
+  max-height: 500px;
+  overflow-y: auto;
+
+  > .goods-type-item {
+    padding: 20px 0;
+    width: 100%;
+    cursor: pointer;
+    transition: 0.35s;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    /deep/ img {
+      margin-right: 20px;
+      width: 100px;
+    }
+    /deep/ h2 {
+      cursor: pointer;
+      font-size: 21px;
+      padding: 10px 0;
+      color: #333;
+    }
+    /deep/ p {
+      color: #999;
+      font-size: 14px;
+      margin-top: 10px;
+    }
+  }
+  > .goods-type-item:hover {
+    transform: translateY(-10px);
+  }
+}
+.template-item {
+  justify-content: flex-start !important;
 }
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
--- a/seller/src/views/login.vue
+++ b/seller/src/views/login.vue
@@ -1,67 +1,29 @@
 <template>
  <div class="login">
-    <Row
-      type="flex"
-      class="row"
-      justify="center"
-      align="middle"
-      @keydown.enter.native="submitLogin"
-    >
+    <Row type="flex" @keydown.enter.native="submitLogin">
      <Col style="width: 368px">
-        <Header />
+      <Header />
+      <Row style="flex-direction: column;">
+        <Form ref="usernameLoginForm" :model="form" :rules="rules" class="form">
+          <FormItem prop="username">
+            <Input v-model="form.username" prefix="ios-contact" size="large" clearable placeholder="请输入用户名" autocomplete="off" />
+          </FormItem>
+          <FormItem prop="password">
+            <Input type="password" v-model="form.password" prefix="ios-lock" size="large" password placeholder="请输入密码" autocomplete="off" />
+          </FormItem>
+        </Form>
+
        <Row>
-            <Form
-              ref="usernameLoginForm"
-              :model="form"
-              :rules="rules"
-              class="form"
-            >
-              <FormItem prop="username">
-                <Input
-                  v-model="form.username"
-                  prefix="ios-contact"
-                  size="large"
-                  clearable
-                  placeholder="请输入用户名"
-                  autocomplete="off"
-                />
-              </FormItem>
-              <FormItem prop="password">
-                <Input
-                  type="password"
-                  v-model="form.password"
-                  prefix="ios-lock"
-                  size="large"
-                  password
-                  placeholder="请输入密码"
-                  autocomplete="off"
-                />
-              </FormItem>
-            </Form>
-
-          <Row>
-            <Button
-              class="login-btn"
-              type="primary"
-              size="large"
-              :loading="loading"
-              @click="submitLogin"
-              long
-            >
-              <span v-if="!loading">{{ $t("login") }}</span>
-              <span v-else>{{ $t("logining") }}</span>
-            </Button>
-          </Row>
-
+          <Button class="login-btn" type="primary" size="large" :loading="loading" @click="submitLogin" long>
+            <span v-if="!loading">{{ $t("login") }}</span>
+            <span v-else>{{ $t("logining") }}</span>
+          </Button>
        </Row>
-        <Footer />
-        <!-- 拼图验证码 -->
-        <verify
-          ref="verify"
-          class="verify-con"
-          verifyType="LOGIN"
-          @change="verifyChange"
-        ></verify>
+
+      </Row>
+      <Footer />
+      <!-- 拼图验证码 -->
+      <verify ref="verify" class="verify-con" verifyType="LOGIN" @change="verifyChange"></verify>
      </Col>
      <!-- <LangSwitch /> -->
    </Row>
@@ -69,35 +31,34 @@
 </template>

 <script>
-import {
-  login,
-  userMsg,
-} from "@/api/index";
+import { login, userMsg } from "@/api/index";
 import { validateMobile } from "@/libs/validate";
 import Cookies from "js-cookie";
 import Header from "@/views/main-components/header";
 import Footer from "@/views/main-components/footer";
 import LangSwitch from "@/views/main-components/lang-switch";
 import util from "@/libs/util.js";
-import verify from '@/views/my-components/verify';
+import verify from "@/views/my-components/verify";
 export default {
  components: {
    LangSwitch,
    Header,
    Footer,
-    verify
+    verify,
  },
  data() {
    return {
      saveLogin: true, // 保存登录状态
      loading: false, // 加载状态
-      form: { // 表单数据
+      form: {
+        // 表单数据
        username: "",
        password: "",
        mobile: "",
        code: "",
      },
-      rules: { // 验证规则
+      rules: {
+        // 验证规则
        username: [
          {
            required: true,
@@ -163,35 +124,41 @@ export default {
        }
      });
    },
-    submitLogin() { // 登录提交
+    submitLogin() {
+      // 登录提交
      this.$refs.usernameLoginForm.validate((valid) => {
        if (valid) {
          this.$refs.verify.show = true;
        }
-      })
+      });
    },
-    verifyChange (con) { // 拼图验证码回显
+    verifyChange(con) {
+      // 拼图验证码回显
      if (!con.status) return;
-      
+
      this.loading = true;
      login({
        username: this.form.username,
        password: this.md5(this.form.password),
-      }).then((res) => {
-        this.loading = false;
-        if (res && res.success) {
-          this.afterLogin(res);
-        }
-      }).catch(()=>{this.loading = false})
-    }
-  }
+      })
+        .then((res) => {
+          this.loading = false;
+          if (res && res.success) {
+            this.afterLogin(res);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+      this.$refs.verify.show = false;
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
- .row {
+.row {
  padding: 70px 50px;
-  border-radius: .8em;
-
+  border-radius: 0.8em;
 }
 .login {
  height: 100%;
@@ -212,11 +179,11 @@ export default {
    position: relative;
    zoom: 1;
  }
-  /deep/ .ivu-row{
+  /deep/ .ivu-row {
    display: flex;
-    flex-direction: column !important;
+
  }
-  .verify-con{
+  .verify-con {
    position: absolute;
    top: 126px;
    z-index: 10;
@@ -260,5 +227,4 @@ export default {
 .flex {
  justify-content: center;
 }
-
 </style>
--- a/seller/src/views/main-components/header.vue
+++ b/seller/src/views/main-components/header.vue
@@ -1,7 +1,7 @@
 <template>
  <div>
    <Row class="header">
-      <img src="../../assets/lili.png" class="logo" width="220px">
+      <img class="logo" src="../../assets/logo.png" >
    </Row>
  </div>
 </template>
@@ -14,13 +14,13 @@ export default {

 <style lang="scss" scoped>
 .header {
-
  margin-bottom: 6vh;
  align-items: center;
  display: flex;
  justify-content: center !important;
 }
 .logo {
-  transform: scale(3);
+  width: 440px;
+  height: 158px;
 }
 </style>
--- a/seller/src/views/order/order/exportOrderDeliver.vue
+++ b/seller/src/views/order/order/exportOrderDeliver.vue
@@ -0,0 +1,122 @@
+<template>
+  <Card>
+    <div class="step-list">
+      <div class="step-item" @click="handleCheckStep(item)" :class="{'active':item.checked}" v-for="(item,index) in stepList" :key="index">
+        <img class="img" :src="item.img" alt="">
+        <div>
+          <h2>{{item.title}}</h2>
+        </div>
+      </div>
+    </div>
+
+    <div v-for="(item,index) in stepList" :key="index">
+      <!-- 下载 -->
+      <div v-if="item.checked && index ==0" class="tpl">
+
+        <Button @click="downLoad">下载导入模板</Button>
+      </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/">
+          <div style="padding: 50px 0">
+            <Icon type="ios-cloud-upload" size="102" style="color: #3399ff"></Icon>
+            <h2>选择或拖拽文件上传</h2>
+          </div>
+        </Upload>
+      </div>
+      <!-- 上传 -->
+      <div v-if="item.checked && index ==2" class="tpl">
+        <h1>发货完成</h1>
+
+        <div>
+          <Button>关闭页面</Button>
+        </div>
+      </div>
+
+    </div>
+
+  </Card>
+</template>
+
+<script>
+import { downLoadDeliverExcel } from "@/api/order.js";
+export default {
+  data() {
+    return {
+      // 步骤集合
+      stepList: [
+        {
+          img: require("@/assets/download.png"),
+          title: "1.下载批量发货导入模板",
+          checked: true,
+        },
+        {
+          img: require("@/assets/upload.png"),
+          title: "2.上传数据",
+          checked: false,
+        },
+        {
+          img: require("@/assets/success.png"),
+          title: "3.完成",
+          checked: false,
+        },
+      ],
+    };
+  },
+  mounted() {},
+  methods: {
+    // 点击选择步骤
+    handleCheckStep(val) {
+      this.stepList.map((item) => {
+        item.checked = false;
+      });
+      val.checked = true;
+    },
+
+    async downLoad() {
+      let res = await downLoadDeliverExcel({ orderIds: "1402886442132217857" });
+      console.log(res);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.step-list {
+  width: 80%;
+  min-width: 500px;
+  max-width: 1160px;
+  margin: 0 auto;
+  display: flex;
+  padding: 40px;
+  justify-content: space-between;
+}
+h2 {
+  text-align: center;
+  margin: 10px 0;
+}
+.tpl {
+  margin: 50px 0;
+  display: flex;
+  justify-content: center;
+}
+.active {
+  background: #efefef;
+  border-radius: 0.8em;
+}
+.step-item {
+  width: 100%;
+  padding: 0 20px;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+  transition: 0.35s;
+  cursor: pointer;
+}
+img {
+  width: 100px;
+  height: 100px;
+}
+</style>
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -527,7 +527,7 @@ export default {
    orderTakeSubmit() {
      this.$refs.orderTakeForm.validate((valid) => {
        if (valid) {
-          API_Order.orderTake(this.sn, this.orderTakeForm).then((res) => {
+          API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then((res) => {
            if (res.success) {
              this.$Message.success("订单核销成功");
              this.orderTakeModal = false;
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -4,22 +4,10 @@
      <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: 200px" />
          </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: 200px" />
          </Form-item>
          <Form-item label="订单状态" prop="orderStatus">
            <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
@@ -33,279 +21,295 @@
            </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: 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>
-      <Table
-        :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">
+          批量发货
+          <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>
+            <div style="margin:10px 0;">
+              <Input v-model="orderCode" style="width:300px; margin-right:10px;" />
+              <Button style="primary" @click="orderVerification">核验</Button>
+            </div>
+          </div>
+        </Poptip>
+
+      </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>
+        <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>

 <script>
-  import * as API_Order from "@/api/order";
-  export default {
-    name: "orderList",
-    data() {
-      return {
-        loading: true, // 表单加载状态
-        searchForm: {
-          // 搜索框初始化对象
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
-          startDate: "", // 起始时间
-          endDate: "", // 终止时间
-          orderSn:"",
-          buyerName:"",
-          orderStatus:""
+import * as API_Order from "@/api/order";
+import { verificationCode } from "@/api/order";
+export default {
+  name: "orderList",
+  data() {
+    return {
+      orderCode: "",
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+        orderSn: "",
+        buyerName: "",
+        orderStatus: "",
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        sn: "",
+        sellerName: "",
+        startTime: "",
+        endTime: "",
+        billPrice: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "订单号",
+          key: "sn",
+          minWidth: 240,
+          tooltip: true,
        },
-        selectDate: null,
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
-        },
-        // 表单验证规则
-        formValidate: {},
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
-        columns: [
-          {
-            title: "订单号",
-            key: "sn",
-            minWidth: 240,
-            tooltip: true
-          },
-          {
-            title: "订单来源",
-            key: "clientType",
-            width: 120,
-            render: (h, params) => {
-              if (params.row.clientType == "H5") {
-                return h("div",{},"移动端");
-              }else if(params.row.clientType == "PC") {
-                return h("div",{},"PC端");
-              }else if(params.row.clientType == "WECHAT_MP") {
-                return h("div",{},"小程序端");
-              }else if(params.row.clientType == "APP") {
-                return h("div",{},"移动应用端");
-              }
-              else{
-                return h("div",{},params.row.clientType);
-              }
-            },
-          },
-          {
-            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', { }, '赠品订单'),]);
-              }
+        {
+          title: "订单来源",
+          key: "clientType",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.clientType == "H5") {
+              return h("div", {}, "移动端");
+            } else if (params.row.clientType == "PC") {
+              return h("div", {}, "PC端");
+            } else if (params.row.clientType == "WECHAT_MP") {
+              return h("div", {}, "小程序端");
+            } else if (params.row.clientType == "APP") {
+              return h("div", {}, "移动应用端");
+            } else {
+              return h("div", {}, params.row.clientType);
            }
          },
-          {
-            title: "买家名称",
-            key: "memberName",
-            minWidth: 130,
-            tooltip: true
-          },
-          {
-            title: "订单金额",
-            key: "flowPrice",
-            minWidth: 100,
-            tooltip: true,
-            render: (h, params) => {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.flowPrice, "￥")
-              );
-            },
-          },
-
-          {
-            title: "订单状态",
-            key: "orderStatus",
-            minWidth: 100,
-            render: (h, params) => {
-              if (params.row.orderStatus == "UNPAID") {
-                return h('div', [h('span', { }, '未付款'),]);
-              } else if (params.row.orderStatus == "PAID") {
-                return h('div', [h('span', { }, '已付款'),]);
-              } else if (params.row.orderStatus == "UNDELIVERED") {
-                return h('div', [h('span', { }, '待发货'),]);
-              }else if (params.row.orderStatus == "DELIVERED") {
-                return h('div', [h('span', { }, '已发货'),]);
-              }else if (params.row.orderStatus == "COMPLETED") {
-                return h('div', [h('span', { }, '已完成'),]);
-              }else if (params.row.orderStatus == "TAKE") {
-                return h('div', [h('span', { }, '待核验'),]);
-              }else if (params.row.orderStatus == "CANCELLED") {
-                return h('div', [h('span', { }, '已取消'),]);
-              }
+        },
+        {
+          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: "createTime",
-            width: 170,
-            sortable: true,
-            sortType: "desc",
+        },
+        {
+          title: "买家名称",
+          key: "memberName",
+          minWidth: 130,
+          tooltip: true,
+        },
+        {
+          title: "订单金额",
+          key: "flowPrice",
+          minWidth: 100,
+          tooltip: true,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
          },
+        },

-          {
-            title: "操作",
-            key: "action",
-            align: "center",
-            width: 100,
-            render: (h, params) => {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.detail(params.row);
-                      },
+        {
+          title: "订单状态",
+          key: "orderStatus",
+          minWidth: 100,
+          render: (h, params) => {
+            if (params.row.orderStatus == "UNPAID") {
+              return h("div", [h("span", {}, "未付款")]);
+            } else if (params.row.orderStatus == "PAID") {
+              return h("div", [h("span", {}, "已付款")]);
+            } else if (params.row.orderStatus == "UNDELIVERED") {
+              return h("div", [h("span", {}, "待发货")]);
+            } else if (params.row.orderStatus == "DELIVERED") {
+              return h("div", [h("span", {}, "已发货")]);
+            } else if (params.row.orderStatus == "COMPLETED") {
+              return h("div", [h("span", {}, "已完成")]);
+            } else if (params.row.orderStatus == "TAKE") {
+              return h("div", [h("span", {}, "待核验")]);
+            } else if (params.row.orderStatus == "CANCELLED") {
+              return h("div", [h("span", {}, "已取消")]);
+            }
+          },
+        },
+        {
+          title: "下单时间",
+          key: "createTime",
+          width: 170,
+          sortable: true,
+          sortType: "desc",
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 100,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
                    },
                  },
-                  "查看"
-                ),
-              ]);
-            },
+                },
+                "查看"
+              ),
+            ]);
          },
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-      };
-    },
-    methods: {
-      init() {
-        this.getDataList();
-      },
-      changePage(v) {
-        this.searchForm.pageNumber = v;
-        this.getDataList();
-        this.clearSelectAll();
-      },
-      changePageSize(v) {
-        this.searchForm.pageSize = v;
-        this.getDataList();
-      },
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getDataList();
-      },
-      handleReset() {
-        this.searchForm = {};
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.selectDate = null;
-        this.searchForm.startDate = "";
-        this.searchForm.endDate = "";
-        // 重新加载数据
-        this.getDataList();
-      },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
-      getDataList() {
-        this.loading = true;
-        API_Order.getOrderList(this.searchForm).then((res) => {
-          this.loading = false;
-          if (res.success) {
-            this.data = res.result.records;
-            this.total = res.result.total;
-          }
-        });
-      },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    /**
+     * 核验订单
+     */
+    async orderVerification() {
+      let result = await verificationCode(this.orderCode);
+
+      if (result.success) {
+

-      detail(v) {
-        let sn = v.sn;
        this.$router.push({
          name: "order-detail",
-          query: { sn: sn },
+          query: { sn: result.result.sn || this.orderCode },
        });
+      }
+    },
+    /**
+     * 批量发货
+     */
+    expressOrderDeliver() {
+      this.$router.push({
+        path: "/export-order-deliver",
+      });
+    },
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.searchForm = {};
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.selectDate = null;
+      this.searchForm.startDate = "";
+      this.searchForm.endDate = "";
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },

-      },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
    },
-    activated () {
-      this.init();
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
    },
-  };
+    getDataList() {
+      this.loading = true;
+      API_Order.getOrderList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+
+    detail(v) {
+      let sn = v.sn;
+      this.$router.push({
+        name: "order-detail",
+        query: { sn: sn },
+      });
+    },
+  },
+  activated() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss">
-  // 建议引入通用样式 可删除下面样式代码
-   @import "@/styles/table-common.scss";
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+.export {
+  margin: 10px 20px 10px 0;
+}
 </style>