diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js
index c2c2b108..d650d2a7 100644
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -1,77 +1,133 @@
 // import Vue from 'vue';
-import axios from 'axios';
-import https from 'https';
-import {
-  Message,
-  Spin,
-  Modal
-} from 'view-design';
-import Storage from './storage';
-import config from '@/config';
-import router from '../router/index.js';
-import store from '../vuex/store';
-import {
-  handleRefreshToken
-} from '@/api/index';
-const qs = require('qs');
-
-export const buyerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.buyer : config.api_prod.buyer);
-export const commonUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.common : config.api_prod.common);
-export const managerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.manager : config.api_prod.manager);
-export const sellerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.seller : config.api_prod.seller);
+import axios from "axios";
+import https from "https";
+import { Message, Spin, Modal } from "view-design";
+import Storage from "./storage";
+import config from "@/config";
+import router from "../router/index.js";
+import store from "../vuex/store";
+import { handleRefreshToken } from "@/api/index";
+const qs = require("qs");
+export const buyerUrl =
+  process.env.NODE_ENV === "development"
+    ? config.api_dev.buyer
+    : config.api_prod.buyer;
+export const commonUrl =
+  process.env.NODE_ENV === "development"
+    ? config.api_dev.common
+    : config.api_prod.common;
+export const managerUrl =
+  process.env.NODE_ENV === "development"
+    ? config.api_dev.manager
+    : config.api_prod.manager;
+export const sellerUrl =
+  process.env.NODE_ENV === "development"
+    ? config.api_dev.seller
+    : config.api_prod.seller;
 // 创建axios实例
 var isRefreshToken = 0;
-const refreshToken = getTokenDebounce()
+const refreshToken = getTokenDebounce();
 const service = axios.create({
   timeout: 10000, // 请求超时时间
   baseURL: buyerUrl, // API
   httpsAgent: new https.Agent({
     rejectUnauthorized: false
   }),
-  paramsSerializer: params => qs.stringify(params, {
-    arrayFormat: 'repeat'
-  })
+  paramsSerializer: params =>
+    qs.stringify(params, {
+      arrayFormat: "repeat"
+    })
 });
 
 // request拦截器
-service.interceptors.request.use(config => {
-  const {
-    loading
-  } = config;
-  // 如果是put/post请求，用qs.stringify序列化参数
-  const isPutPost = config.method === 'put' || config.method === 'post';
-  const isJson = config.headers['Content-Type'] === 'application/json';
-  const isFile = config.headers['Content-Type'] === 'multipart/form-data';
-  if (isPutPost && isJson) {
-    config.data = JSON.stringify(config.data);
+service.interceptors.request.use(
+  config => {
+    const { loading } = config;
+    // 如果是put/post请求，用qs.stringify序列化参数
+    const isPutPost = config.method === "put" || config.method === "post";
+    const isJson = config.headers["Content-Type"] === "application/json";
+    const isFile = config.headers["Content-Type"] === "multipart/form-data";
+    if (isPutPost && isJson) {
+      config.data = JSON.stringify(config.data);
+    }
+    if (isPutPost && !isFile && !isJson) {
+      config.data = qs.stringify(config.data, {
+        arrayFormat: "repeat"
+      });
+    }
+    /** 配置全屏加载 */
+    if (process.client && loading !== false) {
+      config.loading = Spin.show();
+    }
+
+    const uuid = Storage.getItem("uuid");
+    config.headers["uuid"] = uuid;
+
+    // 获取访问Token
+    let accessToken = Storage.getItem("accessToken");
+    if (accessToken && config.needToken) {
+      config.headers["accessToken"] = accessToken;
+      // 解析当前token时间
+      let jwtData = JSON.parse(
+        decodeURIComponent(escape(window.atob(accessToken.split(".")[1])))
+      );
+      if (jwtData.exp < new Date().getTime() / 1000) {
+        refresh()
+      }
+    }
+
+    return config;
+  },
+  error => {
+    Promise.reject(error);
   }
-  if (isPutPost && !isFile && !isJson) {
-    config.data = qs.stringify(config.data, {
-      arrayFormat: 'repeat'
+);
+
+async function refresh() {
+  const getTokenRes = await refreshToken();
+  if (getTokenRes === "success") {
+    // 刷新token
+    if (isRefreshToken === 1) {
+      error.response.config.headers.accessToken = Storage.getItem(
+        "accessToken"
+      );
+      return service(error.response.config);
+    } else {
+      router.go(0);
+    }
+  } else {
+    Storage.removeItem("accessToken");
+    Storage.removeItem("refreshToken");
+    Storage.removeItem("userInfo");
+    Storage.setItem("cartNum", 0);
+    store.commit("SET_CARTNUM", 0);
+    console.log("1111");
+    Modal.confirm({
+      title: "请登录",
+      content: "<p>请登录后执行此操作</p>",
+      okText: "立即登录",
+      cancelText: "继续浏览",
+      onOk: () => {
+        router.push({
+          path: "/login",
+          query: {
+            rePath: router.history.current.path,
+            query: JSON.stringify(router.history.current.query)
+          }
+        });
+      },
+      onCancel: () => {
+        Modal.remove();
+      }
     });
   }
-  /** 配置全屏加载 */
-  if (process.client && loading !== false) {
-    config.loading = Spin.show();
-  }
-
-  const uuid = Storage.getItem('uuid');
-  config.headers['uuid'] = uuid;
-
-  // 获取访问Token
-  let accessToken = Storage.getItem('accessToken');
-  if (accessToken && config.needToken) {
-    config.headers['accessToken'] = accessToken;
-  }
-  return config;
-}, error => {
-  Promise.reject(error);
-});
+}
 
 // respone拦截器
 service.interceptors.response.use(
   async response => {
     await closeLoading(response);
+
     return response.data;
   },
   async error => {
@@ -84,45 +140,15 @@ service.interceptors.response.use(
       isRefreshToken++;
 
       if (isRefreshToken === 1) {
-        const getTokenRes = await refreshToken();
-        if (getTokenRes === 'success') { // 刷新token
-          if (isRefreshToken === 1) {
-            error.response.config.headers.accessToken = Storage.getItem('accessToken')
-            return service(error.response.config)
-          } else {
-            router.go(0)
-          }
-        } else {
-          Storage.removeItem('accessToken');
-          Storage.removeItem('refreshToken');
-          Storage.removeItem('userInfo');
-          Storage.setItem('cartNum', 0)
-          store.commit('SET_CARTNUM', 0)
-          console.log('1111');
-          Modal.confirm({
-            title: '请登录',
-            content: '<p>请登录后执行此操作</p>',
-            okText: '立即登录',
-            cancelText: '继续浏览',
-            onOk: () => {
-              router.push({
-                path: '/login',
-                query: {
-                  rePath: router.history.current.path,
-                  query: JSON.stringify(router.history.current.query)
-                }
-              });
-            },
-            onCancel: () => {
-              Modal.remove();
-            }
-          });
-        }
-        isRefreshToken = 0
+        refresh()
+        isRefreshToken = 0;
       }
     } else {
       if (error.message) {
-        let _message = error.code === 'ECONNABORTED' ? '连接超时，请稍候再试！' : '网络错误，请稍后再试！';
+        let _message =
+          error.code === "ECONNABORTED"
+            ? "连接超时，请稍候再试！"
+            : "网络错误，请稍后再试！";
         Message.error(errorData.message || _message);
       }
     }
@@ -134,7 +160,7 @@ service.interceptors.response.use(
  * 关闭全局加载
  * @param target
  */
-const closeLoading = (target) => {
+const closeLoading = target => {
   if (!target.config || !target.config.loading) return true;
   return new Promise((resolve, reject) => {
     setTimeout(() => {
@@ -145,13 +171,13 @@ const closeLoading = (target) => {
 };
 
 export const Method = {
-  GET: 'get',
-  POST: 'post',
-  PUT: 'put',
-  DELETE: 'delete'
+  GET: "get",
+  POST: "post",
+  PUT: "put",
+  DELETE: "delete"
 };
 
-export default function request (options) {
+export default function request(options) {
   // 如果是服务端或者是请求的刷新token，不需要检查token直接请求。
   //   if (process.server || options.url.indexOf('passport/token') !== -1) {
   return service(options);
@@ -160,47 +186,46 @@ export default function request (options) {
 }
 
 // 防抖闭包来一波
-function getTokenDebounce () {
-  let lock = false
-  let success = false
-  return function () {
+function getTokenDebounce() {
+  let lock = false;
+  let success = false;
+  return function() {
     if (!lock) {
-      lock = true
-      let oldRefreshToken = Storage.getItem('refreshToken');
-      handleRefreshToken(oldRefreshToken).then(res => {
-        if (res.success) {
-          let {
-            accessToken,
-            refreshToken
-          } = res.result;
-          Storage.setItem('accessToken', accessToken);
-          Storage.setItem('refreshToken', refreshToken);
+      lock = true;
+      let oldRefreshToken = Storage.getItem("refreshToken");
+      handleRefreshToken(oldRefreshToken)
+        .then(res => {
+          if (res.success) {
+            let { accessToken, refreshToken } = res.result;
+            Storage.setItem("accessToken", accessToken);
+            Storage.setItem("refreshToken", refreshToken);
 
-          success = true
-          lock = false
-        } else {
-          success = false
-          lock = false
-          // router.push('/login')
-        }
-      }).catch((err) => {
-        console.log(err);
-        success = false
-        lock = false
-      })
+            success = true;
+            lock = false;
+          } else {
+            success = false;
+            lock = false;
+            // router.push('/login')
+          }
+        })
+        .catch(err => {
+          console.log(err);
+          success = false;
+          lock = false;
+        });
     }
     return new Promise(resolve => {
       // 一直看lock,直到请求失败或者成功
       const timer = setInterval(() => {
         if (!lock) {
-          clearInterval(timer)
+          clearInterval(timer);
           if (success) {
-            resolve('success')
+            resolve("success");
           } else {
-            resolve('fail')
+            resolve("fail");
           }
         }
-      }, 500) // 轮询时间间隔
-    })
-  }
+      }, 500); // 轮询时间间隔
+    });
+  };
 }
diff --git a/manager/src/views/lili-floor-renovation/wap/navbar.vue b/manager/src/views/lili-floor-renovation/wap/navbar.vue
index 20be9547..ef7050c5 100644
--- a/manager/src/views/lili-floor-renovation/wap/navbar.vue
+++ b/manager/src/views/lili-floor-renovation/wap/navbar.vue
@@ -3,13 +3,7 @@
   <div class="model-title">
     <div>店铺装修</div>
     <div class="btns">
-      <Button
-        @click="clickBtn(item)"
-        size="small"
-        v-for="(item, index) in way"
-        :key="index"
-        :type="item.selected ? 'primary' : ''"
-      >
+      <Button @click="clickBtn(item)" size="small" v-for="(item, index) in way" :key="index" :type="item.selected ? 'primary' : ''">
         {{ item.title }}
       </Button>
     </div>
@@ -21,17 +15,9 @@
           <div ref="qrCodeUrl"></div>
         </div>
       </Poptip>
-      <Button size="default" type="primary" @click="handleSpinShow"
-        >保存模板</Button
-      >
+      <Button size="default" type="primary" @click="handleSpinShow">保存模板</Button>
 
-      <Modal
-        title="保存中"
-        v-model="saveDialog"
-        :closable="true"
-        :mask-closable="false"
-        :footer-hide="true"
-      >
+      <Modal title="保存中" v-model="saveDialog" :closable="true" :mask-closable="false" :footer-hide="true">
         <div v-if="progress">
           <div class="model-item">
             模板名称 <Input style="width: 200px" v-model="submitWay.name" />
@@ -61,7 +47,8 @@ export default {
       progress: true, // 展示进度
       num: 20, // 提交进度
       saveDialog: false, // 加载状态
-      way: [ // 装修tab栏切换
+      way: [
+        // 装修tab栏切换
         {
           title: "首页",
           name: "index",
@@ -80,7 +67,8 @@ export default {
         },
       ],
       qrcode: "", // 二维码
-      submitWay: { // 表单信息
+      submitWay: {
+        // 表单信息
         pageShow: this.$route.query.type || false,
         name: this.$route.query.name || "模板名称",
         pageClientType: "H5",
@@ -124,11 +112,13 @@ export default {
 
     // 更新
     update() {
-         this.progress = false;
+      this.progress = false;
       API_Other.updateHome(this.$route.query.id, {
         pageData: JSON.stringify(this.$store.state.styleStore),
         name: this.submitWay.name,
         pageShow: this.submitWay.pageShow,
+        pageType: "INDEX",
+        pageClientType: "H5",
       })
         .then((res) => {
           this.num = 50;
@@ -171,7 +161,7 @@ export default {
               this.goback();
             }, 1000);
           } else {
-             this.progress = true;
+            this.progress = true;
             this.saveDialog = false;
             this.$Message.error("保存失败，请稍后重试");
           }
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl.scss b/manager/src/views/lili-floor-renovation/wap/template/tpl.scss
index b8e63cf7..638dd1cc 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl.scss
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl.scss
@@ -1,6 +1,6 @@
 .image-mode {
-    max-width: 100%;
-    height: auto;
+    width: 100%;
+    height: 100%;
     display: block;
     padding: 1px;
 }
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
index 8abfba18..7b405c4a 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
@@ -1,11 +1,11 @@
 
 <template>
   <div class="layout">
-      <img class="image-mode" :src="res.list[0].img" alt="">
-      <img class="image-mode" :src="res.list[1].img" alt="">
-      <img class="image-mode" :src="res.list[2].img" alt="">
-      <img class="image-mode" :src="res.list[3].img" alt="">
-      <img class="image-mode" :src="res.list[4].img" alt="">
+    <img class="image-mode" :src="res.list[0].img" alt="">
+    <img class="image-mode" :src="res.list[1].img" alt="">
+    <img class="image-mode" :src="res.list[2].img" alt="">
+    <img class="image-mode" :src="res.list[3].img" alt="">
+    <img class="image-mode" :src="res.list[4].img" alt="">
   </div>
 </template>
 
@@ -13,21 +13,18 @@
 export default {
   title: "五列单行图片模块",
   props: ["res"],
-  mounted() {
-    console.log(this.res);
-  }
 };
 </script>
 <style lang="scss" scoped>
 @import "./tpl.scss";
 .layout {
- 
+  background: #e8e8e8;
   display: flex;
   align-items: center;
   justify-content: center;
   background-size: cover;
 }
-img{
+img {
   width: 67px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
index 4ef37368..a3ac9350 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
@@ -12,21 +12,22 @@
 export default {
   title: "四列单行图片模块",
   props: ["res"],
-  mounted() {
-    console.log(this.res);
-  }
+
 };
 </script>
 <style lang="scss" scoped>
 @import "./tpl.scss";
 .layout {
-  height: 84px;
+  // background: #e8e8e8;
+  // height: 84px;
   display: flex;
+  padding: 0 8px;
   align-items: center;
   justify-content: center;
   background-size: cover;
 }
+
 img{
   width: 84px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
index 262313ce..e0916e1b 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
@@ -11,14 +11,12 @@
 export default {
   title: "三列单行图片模块",
   props: ["res"],
-  mounted() {
-    console.log(this.res);
-  }
 };
 </script>
 <style lang="scss" scoped>
 @import "./tpl.scss";
 .layout {
+   background: #e8e8e8;
   height: 110px;
   display: flex;
   align-items: center;
@@ -28,4 +26,4 @@ export default {
 img{
    width: 111px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
index 378b07a3..fcf0936f 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
@@ -20,7 +20,7 @@ export default {
   title: "左一右二",
   props: ["res"],
   mounted() {
-    console.log(this.res);
+
   }
 };
 </script>
@@ -34,4 +34,4 @@ export default {
   background-size: cover;
 }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
index 884c01a3..e77470cf 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
@@ -10,7 +10,7 @@
       </div>
     </div>
     <div class="view-height-150">
-      <img class="image-mode" :src="res.list[2].img" />
+      <img class="image-mode" style="height:150px;" :src="res.list[2].img" />
     </div>
   </div>
 </template>
@@ -21,18 +21,22 @@ export default {
   props: ["res"],
   mounted() {
     console.log(this.res);
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>
 @import "./tpl.scss";
 .layout {
-  height: 167px;
+  height: 150px;
   display: flex;
   align-items: center;
   justify-content: center;
 
   background-size: cover;
 }
-
-</style>
\ No newline at end of file
+.view-height-75 {
+  .image-mode {
+    height: 75px;
+  }
+}
+</style>
diff --git a/manager/src/views/login.vue b/manager/src/views/login.vue
index d2ea2e2f..f428e847 100644
--- a/manager/src/views/login.vue
+++ b/manager/src/views/login.vue
@@ -23,12 +23,7 @@
 
       </Row>
       <!-- 拼图验证码 -->
-      <verify
-        ref="verify"
-        class="verify-con"
-        verifyType="LOGIN"
-        @change="verifyChange"
-      ></verify>
+      <verify ref="verify" class="verify-con" verifyType="LOGIN" @change="verifyChange"></verify>
       <div v-if="socialLogining">
         <RectLoading />
       </div>
@@ -48,7 +43,7 @@ import LangSwitch from "@/views/main-components/lang-switch";
 import RectLoading from "@/views/my-components/lili/rect-loading";
 import CountDownButton from "@/views/my-components/lili/count-down-button";
 import util from "@/libs/util.js";
-import verify from '@/views/my-components/verify';
+import verify from "@/views/my-components/verify";
 
 export default {
   components: {
@@ -57,18 +52,20 @@ export default {
     LangSwitch,
     Header,
     Footer,
-    verify
+    verify,
   },
   data() {
     return {
       loading: false, // 加载状态
-      form: { // 表单数据
+      form: {
+        // 表单数据
         username: "",
         password: "",
         mobile: "",
         code: "",
       },
-      rules: { // 验证规则
+      rules: {
+        // 验证规则
         username: [
           {
             required: true,
@@ -88,7 +85,8 @@ export default {
   },
   methods: {
     mounted() {},
-    afterLogin(res) { // 登录成功后处理
+    afterLogin(res) {
+      // 登录成功后处理
       let accessToken = res.result.accessToken;
       let refreshToken = res.result.refreshToken;
       this.setStore("accessToken", accessToken);
@@ -109,28 +107,35 @@ 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) => {
-        if (res && res.success) {
-          this.afterLogin(res);
-        } else {
+      })
+        .then((res) => {
+          if (res && res.success) {
+            this.afterLogin(res);
+          } else {
+            this.loading = false;
+          }
+        })
+        .catch(() => {
           this.loading = false;
-        }
-      }).catch(()=>{this.loading = false});
-    }
+        });
+      this.$refs.verify.show = false;
+    },
   },
 };
 </script>
@@ -154,7 +159,7 @@ export default {
     position: relative;
     zoom: 1;
   }
-  .verify-con{
+  .verify-con {
     position: absolute;
     top: 90px;
     z-index: 10;
@@ -198,5 +203,4 @@ export default {
 .flex {
   justify-content: center;
 }
-
 </style>
diff --git a/manager/src/views/main-components/header.vue b/manager/src/views/main-components/header.vue
index dcfef0bd..1eeb107b 100644
--- a/manager/src/views/main-components/header.vue
+++ b/manager/src/views/main-components/header.vue
@@ -2,7 +2,6 @@
   <div>
     <Row class="header">
       <img src="../../assets/logo.png" class="logo" width="220px">
-      <!-- <div class="description">{{ $t('LILISHOP-ADMIN') }}</div> -->
     </Row>
   </div>
 </template>
@@ -15,13 +14,13 @@ export default {
 
 <style lang="scss" scoped>
 .header {
-
   margin-bottom: 6vh;
   text-align: center;
   display: flex;
   justify-content: center !important;
 }
 .logo {
-  transform: scale(2);
+  width: 440px;
+  height: 158px;
 }
 </style>
diff --git a/manager/src/views/my-components/lili/editor.vue b/manager/src/views/my-components/lili/editor.vue
index bc7811a2..697bc9ed 100644
--- a/manager/src/views/my-components/lili/editor.vue
+++ b/manager/src/views/my-components/lili/editor.vue
@@ -15,20 +15,8 @@
       </div>
     </div>
 
-    <Modal
-      title="编辑html代码"
-      v-model="showHTMLModal"
-      :mask-closable="false"
-      :width="900"
-      :fullscreen="full"
-    >
-      <Input
-        v-if="!full"
-        v-model="dataEdit"
-        :rows="15"
-        type="textarea"
-        style="max-height:60vh;overflow:auto;"
-      />
+    <Modal title="编辑html代码" v-model="showHTMLModal" :mask-closable="false" :width="900" :fullscreen="full">
+      <Input v-if="!full" v-model="dataEdit" :rows="15" type="textarea" style="max-height:60vh;overflow:auto;" />
       <Input v-if="full" v-model="dataEdit" :rows="32" type="textarea" />
       <div slot="footer">
         <Button @click="full=!full" icon="md-expand">全屏开/关</Button>
@@ -56,21 +44,21 @@ export default {
   props: {
     id: {
       type: String,
-      default: "editor"
+      default: "editor",
     },
     value: String,
     base64: {
       type: Boolean,
-      default: false
+      default: false,
     },
     showExpand: {
       type: Boolean,
-      default: true
+      default: true,
     },
     openXss: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
@@ -79,16 +67,17 @@ export default {
       dataEdit: "", // 编辑数据
       showHTMLModal: false, // 显示html
       full: false, // html全屏开关
-      fullscreenModal: false // 显示全屏预览
+      fullscreenModal: false, // 显示全屏预览
     };
   },
   methods: {
+
     initEditor() {
       let that = this;
       // 详见wangeditor3官网文档 https://www.kancloud.cn/wangfupeng/wangeditor3/332599
       editor = new E(`#${this.id}`);
       // 编辑内容绑定数据
-      editor.config.onchange = html => {
+      editor.config.onchange = (html) => {
         if (this.openXss) {
           this.data = xss(html);
         } else {
@@ -108,30 +97,30 @@ export default {
         editor.config.uploadImgServer = uploadFile;
         // lili如要header中传入token鉴权
         editor.config.uploadImgHeaders = {
-          accessToken: that.getStore("accessToken")
+          accessToken: that.getStore("accessToken"),
         };
         editor.config.uploadFileName = "file";
         editor.config.uploadImgHooks = {
-          before: function(xhr, editor, files) {
+          before: function (xhr, editor, files) {
             // 图片上传之前触发
           },
-          success: function(xhr, editor, result) {
+          success: function (xhr, editor, result) {
             // 图片上传并返回结果，图片插入成功之后触发
           },
-          fail: function(xhr, editor, result) {
+          fail: function (xhr, editor, result) {
             // 图片上传并返回结果，但图片插入错误时触发
             that.$Message.error("上传图片失败");
           },
-          error: function(xhr, editor) {
+          error: function (xhr, editor) {
             // 图片上传出错时触发
             that.$Message.error("上传图片出错");
           },
-          timeout: function(xhr, editor) {
+          timeout: function (xhr, editor) {
             // 图片上传超时时触发
             that.$Message.error("上传图片超时");
           },
           // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
-          customInsert: function(insertImg, result, editor) {
+          customInsert: function (insertImg, result, editor) {
             if (result.success == true) {
               let url = result.result;
               insertImg(url);
@@ -139,10 +128,11 @@ export default {
             } else {
               that.$Message.error(result.message);
             }
-          }
+          },
         };
       }
-      editor.config.customAlert = function(info) {
+
+      editor.config.customAlert = function (info) {
         // info 是需要提示的内容
         // that.$Message.info(info);
       };
@@ -156,8 +146,8 @@ export default {
           // type -> 'emoji' / 'image'
           type: "image",
           // content -> 数组
-          content: sina
-        }
+          content: sina,
+        },
       ];
       editor.create();
       if (this.value) {
@@ -187,7 +177,7 @@ export default {
           editor.txt.html(this.data);
           this.$emit("input", this.data);
           this.$emit("on-change", this.data);
-        }
+        },
       });
     },
     setData(value) {
@@ -200,22 +190,21 @@ export default {
         this.$emit("input", this.data);
         this.$emit("on-change", this.data);
       }
-    }
+    },
   },
   watch: {
     value(val) {
       this.setData(val);
-    }
+    },
   },
   mounted() {
     this.initEditor();
-  }
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .e-menu {
-
   z-index: 101;
   position: absolute;
   cursor: pointer;
diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue
index 4ba3ddb5..360492c8 100644
--- a/manager/src/views/page/article-manage/articleList.vue
+++ b/manager/src/views/page/article-manage/articleList.vue
@@ -57,7 +57,7 @@
                 <Input type="number" v-model="form.sort" clearable style="width: 10%" />
               </FormItem>
               <FormItem class="form-item-view-el" label="文章内容" prop="content">
-                <editor v-model="form.content"></editor>
+                <editor openXss v-model="form.content"></editor>
               </FormItem>
               <FormItem label="是否展示" prop="openStatus">
                 <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
@@ -72,7 +72,7 @@
             </div>
           </Modal>
         </template>
-        
+
       </Card>
       </Col>
 
@@ -123,7 +123,7 @@ export default {
       searchTreeValue: "", // 切换
       form: {
         // 添加或编辑表单对象初始化数据
-        openStatus:false,
+        openStatus: false,
         title: "",
         categoryId: "",
         sort: 1,
@@ -380,7 +380,6 @@ export default {
           //为了在是否展示一列展示开关 需要改一下数据类型，最终提交再次更改
           this.data = [];
           if (res.result.records.length > 0) {
-
             this.data = res.result.records;
           }
         }
@@ -390,7 +389,6 @@ export default {
     },
 
     handleSubmit() {
-
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.submitLoading = true;
@@ -403,7 +401,6 @@ export default {
                 this.$Message.success("操作成功");
                 this.getDataList();
                 this.modalVisible = false;
-
               }
             });
           } else {
@@ -414,8 +411,6 @@ export default {
                 this.$Message.success("操作成功");
                 this.getDataList();
                 this.modalVisible = false;
-
-
               }
             });
           }
@@ -440,10 +435,25 @@ export default {
           this.form.categoryId = res.result.categoryId;
           this.treeValue = data.articleCategoryName;
           this.form.id = data.id;
-          this.form.content = res.result.content;
+          this.form.content = htmlEscape(res.result.content);
           this.form.title = res.result.title;
           this.form.sort = res.result.sort;
-            this.form.openStatus = res.result.openStatus
+          this.form.openStatus = res.result.openStatus;
+        }
+      });
+    },
+
+    htmlEscape(text) {
+      return text.replace(/[<>"&]/g, function (match, pos, originalText) {
+        switch (match) {
+          case "<":
+            return "&lt;";
+          case ">":
+            return "&gt;";
+          case "&":
+            return "&amp;";
+          case '"':
+            return "&quot;";
         }
       });
     },
diff --git a/manager/src/views/sys/app-version/appVersion.vue b/manager/src/views/sys/app-version/appVersion.vue
index a869d30b..3d411d76 100644
--- a/manager/src/views/sys/app-version/appVersion.vue
+++ b/manager/src/views/sys/app-version/appVersion.vue
@@ -347,6 +347,7 @@ export default {
             this.form.versionUpdateDate / 1000
           );
           this.form.versionUpdateDate = versionUpdateDate;
+
           this.form.updateTime = versionUpdateDate;
           if (this.modalType == 0) {
             // 添加 避免编辑后传入id等数据 记得删除
diff --git a/seller/src/api/order.js b/seller/src/api/order.js
index f18c4d2c..4256cdb0 100644
--- 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}`)
 }
 
 // 售后服务单
diff --git a/seller/src/assets/download.png b/seller/src/assets/download.png
new file mode 100644
index 00000000..f2d237c2
Binary files /dev/null and b/seller/src/assets/download.png differ
diff --git a/seller/src/assets/goodsType1.png b/seller/src/assets/goodsType1.png
new file mode 100644
index 00000000..765c17c9
Binary files /dev/null and b/seller/src/assets/goodsType1.png differ
diff --git a/seller/src/assets/goodsType2.png b/seller/src/assets/goodsType2.png
new file mode 100644
index 00000000..7a957134
Binary files /dev/null and b/seller/src/assets/goodsType2.png differ
diff --git a/seller/src/assets/goodsTypeTpl.png b/seller/src/assets/goodsTypeTpl.png
new file mode 100644
index 00000000..dafa3393
Binary files /dev/null and b/seller/src/assets/goodsTypeTpl.png differ
diff --git a/seller/src/assets/logo.png b/seller/src/assets/logo.png
index 993ca619..4ee26429 100644
Binary files a/seller/src/assets/logo.png and b/seller/src/assets/logo.png differ
diff --git a/seller/src/assets/success.png b/seller/src/assets/success.png
new file mode 100644
index 00000000..92c815d1
Binary files /dev/null and b/seller/src/assets/success.png differ
diff --git a/seller/src/assets/upload.png b/seller/src/assets/upload.png
new file mode 100644
index 00000000..ff704611
Binary files /dev/null and b/seller/src/assets/upload.png differ
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index 7b283dc2..27da5927 100644
--- 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',
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
index 5bb9b88e..04b15601 100644
--- 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",
diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss
index dda4752a..89f5632b 100644
--- 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;
 }
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index bb794f9b..6368a8af 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -1,12 +1,32 @@
 <template>
   <div class="goods-operation">
-    <div style="height: 45px">
-      <steps
-        :current="activestep"
-        simple
-        style="margin-top: 10px"
-        process-status="process"
-      >
+    <!-- 选择商品类型 -->
+    <Modal v-model="selectGoodsType" width="550" :closable="false">
+      <div class="goods-type-list" v-if="!showGoodsTemplates">
+        <div class="goods-type-item" :class="{'active-goods-type':item.check}" @click="handleClickGoodsType(item)" v-for="(item,index) in goodsTypeWay" :key="index">
+          <img :src="item.img" />
+          <div>
+            <h2>{{item.title}}</h2>
+            <p>{{item.desc}}</p>
+          </div>
+        </div>
+      </div>
+      <div v-else class="goods-type-list">
+        <h2 @click="showGoodsTemplates = !showGoodsTemplates">返回</h2>
+        <div class="goods-type-item template-item" @click="handleClickGoodsTemplate(item)" v-for="(item,index) in goodsTemplates" :key="index">
+          <img :src="item.thumbnail" />
+          <div>
+            <h2>{{item.goodsName}}</h2>
+            <p>{{item.sellingPoint || ''}}</p>
+          </div>
+        </div>
+
+      </div>
+
+    </Modal>
+
+    <div class="step-list">
+      <steps :current="activestep" simple style="height:60px;margin-top: 10px" process-status="process">
         <div class="step-view">
           <step title="选择商品品类" />
         </div>
@@ -21,34 +41,19 @@
     <div class="content-goods-publish" v-show="activestep === 0">
       <div class="goods-category">
         <ul v-if="categoryListLevel1 && categoryListLevel1.length > 0">
-          <li
-            v-for="(item, index) in categoryListLevel1"
-            :class="{ activeClass: index == activeCategoryIndex1 }"
-            @click="handleSelectCategory(item, index, 1)"
-            :key="index"
-          >
+          <li v-for="(item, index) in categoryListLevel1" :class="{ activeClass: index == activeCategoryIndex1 }" @click="handleSelectCategory(item, index, 1)" :key="index">
             <span>{{ item.name }}</span>
             <span>&gt;</span>
           </li>
         </ul>
         <ul v-if="categoryListLevel2 && categoryListLevel2.length > 0">
-          <li
-            v-for="(item, index) in categoryListLevel2"
-            :class="{ activeClass: index == activeCategoryIndex2 }"
-            @click="handleSelectCategory(item, index, 2)"
-            :key="index"
-          >
+          <li v-for="(item, index) in categoryListLevel2" :class="{ activeClass: index == activeCategoryIndex2 }" @click="handleSelectCategory(item, index, 2)" :key="index">
             <span>{{ item.name }}</span>
             <span>&gt;</span>
           </li>
         </ul>
         <ul v-if="categoryListLevel3 && categoryListLevel3.length > 0">
-          <li
-            v-for="(item, index) in categoryListLevel3"
-            :class="{ activeClass: index == activeCategoryIndex3 }"
-            @click="handleSelectCategory(item, index, 3)"
-            :key="index"
-          >
+          <li v-for="(item, index) in categoryListLevel3" :class="{ activeClass: index == activeCategoryIndex3 }" @click="handleSelectCategory(item, index, 3)" :key="index">
             <span>{{ item.name }}</span>
           </li>
         </ul>
@@ -59,87 +64,46 @@
         <span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
         <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
       </p>
-      <template v-if="!$route.query.id">
-        <Divider>或选择商品模版</Divider>
-        <Select v-model="draftId" clearable style="width: 200px">
-          <Option v-for="item in goodsTemplates" :value="item.id" :key="item.id"
-          >{{ item.goodsName || item.id }}
-          </Option>
-        </Select>
+      <template v-if="!$route.query.id && draftId">
+        <Divider>已选商品模版:{{goodsTemplates.find(item=>{return item.id == draftId}).goodsName}}</Divider>
+
       </template>
     </div>
 
     <div class="content-goods-publish" v-show="activestep === 1">
-      <Form
-        ref="baseInfoForm"
-        :model="baseInfoForm"
-        :label-width="120"
-        :rules="baseInfoFormRule"
-      >
+      <Form ref="baseInfoForm" :model="baseInfoForm" :label-width="120" :rules="baseInfoFormRule">
         <div class="base-info-item">
           <h4>基本信息</h4>
           <div class="form-item-view">
             <FormItem label="商品分类">
               <span class="goods-category-name">{{ activeCategoryName1 }}</span>
-              <span v-show="activeCategoryName2"
-              >> {{ activeCategoryName2 }}</span
-              >
-              <span v-show="activeCategoryName3"
-              >> {{ activeCategoryName3 }}</span
-              >
-              <span
-                v-if="!activeCategoryName1"
-                v-html="baseInfoForm.category_name"
-              ></span>
+              <span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
+              <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
+              <span v-if="!activeCategoryName1" v-html="baseInfoForm.category_name"></span>
             </FormItem>
             <FormItem label="商品名称" prop="goodsName">
-              <Input
-                type="text"
-                v-model="baseInfoForm.goodsName"
-                placeholder="商品名称"
-                clearable
-                style="width: 260px"
-              />
+              <Input type="text" v-model="baseInfoForm.goodsName" placeholder="商品名称" clearable style="width: 260px" />
             </FormItem>
 
             <FormItem label="商品卖点" prop="sellingPoint">
-              <Input
-                v-model="baseInfoForm.sellingPoint"
-                type="textarea"
-                :rows="4"
-                style="width: 260px"
-              />
+              <Input v-model="baseInfoForm.sellingPoint" type="textarea" :rows="4" style="width: 260px" />
             </FormItem>
             <FormItem label="商品品牌" prop="brandId">
               <Select v-model="baseInfoForm.brandId" style="width: 200px">
-                <Option
-                  v-for="item in brandList"
-                  :value="item.id"
-                  :key="item.id"
-                  :label="item.name"
-                ></Option>
+                <Option v-for="item in brandList" :value="item.id" :key="item.id" :label="item.name"></Option>
               </Select>
             </FormItem>
           </div>
           <h4>商品交易信息</h4>
           <div class="form-item-view">
-            <FormItem
-              class="form-item-view-el"
-              label="计量单位"
-              prop="goodsUnit"
-            >
+            <FormItem class="form-item-view-el" label="计量单位" prop="goodsUnit">
               <Select v-model="baseInfoForm.goodsUnit" style="width: 100px">
-                <Option v-for="unit in goodsUnitList" :key="unit" :value="unit"
-                >{{ unit }}
+                <Option v-for="unit in goodsUnitList" :key="unit" :value="unit">{{ unit }}
                 </Option>
               </Select>
             </FormItem>
-            <FormItem
-              class="form-item-view-el"
-              label="销售模式"
-              prop="salesModel"
-            >
-              <RadioGroup type="button" button-style="solid" v-model="baseInfoForm.salesModel">
+            <FormItem class="form-item-view-el" label="销售模式" prop="salesModel">
+              <RadioGroup type="button" v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'" button-style="solid" v-model="baseInfoForm.salesModel">
                 <Radio title="零售型" label="RETAIL">
                   <span>零售型</span>
                 </Radio>
@@ -147,113 +111,66 @@
                   <span>批发型</span>
                 </Radio>
               </RadioGroup>
+              <RadioGroup type="button" v-else button-style="solid" v-model="baseInfoForm.salesModel">
+                <Radio title="零售型" label="RETAIL">
+                  <span>虚拟型</span>
+                </Radio>
+
+              </RadioGroup>
+
             </FormItem>
           </div>
           <h4>商品规格及图片</h4>
           <div class="form-item-view">
             <FormItem label="商品编号" prop="sn">
-              <Input
-                type="text"
-                v-model="baseInfoForm.sn"
-                placeholder="商品编号"
-                clearable
-                style="width: 260px"
-              />
+              <Input type="text" v-model="baseInfoForm.sn" placeholder="商品编号" clearable style="width: 260px" />
             </FormItem>
             <FormItem label="商品价格" prop="price">
-              <Input
-                type="text"
-                v-model="baseInfoForm.price"
-                placeholder="商品价格"
-                clearable
-                style="width: 260px"
-              />
+              <Input type="text" v-model="baseInfoForm.price" placeholder="商品价格" clearable style="width: 260px" />
             </FormItem>
             <FormItem label="市场价格" prop="cost">
-              <Input
-                type="text"
-                v-model="baseInfoForm.cost"
-                placeholder="市场价格"
-                clearable
-                style="width: 260px"
-              />
+              <Input type="text" v-model="baseInfoForm.cost" placeholder="市场价格" clearable style="width: 260px" />
             </FormItem>
-            <FormItem
-              class="form-item-view-el required"
-              label="商品图片"
-              prop="goodsGalleryFiles"
-            >
-              <div
-                class="demo-upload-list"
-                v-for="(item, __index) in baseInfoForm.goodsGalleryFiles"
-                :key="__index"
-              >
+            <FormItem class="form-item-view-el required" label="商品图片" prop="goodsGalleryFiles">
+              <div class="demo-upload-list" v-for="(item, __index) in baseInfoForm.goodsGalleryFiles" :key="__index">
                 <template v-if="item.status === 'finished'">
-                  <img :src="item.url"/>
+                  <img :src="item.url" />
 
                   <div class="demo-upload-list-cover">
-                    <Icon
-                      type="ios-eye-outline"
-                      @click.native="handleViewGoodsPicture(item.url)"
-                    ></Icon>
-                    <Icon
-                      type="ios-trash-outline"
-                      @click.native="handleRemoveGoodsPicture(item)"
-                    ></Icon>
-                    <Icon
-                      type="ios-arrow-dropleft"
-                      @click.native="
+                    <div>
+                      <Icon type="ios-eye-outline" @click.native="handleViewGoodsPicture(item.url)"></Icon>
+                      <Icon type="ios-trash-outline" @click.native="handleRemoveGoodsPicture(item)"></Icon>
+                    </div>
+                    <div>
+                      <Icon type="ios-arrow-dropleft" @click.native="
                         handleGoodsPicRemoteUp(
                           baseInfoForm.goodsGalleryFiles,
                           __index
                         )
-                      "
-                    />
-                    <Icon
-                      type="ios-arrow-dropright"
-                      @click.native="
+                      " />
+                      <Icon type="ios-arrow-dropright" @click.native="
                         handleGoodsPicRemoteDown(
                           baseInfoForm.goodsGalleryFiles,
                           __index
                         )
-                      "
-                    />
+                      " />
+                    </div>
                   </div>
                 </template>
                 <template v-else>
-                  <Progress
-                    v-if="item.showProgress"
-                    :percent="item.percentage"
-                    hide-info
-                  ></Progress>
+                  <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
                 </template>
               </div>
-              <Upload
-                ref="upload"
-                :show-upload-list="false"
-                :default-file-list="baseInfoForm.goodsGalleryFiles"
-                :on-success="handleSuccessGoodsPicture"
-                :format="['jpg', 'jpeg', 'png']"
-                :on-format-error="handleFormatError"
-                :on-exceeded-size="handleMaxSize"
-                :before-upload="handleBeforeUploadGoodsPicture"
-                multiple
-                type="drag"
-                :action="uploadFileUrl"
-                :headers="accessToken"
-                style="display: inline-block;margin-left:10px;"
-              >
+              <Upload ref="upload" :show-upload-list="false" :default-file-list="baseInfoForm.goodsGalleryFiles" :on-success="handleSuccessGoodsPicture" :format="['jpg', 'jpeg', 'png']"
+                :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUploadGoodsPicture" multiple type="drag" :action="uploadFileUrl"
+                :headers="accessToken" style="display: inline-block;margin-left:10px;">
                 <div style="width: 80px; height: 80px; line-height: 80px">
                   <Icon type="ios-camera" size="20"></Icon>
                 </div>
               </Upload>
 
               <Modal title="View Image" v-model="goodsPictureVisible">
-                <img
-                  :src="previewGoodsPicture"
-                  v-if="goodsPictureVisible"
-                  style="width: 100%"
-                />
+                <img :src="previewGoodsPicture" v-if="goodsPictureVisible" style="width: 100%" />
               </Modal>
             </FormItem>
 
@@ -263,96 +180,48 @@
                   规格名称
                   <div slot="content" class="sku-item-content">
                     <Form :model="skuForm" @submit.native.prevent>
-                      <div
-                        class="sku-item"
-                        v-for="(item, $index) in skuInfo"
-                        :key="$index"
-                      >
+                      <div class="sku-item" v-for="(item, $index) in skuInfo" :key="$index">
                         <Card :bordered="true">
-                          <FormItem
-                            label="规格名："
-                            class="sku-item-content-name"
-                          >
-                            <AutoComplete
-                              style="width: 150px"
-                              v-model="item.name"
-                              :maxlength="30"
-                              :data="specListSelected"
-                              placeholder="请输入规格项名称"
-                              :filter-method="filterMethod"
-                              @on-change="skuItemChange(item.name, $index)"
-                              @keyup.enter.native="editSkuItem(item, $index)"
-                              @on-focus="
+                          <FormItem label="规格名：" class="sku-item-content-name">
+                            <AutoComplete style="width: 150px" v-model="item.name" :maxlength="30" :data="specListSelected" placeholder="请输入规格项名称" :filter-method="filterMethod"
+                              @on-change="skuItemChange(item.name, $index)" @keyup.enter.native="editSkuItem(item, $index)" @on-focus="
                                 getActiveSkuItem(index, $index, item, val)
-                              "
-                              @on-blur="editSkuItem(item, $index)"
-                            />
-                            <Button
-                              type="error"
-                              style="margin-left: 10px"
-                              @click="handleCloseSkuItem($index)"
-                            >删除
+                              " @on-blur="editSkuItem(item, $index)" />
+                            <Button type="error" style="margin-left: 10px" @click="handleCloseSkuItem($index)">删除
                             </Button>
                           </FormItem>
 
                           <FormItem label="规格值：" prop="sku">
                             <!--规格值文本列表-->
-                            <div
-                              v-for="(val, index) in item.spec_values"
-                              :key="index"
-                              style="padding: 0px 20px 10px 0px; float: left"
-                            >
+                            <div v-for="(val, index) in item.spec_values" :key="index" style="padding: 0px 20px 10px 0px; float: left">
                               <div>
-                                <AutoComplete
-                                  style="width: 150px; float: left"
-                                  v-model="val.value"
-                                  :maxlength="30"
-                                  :data="skuValue"
-                                  placeholder="请输入规格值名称"
-                                  :filter-method="filterMethod"
-                                  @on-change="
+                                <AutoComplete style="width: 150px; float: left" v-model="val.value" :maxlength="30" :data="skuValue" placeholder="请输入规格值名称" :filter-method="filterMethod" @on-change="
                                     skuValueChange(val.value, index, item)
-                                  "
-                                  @on-focus="
+                                  " @on-focus="
                                     getActiveSkuValueItem(
                                       index,
                                       $index,
                                       item,
                                       val
                                     )
-                                  "
-                                  @keyup.enter.native="
+                                  " @keyup.enter.native="
                                     editSkuIValue(item, val, $index, index)
-                                  "
-                                  @on-blur="
+                                  " @on-blur="
                                     editSkuIValue(item, val, $index, $index)
-                                  "
-                                ></AutoComplete>
-                                <Button
-                                  type="error"
-                                  style="float: left; margin-left: 10px"
-                                  @click="handleCloseSkuValue($index, index)"
-                                >删除
+                                  "></AutoComplete>
+                                <Button type="error" style="float: left; margin-left: 10px" @click="handleCloseSkuValue($index, index)">删除
                                 </Button>
                               </div>
                             </div>
                             <div style="float: left">
-                              <Button
-                                type="primary"
-                                @click="addSpec($index, item)"
-                              >添加规格值
+                              <Button type="primary" @click="addSpec($index, item)">添加规格值
                               </Button>
                             </div>
                           </FormItem>
                         </Card>
                       </div>
                     </Form>
-                    <Button
-                      class="add-sku-btn"
-                      type="primary"
-                      size="mini"
-                      @click="addSkuItem"
-                    >添加规格项目
+                    <Button class="add-sku-btn" type="primary" size="mini" @click="addSkuItem">添加规格项目
                     </Button>
                   </div>
                 </Panel>
@@ -360,116 +229,53 @@
                   规格详细
                   <div slot="content">
                     <div slot="content">
-                      <Table
-                        :columns="skuTableColumn"
-                        :data="skuTableData"
-                        style="
+                      <Table :columns="skuTableColumn" :data="skuTableData" style="
                           width: 100%;
                           .ivu-table-overflowX {
                             overflow-x: hidden;
                           }
-                        "
-                        :span-method="handleSpan"
-                      >
+                        " :span-method="handleSpan">
                         <template slot-scope="{ row }" slot="sn">
-                          <Input
-                            v-model="row.sn"
-                            placeholder="请输入货号"
-                            @on-change="updateSkuTable(row, 'sn')"
-                          />
+                          <Input v-model="row.sn" placeholder="请输入货号" @on-change="updateSkuTable(row, 'sn')" />
                         </template>
 
-                        <template slot-scope="{ row }" slot="weight">
-                          <Input
-                            v-model="row.weight"
-                            placeholder="请输入重量"
-                            @on-change="updateSkuTable(row, 'weight')"
-                          />
+                        <template slot-scope="{ row }" slot="weight" v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'">
+                          <Input v-model="row.weight" placeholder="请输入重量" @on-change="updateSkuTable(row, 'weight')" />
                         </template>
 
                         <template slot-scope="{ row }" slot="quantity">
-                          <Input
-                            v-model="row.quantity"
-                            placeholder="请输入库存"
-                            @on-change="updateSkuTable(row, 'quantity')"
-                          />
+                          <Input v-model="row.quantity" placeholder="请输入库存" @on-change="updateSkuTable(row, 'quantity')" />
                         </template>
 
                         <template slot-scope="{ row }" slot="cost">
-                          <Input
-                            v-model="row.cost"
-                            placeholder="请输入成本价"
-                            @on-change="updateSkuTable(row, 'cost')"
-                          />
+                          <Input v-model="row.cost" placeholder="请输入成本价" @on-change="updateSkuTable(row, 'cost')" />
                         </template>
 
                         <template slot-scope="{ row }" slot="price">
-                          <Input
-                            v-model="row.price"
-                            placeholder="请输入价格"
-                            @on-change="updateSkuTable(row, 'price')"
-                          />
+                          <Input v-model="row.price" placeholder="请输入价格" @on-change="updateSkuTable(row, 'price')" />
                         </template>
                         <template slot-scope="{ row }" slot="images">
                           <Button @click="editSkuPicture(row)">编辑图片</Button>
-                          <Modal
-                            v-model="showSkuPicture"
-                            :styles="{ top: '30px' }"
-                            draggable
-                            class-name="sku-preview-modal"
-                            title="编辑图片"
-                            ok-text="结束编辑"
-                            @on-ok="updateSkuPicture()"
-                            cancel-text="取消"
-                          >
+                          <Modal v-model="showSkuPicture" :styles="{ top: '30px' }" class-name="sku-preview-modal" title="编辑图片" ok-text="结束编辑" @on-ok="updateSkuPicture()" cancel-text="取消">
                             <div class="preview-picture">
-                              <img
-                                v-if="previewPicture !== ''"
-                                :src="previewPicture"
-                              />
+                              <img v-if="previewPicture !== ''" :src="previewPicture" />
                             </div>
-                            <Divider/>
-                            <div
-                              class="sku-upload-list"
-                              v-for="(img, __index) in selectedSku.images"
-                              :key="__index"
-                            >
+                            <Divider />
+                            <div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
                               <template v-if="img.status === 'finished'">
-                                <img :src="img.url"/>
+                                <img :src="img.url" />
                                 <div class="sku-upload-list-cover">
-                                  <Icon
-                                    type="ios-eye-outline"
-                                    @click="handleView(img.url)"
-                                  ></Icon>
-                                  <Icon
-                                    type="ios-trash-outline"
-                                    @click="handleRemove(img, __index)"
-                                  ></Icon>
+                                  <Icon type="ios-eye-outline" @click="handleView(img.url)"></Icon>
+                                  <Icon type="ios-trash-outline" @click="handleRemove(img, __index)"></Icon>
                                 </div>
                               </template>
                               <template v-else>
-                                <Progress
-                                  v-if="img.showProgress"
-                                  :percent="img.percentage"
-                                  hide-info
-                                ></Progress>
+                                <Progress v-if="img.showProgress" :percent="img.percentage" hide-info></Progress>
                               </template>
                             </div>
-                            <Upload
-                              ref="uploadSku"
-                              :show-upload-list="false"
-                              :default-file-list="row.images"
-                              :on-success="handleSuccess"
-                              :format="['jpg', 'jpeg', 'png']"
-                              :on-format-error="handleFormatError"
-                              :on-exceeded-size="handleMaxSize"
-                              :before-upload="handleBeforeUpload"
-                              multiple
-                              type="drag"
-                              :action="uploadFileUrl"
-                              :headers="accessToken"
-                              style="display: inline-block; width: 58px"
-                            >
+                            <Upload ref="uploadSku" :show-upload-list="false" :default-file-list="row.images" :on-success="handleSuccess" :format="['jpg', 'jpeg', 'png']"
+                              :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag" :action="uploadFileUrl"
+                              :headers="accessToken" style="display: inline-block; width: 58px">
                               <div>
                                 <Icon type="ios-camera" size="55"></Icon>
                               </div>
@@ -477,6 +283,7 @@
                           </Modal>
                         </template>
                       </Table>
+
                     </div>
                   </div>
                 </Panel>
@@ -486,70 +293,42 @@
           <h4>商品详情描述</h4>
           <div class="form-item-view">
             <div class="tree-bar" :style="{ maxHeight: maxHeight }">
-              <FormItem
-                class="form-item-view-el"
-                label="店内分类"
-                prop="shopCategory"
-              >
-                <Tree
-                  ref="tree"
-                  :data="shopCategory"
-                  show-checkbox
-                  @on-select-change="selectTree"
-                  @on-check-change="changeSelect"
-                  :check-strictly="!strict"
-                ></Tree>
+              <FormItem class="form-item-view-el" label="店内分类" prop="shopCategory">
+                <Tree ref="tree" :data="shopCategory" show-checkbox @on-select-change="selectTree" @on-check-change="changeSelect" :check-strictly="!strict"></Tree>
               </FormItem>
             </div>
             <FormItem class="form-item-view-el" label="商品描述" prop="intro">
               <editor id="intro" v-model="baseInfoForm.intro"></editor>
             </FormItem>
-            <FormItem
-              class="form-item-view-el"
-              label="移动端描述"
-              prop="skuList"
-            >
-              <editor
-                id="mobileIntr"
-                v-model="baseInfoForm.mobileIntro"
-              ></editor>
+            <FormItem class="form-item-view-el" label="移动端描述" prop="skuList">
+              <editor id="mobileIntr" v-model="baseInfoForm.mobileIntro"></editor>
             </FormItem>
           </div>
-          <h4>商品物流信息</h4>
-          <div class="form-item-view">
-            <FormItem class="form-item-view-el" label="商品重量" prop="weight">
-              <Input v-model="baseInfoForm.weight">
+          <div v-if="this.baseInfoForm.goodsType!='VIRTUAL_GOODS'">
+            <h4>商品物流信息</h4>
+            <div class="form-item-view">
+              <FormItem class="form-item-view-el" label="商品重量" prop="weight">
+                <Input v-model="baseInfoForm.weight">
                 <span slot="append">kg</span>
-              </Input>
-            </FormItem>
-            <!-- <FormItem class="form-item-view-el" label="运费" prop="skuList">
-              <RadioGroup type="button" button-style="solid"
-                @on-change="logisticsTemplateChange"
-                v-model="baseInfoForm.freightPayer"
-              >
-                <Radio label="STORE">
-                  <span>卖家承担运费</span>
-                </Radio>
-                <Radio label="BUYER">
-                  <span>使用物流规则</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem> -->
-            <FormItem
-              class="form-item-view-el"
-              label="物流模板"
-              prop="templateId"
-              v-if="logisticsTemplateShow"
-            >
-              <Select v-model="baseInfoForm.templateId" style="width: 200px">
-                <Option
-                  v-for="item in logisticsTemplate"
-                  :value="item.id"
-                  :key="item.id"
-                >{{ item.name }}
-                </Option>
-              </Select>
-            </FormItem>
+                </Input>
+              </FormItem>
+              <FormItem class="form-item-view-el" label="运费" prop="skuList">
+                <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateChange" v-model="baseInfoForm.freightPayer">
+                  <Radio label="STORE">
+                    <span>卖家承担运费</span>
+                  </Radio>
+                  <Radio label="BUYER">
+                    <span>使用物流规则</span>
+                  </Radio>
+                </RadioGroup>
+              </FormItem>
+              <FormItem class="form-item-view-el" label="物流模板" prop="templateId" v-if="logisticsTemplateShow">
+                <Select v-model="baseInfoForm.templateId" style="width: 200px">
+                  <Option v-for="item in logisticsTemplate" :value="item.id" :key="item.id">{{ item.name }}
+                  </Option>
+                </Select>
+              </FormItem>
+            </div>
           </div>
           <h4>其他信息</h4>
           <div class="form-item-view">
@@ -575,35 +354,15 @@
             </FormItem>
           </div>
           <div class="form-item-view-bottom">
-            <Collapse
-              v-model="show"
-              v-for="paramsgroup in goodsParams"
-              :title="paramsgroup.groupName"
-              style="text-align: left"
-              :key="paramsgroup.groupName"
-            >
+            <Collapse v-model="show" v-for="paramsgroup in goodsParams" :title="paramsgroup.groupName" style="text-align: left" :key="paramsgroup.groupName">
               <Panel key="1" name="1">
                 {{ paramsgroup.groupName }}
                 <p slot="content">
-                  <FormItem
-                    v-for="(
+                  <FormItem v-for="(
                       goodsParamsList, index
-                    ) in baseInfoForm.goodsParamsList"
-                    :key="index"
-                    :label="`${goodsParamsList.paramName}：`"
-                  >
-                    <Select
-                      v-model="goodsParamsList.paramValue"
-                      placeholder="请选择"
-                      style="width: 200px"
-                      clearable
-                    >
-                      <Option
-                        v-for="option in goodsParamsList.optionList"
-                        :key="option.paramValue"
-                        :label="option"
-                        :value="option"
-                      ></Option>
+                    ) in baseInfoForm.goodsParamsList" :key="index" :label="`${goodsParamsList.paramName}：`">
+                    <Select v-model="goodsParamsList.paramValue" placeholder="请选择" style="width: 200px" clearable>
+                      <Option v-for="option in goodsParamsList.optionList" :key="option.paramValue" :label="option" :value="option"></Option>
                     </Select>
                   </FormItem>
                 </p>
@@ -615,62 +374,50 @@
     </div>
     <div class="content-goods-publish" v-show="activestep === 2">
       <template>
-        <Card style="width: auto">
-          <div style="text-align: left">
-            <h1>恭喜您，商品发布成功!</h1>
-            <div class="goToGoodsList" @click="gotoGoodsList">
-              <a>去店铺查看商品列表>></a>
+
+        <div class="success" style="text-align: left">
+          <h1>恭喜您，商品发布成功!</h1>
+          <div class="goToGoodsList" @click="gotoGoodsList">
+            <a>去店铺查看商品列表>></a>
+          </div>
+          <div class="operation">
+            <h3>您还可以：</h3>
+            <div>
+              1、继续
+              <a @click="gotoBack">发布商品</a>
             </div>
-            <div class="operation">
-              <h3>您还可以：</h3>
-              <div>
-                1、继续
-                <a @click="gotoBack">发布商品</a>
-              </div>
-              <div>
-                2、进入卖家中心，管理
-                <a @click="gotoGoodsList">商品列表</a>
-              </div>
+            <div>
+              2、进入卖家中心，管理
+              <a @click="gotoGoodsList">商品列表</a>
             </div>
           </div>
-        </Card>
+        </div>
+
       </template>
     </div>
     <div class="footer">
       <ButtonGroup>
-        <Button type="primary" @click="pre" v-if="activestep === 1 && isPublish"
-        >上一步
+        <Button type="primary" @click="pre" v-if="activestep === 1 && isPublish">上一步
         </Button>
-        <Button type="primary" @click="next" v-if="activestep === 0"
-        >下一步
+        <Button type="primary" @click="selectGoodsType=!selectGoodsType" v-if="activestep === 0">商品类型
         </Button>
-        <Button
-          type="primary"
-          @click="save"
-          :loading="submitLoading"
-          v-if="activestep === 1"
-        >
+        <Button type="primary" @click="next" v-if="activestep === 0">下一步
+        </Button>
+        <Button type="primary" @click="save" :loading="submitLoading" v-if="activestep === 1">
           {{ this.goodsId ? "保存" : "保存商品" }}
         </Button>
-        <Button
-          type="primary"
-          @click="saveToDraft('TEMPLATE')"
-          v-if="activestep === 1"
-        >保存为模版
+        <Button type="primary" @click="saveToDraft('TEMPLATE')" v-if="activestep === 1">保存为模版
         </Button>
-        <Button
-          type="primary"
-          @click="saveToDraft('DRAFT')"
-          v-if="activestep === 1 && !isOperationGoods"
-        >保存至草稿箱
+        <Button type="primary" @click="saveToDraft('DRAFT')" v-if="activestep === 1 && !isOperationGoods">保存至草稿箱
         </Button>
       </ButtonGroup>
+
     </div>
   </div>
 </template>
 
 <script>
-import {regular} from "@/utils";
+import { regular } from "@/utils";
 import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
 import editor from "@/views/my-components/lili/editor";
 import * as API_GOODS from "@/api/goods";
@@ -685,7 +432,22 @@ export default {
     editor,
   },
   watch: {
-    $route (to, from) {
+    selectGoodsType: {
+      handler(val) {
+        if (val && this.baseInfoForm.goodsType) {
+          this.goodsTypeWay.forEach((item) => {
+            item.check = false;
+            if (item.type == this.baseInfoForm.goodsType) {
+              item.check = true;
+            }
+            if (!item.type) {
+              this.defaultBaseInfo();
+            }
+          });
+        }
+      },
+    },
+    $route(to, from) {
       if (to.query.draftId) {
         this.draftId = to.query.draftId;
         this.activestep = 1;
@@ -696,31 +458,10 @@ export default {
         this.goodsId = this.$route.query.id;
         this.GET_GoodData();
       } else {
-        this.baseInfoForm = {
-          salesModel: "RETAIL",
-          goodsParamsList: [],
-          // freightPayer: "STORE",
-          weight: "",
-          goodsGalleryFiles: [],
-          release: "true",
-          recommend: "true",
-          storeCategoryPath: "",
-          brandId: 0,
-          goodsUnit: "",
-          categoryPath: "",
-          sellingPoint: "",
-          intro: "",
-          mobileIntro: "",
-          updateSku: true,
-          regeneratorSkuFlag: false,
-          templateId: 0,
-        };
-        this.activestep = 0;
-        this.isPublish = true;
-        this.GET_GoodsTemplate();
-        this.GET_NextLevelCategory();
+        this.selectGoodsType = true;
+        this.defaultBaseInfo();
       }
-    }
+    },
   },
   data() {
     // 表单验证项，商品价格
@@ -762,7 +503,31 @@ export default {
     };
 
     return {
-      show: '1',
+      selectGoodsType: false, //是否选择商品类型
+      showGoodsTemplates: false, //是否显示选择商品模板
+      goodsTypeWay: [
+        {
+          title: "实物商品",
+          img: require("@/assets/goodsType1.png"),
+          desc: "零售批发，物流配送",
+          type: "PHYSICAL_GOODS",
+          check: false,
+        },
+        {
+          title: "虚拟商品",
+          img: require("@/assets/goodsType2.png"),
+          desc: "虚拟核验，无需物流",
+          type: "VIRTUAL_GOODS",
+          check: false,
+        },
+        {
+          title: "商品模板导入",
+          img: require("@/assets/goodsTypeTpl.png"),
+          desc: "商品模板，一键导入",
+          check: false,
+        },
+      ],
+      show: "1",
       //提交状态
       submitLoading: false,
       //上传图片路径
@@ -829,8 +594,8 @@ export default {
               paramValue: "",
               required: 0,
               optionList: [
-                {value: 1, label: ""},
-                {value: 2, label: ""},
+                { value: 1, label: "" },
+                { value: 2, label: "" },
               ],
             },
           ],
@@ -858,6 +623,7 @@ export default {
         brandId: 0,
         /** 计量单位 **/
         goodsUnit: "",
+        goodsType: "",
         /** 路径 **/
         categoryPath: "",
         /** 商品卖点 **/
@@ -933,7 +699,7 @@ export default {
       validateError: [],
       baseInfoFormRule: {
         goodsName: [
-          {required: true, message: "请输入商品名称"},
+          { required: true, message: "请输入商品名称" },
           {
             whitespace: true,
             message: "商品名称不可为纯空格",
@@ -945,23 +711,23 @@ export default {
           },
         ],
         sn: [
-          {required: true, message: "请输入商品编号"},
-          {validator: checkSn},
+          { required: true, message: "请输入商品编号" },
+          { validator: checkSn },
         ],
         price: [
-          {required: true, message: "请输入商品价格"},
-          {validator: checkPrice},
+          { required: true, message: "请输入商品价格" },
+          { validator: checkPrice },
         ],
         cost: [
-          {required: true, message: "请输入市场价格"},
-          {validator: checkPrice},
+          { required: true, message: "请输入市场价格" },
+          { validator: checkPrice },
         ],
         weight: [
-          {required: true, message: "请输入物流参数"},
-          {validator: checkWeight},
+          { required: true, message: "请输入物流参数" },
+          { validator: checkWeight },
         ],
-        sellingPoint: [{required: true, message: "请输入商品卖点"}],
-        goodsUnit: [{required: true, message: "请选择计量单位"}],
+        sellingPoint: [{ required: true, message: "请输入商品卖点" }],
+        goodsUnit: [{ required: true, message: "请选择计量单位" }],
       },
       /** 品牌列表 */
       brandList: [],
@@ -994,6 +760,7 @@ export default {
       this.activestep = 1;
       this.goodsId = this.$route.query.id;
       this.GET_GoodData();
+      this.selectGoodsType = false;
     }
     //编辑模版/草稿
     else if (this.$route.query.draftId) {
@@ -1001,9 +768,17 @@ export default {
       this.activestep = 1;
       this.isOperationGoods = false;
       this.GET_GoodData();
+      this.selectGoodsType = false;
     }
     //新增商品
     else {
+      this.selectGoodsType = true;
+      this.defaultBaseInfo();
+    }
+  },
+  methods: {
+    // 默认还原数据
+    defaultBaseInfo() {
       this.baseInfoForm = {
         salesModel: "RETAIL",
         goodsParamsList: [],
@@ -1015,6 +790,7 @@ export default {
         storeCategoryPath: "",
         brandId: 0,
         goodsUnit: "",
+        goodsType: "",
         categoryPath: "",
         sellingPoint: "",
         intro: "",
@@ -1027,9 +803,28 @@ export default {
       this.isPublish = true;
       this.GET_GoodsTemplate();
       this.GET_NextLevelCategory();
-    }
-  },
-  methods: {
+    },
+
+    // 选择商品模板
+    handleClickGoodsTemplate(val) {
+      this.draftId = val.id;
+      this.selectGoodsType = false;
+    },
+    // 点击商品类型
+    handleClickGoodsType(val) {
+      this.goodsTypeWay.map((item) => {
+        return (item.check = false);
+      });
+
+      val.check = !val.check;
+      if (!val.type) {
+        this.showGoodsTemplates = true;
+      } else {
+        this.baseInfoForm.goodsType = val.type;
+        this.draftId = "";
+      }
+    },
+
     // 移动商品图片位置
     handleGoodsPicRemoteUp(fieldData, index) {
       if (index != 0) {
@@ -1059,6 +854,7 @@ export default {
       });
     },
     editSkuPicture(row) {
+      console.log(row);
       if (row.images && row.images.length > 0) {
         this.previewPicture = row.images[0].url;
       }
@@ -1084,9 +880,8 @@ export default {
       this.goodsPictureVisible = true;
     },
     handleRemoveGoodsPicture(file) {
-      this.baseInfoForm.goodsGalleryFiles = this.baseInfoForm.goodsGalleryFiles.filter(
-        (i) => i.url !== file.url
-      );
+      this.baseInfoForm.goodsGalleryFiles =
+        this.baseInfoForm.goodsGalleryFiles.filter((i) => i.url !== file.url);
     },
     updateSkuPicture() {
       let _index = this.selectedSku._index;
@@ -1121,7 +916,7 @@ export default {
     handleMaxSize(file) {
       this.$Notice.warning({
         title: "超过文件大小限制",
-         desc: "图片  " + file.name + " 不能超过2mb",
+        desc: "图片  " + file.name + " 不能超过2mb",
       });
     },
     handleBeforeUploadGoodsPicture() {
@@ -1180,7 +975,7 @@ export default {
       }
     },
     gotoGoodsList() {
-      this.$router.push({name: "goods"});
+      this.$router.push({ name: "goods" });
     },
     gotoBack() {
       this.$router.go();
@@ -1258,12 +1053,11 @@ export default {
         response.result.goodsGalleryList &&
         response.result.goodsGalleryList.length > 0
       ) {
-        this.baseInfoForm.goodsGalleryFiles = response.result.goodsGalleryList.map(
-          (i) => {
-            let files = {url: i};
+        this.baseInfoForm.goodsGalleryFiles =
+          response.result.goodsGalleryList.map((i) => {
+            let files = { url: i };
             return files;
-          }
-        );
+          });
       }
 
       this.categoryId = this.baseInfoForm.categoryId[2];
@@ -1365,8 +1159,8 @@ export default {
                   this.baseInfoForm.goodsParamsList.push(elem);
                 }
                 if (this.$route.query.id || this.draftId) {
-                  this.baseInfoForm.goodsParamsList = this.baseInfoForm.goodsParamsList.map(
-                    (i) => {
+                  this.baseInfoForm.goodsParamsList =
+                    this.baseInfoForm.goodsParamsList.map((i) => {
                       if (i.paramId === elem.id || i.id === elem.id) {
                         elem.optionList = elem.options.split(",");
                         i = {
@@ -1375,8 +1169,7 @@ export default {
                         };
                       }
                       return i;
-                    }
-                  );
+                    });
                   return;
                 }
               });
@@ -1477,7 +1270,7 @@ export default {
      * 根据规格项名称，搜索对应的规格对象（如果是服务器设置过的话）
      */
     findSpec(name) {
-      let spec = {name: name};
+      let spec = { name: name };
       this.skuData.forEach((item) => {
         if (item.name === name) {
           spec = item;
@@ -1499,7 +1292,6 @@ export default {
     async skuValueChange(val, index, item) {
       this.specValSelected = val;
       await this.GET_SkuSpecVal(item.spec_id);
-      l;
       /** 更新skuInfo数据 */
       let _arr = cloneObj(this.skuInfo[this.activeSkuItemIndex]);
       this.$set(this.skuInfo[this.activeSkuItemIndex], "name", _arr.name);
@@ -1568,15 +1360,19 @@ export default {
           key: columnName,
         });
       });
-      this.skuTableColumn.push(
+      let pushData = [];
+      pushData.push(...this.skuTableColumn);
+      this.baseInfoForm.goodsType != "VIRTUAL_GOODS"
+        ? pushData.push({
+            title: "重量",
+            slot: "weight",
+          })
+        : "";
+      pushData.push(
         {
           title: "货号",
           slot: "sn",
         },
-        {
-          title: "重量",
-          slot: "weight",
-        },
         {
           title: "库存",
           slot: "quantity",
@@ -1595,6 +1391,8 @@ export default {
         }
       );
 
+      this.skuTableColumn = pushData;
+
       //克隆所有渲染的数据
       let cloneTemp = cloneObj(this.skuInfo);
       //数据清空一次
@@ -1670,8 +1468,7 @@ export default {
       }
       return this.specIterator(result, cloneTemp);
     },
-    handleSpan({row, column, rowIndex, columnIndex}) {
-    },
+    handleSpan({ row, column, rowIndex, columnIndex }) {},
     /** 数据改变之后 抛出数据 */
     updateSkuTable(row, item) {
       let index = row._index;
@@ -1715,7 +1512,7 @@ export default {
     },
     /** 上一步*/
     pre() {
-      window.scrollTo(0,0)
+      window.scrollTo(0, 0);
       this.loading = true;
       if (this.activestep === 1) {
         this.toPreCount > 0
@@ -1732,7 +1529,7 @@ export default {
     /** 下一步*/
     next() {
       console.log(111);
-      window.scrollTo(0,0)
+      window.scrollTo(0, 0);
       if (this.activestep === 0 && this.draftId) {
         this.activestep = 1;
         this.GET_GoodData();
@@ -1828,14 +1625,17 @@ export default {
           }
           let flag = false;
           let paramValue = "";
-          this.baseInfoForm.goodsParamsList.forEach((e)=> {
-            if(e.required === 1 && e.paramValue === null || e.paramValue === undefined){
-              flag = true
-              paramValue = e.paramName
+          this.baseInfoForm.goodsParamsList.forEach((e) => {
+            if (
+              (e.required === 1 && e.paramValue === null) ||
+              e.paramValue === undefined
+            ) {
+              flag = true;
+              paramValue = e.paramName;
             }
           });
-          if(flag){
-            this.$Message.error(paramValue +" 参数值不能为空");
+          if (flag) {
+            this.$Message.error(paramValue + " 参数值不能为空");
             this.submitLoading = false;
             return;
           }
@@ -1853,36 +1653,32 @@ export default {
           });
 
           if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
-            this.baseInfoForm.goodsGalleryList = this.baseInfoForm.goodsGalleryFiles.map(
-              (i) => i.url
-            );
+            this.baseInfoForm.goodsGalleryList =
+              this.baseInfoForm.goodsGalleryFiles.map((i) => i.url);
           }
           /** 参数校验 **/
-         /* Object.keys(this.baseInfoForm.goodsParamsList).forEach((item) => {
+          /* Object.keys(this.baseInfoForm.goodsParamsList).forEach((item) => {
             console.warn(item.paramName)
           });*/
 
-
-
           if (this.goodsId) {
             API_GOODS.editGoods(this.goodsId, this.baseInfoForm).then((res) => {
               if (res.success) {
                 this.submitLoading = false;
                 this.$router.go(-1);
-              }
-              else{
-                 this.submitLoading = false;
+              } else {
+                this.submitLoading = false;
               }
             });
           } else {
-            this.baseInfoForm.goodsType = "NORMAL";
+            // this.baseInfoForm.goodsType = "NORMAL";
             API_GOODS.createGoods(this.baseInfoForm).then((res) => {
               if (res.success) {
                 this.submitLoading = false;
                 this.activestep = 2;
-                window.scrollTo(0,0)
-              }else{
-                 this.submitLoading = false;
+                window.scrollTo(0, 0);
+              } else {
+                this.submitLoading = false;
               }
             });
           }
@@ -1896,9 +1692,8 @@ export default {
       let showType = saveType === "TEMPLATE" ? "模版" : "草稿";
       this.baseInfoForm.skuList = this.skuTableData;
       if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
-        this.baseInfoForm.goodsGalleryList = this.baseInfoForm.goodsGalleryFiles.map(
-          (i) => i.url
-        );
+        this.baseInfoForm.goodsGalleryList =
+          this.baseInfoForm.goodsGalleryFiles.map((i) => i.url);
       }
       this.baseInfoForm.categoryName = [];
       this.baseInfoForm.saveType = saveType;
diff --git a/seller/src/views/login.vue b/seller/src/views/login.vue
index 93747100..bb014b1a 100644
--- 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>
diff --git a/seller/src/views/main-components/header.vue b/seller/src/views/main-components/header.vue
index e3727242..5f3bac1a 100644
--- 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>
diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue
new file mode 100644
index 00000000..ab0d7c51
--- /dev/null
+++ 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>
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index cfda0899..740dfa33 100644
--- 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;
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 7b53d2c3..9451e16f 100644
--- 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>