diff --git a/buyer/src/assets/images/geted.png b/buyer/src/assets/images/geted.png
index 9bab88c6..0dc683c0 100644
Binary files a/buyer/src/assets/images/geted.png and b/buyer/src/assets/images/geted.png differ
diff --git a/buyer/src/components/nav/cateNav.vue b/buyer/src/components/nav/cateNav.vue
index 9cdd66c6..e4fd092c 100644
--- a/buyer/src/components/nav/cateNav.vue
+++ b/buyer/src/components/nav/cateNav.vue
@@ -13,11 +13,12 @@
         </li>
       </ul>
     </div>
-    <!-- 侧边导航 -->
+    <!-- 全部商品分类 -->
     <div class="cate-list" v-show="showAlways || showFirstList" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false">
-      <div class="nav-side">
+      <!-- 第一级分类 -->
+      <div class="nav-side" @mouseleave="panel = false">
         <ul>
-          <li v-for="(item, index) in cateList" :key="index" @mouseenter="showDetail(index)" @mouseleave="panel = false">
+          <li v-for="(item, index) in cateList" :key="index" @mouseenter="showDetail(index)" >
             <span class="nav-side-item" @click="goGoodsList(item.id)">{{item.name}}</span>
             <span v-for="(second, secIndex) in item.children" :key="secIndex">
               <span v-if="secIndex < 2" > / </span>
@@ -26,38 +27,35 @@
           </li>
         </ul>
       </div>
-      <transition name="fade">
-        <div
-          class="detail-item-panel"
-          :duration="{ enter: 100, leave: 100 }"
-          v-show="panel"
-          @mouseenter="panel = true"
-          ref="itemPanel1"
-          @mouseleave="panel = false"
-        >
-          <div class="nav-detail-item">
-            <template v-for="(item, index) in panelData">
-              <span @click="goGoodsList(item.id, item.parentId)" v-if="index < 8" :key="index">{{ item.name }}<Icon type="ios-arrow-forward" /></span>
-            </template>
-          </div>
-          <ul>
-            <li
-              v-for="(items, index) in panelData"
-              :key="index"
-              class="detail-item-row"
-            >
-              <span class="detail-item-title" @click="goGoodsList(items.id,items.parentId)">
-                {{ items.name }} <Icon type="ios-arrow-forward" />
-                <span class="glyphicon glyphicon-menu-right"></span>
-              </span>
-              <div>
-                <span v-for="(item, subIndex) in items.children" @click="goGoodsList(item.id,items.id,items.parentId)"
-                :key="subIndex" class="detail-item">{{ item.name }}</span>
-              </div>
-            </li>
-          </ul>
+      <!-- 展开分类 -->
+      <div
+        class="detail-item-panel"
+        v-show="panel"
+        @mouseenter="panel = true"
+        @mouseleave="panel = false"
+      >
+        <div class="nav-detail-item">
+          <template v-for="(item, index) in panelData">
+            <span @click="goGoodsList(item.id, item.parentId)" v-if="index < 8" :key="index">{{ item.name }}<Icon type="ios-arrow-forward" /></span>
+          </template>
         </div>
-      </transition>
+        <ul>
+          <li
+            v-for="(items, index) in panelData"
+            :key="index"
+            class="detail-item-row"
+          >
+            <span class="detail-item-title" @click="goGoodsList(items.id,items.parentId)">
+              {{ items.name }} <Icon type="ios-arrow-forward" />
+              <span class="glyphicon glyphicon-menu-right"></span>
+            </span>
+            <div>
+              <span v-for="(item, subIndex) in items.children" @click="goGoodsList(item.id,items.id,items.parentId)"
+              :key="subIndex" class="detail-item">{{ item.name }}</span>
+            </div>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
 </template>
@@ -86,12 +84,12 @@ export default {
     }
   },
   computed: {
-    navList () {
+    navList () { // 导航列表
       return JSON.parse(storage.getItem('navList')) || []
     }
   },
   methods: {
-    getCate () {
+    getCate () { // 获取分类数据
       getCategory(0).then(res => {
         if (res.success) {
           this.cateList = res.result;
@@ -99,7 +97,7 @@ export default {
         }
       });
     },
-    showDetail (index) {
+    showDetail (index) { // 展示全部分类
       this.panel = true
       this.panelData = this.cateList[index].children
     },
@@ -245,9 +243,6 @@ export default {
 .nav-detail-item span:hover {
   background-color: $theme_color;
 }
-.detail-item-panel ul {
-  list-style: none;
-}
 .detail-item-panel li {
   line-height: 30px;
   // margin-left: 40px;
diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue
index 79dcbc9a..0ae2f84d 100644
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@@ -116,11 +116,13 @@
                             <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.couponDiscount}}</span>折</span>
                             <span class="describe">满{{item.consumeThreshold}}元可用</span>
                         </div>
-                        <p>使用范围：{{useScope(item.scopeType)}}</p>
-                        <p>有效期：{{item.endTime}}</p>
+                          <p>使用范围：{{useScope(item.scopeType)}}</p>
+                          <p>有效期：{{item.endTime}}</p>
                         </div>
+                        <img class="used" v-if="usedCouponId.includes(item.id)" src="../../assets/images/geted.png" alt="">
                         <b></b>
-                        <a class="c-right" @click="useCoupon(item.id)">立即使用</a>
+                        <a class="c-right" @click="useCoupon(item.id, true)">立即使用</a>
+                        <a class="c-right" v-if="usedCouponId.includes(item.id)" @click="useCoupon(item.id, false)">放弃优惠</a>
                         <i class="circle-top"></i>
                         <i class="circle-bottom"></i>
                     </li>
@@ -207,7 +209,9 @@ export default {
       moreAddr: false, // 更多地址
       canUseCouponNum: 0, // 可用优惠券数量
       couponList: [], // 可用优惠券列表
-      logoImg: '' // 平台logo
+      logoImg: '', // 平台logo
+      usedCouponId: [], // 已使用优惠券id
+      selectedCoupon: {} // 已选优惠券对象
     };
   },
   mounted () {
@@ -250,7 +254,10 @@ export default {
           this.goodsList = res.result.cartList;
           this.priceDetailDTO = res.result.priceDetailDTO;
           this.skuList = res.result.skuList;
-          let notSupArea = res.result.notSupportFreight
+          let notSupArea = res.result.notSupportFreight;
+          this.selectedCoupon = {}
+          if (res.result.platformCoupon) this.selectedCoupon.platformCoupon = res.result.platformCoupon
+          Object.assign(this.selectedCoupon, res.result.storeCoupons)
           if (notSupArea) {
             let content = [];
             let title = ''
@@ -295,8 +302,22 @@ export default {
             storeId: storeArr.toString(),
             totalPrice: this.priceDetailDTO.goodsPrice
           }
-          canUseCouponList(params).then(res => {
+          canUseCouponList(params).then(res => { // 可用优惠券列表
             if (res.success) this.couponList = res.result.records
+            const couponKeys = Object.keys(this.selectedCoupon)
+            this.usedCouponId = []
+            if (couponKeys.length) {
+              this.couponList.forEach(e => {
+                if (e.id === this.selectedCoupon[couponKeys].memberCoupon.id) {
+                  this.usedCouponId.push(e.id)
+                } 
+              })
+              this.$nextTick(() => {
+                this.$forceUpdate()
+              })
+            }
+            
+            
           })
         }
       })
@@ -361,16 +382,14 @@ export default {
 
       });
     },
-    useCoupon (id) { // 使用优惠券
+    useCoupon (id, used) { // 使用优惠券
       let params = {
         way: this.$route.query.way,
         memberCouponId: id,
-        used: true
+        used: used  // true 为使用， false为弃用
       }
       selectCoupon(params).then(res => {
-        if (res.success) {
-          this.init()
-        }
+        if (res.success) this.init()
       })
     },
     editInvoice () { // 编辑发票信息
@@ -774,5 +793,16 @@ export default {
     .circle-top,.circle-bottom{
         right: 22px;
     }
+    .used {
+      position: absolute;
+      top: 60px;
+      right: 40px;
+      width: 50px;
+      height: 50px;
+    }
+}
+.coupon-list {
+  max-height: 260px;
+  overflow: scroll;
 }
 </style>
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 8f1ce647..9f868153 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -2,7 +2,7 @@ export default {
   /**
    * @description 配置显示在浏览器标签的title
    */
-  title: 'Lili电商',
+  title: "Lili电商",
   /**
    * @description token在Cookie中存储的天数，默认1天
    */
@@ -17,29 +17,28 @@ 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"
   },
   api_prod: {
-    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"
   },
   /**
    *  @description api请求基础路径前缀
    */
-  baseUrlPrefix: '/manager',
+  baseUrlPrefix: "/manager",
   /**
    * @description 需要加载的插件
    */
   plugin: {
-    'error-store': {
+    "error-store": {
       showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
       developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
     }
   }
-}
-
+};
diff --git a/manager/src/views/Main.vue b/manager/src/views/Main.vue
index 491b10d4..d073cfa6 100644
--- a/manager/src/views/Main.vue
+++ b/manager/src/views/Main.vue
@@ -12,7 +12,7 @@
       <shrinkable-menu></shrinkable-menu>
     </div>
     <!-- 顶部标题栏主体 -->
-    <div class="main-header-con" style="padding-left:240px">
+    <div class="main-header-con">
       <div class="main-header">
         <div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}">
           <!-- 通知消息 -->
diff --git a/manager/src/views/distribution/distribution.vue b/manager/src/views/distribution/distribution.vue
index 294f26d4..e76799ab 100644
--- a/manager/src/views/distribution/distribution.vue
+++ b/manager/src/views/distribution/distribution.vue
@@ -1,263 +1,329 @@
 <template>
-    <div class="search">
-        <Row>
-            <Col>
-                <Card>
-                    <Row @keydown.enter.native="handleSearch">
-                        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-                          <Form-item label="会员名称" prop="memberName">
-                            <Input
-                              type="text"
-                              v-model="searchForm.memberName"
-                              placeholder="请输入会员名称"
-                              clearable
-                              style="width: 200px"
-                            />
-                          </Form-item>
-                            <Form-item label="状态">
-                                <Select v-model="searchForm.distributionStatus" style="width:200px">
-                                    <Option v-for="item in distributionStatusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-                                </Select>
-                            </Form-item>
-                          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-                        </Form>
-                    </Row>
-                    <Row class="padding-row">
-                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-                    </Row>
-                    <Row type="flex" justify="end" class="page">
-                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
-                    </Row>
-                </Card>
-            </Col>
-        </Row>
-
-    </div>
+  <div class="search">
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              placeholder="请输入会员名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="状态">
+            <Select
+              v-model="searchForm.distributionStatus"
+              style="width: 200px"
+            >
+              <Option
+                v-for="item in distributionStatusList"
+                :value="item.value"
+                :key="item.value"
+                >{{ item.label }}</Option
+              >
+            </Select>
+          </Form-item>
+          <Button
+            @click="handleSearch"
+            type="primary"
+            icon="ios-search"
+            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>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
 </template>
 
 <script>
-    import {
-        getDistributionListData,
-        retreatDistribution,
-        resumeDistribution,
-        auditDistribution,
-    } from "@/api/distribution";
-    import  {distributionStatusList}  from './dataJson.js';
-    export default {
-        name: "distribution",
-        components: {
+import {
+  getDistributionListData,
+  retreatDistribution,
+  resumeDistribution,
+  auditDistribution,
+} from "@/api/distribution";
+import { distributionStatusList } from "./dataJson.js";
+export default {
+  name: "distribution",
+  components: {},
+  data() {
+    return {
+      distributionStatusList, // 分销状态
+      openSearch: true, // 显示搜索
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+      },
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 120,
+          tooltip: true,
         },
-        data() {
-            return {
-                distributionStatusList, // 分销状态
-                openSearch: true, // 显示搜索
-                loading: true, // 表单加载状态
-                searchForm: { // 搜索框初始化对象
-                    pageNumber: 1, // 当前页数
-                    pageSize: 10, // 页面大小
-                },
-                selectList: [], // 多选数据
-                selectCount: 0, // 多选计数
-                columns: [
-                    {
-                        title: "会员名称",
-                        key: "memberName",
-                        minWidth: 120,
-                        tooltip: true
-                    },
-                    {
-                        title: "推广单数",
-                        key: "orderNum",
-                        minWidth: 120,
-                        width: 150,
-                    },
-                    {
-                        title: "分销金额",
-                        key: "rebateTotal",
-                        width: 150,
-                        sortable: false,
-                        render: (h, params) => {
-                            return h('div', this.$options.filters.unitPrice(params.row.rebateTotal, '￥'))
-                        }
-                    },
-                    {
-                        title: "可用金额",
-                        key: "canRebate",
-                        width: 150,
-                        sortable: false,
-                        render: (h, params) => {
-                            return h('div', this.$options.filters.unitPrice(params.row.rebateTotal, '￥'))
-                        }
-                    },
-                    {
-                        title: "冻结金额",
-                        key: "commissionFrozen",
-                        width: 150,
-                        sortable: false,
-                        render: (h, params) => {
-                            return h('div', this.$options.filters.unitPrice(params.row.rebateTotal, '￥'))
-                        }
-                    },
-                    {
-                        title: "状态",
-                        key: "distributionStatus",
-                        width: 150,
-                        sortable: false,
-                        render: (h, params) => {
-                            if (params.row.distributionStatus == "PASS") {
-                                return h( "Badge", {props: { status: "success",text: "审核通过" } })
-                            } else if (params.row.distributionStatus == "APPLY") {
-                                return h( "Badge", {props: { status: "processing",text: "申请中" } })
-                            } else if (params.row.distributionStatus == "RETREAT") {
-                                return h( "Badge", {props: { status: "warning",text: "已清退" } })
-                            } else if (params.row.distributionStatus == "REFUSE") {
-                                return h( "Badge", {props: { status: "error",text: "审核拒绝" } })
-                            }
-                        }
-                    },
-                    {
-                        title: "操作",
-                        key: "action",
-                        align: "center",
-                        fixed: "right",
-                        width: 140,
-                        render: (h, params) => {
-                            return h("div",{
-                                style:{
-                                    display:'flex',
-                                    justifyContent:'center'
-                                }
-                            },
-                            [
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "error",
-                                            size: "small"
-                                        },
-                                        style:{marginRight:'5px', display:params.row.distributionStatus!='RETREAT'?'block':'none'},
-                                        on: {
-                                            click: () => {
-                                                this.retreat(params.row);
-                                            }
-                                        }
-                                    },
-                                    "清退"
-                                ),
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "success",
-                                            size: "small"
-                                        },
-                                        style:{marginRight:'5px', display:params.row.distributionStatus=='RETREAT'?'block':'none'},
-                                        on: {
-                                            click: () => {
-                                                this.resume(params.row);
-                                            }
-                                        }
-                                    },
-                                    "恢复"
-                                )
-                            ]);
-                        }
-                    }
-                ],
-                data: [], // 表单数据
-                total: 0 // 表单数据总数
-            };
+        {
+          title: "推广单数",
+          key: "orderNum",
+          minWidth: 120,
+          width: 150,
         },
-        methods: {
-            init() {
-                this.getDataList();
-            },
-            see(v) {
-                this.$router.push({
-                    name: "distributionOrder",
-                    query: { id:v.memberId }
-                });
-            },
-            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();
-            },
-
-            clearSelectAll() { // 清空
-                this.$refs.table.selectAll(false);
-            },
-            changeSelect(e) {
-                this.selectList = e;
-                this.selectCount = e.length;
-            },
-
-            getDataList() {
-                this.loading = true;
-                this.searchForm.status = "PASS";
-                // 带多条件搜索参数获取表单数据 请自行修改接口
-                getDistributionListData(this.searchForm).then(res => {
-                    this.loading = false;
-                    if (res.success) {
-                        this.data = res.result.records;
-                        this.total = res.result.total;
-                    }
-                });
-            },
-            // 清退分销商
-            retreat(v) {
-                this.$Modal.confirm({
-                    title: "提示",
-                    // 记得确认修改此处
-                    content: "您确认要清退 " + v.memberName + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        retreatDistribution(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            // 恢复分销商
-            resume(v){
-                this.$Modal.confirm({
-                    title: '提示',
-                    // 记得确认修改此处
-                    content: "您确认要恢复 " + v.memberName + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        resumeDistribution(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
+        {
+          title: "分销金额",
+          key: "rebateTotal",
+          width: 150,
+          sortable: false,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.rebateTotal, "￥")
+            );
+          },
+        },
+        {
+          title: "可用金额",
+          key: "canRebate",
+          width: 150,
+          sortable: false,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.rebateTotal, "￥")
+            );
+          },
+        },
+        {
+          title: "冻结金额",
+          key: "commissionFrozen",
+          width: 150,
+          sortable: false,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.rebateTotal, "￥")
+            );
+          },
+        },
+        {
+          title: "状态",
+          key: "distributionStatus",
+          width: 150,
+          sortable: false,
+          render: (h, params) => {
+            if (params.row.distributionStatus == "PASS") {
+              return h("Badge", {
+                props: { status: "success", text: "审核通过" },
+              });
+            } else if (params.row.distributionStatus == "APPLY") {
+              return h("Badge", {
+                props: { status: "processing", text: "申请中" },
+              });
+            } else if (params.row.distributionStatus == "RETREAT") {
+              return h("Badge", {
+                props: { status: "warning", text: "已清退" },
+              });
+            } else if (params.row.distributionStatus == "REFUSE") {
+              return h("Badge", {
+                props: { status: "error", text: "审核拒绝" },
+              });
             }
+          },
         },
-        mounted() {
-            this.init();
-        }
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 140,
+          render: (h, params) => {
+            return h(
+              "div",
+              {
+                style: {
+                  display: "flex",
+                  justifyContent: "center",
+                },
+              },
+              [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                      display:
+                        params.row.distributionStatus != "RETREAT"
+                          ? "block"
+                          : "none",
+                    },
+                    on: {
+                      click: () => {
+                        this.retreat(params.row);
+                      },
+                    },
+                  },
+                  "清退"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "success",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                      display:
+                        params.row.distributionStatus == "RETREAT"
+                          ? "block"
+                          : "none",
+                    },
+                    on: {
+                      click: () => {
+                        this.resume(params.row);
+                      },
+                    },
+                  },
+                  "恢复"
+                ),
+              ]
+            );
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
     };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    see(v) {
+      this.$router.push({
+        name: "distributionOrder",
+        query: { id: v.memberId },
+      });
+    },
+    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();
+    },
+
+    clearSelectAll() {
+      // 清空
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+
+    getDataList() {
+      this.loading = true;
+      this.searchForm.status = "PASS";
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getDistributionListData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    // 清退分销商
+    retreat(v) {
+      this.$Modal.confirm({
+        title: "提示",
+        // 记得确认修改此处
+        content: "您确认要清退 " + v.memberName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          retreatDistribution(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    // 恢复分销商
+    resume(v) {
+      this.$Modal.confirm({
+        title: "提示",
+        // 记得确认修改此处
+        content: "您确认要恢复 " + v.memberName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          resumeDistribution(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss">
-  @import "@/styles/table-common.scss";
+@import "@/styles/table-common.scss";
 </style>
diff --git a/manager/src/views/distribution/distributionApply.vue b/manager/src/views/distribution/distributionApply.vue
index d8465ccf..d3f7bba7 100644
--- a/manager/src/views/distribution/distributionApply.vue
+++ b/manager/src/views/distribution/distributionApply.vue
@@ -1,217 +1,240 @@
 <template>
-    <div class="search">
-        <Row>
-            <Col>
-                <Card>
-                    <Row @keydown.enter.native="handleSearch">
-                        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-                          <Form-item label="会员名称" prop="memberName">
-                            <Input
-                              type="text"
-                              v-model="searchForm.memberName"
-                              placeholder="请输入会员名称"
-                              clearable
-                              style="width: 200px"
-                            />
-                          </Form-item>
-                          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-                        </Form>
-                    </Row>
-                    <Row style="margin-top: 10px">
-                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-                               @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-                    </Row>
-                    <Row type="flex" justify="end" class="page">
-                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
-                              @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
-                              size="small" show-total show-elevator show-sizer></Page>
-                    </Row>
-                </Card>
-            </Col>
-        </Row>
-    </div>
+  <div class="search">
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              placeholder="请输入会员名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Button
+            @click="handleSearch"
+            type="primary"
+            icon="ios-search"
+            class="search-btn"
+            >搜索</Button
+          >
+        </Form>
+      </Row>
+      <Table
+        class="mt_10"
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
 </template>
 
 <script>
-    import {
-        getDistributionListData,
-        auditDistribution
-    } from "@/api/distribution";
+import { getDistributionListData, auditDistribution } from "@/api/distribution";
 
-    export default {
-        name: "distributionApply",
-        components: {},
-        data() {
-            return {
-                loading: true, // 表单加载状态
-                searchForm: { // 搜索框初始化对象
-                    pageNumber: 1, // 当前页数
-                    pageSize: 10, // 页面大小
-                    sort: "createTime", // 默认排序字段
-                    order: "desc", // 默认排序方式
-                    startDate: "", // 起始时间
-                    endDate: "" // 终止时间
-                },
-                form: { // 添加或编辑表单对象初始化数据
-                    memberName: "",
-                },
-                // 表单验证规则
-                submitLoading: false, // 添加或编辑提交状态
-                selectList: [], // 多选数据
-                selectCount: 0, // 多选计数
-                columns: [
-                    {
-                        title: "会员名称",
-                        key: "memberName",
-                        minWidth: 150,
-                        tooltip: true,
-                    },
-                  {
-                    title: "会员姓名",
-                    key: "name",
-                    minWidth: 120,
+export default {
+  name: "distributionApply",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        memberName: "",
+      },
+      // 表单验证规则
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 150,
+          tooltip: true,
+        },
+        {
+          title: "会员姓名",
+          key: "name",
+          minWidth: 120,
+        },
+        {
+          title: "提交时间",
+          key: "createTime",
+          minWidth: 150,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "success",
+                    size: "small",
                   },
-                    {
-                        title: "提交时间",
-                        key: "createTime",
-                        minWidth: 150,
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.audit(params.row, "PASS");
                     },
-                    {
-                        title: "操作",
-                        key: "action",
-                        align: "center",
-                        fixed: "right",
-                        width: 200,
-                        render: (h, params) => {
-                            return h("div", [
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "success",
-                                            size: "small",
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.audit(params.row, "PASS");
-                                            }
-                                        }
-                                    },
-                                    "通过"
-                                ),
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "error",
-                                            size: "small",
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.audit(params.row, "REFUSE");
-                                            }
-                                        }
-                                    },
-                                    "拒绝"
-                                )
-                            ]);
-                        }
-                    }
-                ],
-                data: [], // 表单数据
-                total: 0 // 表单数据总数
-            };
+                  },
+                },
+                "通过"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  on: {
+                    click: () => {
+                      this.audit(params.row, "REFUSE");
+                    },
+                  },
+                },
+                "拒绝"
+              ),
+            ]);
+          },
         },
-        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();
-            },
-            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;
-                this.searchForm.distributionStatus = "APPLY";
-                // 带多条件搜索参数获取表单数据 请自行修改接口
-                getDistributionListData(this.searchForm).then(res => {
-                    this.loading = false;
-                    if (res.success) {
-                        this.data = res.result.records;
-                        this.total = res.result.total;
-                    }
-                });
-                // 以下为模拟数据
-                //this.data = [
-                //];
-                this.total = this.data.length;
-                this.loading = false;
-            },
-            //审核
-            audit(v, status) {
-                let test = "拒绝"
-                if (status == "PASS") {
-                    test = "通过"
-                }
-                let params = {
-                    status : status
-                }
-                this.$Modal.confirm({
-                    title: "确认" + test,
-                    // 记得确认修改此处
-                    content: "您确认要" + test + " " + v.memberName + " ?",
-                    loading: true,
-                    onOk: () => {
-                        auditDistribution(v.id, params).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            }
-        },
-        mounted() {
-            this.init();
-        }
+      ],
+      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();
+    },
+    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;
+      this.searchForm.distributionStatus = "APPLY";
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getDistributionListData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      // 以下为模拟数据
+      //this.data = [
+      //];
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    //审核
+    audit(v, status) {
+      let test = "拒绝";
+      if (status == "PASS") {
+        test = "通过";
+      }
+      let params = {
+        status: status,
+      };
+      this.$Modal.confirm({
+        title: "确认" + test,
+        // 记得确认修改此处
+        content: "您确认要" + test + " " + v.memberName + " ?",
+        loading: true,
+        onOk: () => {
+          auditDistribution(v.id, params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss">
-  @import "@/styles/table-common.scss";
+@import "@/styles/table-common.scss";
 </style>
diff --git a/manager/src/views/distribution/distributionCash.vue b/manager/src/views/distribution/distributionCash.vue
index e2d07a12..b450376b 100644
--- a/manager/src/views/distribution/distributionCash.vue
+++ b/manager/src/views/distribution/distributionCash.vue
@@ -1,35 +1,29 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch" >
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Input class="search-input" v-model="searchForm.memberName">
-                <span slot="prepend">会员名称</span>
-              </Input>
-              <Input class="search-input" v-model="searchForm.sn">
-                <span slot="prepend">编号</span>
-              </Input>
-              <Form-item label="状态" style="margin-left: -20px">
-                <Select v-model="searchForm.distributionCashStatus" style="width:150px;">
-                    <Option v-for="item in cashStatusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-                </Select>
-              </Form-item>
-              <Form-item style="margin-left:-35px;" class="br">
-                <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
-              </Form-item>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page padding-row">
-            <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>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch" >
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Input class="search-input" v-model="searchForm.memberName">
+            <span slot="prepend">会员名称</span>
+          </Input>
+          <Input class="search-input" v-model="searchForm.sn">
+            <span slot="prepend">编号</span>
+          </Input>
+          <Form-item label="状态" style="margin-left: -20px">
+            <Select v-model="searchForm.distributionCashStatus" style="width:150px;">
+                <Option v-for="item in cashStatusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+            </Select>
+          </Form-item>
+          <Form-item style="margin-left:-35px;" class="br">
+            <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
+          </Form-item>
+        </Form>
+      </Row>
+      <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 padding-row">
+        <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>
     <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
       <Form ref="form" :model="form" :label-width="100" :rules="formValidate" >
       <FormItem label="编号">
diff --git a/manager/src/views/distribution/distributionGoods.vue b/manager/src/views/distribution/distributionGoods.vue
index a888bab2..a78c5830 100644
--- a/manager/src/views/distribution/distributionGoods.vue
+++ b/manager/src/views/distribution/distributionGoods.vue
@@ -1,48 +1,42 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="商品名称" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  placeholder="请输入商品名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="operation" style="margin-top: 10px">
-            <Button @click="delAll">批量删除</Button>
-          </Row>
-          <Row>
-            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-              <template slot="goodsName" slot-scope="{row}">
-                <div>
-                    <div class="div-zoom">
-                      <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                    </div>
-                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                      <div slot="content">
-                        <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                      </div>
-                      <img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                    </Poptip>
-                  </div>
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="商品名称" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              placeholder="请输入商品名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation" style="margin-top: 10px">
+        <Button @click="delAll">批量删除</Button>
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        <template slot="goodsName" slot-scope="{row}">
+          <div>
+              <div class="div-zoom">
+                <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                </div>
+                <img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
index 3f5ca80f..b3b1cc03 100644
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -1,54 +1,46 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row v-show="openSearch" @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  placeholder="请输入订单编号"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="分销商" prop="distributionName">
-                <Input
-                  type="text"
-                  v-model="searchForm.distributionName"
-                  placeholder="请输入分销商名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="店铺名称">
-                <Select v-model="searchForm.shopId" placeholder="请选择" @on-query-change="searchChange" filterable
-                        clearable style="width: 150px">
-                  <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="订单时间">
-                <DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间"
-                            style="width: 210px"></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-
-          <Row class="padding-row">
-            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
-                  @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
-                  size="small" show-total show-elevator show-sizer></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
-
+    <Card>
+      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              placeholder="请输入订单编号"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="分销商" prop="distributionName">
+            <Input
+              type="text"
+              v-model="searchForm.distributionName"
+              placeholder="请输入分销商名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="店铺名称">
+            <Select v-model="searchForm.shopId" placeholder="请选择" @on-query-change="searchChange" filterable
+                    clearable style="width: 150px">
+              <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="订单时间">
+            <DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间"
+                        style="width: 210px"></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
+          @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/manager/src/views/goods-unit/index.vue b/manager/src/views/goods-unit/index.vue
index ea1d1a46..93c84b5c 100644
--- a/manager/src/views/goods-unit/index.vue
+++ b/manager/src/views/goods-unit/index.vue
@@ -1,43 +1,37 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch"> </Row>
-          <Row class="operation">
-            <Button @click="add" type="primary" >添加</Button>
+    <Card>
+      <Row @keydown.enter.native="handleSearch"> </Row>
+      <Row class="operation">
+        <Button @click="add" type="primary" >添加</Button>
 
-            <Button @click="delAll">批量删除</Button>
-          </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+        <Button @click="delAll">批量删除</Button>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/manager/src/views/goods/goods-industry-statistics/index.vue b/manager/src/views/goods/goods-industry-statistics/index.vue
index 5deae22b..6d5f13cd 100644
--- a/manager/src/views/goods/goods-industry-statistics/index.vue
+++ b/manager/src/views/goods/goods-industry-statistics/index.vue
@@ -70,7 +70,6 @@
     <Tabs v-model="orderStatus" @on-click="handleClickType">
       <TabPane label="行业订单数量" name="NUM">
         <Table :columns="columns" :data="data"></Table>
-
       </TabPane>
       <TabPane label="行业订单金额" name="PRICE">
         <Table :columns="columns" :data="data"></Table>
diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index 9ac9e257..d46ce5e8 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -1,100 +1,94 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="商品名称" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  placeholder="请输入商品名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="商品编号" prop="sn">
-                <Input
-                  type="text"
-                  v-model="searchForm.sn"
-                  placeholder="请输入商品编号"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="状态" prop="status">
-                <Select
-                  v-model="searchForm.marketEnable"
-                  placeholder="请选择"
-                  clearable
-                  style="width: 200px"
-                >
-                  <Option value="UPPER">上架</Option>
-                  <Option value="DOWN">下架</Option>
-                </Select>
-              </Form-item>
-              <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="商品名称" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              placeholder="请输入商品名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="商品编号" prop="sn">
+            <Input
+              type="text"
+              v-model="searchForm.sn"
+              placeholder="请输入商品编号"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="状态" prop="status">
+            <Select
+              v-model="searchForm.marketEnable"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
             >
+              <Option value="UPPER">上架</Option>
+              <Option value="DOWN">下架</Option>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
 
-              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="{row}">
-                <div style="margin: 5px 0px;height: 80px; display: flex;">
-                  <div style="">
-                    <img :src="row.original" style="height: 60px;margin-top: 1px;width: 60px">
-                  </div>
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin: 5px 0px;height: 80px; display: flex;">
+            <div style="">
+              <img :src="row.original" style="height: 60px;margin-top: 1px;width: 60px">
+            </div>
 
-                  <div style="margin-left: 13px;">
-                    <div class="div-zoom">
-                      <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
-                    </div>
-                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                      <div slot="content">
-                        <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                      </div>
-                      <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                    </Poptip>
-                  </div>
+            <div style="margin-left: 13px;">
+              <div class="div-zoom">
+                <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
                 </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
 
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
@@ -105,7 +99,6 @@
         ref="underForm"
         :model="underForm"
         :label-width="100"
-        :rules="formValidate"
       >
         <FormItem label="下架原因" prop="reason">
           <Input v-model="underForm.reason" clearable style="width: 100%" />
@@ -133,9 +126,6 @@ export default {
       modalType: 0, // 添加或编辑标识
       modalVisible: false, // 添加或编辑显示
       modalTitle: "", // 添加或编辑标题
-      drop: false, // 展开搜索框
-      dropDownContent: "展开", // 展开标签文字
-      dropDownIcon: "ios-arrow-down", // 展开图标
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
@@ -146,17 +136,6 @@ export default {
       underForm: { // 下架原因
         reason: "",
       },
-      form: {
-        // 添加或编辑表单对象初始化数据
-        goodsName: "",
-        sn: "",
-        marketEnable: "",
-        price: "",
-        sellerName: "",
-      },
-      // 表单验证规则
-
-      formValidate: {},
       submitLoading: false, // 添加或编辑提交状态
       selectList: [], // 多选数据
       selectCount: 0, // 多选计数
@@ -379,16 +358,6 @@ export default {
       this.selectList = e;
       this.selectCount = e.length;
     },
-    dropDown() {
-      if (this.drop) {
-        this.dropDownContent = "展开";
-        this.dropDownIcon = "ios-arrow-down";
-      } else {
-        this.dropDownContent = "收起";
-        this.dropDownIcon = "ios-arrow-up";
-      }
-      this.drop = !this.drop;
-    },
     getDataList() {
       this.loading = true;
       // 带多条件搜索参数获取表单数据
diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue
index 895f23fb..07de31f3 100644
--- a/manager/src/views/goods/goods-info/goodsApply.vue
+++ b/manager/src/views/goods/goods-info/goodsApply.vue
@@ -1,83 +1,77 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="商品名称" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  placeholder="请输入商品名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="商品编号" prop="sn">
-                <Input
-                  type="text"
-                  v-model="searchForm.sn"
-                  placeholder="请输入商品编号"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="商品名称" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              placeholder="请输入商品名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="商品编号" prop="sn">
+            <Input
+              type="text"
+              v-model="searchForm.sn"
+              placeholder="请输入商品编号"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
 
-              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="scope">
-                <div style="margin-top: 5px;height: 80px; display: flex;">
-                  <div style="">
-                    <img :src="scope.row.original" style="height: 60px;margin-top: 3px;width: 60px">
-                  </div>
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="scope">
+          <div style="margin-top: 5px;height: 80px; display: flex;">
+            <div style="">
+              <img :src="scope.row.original" style="height: 60px;margin-top: 3px;width: 60px">
+            </div>
 
-                  <div style="margin-left: 13px">
-                    <div class="div-zoom" >
-                      <a>{{scope.row.goodsName}}</a>
-                    </div>
-                  </div>
-                </div>
+            <div style="margin-left: 13px">
+              <div class="div-zoom" >
+                <a>{{scope.row.goodsName}}</a>
+              </div>
+            </div>
+          </div>
 
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
@@ -105,16 +99,6 @@
         goodsAuditForm: { // 商品编辑表单
           is_auth: 1,
         },
-        form: {
-          // 添加或编辑表单对象初始化数据
-          goodsName: "",
-          sn: "",
-          marketEnable: "",
-          price: "",
-          sellerName: "",
-        },
-        // 表单验证规则
-        formValidate: {},
         submitLoading: false, // 添加或编辑提交状态
         selectList: [], // 多选数据
         selectCount: 0, // 多选计数
diff --git a/manager/src/views/goods/goods-manage/brand.vue b/manager/src/views/goods/goods-manage/brand.vue
index d58607a8..1e502c93 100644
--- a/manager/src/views/goods/goods-manage/brand.vue
+++ b/manager/src/views/goods/goods-manage/brand.vue
@@ -3,62 +3,56 @@
 </style>
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="品牌名称" prop="name">
-                <Input
-                  type="text"
-                  v-model="searchForm.name"
-                  placeholder="请输入品牌名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="品牌名称" prop="name">
+            <Input
+              type="text"
+              v-model="searchForm.name"
+              placeholder="请输入品牌名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
 
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="operation padding-row">
-            <Button @click="add" type="primary">添加</Button>
-          </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="add" type="primary">添加</Button>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/manager/src/views/goods/goods-manage/spec.vue b/manager/src/views/goods/goods-manage/spec.vue
index c81e1b5c..701554d8 100644
--- a/manager/src/views/goods/goods-manage/spec.vue
+++ b/manager/src/views/goods/goods-manage/spec.vue
@@ -1,64 +1,57 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="规格名称" prop="specName">
-                <Input
-                  type="text"
-                  v-model="searchForm.specName"
-                  placeholder="请输入规格名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="规格名称" prop="specName">
+            <Input
+              type="text"
+              v-model="searchForm.specName"
+              placeholder="请输入规格名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
 
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="operation padding-row">
-            <Button @click="add" type="primary" >添加</Button>
-            <Button @click="delAll" >批量删除</Button>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="add" type="primary" >添加</Button>
+        <Button @click="delAll" >批量删除</Button>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/manager/src/views/goods/goods-refund/index.vue b/manager/src/views/goods/goods-refund/index.vue
deleted file mode 100644
index 75a7b91f..00000000
--- a/manager/src/views/goods/goods-refund/index.vue
+++ /dev/null
@@ -1,249 +0,0 @@
-<template>
-  <Card>
-    <Form
-      label-position="left"
-      ref="searchForm"
-      :model="params"
-      inline
-      :label-width="100"
-      class="search-form"
-    >
-      <Form-item label="选择店铺" prop="sn">
-        <span class="tips" v-if="storeName"
-          >{{ storeName }}
-          <Button
-            @click="
-              () => {
-                storeName = '';
-                params.shopId = '';
-              }
-            "
-            type="text"
-            >清空</Button
-          >
-        </span>
-        <Button size="small" @click="handleClickShop" type="primary"
-          >选择店铺</Button
-        >
-      </Form-item>
-
-      <Form-item label="选择时间类型">
-        <Select v-model="params.timeType" style="width: 200px">
-          <Option
-            v-for="item in typeList"
-            :value="item.value"
-            :key="item.value"
-            >{{ item.label }}</Option
-          >
-        </Select>
-      </Form-item>
-      <Form-item label="按年查询">
-        <DatePicker
-          type="year"
-          placeholder="Select year"
-          style="width: 200px"
-          v-model="year"
-        ></DatePicker>
-      </Form-item>
-      <Form-item label="按月查询" v-if="params.timeType == 'MONTH'">
-        <InputNumber :max="12" :min="1" v-model="params.month"></InputNumber>
-      </Form-item>
-    </Form>
-
-    <div class="order-list">
-      <div class="order-col">
-        <div>金额</div>
-        <div>{{ priceData | unitPrice }}</div>
-      </div>
-    </div>
-    <Tabs v-model="orderStatus" @on-click="handleClickType">
-      <TabPane label="订单列表" name="PRICE">
-        <Table :columns="columns" :data="data"></Table>
-        <div class="page-col">
-          <Page @on-change="changePage" :total="total" show-total />
-        </div>
-      </TabPane>
-    </Tabs>
-
-    <Modal v-model="modalFlag" width="1200" :title="selectName">
-      <!-- 店铺 -->
-      <shopLayout v-if="shopFlag" @callback="callbackShop" ref="shops" />
-      <!-- 会员 -->
-      <memberLayout v-else @callback="callbackMember" ref="members" />
-    </Modal>
-  </Card>
-</template>
-<script>
-import shopLayout from "@/views/seller/shop/shopList";
-import memberLayout from "@/views/member/list/index";
-import * as API_Goods from "@/api/goods";
-export default {
-  components: {
-    shopLayout,
-    memberLayout,
-  },
-  data() {
-    return {
-      storeName: "", // 店铺名称
-      memberName: "", // 会员名称
-      shopFlag: false, // 是否展示
-      selectName: "选择", // modal名称
-      modalFlag: false, // modal显隐
-      priceData: "", // 价格
-      orderStatus: "PRICE", // tab展示
-      shopList: {}, // 店铺列表
-      memberList: {}, // 会员列表
-      typeList: [
-        {
-          value: "YEAR",
-          label: "年",
-        },
-        {
-          value: "MONTH",
-          label: "月",
-        },
-      ],
-      total: 0, // 列表总数
-      year: "", // 当前年份
-      params: { // 请求参数
-        type: "PRICE",
-        timeType: "YEAR",
-        pageNumber: 1,
-        pageSize: 10,
-        year: "",
-        shopId: "",
-        memberId: "",
-      },
-      columns: [ // 表格表头
-        {
-          title: "售后号",
-          key: "refundSn",
-        },
-        {
-          title: "卖家名称",
-          key: "sellerName",
-        },
-        {
-          title: "商品名称",
-          key: "name",
-        },
-        {
-          title: "规格名称",
-          key: "specs",
-        },
-        {
-          title: "会员名称",
-          key: "memberName",
-        },
-
-        {
-          title: "实际退款金额",
-          key: "finalPrice",
-          align: "center",
-          render: (h, params) => {
-            return h(
-              "div",
-              this.$options.filters.unitPrice(params.row.finalPrice)
-            );
-          },
-        },
-      ],
-      data: [] // 列表数据
-    };
-  },
-  watch: {
-    params: {
-      handler(val) {
-        this.init();
-      },
-      deep: true,
-    },
-
-    year(val) {
-      this.params.year = new Date(val).getFullYear();
-    },
-  },
-  methods: {
-    // 选择店铺
-    handleClickShop() {
-      this.modalFlag = true;
-      this.selectName += "店铺";
-      this.shopFlag = true;
-      this.$nextTick(() => {
-        this.$refs.shops.selectedShop = true;
-      });
-    },
-    // 选择会员
-    handleClickMember() {
-      this.modalFlag = true;
-      this.selectName += "会员";
-      this.$nextTick(() => {
-        this.$refs.members.selectedMember = true;
-      });
-    },
-
-    callbackMember(val) {
-      this.memberName = val.username;
-      this.params.memberId = val.id;
-      this.modalFlag = false;
-    },
-
-    callbackShop(val) {
-      this.storeName = val.storeName;
-      this.params.shopId = val.id;
-      this.modalFlag = false;
-    },
-
-    // 点击分页
-    changePage(index) {
-      this.params.pageNumber = index;
-    },
-
-    handleClickType(name) {
-      this.params.type = name;
-    },
-    init(name) {
-      Promise.all([
-        API_Goods.refundStatistics(this.params),
-        !this.priceData ? API_Goods.refundPriceStatistics(this.params) : "",
-      ]).then((res) => {
-        if (res[0].result) {
-          this.data = res[0].result.records;
-          this.total = res[0].result.total;
-        }
-        if (res[1].result) {
-          this.priceData = res[1].result;
-        }
-      });
-    },
-  },
-  mounted() {
-    let data = new Date();
-
-    this.year = data;
-    this.year && this.params.month
-      ? this.timeType == "MONTH"
-      : this.timeType == "YEAR";
-  },
-};
-</script>
-<style scoped lang="scss">
-.page-col {
-  text-align: right;
-  margin: 10px 0;
-}
-.order-col {
-  display: flex;
-  > div {
-    margin-right: 8px;
-    padding: 16px;
-    font-size: 15px;
-  }
-}
-.order-list {
-  display: flex;
-}
-.tips {
-  margin: 0 8px;
-}
-</style>
diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue
index c837f4ae..bc2b8ea0 100644
--- a/manager/src/views/goods/goods-review/index.vue
+++ b/manager/src/views/goods/goods-review/index.vue
@@ -1,38 +1,33 @@
 <template>
   <div class="search">
-    <Row>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="会员名称" prop="memberName">
-              <Input type="text" v-model="searchForm.memberName" placeholder="请输入会员名称" clearable style="width: 200px"/>
-            </Form-item>
-            <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
-          </Form>
-        </Row>
-        <Row class="padding-row">
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-                 @on-sort-change="changeSort" @on-selection-change="changeSelect">
-            <!-- 页面展示 -->
-            <template slot="shopDisableSlot" slot-scope="scope">
-              <div>
-              </div>
-              <i-switch size="large" true-value="OPEN" false-value="CLOSE" v-model="scope.row.status"
-                        @on-change="changeSwitch(scope.row)">
-                <span slot="open">展示</span>
-                <span slot="close">隐藏</span>
-              </i-switch>
-            </template>
-          </Table>
-
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
-                @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-                size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="memberName">
+            <Input type="text" v-model="searchForm.memberName" placeholder="请输入会员名称" clearable style="width: 200px"/>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
+        </Form>
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+              @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        <!-- 页面展示 -->
+        <template slot="shopDisableSlot" slot-scope="scope">
+          <div>
+          </div>
+          <i-switch size="large" true-value="OPEN" false-value="CLOSE" v-model="scope.row.status"
+                    @on-change="changeSwitch(scope.row)">
+            <span slot="open">展示</span>
+            <span slot="close">隐藏</span>
+          </i-switch>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
+              @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+              size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
 
     <Modal v-model="infoFlag" width="800" :title="infoTitle">
 
@@ -68,7 +63,7 @@
                 <div style="margin-left: 40px">
                   <img style="width: 100px;height: 110px;margin-left: 2px"
                        v-for="(img,index) in infoData.image.split(',')" v-if="infoData.image.length !=0" :src="img"
-                       alt="" />
+                       alt="" :key="index"/>
                 </div>
               </div>
             </List>
@@ -81,7 +76,7 @@
               </div>
               <div v-if="infoData.haveReplyImage == 1">
                 <div style="margin-left: 60px">
-                  <img style="width: 100px;height: 110px" v-for="(img,index) in infoData.replyImage.split(',')"
+                  <img style="width: 100px;height: 110px" v-for="(img,index) in infoData.replyImage.split(',')" :key="index"
                        v-if="infoData.replyImage.length !=0" :src="img" alt=""/>
                 </div>
               </div>
@@ -114,16 +109,6 @@ export default {
         startDate: "", // 起始时间
         endDate: "", // 终止时间
       },
-      form: {
-        // 添加或编辑表单对象初始化数据
-        memberName: "",
-        storeName: "",
-        shopDisable: "",
-        id: "",
-        createTime: "",
-      },
-      // 表单验证规则
-      formValidate: {},
       submitLoading: false, // 添加或编辑提交状态
       selectList: [], // 多选数据
       selectCount: 0, // 多选计数
diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue
index 1f374a8d..fb7f0be3 100644
--- a/manager/src/views/lili-dialog/goods-dialog.vue
+++ b/manager/src/views/lili-dialog/goods-dialog.vue
@@ -45,8 +45,6 @@ export default {
       type: "multiple", //单选或者多选 single  multiple
 
       skuList: [], // 商品sku列表
-
-      selectedWay: [], //选中商品集合
       total: "",  // 商品总数
       goodsParams: { // 商品请求参数
         pageNumber: 1,
@@ -64,7 +62,12 @@ export default {
       loading: false, // 加载状态
     };
   },
-  props: ["clearFlag"],
+  props: {
+    selectedWay: {
+      type: Array,
+      default: new Array()
+    }
+  },
   watch: {
     category(val) {
       this.goodsParams.categoryPath = val[0];
@@ -74,6 +77,7 @@ export default {
         this.$emit("selected", this.selectedWay);
       },
       deep: true,
+      immediate: true
     },
 
     "goodsParams.categoryPath": {
@@ -110,6 +114,12 @@ export default {
         res.result.records.forEach((item) => {
           item.selected = false;
           item.___type = "goods"; //设置为goods让pc wap知道标识
+          
+          this.selectedWay.forEach(e => {
+            if (e.id === item.id) {
+              item.selected = true 
+            }
+          })
         });
         /**
          * 解决数据请求中，滚动栏会一直上下跳动
@@ -117,7 +127,6 @@ export default {
         this.total = res.result.total;
         this.goodsData.push(...res.result.records);
 
-        // console.log(this.goodsData);
       } else {
         this.empty = true;
       }
@@ -193,9 +202,13 @@ export default {
         this.selectedWay.push(val);
       } else {
         val.selected = false;
-        this.selectedWay.splice(index, 1);
+        for (let i = 0; i<this.selectedWay.length; i++ ) {
+          if (this.selectedWay[i].id===val.id) {
+            this.selectedWay.splice(i,1)
+            break;
+          }
+        }
       }
-      // console.log(this.selectedWay);
     },
   },
 };
diff --git a/manager/src/views/lili-dialog/index.vue b/manager/src/views/lili-dialog/index.vue
index dc8341ec..49b3b1c1 100644
--- a/manager/src/views/lili-dialog/index.vue
+++ b/manager/src/views/lili-dialog/index.vue
@@ -1,15 +1,14 @@
 <template>
   <Modal :styles="{ top: '120px' }" width="1160" @on-cancel="clickClose" @on-ok="clickOK" v-model="flag" :mask-closable="false" scrollable>
-    <goodsDialog @selected="
-        (val) => {
-          goodsData = val;
-        }
-      " v-if="goodsFlag" ref="goodsDialog" />
-    <linkDialog @selectedLink="
-        (val) => {
-          linkData = val;
-        }
-      " v-else class="linkDialog" />
+    <template v-if="flag">
+      <goodsDialog @selected="(val) => {goodsData = val;}" 
+        v-if="goodsFlag" ref="goodsDialog" :selectedWay='goodsData'/>
+      <linkDialog @selectedLink="
+          (val) => {
+            linkData = val;
+          }
+        " v-else class="linkDialog" />
+    </template>
   </Modal>
 </template>
 <script>
@@ -23,14 +22,11 @@ export default {
   data() {
     return {
       goodsFlag: false, // 是否商品选择器
-      goodsData: "", //选择的商品
+      goodsData: [], //选择的商品
       linkData: "", //选择的链接
       flag: false, // modal显隐
     };
   },
-  props: ["types"],
-  watch: {},
-  mounted() {},
   methods: {
     // 关闭弹窗
     clickClose() {
@@ -54,13 +50,17 @@ export default {
       }
       this.clickClose();
     },
-    open(type) {
+    open(type, mutiple) {
       this.flag = true;
       if (type == "goods") {
         this.goodsFlag = true;
+        if (mutiple) {
+          this.singleGoods()
+        }
       } else {
         this.goodsFlag = false;
       }
+      
     },
     close() {
       this.flag = false;
diff --git a/manager/src/views/lili-dialog/link-dialog.vue b/manager/src/views/lili-dialog/link-dialog.vue
index a5294ce5..0c68f0e3 100644
--- a/manager/src/views/lili-dialog/link-dialog.vue
+++ b/manager/src/views/lili-dialog/link-dialog.vue
@@ -40,7 +40,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.$refs["lili-component"][0].type = "single"; //如果商品页面设置成为单选
+      this.$refs["lili-component"][0].type = "single"; //商品页面设置成为单选
     });
 
     this.wap.forEach((item) => {
diff --git a/manager/src/views/lili-dialog/template/marketing.vue b/manager/src/views/lili-dialog/template/marketing.vue
index 4b89cd6d..04af40de 100644
--- a/manager/src/views/lili-dialog/template/marketing.vue
+++ b/manager/src/views/lili-dialog/template/marketing.vue
@@ -65,7 +65,7 @@ export default {
         },
         {
           title: "店铺名称",
-          key: "sellerName",
+          key: "storeName",
           tooltip: true,
         },
         {
@@ -113,7 +113,7 @@ export default {
         },
         {
           title: "店铺名称",
-          key: "sellerName",
+          key: "storeName",
           tooltip: true,
         },
         {
diff --git a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
index 42da8019..c74d4b48 100644
--- a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
@@ -176,12 +176,16 @@ export default {
         handleSelectGoods(item) { // 调起选择商品
             console.warn(item);
             if (item) this.selected = item;
-            this.$refs.liliDialog.open('goods')
+            this.$refs.liliDialog.open('goods', 'single')
+            setTimeout(() => {
+                this.$refs.liliDialog.goodsData = [this.selected]
+            }, 500);
         },
         selectedLink (val) {
             this.selected.url = this.$options.filters.formatLinkType(val);
         },
         selectedGoodsData (val) {
+            console.log(val);
             let goods = val[0]
             console.log(this.selected);
             this.selected.img = goods.thumbnail
diff --git a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
index 2a93c86f..11b369b6 100644
--- a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
@@ -108,7 +108,10 @@ export default {
         },
         handleSelectGoods(item) { // 调起选择链接弹窗
             if(item) this.selected = item;
-            this.$refs.liliDialog.open('goods')
+            this.$refs.liliDialog.open('goods', 'single')
+            setTimeout(() => {
+                this.$refs.liliDialog.goodsData = [this.selected]
+            }, 500);
         },
         selectedLink(val) {
            this.selected.url = this.$options.filters.formatLinkType(val);
diff --git a/manager/src/views/lili-floor-renovation/modelList/recommend.vue b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
index 588709dc..d37a34a2 100644
--- a/manager/src/views/lili-floor-renovation/modelList/recommend.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
@@ -241,7 +241,7 @@ export default {
     },
     handleSelectGoods(item) {
       // 调起选择商品
-      this.$refs.liliDialog.open("goods");
+      this.$refs.liliDialog.open('goods', 'single')
     },
     selectedLink(val) {
       this.selected.url = this.$options.filters.formatLinkType(val);
diff --git a/manager/src/views/logistics/index.vue b/manager/src/views/logistics/index.vue
index cf4d9e11..ae43626b 100644
--- a/manager/src/views/logistics/index.vue
+++ b/manager/src/views/logistics/index.vue
@@ -1,49 +1,43 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch"></Row>
-          <Row class="operation padding-row">
-            <Button @click="add" type="primary">添加</Button>
-          </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <!-- 页面展示 -->
-              <template slot="disableSlot" slot-scope="scope">
-                <i-switch size="large" v-model="scope.row.disabled == 'OPEN'?true:false" @on-change="changeSwitch(scope.row)">
-                  <span slot="open">展示</span>
-                  <span slot="close">隐藏</span>
-                </i-switch>
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch"></Row>
+      <Row class="operation padding-row">
+        <Button @click="add" type="primary">添加</Button>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <!-- 页面展示 -->
+        <template slot="disableSlot" slot-scope="scope">
+          <i-switch size="large" v-model="scope.row.disabled == 'OPEN'?true:false" @on-change="changeSwitch(scope.row)">
+            <span slot="open">展示</span>
+            <span slot="close">隐藏</span>
+          </i-switch>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index fe5c2fe0..68738da7 100644
--- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -3,7 +3,7 @@
 <template>
   <div class="ivu-shrinkable-menu">
     <!-- 一级菜单 -->
-    <Menu ref="sideMenu" width="110px" theme="dark"  :active-name="currNav" @on-select="selectNav">
+    <Menu ref="sideMenu" width="80px" theme="dark"  :active-name="currNav" @on-select="selectNav">
       <MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
         {{item.title}}
       </MenuItem>
@@ -12,7 +12,7 @@
     <Menu
       ref="childrenMenu"
       :active-name="$route.name"
-      width="130px"
+      width="100px"
       @on-select="changeMenu"
     >
       <template v-for="item in menuList">
diff --git a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
index 63cf3b63..f2a71fac 100644
--- a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
+++ b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
@@ -1,6 +1,6 @@
 .ivu-shrinkable-menu{
     height: calc(100% - 60px);
-    width: 240px;
+    width: 180px;
     display: flex;
 }
 .ivu-menu-vertical .ivu-menu-item-group-title {
diff --git a/manager/src/views/main.scss b/manager/src/views/main.scss
index 01f0d0b1..d696df11 100644
--- a/manager/src/views/main.scss
+++ b/manager/src/views/main.scss
@@ -52,7 +52,7 @@
     box-sizing: border-box;
     position: fixed;
     display: block;
-    padding-left: 200px;
+    padding-left: 180px;
     width: 100%;
     height: 100px;
     z-index: 20;
@@ -256,12 +256,12 @@
   .single-page-con {
     min-width: 740px;
     position: relative;
-    left: 240px;
+    left: 180px;
     top: 100px;
     right: 0;
     bottom: 0;
     height: calc(100% - 110px);
-    width: calc(100% - 240px);
+    width: calc(100% - 180px);
     overflow: auto;
     background-color: #f0f0f0;
     z-index: 1;
diff --git a/manager/src/views/member/advance/recharge.vue b/manager/src/views/member/advance/recharge.vue
index 27daf2b9..96759e43 100644
--- a/manager/src/views/member/advance/recharge.vue
+++ b/manager/src/views/member/advance/recharge.vue
@@ -1,77 +1,71 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  placeholder="请输入会员名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="充值单号" prop="rechargeSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.rechargeSn"
-                  placeholder="请输入充值单号"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="支付时间">
-              <DatePicker
-                v-model="selectDate"
-                type="datetimerange"
-                format="yyyy-MM-dd HH:mm:ss"
-                clearable
-                @on-change="selectDateRange"
-                placeholder="选择起始时间"
-                style="width: 200px"
-              ></DatePicker>
-            </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              placeholder="请输入会员名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="充值单号" prop="rechargeSn">
+            <Input
+              type="text"
+              v-model="searchForm.rechargeSn"
+              placeholder="请输入充值单号"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="支付时间">
+          <DatePicker
+            v-model="selectDate"
+            type="datetimerange"
+            format="yyyy-MM-dd HH:mm:ss"
+            clearable
+            @on-change="selectDateRange"
+            placeholder="选择起始时间"
+            style="width: 200px"
+          ></DatePicker>
+        </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/manager/src/views/member/advance/walletLog.vue b/manager/src/views/member/advance/walletLog.vue
index 3efe7648..3de776e4 100644
--- a/manager/src/views/member/advance/walletLog.vue
+++ b/manager/src/views/member/advance/walletLog.vue
@@ -1,30 +1,24 @@
 
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="会员名称" prop="memberName">
-              <Input type="text" v-model="searchForm.memberName" placeholder="请输入会员名称" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="支付时间">
-              <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-            </Form-item>
-            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          </Form>
-        </Row>
-        <Row class="padding-row">
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-            size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="memberName">
+            <Input type="text" v-model="searchForm.memberName" placeholder="请输入会员名称" clearable style="width: 200px" />
+          </Form-item>
+          <Form-item label="支付时间">
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue
index b41b709a..c5a9078a 100644
--- a/manager/src/views/member/advance/withdrawApply.vue
+++ b/manager/src/views/member/advance/withdrawApply.vue
@@ -1,84 +1,78 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              placeholder="请输入会员名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="审核状态" prop="applyStatus">
+            <Select
+              v-model="searchForm.memberName"
+              clearable
+              style="width: 200px"
             >
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  placeholder="请输入会员名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="审核状态" prop="applyStatus">
-                <Select
-                  v-model="searchForm.memberName"
-                  clearable
-                  style="width: 200px"
-                >
-                  <Option value="APPLY">申请中</Option>
-                  <Option value="VIA_AUDITING">审核通过(提现成功)</Option>
-                  <Option value="FAIL_AUDITING">审核拒绝</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="申请时间">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Form-item style="margin-left: -35px" class="br">
-                <Button @click="handleSearch" type="primary" icon="ios-search"
-                >搜索
-                </Button
-                >
-              </Form-item>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+              <Option value="APPLY">申请中</Option>
+              <Option value="VIA_AUDITING">审核通过(提现成功)</Option>
+              <Option value="FAIL_AUDITING">审核拒绝</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="申请时间">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Form-item style="margin-left: -35px" class="br">
+            <Button @click="handleSearch" type="primary" icon="ios-search"
+            >搜索
+            </Button
+            >
+          </Form-item>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="roleModalVisible"
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 974e827d..73d13435 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -1,38 +1,33 @@
 <template>
   <div class="search">
-    <Row>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="会员名称" prop="username">
-              <Input type="text" v-model="searchForm.username" placeholder="请输入会员名称" clearable style="width: 200px" />
-            </Form-item>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="username">
+            <Input type="text" v-model="searchForm.username" placeholder="请输入会员名称" clearable style="width: 200px" />
+          </Form-item>
 
-            <Form-item label="会员昵称" prop="nickName">
-              <Input type="text" v-model="searchForm.nickName" placeholder="请输入会员昵称" clearable style="width: 200px" />
-            </Form-item>
+          <Form-item label="会员昵称" prop="nickName">
+            <Input type="text" v-model="searchForm.nickName" placeholder="请输入会员昵称" clearable style="width: 200px" />
+          </Form-item>
 
-            <Form-item label="联系方式" prop="mobile">
-              <Input type="text" v-model="searchForm.mobile" placeholder="请输入会员联系方式" clearable style="width: 200px" />
-            </Form-item>
-            <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button>
-          </Form>
-        </Row>
-        <Row class="operation padding-row">
-          <Button @click="addMember" type="primary">添加会员</Button>
-        </Row>
+          <Form-item label="联系方式" prop="mobile">
+            <Input type="text" v-model="searchForm.mobile" placeholder="请输入会员联系方式" clearable style="width: 200px" />
+          </Form-item>
+          <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="addMember" type="primary">添加会员</Button>
+      </Row>
 
-        <Row>
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-          </Table>
-
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-            size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-    </Row>
+        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
 
     <!-- 添加用户模态框 -->
     <Modal v-model="addFlag" title="添加用户">
diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue
index ccdd938f..29d2f9a4 100644
--- a/manager/src/views/member/list/memberDetail.vue
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -78,7 +78,6 @@
             </div>
           </div>
           <div class="point-data" style="margin-top: -5px">
-            <Row>
               <Table
                 :loading="loading"
                 border
@@ -89,7 +88,6 @@
                 @on-sort-change="pointChangeSort"
               >
               </Table>
-            </Row>
 
             <Row type="flex" justify="end" class="page" style="margin-top: 10px">
               <Page
@@ -168,18 +166,16 @@
             </Form>
           </Row>
           <div style="min-height: 180px">
-            <Row class="padding-row">
-              <Table
-                :loading="loading"
-                border
-                :columns="orderColumns"
-                :data="orderData"
-                ref="table"
-                sortable="custom"
-                @on-sort-change="orderChangeSort"
-              >
-              </Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="orderColumns"
+              :data="orderData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="orderChangeSort"
+            >
+            </Table>
 
             <Row type="flex" justify="end" class="page" style="margin-top: 10px">
               <Page
@@ -201,18 +197,16 @@
           <Row class="operation padding-row">
             <Button @click="addMemberAddress" type="primary">新增</Button>
           </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="addressColumns"
-              :data="addressData"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="addressChangeSort"
-            >
-            </Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="addressColumns"
+            :data="addressData"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="addressChangeSort"
+          >
+          </Table>
 
           <Row type="flex" justify="end" class="page" style="margin-top: 10px">
             <Page
@@ -249,18 +243,16 @@
               </div>
             </div>
           </div>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="walletColumns"
-              :data="walletData"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="walletChangeSort"
-            >
-            </Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="walletColumns"
+            :data="walletData"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="walletChangeSort"
+          >
+          </Table>
 
           <Row type="flex" justify="end" class="page" style="margin-top: 10px">
             <Page
@@ -292,23 +284,21 @@
               <Button @click="getReceiptRecordData" type="primary" icon="ios-search" class="search-btn">搜索</Button>
             </Form>
           </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="receiptRecordColumns"
-              :data="receiptRecordData"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="walletChangeSort"
-            >
-              <template slot="orderSnSlot" slot-scope="scope">
+          <Table
+            :loading="loading"
+            border
+            :columns="receiptRecordColumns"
+            :data="receiptRecordData"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="walletChangeSort"
+          >
+            <template slot="orderSnSlot" slot-scope="scope">
 
-                <a @click="orderDetail(scope.row.orderSn)">{{scope.row.orderSn}}</a>
+              <a @click="orderDetail(scope.row.orderSn)">{{scope.row.orderSn}}</a>
 
-              </template>
-            </Table>
-          </Row>
+            </template>
+          </Table>
 
           <Row type="flex" justify="end" class="page" style="margin-top: 10px">
             <Page
diff --git a/manager/src/views/member/list/memberRecycle.vue b/manager/src/views/member/list/memberRecycle.vue
index b5789951..0125c430 100644
--- a/manager/src/views/member/list/memberRecycle.vue
+++ b/manager/src/views/member/list/memberRecycle.vue
@@ -32,20 +32,17 @@
             <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
           </Form>
         </Row>
-        <Row class="padding-row">
-          <Table
-            :loading="loading"
-            border
-            :columns="columns"
-            :data="data"
-            ref="table"
-            sortable="custom"
-            @on-sort-change="changeSort"
-            @on-selection-change="changeSelect"
-          >
-          </Table>
-
-        </Row>
+        <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"
diff --git a/manager/src/views/member/message-manage/memberMessageManager.vue b/manager/src/views/member/message-manage/memberMessageManager.vue
index e7480e8a..990134d2 100644
--- a/manager/src/views/member/message-manage/memberMessageManager.vue
+++ b/manager/src/views/member/message-manage/memberMessageManager.vue
@@ -101,18 +101,16 @@
                 <a class="select-clear" @click="clearSelectAll">清空</a>
               </Alert>
             </Row>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="columns"
-                :data="data"
-                sortable="custom"
-                @on-sort-change="changeSort"
-                @on-selection-change="showSelect"
-                ref="memberTable"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="showSelect"
+              ref="memberTable"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="searchForm.pageNumber"
@@ -145,18 +143,16 @@
                 <a class="select-clear" @click="clearSelectAll">清空</a>
               </Alert>
             </Row>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="columns"
-                :data="data"
-                sortable="custom"
-                @on-sort-change="changeSort"
-                @on-selection-change="showSelect"
-                ref="shopTable"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="showSelect"
+              ref="shopTable"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="searchForm.pageNumber"
@@ -191,18 +187,16 @@
                 <a class="select-clear" @click="clearSelectAll">清空</a>
               </Alert>
             </Row>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="weChatColumns"
-                :data="weChatData"
-                sortable="custom"
-                @on-sort-change="changeSort"
-                @on-selection-change="showSelect"
-                ref="weChatTable"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="weChatColumns"
+              :data="weChatData"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="showSelect"
+              ref="weChatTable"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="weChatSearchForm.pageNumber"
@@ -236,18 +230,16 @@
                 <a class="select-clear" @click="clearSelectAll">清空</a>
               </Alert>
             </Row>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="columns"
-                :data="data"
-                sortable="custom"
-                @on-sort-change="changeSort"
-                @on-selection-change="showSelect"
-                ref="otherTable"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="showSelect"
+              ref="otherTable"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="searchForm.pageNumber"
diff --git a/manager/src/views/member/message-manage/messageManage.vue b/manager/src/views/member/message-manage/messageManage.vue
index 0d2a0d93..4a5a40b0 100644
--- a/manager/src/views/member/message-manage/messageManage.vue
+++ b/manager/src/views/member/message-manage/messageManage.vue
@@ -75,18 +75,16 @@
           <a class="select-clear" @click="clearSelectAll">清空</a>
         </Alert>
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="showSelect"
-          ref="table"
-        ></Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="showSelect"
+        ref="table"
+      ></Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber"
diff --git a/manager/src/views/member/message-manage/messageSendDetail.vue b/manager/src/views/member/message-manage/messageSendDetail.vue
index 26e46490..98fe5a6a 100644
--- a/manager/src/views/member/message-manage/messageSendDetail.vue
+++ b/manager/src/views/member/message-manage/messageSendDetail.vue
@@ -41,18 +41,16 @@
           <a class="select-clear" @click="clearSelectAll">清空</a>
         </Alert>
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        ></Table>
-      </Row>
+      <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="pageNumber"
diff --git a/manager/src/views/member/message-manage/weChatMessageManager.vue b/manager/src/views/member/message-manage/weChatMessageManager.vue
index ed17d7cb..4a23adde 100644
--- a/manager/src/views/member/message-manage/weChatMessageManager.vue
+++ b/manager/src/views/member/message-manage/weChatMessageManager.vue
@@ -46,15 +46,13 @@
             <Row class="operation">
               <Button @click="weChatSync" type="primary">同步微信消息</Button>
             </Row>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="weChatColumns"
-                :data="weChatData"
-                ref="weChatTable"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="weChatColumns"
+              :data="weChatData"
+              ref="weChatTable"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="weChatSearchForm.pageNumber"
@@ -77,16 +75,14 @@
             <Row class="operation">
               <Button @click="weChatSync('mp')" type="primary">同步微信小程序订阅消息</Button>
             </Row>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="weChatColumns"
-                :data="weChatMPData"
-                sortable="custom"
-                ref="weChatMPTable"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="weChatColumns"
+              :data="weChatMPData"
+              sortable="custom"
+              ref="weChatMPTable"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="weChatMPSearchForm.pageNumber"
diff --git a/manager/src/views/member/notice/sender.vue b/manager/src/views/member/notice/sender.vue
index fd6bba9d..bb707ffd 100644
--- a/manager/src/views/member/notice/sender.vue
+++ b/manager/src/views/member/notice/sender.vue
@@ -1,342 +1,392 @@
 <template>
-    <div class="search">
-        <Row>
-            <Col>
-                <Card>
-                    <Row @keydown.enter.native="handleSearch">
-                        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-                            <Form-item label="标题" prop="title">
-                                <Input type="text" v-model="searchForm.title" placeholder="请输入标题" clearable style="width: 200px"/>
-                            </Form-item>
-                            <Form-item label="消息内容" prop="content">
-                                <Input type="text" v-model="searchForm.content" placeholder="请输入消息内容" clearable style="width: 200px"/>
-                            </Form-item>
-                            <span v-if="drop">
-                <Form-item label="发送类型" prop="sendType">
-                  <Select v-model="searchForm.sendType" placeholder="请选择" clearable style="width: 200px">
-                    <Option value="ALL">全站会员</Option>
-                    <Option value="SELECT">指定会员</Option>
-                  </Select>
-                </Form-item>
-                <Form-item label="创建人" prop="createBy">
-                  <Input type="text" v-model="searchForm.createBy" placeholder="请输入创建人" clearable style="width: 200px"/>
-                </Form-item>
-              </span>
-                            <Form-item style="margin-left:-35px;" class="br">
-                                <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
-                                <Button @click="handleReset">重置</Button>
-                                <a class="drop-down" @click="dropDown">
-                                    {{dropDownContent}}
-                                    <Icon :type="dropDownIcon"></Icon>
-                                </a>
-                            </Form-item>
-                        </Form>
-                    </Row>
-                    <Row class="operation">
-                        <Button @click="add" type="primary" icon="md-add">发送新消息</Button>
-                        <Button @click="delAll" icon="md-trash">批量删除</Button>
-                        <Button @click="getDataList" icon="md-refresh">刷新</Button>
-                    </Row>
-                    <Row v-show="openTip">
-                        <Alert show-icon>
-                            已选择 <span class="select-count">{{selectCount}}</span> 项
-                            <a class="select-clear" @click="clearSelectAll">清空</a>
-                        </Alert>
-                    </Row>
-                    <Row>
-                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-                    </Row>
-                    <Row type="flex" justify="end" class="page">
-                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
-                    </Row>
-                </Card>
-            </Col>
-        </Row>
-    </div>
+  <div class="search">
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="标题" prop="title">
+            <Input
+              type="text"
+              v-model="searchForm.title"
+              placeholder="请输入标题"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="消息内容" prop="content">
+            <Input
+              type="text"
+              v-model="searchForm.content"
+              placeholder="请输入消息内容"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <span v-if="drop">
+            <Form-item label="发送类型" prop="sendType">
+              <Select
+                v-model="searchForm.sendType"
+                placeholder="请选择"
+                clearable
+                style="width: 200px"
+              >
+                <Option value="ALL">全站会员</Option>
+                <Option value="SELECT">指定会员</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="创建人" prop="createBy">
+              <Input
+                type="text"
+                v-model="searchForm.createBy"
+                placeholder="请输入创建人"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+          </span>
+          <Form-item style="margin-left: -35px" class="br">
+            <Button @click="handleSearch" type="primary" icon="ios-search"
+              >搜索</Button
+            >
+            <Button @click="handleReset">重置</Button>
+            <a class="drop-down" @click="dropDown">
+              {{ dropDownContent }}
+              <Icon :type="dropDownIcon"></Icon>
+            </a>
+          </Form-item>
+        </Form>
+      </Row>
+      <Row class="operation">
+        <Button @click="add" type="primary" icon="md-add">发送新消息</Button>
+        <Button @click="delAll" icon="md-trash">批量删除</Button>
+        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择 <span class="select-count">{{ selectCount }}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
 </template>
 
 <script>
-    export default {
-        name: "member-notice-sender",
-        components: {
+export default {
+  name: "member-notice-sender",
+  components: {},
+  data() {
+    return {
+      openSearch: true, // 显示搜索
+      openTip: true, // 显示提示
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      drop: false, // 更多搜索项
+      dropDownContent: "展开", // drop中文提示
+      dropDownIcon: "ios-arrow-down", // drop图标
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
         },
-        data() {
-            return {
-                openSearch: true, // 显示搜索
-                openTip: true, // 显示提示
-                loading: true, // 表单加载状态
-                modalType: 0, // 添加或编辑标识
-                modalVisible: false, // 添加或编辑显示
-                modalTitle: "", // 添加或编辑标题
-                drop: false, // 更多搜索项
-                dropDownContent: "展开", // drop中文提示
-                dropDownIcon: "ios-arrow-down", // drop图标
-                searchForm: { // 搜索框初始化对象
-                    pageNumber: 1, // 当前页数
-                    pageSize: 10, // 页面大小
-                    sort: "createTime", // 默认排序字段
-                    order: "desc", // 默认排序方式
-                },
-                submitLoading: false, // 添加或编辑提交状态
-                selectList: [], // 多选数据
-                selectCount: 0, // 多选计数
-                columns: [
-                    // 表头
-                    {
-                        type: "selection",
-                        width: 60,
-                        align: "center"
-                    },
-                    {
-                        type: "index",
-                        width: 60,
-                        align: "center"
-                    },
-                    {
-                        title: "标题",
-                        key: "title",
-                        minWidth: 120,
-                        sortable: false,
-                    },
-                    {
-                        title: "发送类型",
-                        key: "sendType",
-                        minWidth: 120,
-                        sortable: false,
-
-                        render: (h, params) => {
-                            if (params.row.sendType == "ALL") {
-                                return h("div", [
-                                    h("Badge", {
-                                        props: {
-                                            status: "success",
-                                            text: "全部会员"
-                                        }
-                                    })
-                                ]);
-                            }else{
-                                return h("div", [
-                                    h("Badge", {
-                                        props: {
-                                            status: "success",
-                                            text: "指定会员"
-                                        }
-                                    })
-                                ]);
-                            }
-                        }
-
-                    },
-                    {
-                        title: "创建人",
-                        key: "createBy",
-                        minWidth: 120,
-                        sortable: false,
-                    },
-                    {
-                        title: "创建时间",
-                        key: "createTime",
-                        minWidth: 120,
-                        sortable: true,
-                    },
-                    {
-                        title: "操作",
-                        key: "action",
-                        align: "center",
-                        width: 200,
-                        render: (h, params) => {
-                            return h("div", [
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "error",
-                                            size: "small",
-                                            icon: "md-trash"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.remove(params.row);
-                                            }
-                                        }
-                                    },
-                                    "删除"
-                                )
-                            ]);
-                        }
-                    }
-                ],
-                data: [], // 表单数据
-                total: 0 // 表单数据总数
-            };
+        {
+          type: "index",
+          width: 60,
+          align: "center",
         },
-        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.$refs.searchForm.resetFields();
-                this.searchForm.pageNumber = 1;
-                this.searchForm.pageSize = 10;
-                // 重新加载数据
-                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;
-            },
-            dropDown() {
-                if (this.drop) {
-                    this.dropDownContent = "展开";
-                    this.dropDownIcon = "ios-arrow-down";
-                } else {
-                    this.dropDownContent = "收起";
-                    this.dropDownIcon = "ios-arrow-up";
-                }
-                this.drop = !this.drop;
-            },
-            getDataList() {
-                this.loading = true;
-                // 带多条件搜索参数获取表单数据 请自行修改接口
-                this.getRequest("/memberNoticeSenter/getByPage", this.searchForm).then(res => {
-                    this.loading = false;
-                    if (res.success) {
-                        this.data = res.result.records;
-                        this.total = res.result.total;
-                    }
-                });
-                // 以下为模拟数据
-                //this.data = [
-                //];
-                this.total = this.data.length;
-                this.loading = false;
-            },
-            add() {
-                let query = { type: 0, backRoute: this.$route.name };
-                this.$router.push({
-                    name: "add_message",
-                    query: query
-                });
-            },
-            edit(v) {
-                this.modalType = 1;
-                this.modalTitle = "编辑";
-                this.$refs.form.resetFields();
-                // 转换null为""
-                for (let attr in v) {
-                    if (v[attr] === null) {
-                        v[attr] = "";
-                    }
-                }
-                let str = JSON.stringify(v);
-                let data = JSON.parse(str);
-                this.form = data;
-                this.modalVisible = true;
-            },
-            remove(v) {
-                this.$Modal.confirm({
-                    title: "确认删除",
-                    // 记得确认修改此处
-                    content: "您确认要删除么?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        this.deleteRequest("/memberNoticeSenter/delByIds/" + v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                        // 模拟请求成功
-                        //this.$Message.success("操作成功");
-                        //this.$Modal.remove();
-                        //this.getDataList();
-                    }
-                });
-            },
-            delAll() {
-                if (this.selectCount <= 0) {
-                    this.$Message.warning("您还未选择要删除的数据");
-                    return;
-                }
-                this.$Modal.confirm({
-                    title: "确认删除",
-                    content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-                    loading: true,
-                    onOk: () => {
-                        let ids = "";
-                        this.selectList.forEach(function(e) {
-                            ids += e.id + ",";
-                        });
-                        ids = ids.substring(0, ids.length - 1);
-                        // 批量删除
-                        this.deleteRequest("/memberNoticeSenter/delByIds/" + ids).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.clearSelectAll();
-                                this.getDataList();
-                            }
-                        });
-                        // 模拟请求成功
-                        //this.$Message.success("操作成功");
-                        //this.$Modal.remove();
-                        //this.clearSelectAll();
-                        //this.getDataList();
-                    }
-                });
+        {
+          title: "标题",
+          key: "title",
+          minWidth: 120,
+          sortable: false,
+        },
+        {
+          title: "发送类型",
+          key: "sendType",
+          minWidth: 120,
+          sortable: false,
+
+          render: (h, params) => {
+            if (params.row.sendType == "ALL") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "全部会员",
+                  },
+                }),
+              ]);
+            } else {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "指定会员",
+                  },
+                }),
+              ]);
             }
+          },
         },
-        mounted() {
-            this.init();
-        }
+        {
+          title: "创建人",
+          key: "createBy",
+          minWidth: 120,
+          sortable: false,
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          minWidth: 120,
+          sortable: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                    icon: "md-trash",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(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.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      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;
+    },
+    dropDown() {
+      if (this.drop) {
+        this.dropDownContent = "展开";
+        this.dropDownIcon = "ios-arrow-down";
+      } else {
+        this.dropDownContent = "收起";
+        this.dropDownIcon = "ios-arrow-up";
+      }
+      this.drop = !this.drop;
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      this.getRequest("/memberNoticeSenter/getByPage", this.searchForm).then(
+        (res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        }
+      );
+      // 以下为模拟数据
+      //this.data = [
+      //];
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    add() {
+      let query = { type: 0, backRoute: this.$route.name };
+      this.$router.push({
+        name: "add_message",
+        query: query,
+      });
+    },
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑";
+      this.$refs.form.resetFields();
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] === null) {
+          v[attr] = "";
+        }
+      }
+      let str = JSON.stringify(v);
+      let data = JSON.parse(str);
+      this.form = data;
+      this.modalVisible = true;
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除么?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          this.deleteRequest("/memberNoticeSenter/delByIds/" + v.id).then(
+            (res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            }
+          );
+          // 模拟请求成功
+          //this.$Message.success("操作成功");
+          //this.$Modal.remove();
+          //this.getDataList();
+        },
+      });
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          this.deleteRequest("/memberNoticeSenter/delByIds/" + ids).then(
+            (res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.clearSelectAll();
+                this.getDataList();
+              }
+            }
+          );
+          // 模拟请求成功
+          //this.$Message.success("操作成功");
+          //this.$Modal.remove();
+          //this.clearSelectAll();
+          //this.getDataList();
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss">
-    // 建议引入通用样式 可删除下面样式代码
-    // @import "@/styles/table-common.scss";
-    .search {
-        .operation {
-            margin-bottom: 2vh;
-        }
-        .select-count {
-            font-weight: 600;
-            color: #40a9ff;
-        }
-        .select-clear {
-            margin-left: 10px;
-        }
-        .page {
-            margin-top: 2vh;
-        }
-        .drop-down {
-            margin-left: 5px;
-        }
-    }
+// 建议引入通用样式 可删除下面样式代码
+// @import "@/styles/table-common.scss";
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+  .select-clear {
+    margin-left: 10px;
+  }
+  .page {
+    margin-top: 2vh;
+  }
+  .drop-down {
+    margin-left: 5px;
+  }
+}
 </style>
diff --git a/manager/src/views/member/point/point.vue b/manager/src/views/member/point/point.vue
index 4e9d51e4..06aee6bc 100644
--- a/manager/src/views/member/point/point.vue
+++ b/manager/src/views/member/point/point.vue
@@ -22,20 +22,17 @@
             <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
           </Form>
         </Row>
-        <Row class="padding-row">
-          <Table
-            :loading="loading"
-            border
-            :columns="columns"
-            :data="data"
-            ref="table"
-            sortable="custom"
-            @on-sort-change="changeSort"
-            @on-selection-change="changeSelect"
-          >
-          </Table>
-
-        </Row>
+        <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"
diff --git a/manager/src/views/order/after-order/afterSale.vue b/manager/src/views/order/after-order/afterSale.vue
index 390f9700..dff16472 100644
--- a/manager/src/views/order/after-order/afterSale.vue
+++ b/manager/src/views/order/after-order/afterSale.vue
@@ -10,18 +10,16 @@
                   <Row class="operation" style="margin-bottom: 10px">
                     <Button @click="add"  type="primary" >添加</Button>
                   </Row>
-                  <Row>
-                    <Table
-                      :loading="loading"
-                      border
-                      :columns="columns"
-                      :data="data"
-                      ref="table"
-                      sortable="custom"
-                      @on-sort-change="changeSort"
-                      @on-selection-change="changeSelect"
-                    ></Table>
-                  </Row>
+                  <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"
@@ -45,18 +43,16 @@
                   <Row class="operation" style="margin-bottom: 10px">
                     <Button @click="add" type="primary" icon="md-add">添加</Button>
                   </Row>
-                  <Row>
-                    <Table
-                      :loading="loading"
-                      border
-                      :columns="columns"
-                      :data="data"
-                      ref="table"
-                      sortable="custom"
-                      @on-sort-change="changeSort"
-                      @on-selection-change="changeSelect"
-                    ></Table>
-                  </Row>
+                  <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"
@@ -80,18 +76,16 @@
                   <Row class="operation" style="margin-bottom: 10px">
                     <Button @click="add" type="primary" icon="md-add">添加</Button>
                   </Row>
-                  <Row>
-                    <Table
-                      :loading="loading"
-                      border
-                      :columns="columns"
-                      :data="data"
-                      ref="table"
-                      sortable="custom"
-                      @on-sort-change="changeSort"
-                      @on-selection-change="changeSelect"
-                    ></Table>
-                  </Row>
+                  <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"
@@ -116,18 +110,16 @@
                     <Button @click="add" type="primary" icon="md-add">添加</Button>
                     <Button @click="getDataList" icon="md-refresh">刷新</Button>
                   </Row>
-                  <Row>
-                    <Table
-                      :loading="loading"
-                      border
-                      :columns="columns"
-                      :data="data"
-                      ref="table"
-                      sortable="custom"
-                      @on-sort-change="changeSort"
-                      @on-selection-change="changeSelect"
-                    ></Table>
-                  </Row>
+                  <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"
diff --git a/manager/src/views/order/after-order/afterSaleOrder.vue b/manager/src/views/order/after-order/afterSaleOrder.vue
index 3507fc46..bfb61de6 100644
--- a/manager/src/views/order/after-order/afterSaleOrder.vue
+++ b/manager/src/views/order/after-order/afterSaleOrder.vue
@@ -73,40 +73,38 @@
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
             </Form>
           </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="{row}">
-                <div style="margin-top: 5px;height: 80px; display: flex;">
-                  <div style="">
-                    <img :src="row.goodsImage" style="height: 60px;margin-top: 3px">
-                  </div>
-
-                  <div style="margin-left: 13px;">
-                    <div class="div-zoom">
-                      <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                    </div>
-                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                      <div slot="content">
-                        <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                      </div>
-                      <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                    </Poptip>
-                  </div>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect"
+          >
+            <!-- 商品栏目格式化 -->
+            <template slot="goodsSlot" slot-scope="{row}">
+              <div style="margin-top: 5px;height: 80px; display: flex;">
+                <div style="">
+                  <img :src="row.goodsImage" style="height: 60px;margin-top: 3px">
                 </div>
 
-              </template>
-            </Table>
-          </Row>
+                <div style="margin-left: 13px;">
+                  <div class="div-zoom">
+                    <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+                  </div>
+                  <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                    <div slot="content">
+                      <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                    </div>
+                    <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+                  </Poptip>
+                </div>
+              </div>
+
+            </template>
+          </Table>
           <Row type="flex" justify="end" class="page">
             <Page
               :current="searchForm.pageNumber"
diff --git a/manager/src/views/order/after-order/orderComplaint.vue b/manager/src/views/order/after-order/orderComplaint.vue
index 86e50b8c..31051a5d 100644
--- a/manager/src/views/order/after-order/orderComplaint.vue
+++ b/manager/src/views/order/after-order/orderComplaint.vue
@@ -1,81 +1,74 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  placeholder="请输入订单编号"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  placeholder="请输入会员名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="状态" prop="status">
-                <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="NEW">新投诉</Option>
-                  <Option value="CANCEL">已撤销</Option>
-                  <Option value="WAIT_APPEAL">待申诉</Option>
-                  <Option value="COMMUNICATION">对话中</Option>
-                  <Option value="WAIT_ARBITRATION">等待仲裁</Option>
-                  <Option value="COMPLETE">已完成</Option>
-                </Select>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <template slot-scope="{row}" slot="goodsName">
-                <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                  <div slot="content">
-                    <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                  </div>
-                  <img src="../../../assets/qrcode.svg" style="vertical-align:bottom;" class="hover-pointer" width="20" height="20" alt="">
-                </Poptip>
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              placeholder="请输入订单编号"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              placeholder="请输入会员名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="状态" prop="status">
+            <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px">
+              <Option value="NEW">新投诉</Option>
+              <Option value="CANCEL">已撤销</Option>
+              <Option value="WAIT_APPEAL">待申诉</Option>
+              <Option value="COMMUNICATION">对话中</Option>
+              <Option value="WAIT_ARBITRATION">等待仲裁</Option>
+              <Option value="COMPLETE">已完成</Option>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" 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"
+      >
+        <template slot-scope="{row}" slot="goodsName">
+          <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+          <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+            <div slot="content">
+              <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+            </div>
+            <img src="../../../assets/qrcode.svg" style="vertical-align:bottom;" class="hover-pointer" width="20" height="20" alt="">
+          </Poptip>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/manager/src/views/order/flow/paymentLog.vue b/manager/src/views/order/flow/paymentLog.vue
index 528c3eba..e624d3c0 100644
--- a/manager/src/views/order/flow/paymentLog.vue
+++ b/manager/src/views/order/flow/paymentLog.vue
@@ -1,44 +1,38 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="订单号" prop="sn">
-              <Input type="text" v-model="searchForm.sn" placeholder="订单/交易号" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="付款状态" prop="orderStatus">
-              <Select v-model="searchForm.payStatus" placeholder="请选择" clearable style="width: 200px">
-                <Option value="UNPAID">未付款</Option>
-                <Option value="PAID">已付款</Option>
-              </Select>
-            </Form-item>
-            <Form-item label="支付方式" prop="orderStatus">
-              <Select v-model="searchForm.paymentMethod" placeholder="请选择" clearable style="width: 200px">
-                <Option value="WECHAT">微信</Option>
-                <Option value="ALIPAY">支付宝</Option>
-                <Option value="WALLET">余额</Option>
-                <Option value="BANK_TRANSFER">银行转账</Option>
-                <Option value="">暂未付款</Option>
-              </Select>
-            </Form-item>
-            <Form-item label="支付时间">
-              <DatePicker v-model="searchForm" 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>
-          </Form>
-        </Row>
-        <Row class="padding-row">
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-            size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单号" prop="sn">
+            <Input type="text" v-model="searchForm.sn" placeholder="订单/交易号" clearable style="width: 200px" />
+          </Form-item>
+          <Form-item label="付款状态" prop="orderStatus">
+            <Select v-model="searchForm.payStatus" placeholder="请选择" clearable style="width: 200px">
+              <Option value="UNPAID">未付款</Option>
+              <Option value="PAID">已付款</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="支付方式" prop="orderStatus">
+            <Select v-model="searchForm.paymentMethod" placeholder="请选择" clearable style="width: 200px">
+              <Option value="WECHAT">微信</Option>
+              <Option value="ALIPAY">支付宝</Option>
+              <Option value="WALLET">余额</Option>
+              <Option value="BANK_TRANSFER">银行转账</Option>
+              <Option value="">暂未付款</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="支付时间">
+            <DatePicker v-model="searchForm" 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>
+        </Form>
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/manager/src/views/order/flow/refundLog.vue b/manager/src/views/order/flow/refundLog.vue
index 3b99a5fd..4d4657e3 100644
--- a/manager/src/views/order/flow/refundLog.vue
+++ b/manager/src/views/order/flow/refundLog.vue
@@ -1,38 +1,32 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="订单号" prop="orderSn">
-                <Input type="text" v-model="searchForm.orderSn" placeholder="订单/交易号" clearable style="width: 200px"/>
-              </Form-item>
-              <Form-item label="退款状态" prop="orderStatus">
-                <Select v-model="searchForm.isRefund" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="false">未退款</Option>
-                  <Option value="true">已退款</Option>
-                </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>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-                   @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
-                  @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-                  size="small" show-total show-elevator show-sizer></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单号" prop="orderSn">
+            <Input type="text" v-model="searchForm.orderSn" placeholder="订单/交易号" clearable style="width: 200px"/>
+          </Form-item>
+          <Form-item label="退款状态" prop="orderStatus">
+            <Select v-model="searchForm.isRefund" placeholder="请选择" clearable style="width: 200px">
+              <Option value="false">未退款</Option>
+              <Option value="true">已退款</Option>
+            </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>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" 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>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
+              @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+              size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
@@ -57,14 +51,6 @@ export default {
         isRefund: "",
       },
       selectDate: null,
-      form: {
-        // 添加或编辑表单对象初始化数据
-        sn: "",
-        sellerName: "",
-        startTime: "",
-        endTime: "",
-        billPrice: "",
-      },
       columns: [
         {
           title: "售后单号",
diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue
index 50387891..2d4c9ac3 100644
--- a/manager/src/views/order/order/fictitiousOrderList.vue
+++ b/manager/src/views/order/order/fictitiousOrderList.vue
@@ -51,18 +51,16 @@
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
             </Form>
           </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
+          <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"
@@ -106,16 +104,6 @@
           orderStatus: ""
         },
         selectDate: null, // 下单时间
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
-        },
-        // 表单验证规则
-        formValidate: {},
         submitLoading: false, // 添加或编辑提交状态
         selectList: [], // 多选数据
         selectCount: 0, // 多选计数
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 545b8ed6..2005fe73 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -212,7 +212,7 @@
             <li>
               <span class="label">应付金额：</span>
               <span class="txt flowPrice"
-                >¥{{ orderInfo.order.priceDetailDTO.flowPrice }}</span
+                >¥{{ orderInfo.order.priceDetailDTO.flowPrice | unitPrice }}</span
               >
             </li>
           </ul>
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index a36f93c8..a64378e9 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -1,43 +1,37 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="订单号" prop="orderSn">
-              <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="会员名称" prop="buyerName">
-              <Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="订单状态" prop="orderStatus">
-              <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
-                <Option value="UNPAID">未付款</Option>
-                <Option value="PAID">已付款</Option>
-                <Option value="UNDELIVERED">待发货</Option>
-                <Option value="DELIVERED">已发货</Option>
-                <Option value="COMPLETED">已完成</Option>
-                <Option value="TAKE">待核验</Option>
-                <Option value="CANCELLED">已取消</Option>
-              </Select>
-            </Form-item>
-            <Form-item label="下单时间">
-              <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-            </Form-item>
-            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          </Form>
-        </Row>
-        <Row class="padding-row">
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-            size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单号" prop="orderSn">
+            <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 200px" />
+          </Form-item>
+          <Form-item label="会员名称" prop="buyerName">
+            <Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 200px" />
+          </Form-item>
+          <Form-item label="订单状态" prop="orderStatus">
+            <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
+              <Option value="UNPAID">未付款</Option>
+              <Option value="PAID">已付款</Option>
+              <Option value="UNDELIVERED">待发货</Option>
+              <Option value="DELIVERED">已发货</Option>
+              <Option value="COMPLETED">已完成</Option>
+              <Option value="TAKE">待核验</Option>
+              <Option value="CANCELLED">已取消</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="下单时间">
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
@@ -64,16 +58,6 @@ export default {
         orderStatus: "",
       },
       selectDate: null,
-      form: {
-        // 添加或编辑表单对象初始化数据
-        sn: "",
-        sellerName: "",
-        startTime: "",
-        endTime: "",
-        billPrice: "",
-      },
-      // 表单验证规则
-      formValidate: {},
       submitLoading: false, // 添加或编辑提交状态
       selectList: [], // 多选数据
       selectCount: 0, // 多选计数
diff --git a/manager/src/views/order/receipt/receipt.vue b/manager/src/views/order/receipt/receipt.vue
index 52f36e32..006dbcea 100644
--- a/manager/src/views/order/receipt/receipt.vue
+++ b/manager/src/views/order/receipt/receipt.vue
@@ -58,24 +58,22 @@
 
             </Form>
           </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <!-- 订单详情格式化 -->
-              <template slot="orderSlot" slot-scope="scope">
-                <a
-                  @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
-              </template>
-            </Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect"
+          >
+            <!-- 订单详情格式化 -->
+            <template slot="orderSlot" slot-scope="scope">
+              <a
+                @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+            </template>
+          </Table>
           <Row type="flex" justify="end" class="page">
             <Page
               :current="searchForm.pageNumber"
@@ -114,20 +112,10 @@
           receiptStatus: "", // 起始时间
         },
         shopsData: [], // 店铺数据
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
-        },
         params: {
           pageNumber: 1,
-          pageSize: 1,
+          pageSize: 10,
         },
-        // 表单验证规则
-        formValidate: {},
         submitLoading: false, // 添加或编辑提交状态
         selectList: [], // 多选数据
         selectCount: 0, // 多选计数
diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue
index 6fe74ae4..4ba3ddb5 100644
--- a/manager/src/views/page/article-manage/articleList.vue
+++ b/manager/src/views/page/article-manage/articleList.vue
@@ -20,59 +20,59 @@
         <Row class="operation padding-row">
           <Button @click="add" type="primary" style="">添加</Button>
         </Row>
-        <Row>
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-            <!-- 页面展示 -->
-            <template slot="openStatusSlot" slot-scope="scope">
-              <div>
+        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+          <!-- 页面展示 -->
+          <template slot="openStatusSlot" slot-scope="scope">
+            <div>
 
-              </div>
-              <i-switch size="large" v-model="scope.row.openStatus" @on-change="changeSwitch(scope.row)">
-                <span slot="open">展示</span>
-                <span slot="close">隐藏</span>
-              </i-switch>
-            </template>
-          </Table>
-        </Row>
+            </div>
+            <i-switch size="large" v-model="scope.row.openStatus" @on-change="changeSwitch(scope.row)">
+              <span slot="open">展示</span>
+              <span slot="close">隐藏</span>
+            </i-switch>
+          </template>
+        </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>
 
           </Page>
         </Row>
-
-        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
-          <Form ref="form" :model="form" :label-width="100">
-            <FormItem label="文章标题" prop="title">
-              <Input v-model="form.title" clearable style="width: 40%" />
-            </FormItem>
-            <FormItem label="文章分类" prop="categoryId">
-              <Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
-                <Option :value="treeValue" style="display: none">{{
-                        treeValue
-                      }}
-                </Option>
-                <Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
-              </Select>
-            </FormItem>
-            <FormItem label="文章排序" prop="sort">
-              <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>
-            </FormItem>
-            <FormItem label="是否展示" prop="openStatus">
-              <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
-                <span slot="open">展示</span>
-                <span slot="close">隐藏</span>
-              </i-switch>
-            </FormItem>
-          </Form>
-          <div slot="footer">
-            <Button type="text" @click="modalVisible = false">取消</Button>
-            <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
-          </div>
-        </Modal>
+        <template v-if="!selected">
+          <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
+            <Form ref="form" :model="form" :label-width="100">
+              <FormItem label="文章标题" prop="title">
+                <Input v-model="form.title" clearable style="width: 40%" />
+              </FormItem>
+              <FormItem label="文章分类" prop="categoryId">
+                <Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
+                  <Option :value="treeValue" style="display: none">{{
+                          treeValue
+                        }}
+                  </Option>
+                  <Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
+                </Select>
+              </FormItem>
+              <FormItem label="文章排序" prop="sort">
+                <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>
+              </FormItem>
+              <FormItem label="是否展示" prop="openStatus">
+                <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
+                  <span slot="open">展示</span>
+                  <span slot="close">隐藏</span>
+                </i-switch>
+              </FormItem>
+            </Form>
+            <div slot="footer">
+              <Button type="text" @click="modalVisible = false">取消</Button>
+              <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+            </div>
+          </Modal>
+        </template>
+        
       </Card>
       </Col>
 
diff --git a/manager/src/views/page/feedback/feedback.vue b/manager/src/views/page/feedback/feedback.vue
index bf05ae3b..b123ce50 100644
--- a/manager/src/views/page/feedback/feedback.vue
+++ b/manager/src/views/page/feedback/feedback.vue
@@ -4,18 +4,16 @@
 <template>
   <div class="search">
     <Card>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        ></Table>
-      </Row>
+      <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="pageNumber"
diff --git a/manager/src/views/page/focus/mobileFocus.vue b/manager/src/views/page/focus/mobileFocus.vue
index 7b6d3c5d..6d8920df 100644
--- a/manager/src/views/page/focus/mobileFocus.vue
+++ b/manager/src/views/page/focus/mobileFocus.vue
@@ -1,477 +1,511 @@
 <template>
-    <div class="search">
-        <Row>
-            <Col>
-                <Card>
-                    <Row class="operation">
-                        <Button @click="add" type="primary" icon="md-add">添加</Button>
-                        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
-                        <Button @click="getDataList" icon="md-refresh">刷新</Button>
-                        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
-                    </Row>
-                    <Row v-show="openTip">
-                        <Alert show-icon>
-                            已选择 <span class="select-count">{{selectCount}}</span> 项
-                            <a class="select-clear" @click="clearSelectAll">清空</a>
-                        </Alert>
-                    </Row>
-                    <Row>
-                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-                    </Row>
-                    <Row type="flex" justify="end" class="page">
-                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
-                    </Row>
-                </Card>
-            </Col>
-        </Row>
-        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
-            <Form ref="form" :model="form" :label-width="100" :rules="formValidate" >        <FormItem label="名称" prop="name" >
-                <Input v-model="form.name" clearable style="width:100%"/>
-            </FormItem>
-                <FormItem label="图片" prop="url">
-                    <upload-pic-input v-model="form.url" style="width:100%"></upload-pic-input>
-                </FormItem>
-                <FormItem label="操作类型" prop="operationType" >
-                    <Select v-model="form.operationType" placeholder="请选择" clearable style="width: 200px">
-                        <Option value="NONE">无操作</Option>
-                        <Option value="URL">链接地址</Option>
-                        <Option value="GOODS">商品序号</Option>
-                        <Option value="SHOP">店铺编号</Option>
-                        <Option value="KEYWORD">关键字</Option>
-                        <Option value="CATEGORY">商品分类</Option>
-                    </Select>
-                </FormItem>
-                <FormItem label="链接值" prop="sort" >
-                    <Input v-model="form.operationUrl" clearable style="width:100%"/>
-                </FormItem>
-                <FormItem label="排序" prop="sort" >
-                    <InputNumber :max="999" :min="0" v-model="form.sort"></InputNumber>
-                </FormItem>
-            </Form>
-            <div slot="footer">
-                <Button type="text" @click="modalVisible=false">取消</Button>
-                <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
-            </div>
-        </Modal>
-    </div>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+        <Button @click="add" type="primary" icon="md-add">添加</Button>
+        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
+        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+        <Button type="dashed" @click="openTip = !openTip">{{
+          openTip ? "关闭提示" : "开启提示"
+        }}</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择 <span class="select-count">{{ selectCount }}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="名称" prop="name">
+          <Input v-model="form.name" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="图片" prop="url">
+          <upload-pic-input
+            v-model="form.url"
+            style="width: 100%"
+          ></upload-pic-input>
+        </FormItem>
+        <FormItem label="操作类型" prop="operationType">
+          <Select
+            v-model="form.operationType"
+            placeholder="请选择"
+            clearable
+            style="width: 200px"
+          >
+            <Option value="NONE">无操作</Option>
+            <Option value="URL">链接地址</Option>
+            <Option value="GOODS">商品序号</Option>
+            <Option value="SHOP">店铺编号</Option>
+            <Option value="KEYWORD">关键字</Option>
+            <Option value="CATEGORY">商品分类</Option>
+          </Select>
+        </FormItem>
+        <FormItem label="链接值" prop="sort">
+          <Input v-model="form.operationUrl" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="排序" prop="sort">
+          <InputNumber :max="999" :min="0" v-model="form.sort"></InputNumber>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
 </template>
 
 <script>
-    import {
-        getFocusData,
-        saveFocusData,
-        disableFocus,
-        enableFocus,
-        delFocus
-    } from "@/api/pages";
-    import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+import {
+  getFocusData,
+  saveFocusData,
+  disableFocus,
+  enableFocus,
+  delFocus,
+} from "@/api/pages";
+import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
 
-    export default {
-        name: "mobileFocus",
-        components: {
-            uploadPicInput
+export default {
+  name: "mobileFocus",
+  components: {
+    uploadPicInput,
+  },
+  data() {
+    return {
+      openTip: true, // 显示提示
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      searchForm: {
+        // 搜索框初始化对象
+        clientType: "MOBILE", //客户端类型
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        name: "",
+        operationType: "",
+        operationUrl: "",
+        url: "",
+        sort: 0,
+      },
+      // 表单验证规则
+      formValidate: {
+        name: [{ required: true, message: "不能为空", trigger: "blur" }],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
         },
-        data() {
-            return {
-                openTip: true, // 显示提示
-                loading: true, // 表单加载状态
-                modalType: 0, // 添加或编辑标识
-                modalVisible: false, // 添加或编辑显示
-                modalTitle: "", // 添加或编辑标题
-                searchForm: { // 搜索框初始化对象
-                    clientType: "MOBILE", //客户端类型
-                    pageNumber: 1, // 当前页数
-                    pageSize: 10, // 页面大小
-                    sort: "createTime", // 默认排序字段
-                    order: "desc", // 默认排序方式
-                },
-                form: { // 添加或编辑表单对象初始化数据
-                    name: "",
-                    operationType: "",
-                    operationUrl: "",
-                    url: "",
-                    sort: 0,
-                },
-                // 表单验证规则
-                formValidate: {
-                    name: [{ required: true, message: "不能为空", trigger: "blur" }],
-                },
-                submitLoading: false, // 添加或编辑提交状态
-                selectList: [], // 多选数据
-                selectCount: 0, // 多选计数
-                columns: [
-                    // 表头
-                    {
-                        type: "selection",
-                        width: 60,
-                        align: "center"
-                    },
-                    {
-                        title: "名称",
-                        key: "name",
-                        minWidth: 120,
-                        sortable: false,
-                    },
-                    {
-                        title: "状态",
-                        key: "status",
-                        minWidth: 100,
-                        sortable: false,
-                        render: (h, params) => {
-                            if (params.row.status == 'CLOSE') {
-                                return h("div", [
-                                    h("Badge", {
-                                        props: {
-                                            status: "error",
-                                            text: "禁用"
-                                        }
-                                    })
-                                ]);
-                            } else if (params.row.status == 'OPEN') {
-                                return h("div", [
-                                    h("Badge", {
-                                        props: {
-                                            status: "success",
-                                            text: "启用"
-                                        }
-                                    })
-                                ]);
-                            }
-                        }
-                    },
-                    {
-                        title: "图片",
-                        key: "url",
-                        minWidth: 120,
-                        sortable: false,
-                        render: (h, params) => {
-                            return h("img", {
-                                attrs: {
-                                    src: params.row.url,
-                                    alt: "加载图片失败"
-                                },
-                                style: {
-                                    cursor: "pointer",
-                                    width: "80px",
-                                    height: "60px",
-                                    margin: "10px 0",
-                                    "object-fit": "contain"
-                                }
-                            });
-                        }
-                    },
-                    {
-                        title: "排序",
-                        key: "sort",
-                        minWidth: 120,
-                        sortable: false,
-                    },
-                    {
-                        title: "操作",
-                        key: "action",
-                        align: "center",
-                        width: 200,
-                        render: (h, params) => {
-                            let enableOrDisable = "";
-                            if (params.row.status == "CLOSE") {
-                                enableOrDisable = h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "success",
-                                            size: "small"
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.enable(params.row);
-                                            }
-                                        }
-                                    },
-                                    "启用"
-                                );
-                            } else {
-                                enableOrDisable = h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            size: "small"
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.disable(params.row);
-                                            }
-                                        }
-                                    },
-                                    "禁用"
-                                );
-                            }
-                            return h("div", [
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "primary",
-                                            size: "small"
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.edit(params.row);
-                                            }
-                                        }
-                                    },
-                                    "编辑"
-                                ),
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "error",
-                                            size: "small",
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.remove(params.row);
-                                            }
-                                        }
-                                    },
-                                    "删除"
-                                ),
-                                enableOrDisable,
-                            ]);
-                        }
-                    }
-                ],
-                data: [], // 表单数据
-                total: 0 // 表单数据总数
-            };
+        {
+          title: "名称",
+          key: "name",
+          minWidth: 120,
+          sortable: false,
         },
-        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.$refs.searchForm.resetFields();
-                this.searchForm.pageNumber = 1;
-                this.searchForm.pageSize = 10;
-                // 重新加载数据
-                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;
-            },
-            getDataList() {
-                this.loading = true;
-                // 带多条件搜索参数获取表单数据 请自行修改接口
-                getFocusData(this.searchForm).then(res => {
-                    this.loading = false;
-                    if (res.success) {
-                        this.data = res.result.records;
-                        this.total = res.result.total;
-                    }
-                });
-                // 以下为模拟数据
-                //this.data = [
-                //];
-                this.total = this.data.length;
-                this.loading = false;
-            },
-            enable(v){
-                this.$Modal.confirm({
-                    title: "确认启用",
-                    // 记得确认修改此处
-                    content: "您确认要确认启用 " + v.name + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        enableFocus(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            disable(v) {
-                this.$Modal.confirm({
-                    title: "确认禁用",
-                    // 记得确认修改此处
-                    content: "您确认要禁用 " + v.name + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        disableFocus(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            handleSubmit() {
-                this.$refs.form.validate(valid => {
-                    if (valid) {
-                        this.form.ClientType = "MOBILE"
-                        this.submitLoading = true;
-                        if (this.modalType === 0) {
-                            this.form.status = "OPEN"
-                            // 添加 避免编辑后传入id等数据 记得删除
-                            delete this.form.id;
-                            saveFocusData(this.form).then(res => {
-                                this.submitLoading = false;
-                                if (res.success) {
-                                    this.$Message.success("操作成功");
-                                    this.getDataList();
-                                    this.modalVisible = false;
-                                }
-                            });
-                        } else {
-                            // 编辑
-                            saveFocusData(this.form).then(res => {
-                                this.submitLoading = false;
-                                if (res.success) {
-                                    this.$Message.success("操作成功");
-                                    this.getDataList();
-                                    this.modalVisible = false;
-                                }
-                            });
-                        }
-                    }
-                });
-            },
-            add() {
-                this.modalType = 0;
-                this.modalTitle = "添加";
-                this.$refs.form.resetFields();
-                delete this.form.id;
-                this.modalVisible = true;
-            },
-            edit(v) {
-                this.modalType = 1;
-                this.modalTitle = "编辑";
-                this.$refs.form.resetFields();
-                // 转换null为""
-                for (let attr in v) {
-                    if (v[attr] === null) {
-                        v[attr] = "";
-                    }
-                }
-                let str = JSON.stringify(v);
-                let data = JSON.parse(str);
-                this.form = data;
-                this.modalVisible = true;
-            },
-            remove(v) {
-                this.$Modal.confirm({
-                    title: "确认删除",
-                    // 记得确认修改此处
-                    content: "您确认要删除么?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        delFocus(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            disableAll() {
-                if (this.selectCount <= 0) {
-                    this.$Message.warning("您还未选择要禁用的数据");
-                    return;
-                }
-                this.$Modal.confirm({
-                    title: "确认禁用",
-                    content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
-                    loading: true,
-                    onOk: () => {
-                        let ids = "";
-                        this.selectList.forEach(function(e) {
-                            ids += e.id + ",";
-                        });
-                        ids = ids.substring(0, ids.length - 1);
-                        // 批量删除
-                        disableFocus(ids).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("禁用成功");
-                                this.clearSelectAll();
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
+        {
+          title: "状态",
+          key: "status",
+          minWidth: 100,
+          sortable: false,
+          render: (h, params) => {
+            if (params.row.status == "CLOSE") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "禁用",
+                  },
+                }),
+              ]);
+            } else if (params.row.status == "OPEN") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "启用",
+                  },
+                }),
+              ]);
             }
+          },
         },
-        mounted() {
-            this.init();
-        }
+        {
+          title: "图片",
+          key: "url",
+          minWidth: 120,
+          sortable: false,
+          render: (h, params) => {
+            return h("img", {
+              attrs: {
+                src: params.row.url,
+                alt: "加载图片失败",
+              },
+              style: {
+                cursor: "pointer",
+                width: "80px",
+                height: "60px",
+                margin: "10px 0",
+                "object-fit": "contain",
+              },
+            });
+          },
+        },
+        {
+          title: "排序",
+          key: "sort",
+          minWidth: 120,
+          sortable: false,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            let enableOrDisable = "";
+            if (params.row.status == "CLOSE") {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    type: "success",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.enable(params.row);
+                    },
+                  },
+                },
+                "启用"
+              );
+            } else {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.disable(params.row);
+                    },
+                  },
+                },
+                "禁用"
+              );
+            }
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+              enableOrDisable,
+            ]);
+          },
+        },
+      ],
+      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.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      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;
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getFocusData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      // 以下为模拟数据
+      //this.data = [
+      //];
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    enable(v) {
+      this.$Modal.confirm({
+        title: "确认启用",
+        // 记得确认修改此处
+        content: "您确认要确认启用 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          enableFocus(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    disable(v) {
+      this.$Modal.confirm({
+        title: "确认禁用",
+        // 记得确认修改此处
+        content: "您确认要禁用 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          disableFocus(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.form.ClientType = "MOBILE";
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            this.form.status = "OPEN";
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            saveFocusData(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            saveFocusData(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加";
+      this.$refs.form.resetFields();
+      delete this.form.id;
+      this.modalVisible = true;
+    },
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑";
+      this.$refs.form.resetFields();
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] === null) {
+          v[attr] = "";
+        }
+      }
+      let str = JSON.stringify(v);
+      let data = JSON.parse(str);
+      this.form = data;
+      this.modalVisible = true;
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除么?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delFocus(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    disableAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要禁用的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认禁用",
+        content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          disableFocus(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("禁用成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss">
-    // 建议引入通用样式 可删除下面样式代码
-    // @import "@/styles/table-common.scss";
-    .search {
-        .operation {
-            margin-bottom: 2vh;
-        }
-        .select-count {
-            font-weight: 600;
-            color: #40a9ff;
-        }
-        .select-clear {
-            margin-left: 10px;
-        }
-        .page {
-            margin-top: 2vh;
-        }
-        .drop-down {
-            margin-left: 5px;
-        }
-    }
+// 建议引入通用样式 可删除下面样式代码
+// @import "@/styles/table-common.scss";
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+  .select-clear {
+    margin-left: 10px;
+  }
+  .page {
+    margin-top: 2vh;
+  }
+  .drop-down {
+    margin-left: 5px;
+  }
+}
 </style>
diff --git a/manager/src/views/page/focus/pcFocus.vue b/manager/src/views/page/focus/pcFocus.vue
index 8e4b495a..2b778838 100644
--- a/manager/src/views/page/focus/pcFocus.vue
+++ b/manager/src/views/page/focus/pcFocus.vue
@@ -1,477 +1,511 @@
 <template>
-    <div class="search">
-        <Row>
-            <Col>
-                <Card>
-                    <Row class="operation">
-                        <Button @click="add" type="primary" icon="md-add">添加</Button>
-                        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
-                        <Button @click="getDataList" icon="md-refresh">刷新</Button>
-                        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
-                    </Row>
-                    <Row v-show="openTip">
-                        <Alert show-icon>
-                            已选择 <span class="select-count">{{selectCount}}</span> 项
-                            <a class="select-clear" @click="clearSelectAll">清空</a>
-                        </Alert>
-                    </Row>
-                    <Row>
-                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-                    </Row>
-                    <Row type="flex" justify="end" class="page">
-                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
-                    </Row>
-                </Card>
-            </Col>
-        </Row>
-        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
-            <Form ref="form" :model="form" :label-width="100" :rules="formValidate" >        <FormItem label="名称" prop="name" >
-                <Input v-model="form.name" clearable style="width:100%"/>
-            </FormItem>
-                <FormItem label="图片" prop="url">
-                    <upload-pic-input v-model="form.url" style="width:100%"></upload-pic-input>
-                </FormItem>
-                <FormItem label="操作类型" prop="operationType" >
-                    <Select v-model="form.operationType" placeholder="请选择" clearable style="width: 200px">
-                        <Option value="NONE">无操作</Option>
-                        <Option value="URL">链接地址</Option>
-                        <Option value="GOODS">商品序号</Option>
-                        <Option value="SHOP">店铺编号</Option>
-                        <Option value="KEYWORD">关键字</Option>
-                        <Option value="CATEGORY">商品分类</Option>
-                    </Select>
-                </FormItem>
-                <FormItem label="链接值" prop="sort" >
-                    <Input v-model="form.operationUrl" clearable style="width:100%"/>
-                </FormItem>
-                <FormItem label="排序" prop="sort" >
-                    <InputNumber :max="999" :min="0" v-model="form.sort"></InputNumber>
-                </FormItem>
-            </Form>
-            <div slot="footer">
-                <Button type="text" @click="modalVisible=false">取消</Button>
-                <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
-            </div>
-        </Modal>
-    </div>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+        <Button @click="add" type="primary" icon="md-add">添加</Button>
+        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
+        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+        <Button type="dashed" @click="openTip = !openTip">{{
+          openTip ? "关闭提示" : "开启提示"
+        }}</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择 <span class="select-count">{{ selectCount }}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="名称" prop="name">
+          <Input v-model="form.name" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="图片" prop="url">
+          <upload-pic-input
+            v-model="form.url"
+            style="width: 100%"
+          ></upload-pic-input>
+        </FormItem>
+        <FormItem label="操作类型" prop="operationType">
+          <Select
+            v-model="form.operationType"
+            placeholder="请选择"
+            clearable
+            style="width: 200px"
+          >
+            <Option value="NONE">无操作</Option>
+            <Option value="URL">链接地址</Option>
+            <Option value="GOODS">商品序号</Option>
+            <Option value="SHOP">店铺编号</Option>
+            <Option value="KEYWORD">关键字</Option>
+            <Option value="CATEGORY">商品分类</Option>
+          </Select>
+        </FormItem>
+        <FormItem label="链接值" prop="sort">
+          <Input v-model="form.operationUrl" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="排序" prop="sort">
+          <InputNumber :max="999" :min="0" v-model="form.sort"></InputNumber>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
 </template>
 
 <script>
-    import {
-        getFocusData,
-        saveFocusData,
-        disableFocus,
-        enableFocus,
-        delFocus
-    } from "@/api/pages";
-    import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+import {
+  getFocusData,
+  saveFocusData,
+  disableFocus,
+  enableFocus,
+  delFocus,
+} from "@/api/pages";
+import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
 
-    export default {
-        name: "pcFocus",
-        components: {
-            uploadPicInput
+export default {
+  name: "pcFocus",
+  components: {
+    uploadPicInput,
+  },
+  data() {
+    return {
+      openTip: true, // 显示提示
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      searchForm: {
+        // 搜索框初始化对象
+        clientType: "PC", //客户端类型
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        name: "",
+        operationType: "",
+        operationUrl: "",
+        url: "",
+        sort: 0,
+      },
+      // 表单验证规则
+      formValidate: {
+        name: [{ required: true, message: "不能为空", trigger: "blur" }],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
         },
-        data() {
-            return {
-                openTip: true, // 显示提示
-                loading: true, // 表单加载状态
-                modalType: 0, // 添加或编辑标识
-                modalVisible: false, // 添加或编辑显示
-                modalTitle: "", // 添加或编辑标题
-                searchForm: { // 搜索框初始化对象
-                    clientType: "PC", //客户端类型
-                    pageNumber: 1, // 当前页数
-                    pageSize: 10, // 页面大小
-                    sort: "createTime", // 默认排序字段
-                    order: "desc", // 默认排序方式
-                },
-                form: { // 添加或编辑表单对象初始化数据
-                    name: "",
-                    operationType: "",
-                    operationUrl: "",
-                    url: "",
-                    sort: 0,
-                },
-                // 表单验证规则
-                formValidate: {
-                    name: [{ required: true, message: "不能为空", trigger: "blur" }],
-                },
-                submitLoading: false, // 添加或编辑提交状态
-                selectList: [], // 多选数据
-                selectCount: 0, // 多选计数
-                columns: [
-                    // 表头
-                    {
-                        type: "selection",
-                        width: 60,
-                        align: "center"
-                    },
-                    {
-                        title: "名称",
-                        key: "name",
-                        minWidth: 120,
-                        sortable: false,
-                    },
-                    {
-                        title: "状态",
-                        key: "status",
-                        minWidth: 100,
-                        sortable: false,
-                        render: (h, params) => {
-                            if (params.row.status == 'CLOSE') {
-                                return h("div", [
-                                    h("Badge", {
-                                        props: {
-                                            status: "error",
-                                            text: "禁用"
-                                        }
-                                    })
-                                ]);
-                            } else if (params.row.status == 'OPEN') {
-                                return h("div", [
-                                    h("Badge", {
-                                        props: {
-                                            status: "success",
-                                            text: "启用"
-                                        }
-                                    })
-                                ]);
-                            }
-                        }
-                    },
-                    {
-                        title: "图片",
-                        key: "url",
-                        minWidth: 120,
-                        sortable: false,
-                        render: (h, params) => {
-                            return h("img", {
-                                attrs: {
-                                    src: params.row.url,
-                                    alt: "加载图片失败"
-                                },
-                                style: {
-                                    cursor: "pointer",
-                                    width: "80px",
-                                    height: "60px",
-                                    margin: "10px 0",
-                                    "object-fit": "contain"
-                                }
-                            });
-                        }
-                    },
-                    {
-                        title: "排序",
-                        key: "sort",
-                        minWidth: 120,
-                        sortable: false,
-                    },
-                    {
-                        title: "操作",
-                        key: "action",
-                        align: "center",
-                        width: 200,
-                        render: (h, params) => {
-                            let enableOrDisable = "";
-                            if (params.row.status == "CLOSE") {
-                                enableOrDisable = h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "success",
-                                            size: "small"
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.enable(params.row);
-                                            }
-                                        }
-                                    },
-                                    "启用"
-                                );
-                            } else {
-                                enableOrDisable = h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            size: "small"
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.disable(params.row);
-                                            }
-                                        }
-                                    },
-                                    "禁用"
-                                );
-                            }
-                            return h("div", [
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "primary",
-                                            size: "small"
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.edit(params.row);
-                                            }
-                                        }
-                                    },
-                                    "编辑"
-                                ),
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "error",
-                                            size: "small",
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.remove(params.row);
-                                            }
-                                        }
-                                    },
-                                    "删除"
-                                ),
-                                enableOrDisable,
-                            ]);
-                        }
-                    }
-                ],
-                data: [], // 表单数据
-                total: 0 // 表单数据总数
-            };
+        {
+          title: "名称",
+          key: "name",
+          minWidth: 120,
+          sortable: false,
         },
-        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.$refs.searchForm.resetFields();
-                this.searchForm.pageNumber = 1;
-                this.searchForm.pageSize = 10;
-                // 重新加载数据
-                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;
-            },
-            getDataList() {
-                this.loading = true;
-                // 带多条件搜索参数获取表单数据 请自行修改接口
-                getFocusData(this.searchForm).then(res => {
-                    this.loading = false;
-                    if (res.success) {
-                        this.data = res.result.records;
-                        this.total = res.result.total;
-                    }
-                });
-                // 以下为模拟数据
-                //this.data = [
-                //];
-                this.total = this.data.length;
-                this.loading = false;
-            },
-            enable(v){
-                this.$Modal.confirm({
-                    title: "确认启用",
-                    // 记得确认修改此处
-                    content: "您确认要确认启用 " + v.name + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        enableFocus(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            disable(v) {
-                this.$Modal.confirm({
-                    title: "确认禁用",
-                    // 记得确认修改此处
-                    content: "您确认要禁用 " + v.name + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        disableFocus(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            handleSubmit() {
-                this.$refs.form.validate(valid => {
-                    if (valid) {
-                        this.form.ClientType = "PC"
-                        this.submitLoading = true;
-                        if (this.modalType === 0) {
-                            this.form.status = "OPEN"
-                            // 添加 避免编辑后传入id等数据 记得删除
-                            delete this.form.id;
-                            saveFocusData(this.form).then(res => {
-                                this.submitLoading = false;
-                                if (res.success) {
-                                    this.$Message.success("操作成功");
-                                    this.getDataList();
-                                    this.modalVisible = false;
-                                }
-                            });
-                        } else {
-                            // 编辑
-                            saveFocusData(this.form).then(res => {
-                                this.submitLoading = false;
-                                if (res.success) {
-                                    this.$Message.success("操作成功");
-                                    this.getDataList();
-                                    this.modalVisible = false;
-                                }
-                            });
-                        }
-                    }
-                });
-            },
-            add() {
-                this.modalType = 0;
-                this.modalTitle = "添加";
-                this.$refs.form.resetFields();
-                delete this.form.id;
-                this.modalVisible = true;
-            },
-            edit(v) {
-                this.modalType = 1;
-                this.modalTitle = "编辑";
-                this.$refs.form.resetFields();
-                // 转换null为""
-                for (let attr in v) {
-                    if (v[attr] === null) {
-                        v[attr] = "";
-                    }
-                }
-                let str = JSON.stringify(v);
-                let data = JSON.parse(str);
-                this.form = data;
-                this.modalVisible = true;
-            },
-            remove(v) {
-                this.$Modal.confirm({
-                    title: "确认删除",
-                    // 记得确认修改此处
-                    content: "您确认要删除么?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        delFocus(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            disableAll() {
-                if (this.selectCount <= 0) {
-                    this.$Message.warning("您还未选择要禁用的数据");
-                    return;
-                }
-                this.$Modal.confirm({
-                    title: "确认禁用",
-                    content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
-                    loading: true,
-                    onOk: () => {
-                        let ids = "";
-                        this.selectList.forEach(function(e) {
-                            ids += e.id + ",";
-                        });
-                        ids = ids.substring(0, ids.length - 1);
-                        // 批量删除
-                        disableFocus(ids).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("禁用成功");
-                                this.clearSelectAll();
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
+        {
+          title: "状态",
+          key: "status",
+          minWidth: 100,
+          sortable: false,
+          render: (h, params) => {
+            if (params.row.status == "CLOSE") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "禁用",
+                  },
+                }),
+              ]);
+            } else if (params.row.status == "OPEN") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "启用",
+                  },
+                }),
+              ]);
             }
+          },
         },
-        mounted() {
-            this.init();
-        }
+        {
+          title: "图片",
+          key: "url",
+          minWidth: 120,
+          sortable: false,
+          render: (h, params) => {
+            return h("img", {
+              attrs: {
+                src: params.row.url,
+                alt: "加载图片失败",
+              },
+              style: {
+                cursor: "pointer",
+                width: "80px",
+                height: "60px",
+                margin: "10px 0",
+                "object-fit": "contain",
+              },
+            });
+          },
+        },
+        {
+          title: "排序",
+          key: "sort",
+          minWidth: 120,
+          sortable: false,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            let enableOrDisable = "";
+            if (params.row.status == "CLOSE") {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    type: "success",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.enable(params.row);
+                    },
+                  },
+                },
+                "启用"
+              );
+            } else {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.disable(params.row);
+                    },
+                  },
+                },
+                "禁用"
+              );
+            }
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+              enableOrDisable,
+            ]);
+          },
+        },
+      ],
+      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.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      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;
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getFocusData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      // 以下为模拟数据
+      //this.data = [
+      //];
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    enable(v) {
+      this.$Modal.confirm({
+        title: "确认启用",
+        // 记得确认修改此处
+        content: "您确认要确认启用 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          enableFocus(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    disable(v) {
+      this.$Modal.confirm({
+        title: "确认禁用",
+        // 记得确认修改此处
+        content: "您确认要禁用 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          disableFocus(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.form.ClientType = "PC";
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            this.form.status = "OPEN";
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            saveFocusData(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            saveFocusData(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加";
+      this.$refs.form.resetFields();
+      delete this.form.id;
+      this.modalVisible = true;
+    },
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑";
+      this.$refs.form.resetFields();
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] === null) {
+          v[attr] = "";
+        }
+      }
+      let str = JSON.stringify(v);
+      let data = JSON.parse(str);
+      this.form = data;
+      this.modalVisible = true;
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除么?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delFocus(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    disableAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要禁用的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认禁用",
+        content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          disableFocus(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("禁用成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss">
-    // 建议引入通用样式 可删除下面样式代码
-    // @import "@/styles/table-common.scss";
-    .search {
-        .operation {
-            margin-bottom: 2vh;
-        }
-        .select-count {
-            font-weight: 600;
-            color: #40a9ff;
-        }
-        .select-clear {
-            margin-left: 10px;
-        }
-        .page {
-            margin-top: 2vh;
-        }
-        .drop-down {
-            margin-left: 5px;
-        }
-    }
+// 建议引入通用样式 可删除下面样式代码
+// @import "@/styles/table-common.scss";
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+  .select-clear {
+    margin-left: 10px;
+  }
+  .page {
+    margin-top: 2vh;
+  }
+  .drop-down {
+    margin-left: 5px;
+  }
+}
 </style>
diff --git a/manager/src/views/page/navigation/mobileNavigation.vue b/manager/src/views/page/navigation/mobileNavigation.vue
index f2c4e0b4..97df2216 100644
--- a/manager/src/views/page/navigation/mobileNavigation.vue
+++ b/manager/src/views/page/navigation/mobileNavigation.vue
@@ -1,467 +1,496 @@
 <template>
-    <div class="search">
-        <Row>
-            <Col>
-                <Card>
-                    <Row class="operation">
-                        <Button @click="add" type="primary" icon="md-add">添加</Button>
-                        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
-                        <Button @click="getDataList" icon="md-refresh">刷新</Button>
-                        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
-                    </Row>
-                    <Row v-show="openTip">
-                        <Alert show-icon>
-                            已选择 <span class="select-count">{{selectCount}}</span> 项
-                            <a class="select-clear" @click="clearSelectAll">清空</a>
-                        </Alert>
-                    </Row>
-                    <Row>
-                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-                               @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-                    </Row>
-                    <Row type="flex" justify="end" class="page">
-                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
-                              @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
-                              size="small" show-total show-elevator show-sizer></Page>
-                    </Row>
-                </Card>
-            </Col>
-        </Row>
-        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
-            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-                <FormItem label="导航栏名称" prop="navigationName">
-                    <Input v-model="form.navigationName" clearable style="width:100%"/>
-                </FormItem>
-                <FormItem label="导航栏链接" prop="url">
-                    <Input v-model="form.url" clearable style="width:100%"/>
-                </FormItem>
-                <FormItem label="品牌图标" prop="image">
-                    <upload-pic-input v-model="form.image" style="width:100%"></upload-pic-input>
-                </FormItem>
-            </Form>
-            <div slot="footer">
-                <Button type="text" @click="modalVisible=false">取消</Button>
-                <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
-            </div>
-        </Modal>
-    </div>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+        <Button @click="add" type="primary" icon="md-add">添加</Button>
+        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
+        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+        <Button type="dashed" @click="openTip = !openTip">{{
+          openTip ? "关闭提示" : "开启提示"
+        }}</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择 <span class="select-count">{{ selectCount }}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="导航栏名称" prop="navigationName">
+          <Input v-model="form.navigationName" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="导航栏链接" prop="url">
+          <Input v-model="form.url" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="品牌图标" prop="image">
+          <upload-pic-input
+            v-model="form.image"
+            style="width: 100%"
+          ></upload-pic-input>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
 </template>
 
 <script>
-    import {
-        save,
-        getNavigationData,
-        disableNavigation,
-        enableNavigation,
-        delNavigation,
-        update
-    } from "@/api/pages";
-    import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+import {
+  save,
+  getNavigationData,
+  disableNavigation,
+  enableNavigation,
+  delNavigation,
+  update,
+} from "@/api/pages";
+import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
 
-    export default {
-        name: "mobileNavigation",
-        components: {
-            uploadPicInput
+export default {
+  name: "mobileNavigation",
+  components: {
+    uploadPicInput,
+  },
+  data() {
+    return {
+      openTip: true, // 显示提示
+      loading: true, // 表单加载状态
+      type: "MOBILE", // 手机还是pc
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        navigationName: "",
+        image: "",
+        url: "",
+      },
+      // 表单验证规则
+      formValidate: {
+        url: [
+          { required: true, message: "导航栏url不能为空", trigger: "blur" },
+        ],
+        navigationName: [
+          { required: true, message: "导航栏不能为空", trigger: "blur" },
+        ],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
         },
-        data() {
-            return {
-                openTip: true, // 显示提示
-                loading: true, // 表单加载状态
-                type: "MOBILE", // 手机还是pc
-                modalType: 0, // 添加或编辑标识
-                modalVisible: false, // 添加或编辑显示
-                modalTitle: "", // 添加或编辑标题
-                searchForm: { // 搜索框初始化对象
-                    pageNumber: 1, // 当前页数
-                    pageSize: 10, // 页面大小
-                    sort: "createTime", // 默认排序字段
-                    order: "desc", // 默认排序方式
-                },
-                form: { // 添加或编辑表单对象初始化数据
-                    navigationName: "",
-                    image: "",
-                    url: "",
-                },
-                // 表单验证规则
-                formValidate: {
-                    url: [{required: true, message: "导航栏url不能为空", trigger: "blur"}],
-                    navigationName: [{required: true, message: "导航栏不能为空", trigger: "blur"}],
-                },
-                submitLoading: false, // 添加或编辑提交状态
-                selectList: [], // 多选数据
-                selectCount: 0, // 多选计数
-                columns: [
-                    // 表头
-                    {
-                        type: "selection",
-                        width: 60,
-                        align: "center"
-                    },
-                    {
-                        title: "导航名称",
-                        key: "navigationName",
-                        minWidth: 120,
-                        sortable: false,
-                    },
-                    {
-                        title: "状态",
-                        key: "status",
-                        minWidth: 100,
-                        sortable: false,
-                        render: (h, params) => {
-                            if (params.row.status == 'CLOSE') {
-                                return h("div", [
-                                    h("Badge", {
-                                        props: {
-                                            status: "error",
-                                            text: "禁用"
-                                        }
-                                    })
-                                ]);
-                            } else if (params.row.status == 'OPEN') {
-                                return h("div", [
-                                    h("Badge", {
-                                        props: {
-                                            status: "success",
-                                            text: "启用"
-                                        }
-                                    })
-                                ]);
-                            }
-                        }
-                    },
-                    {
-                        title: "图片",
-                        key: "image",
-                        minWidth: 120,
-                        sortable: false,
-                        render: (h, params) => {
-                            return h("img", {
-                                attrs: {
-                                    src: params.row.image,
-                                    alt: "加载图片失败"
-                                },
-                                style: {
-                                    cursor: "pointer",
-                                    width: "80px",
-                                    height: "60px",
-                                    margin: "10px 0",
-                                    "object-fit": "contain"
-                                }
-                            });
-                        }
-                    },
-                    {
-                        title: "排序",
-                        key: "sort",
-                        minWidth: 120,
-                        sortable: false,
-                    },
-                    {
-                        title: "操作",
-                        key: "action",
-                        align: "center",
-                        width: 250,
-                        render: (h, params) => {
-                            console.warn(params.status)
-                            let enableOrDisable = "";
-                            if (params.row.status == "CLOSE") {
-                                enableOrDisable = h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "success",
-                                            size: "small"
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.enable(params.row);
-                                            }
-                                        }
-                                    },
-                                    "启用"
-                                );
-                            } else {
-                                enableOrDisable = h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            size: "small"
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.disable(params.row);
-                                            }
-                                        }
-                                    },
-                                    "禁用"
-                                );
-                            }
-                            return h("div", [
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "primary",
-                                            size: "small"
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.edit(params.row);
-                                            }
-                                        }
-                                    },
-                                    "编辑"
-                                ),
-                                h(
-                                    "Button",
-                                    {
-                                        props: {
-                                            type: "error",
-                                            size: "small",
-                                        },
-                                        style: {
-                                            marginRight: "5px"
-                                        },
-                                        on: {
-                                            click: () => {
-                                                this.del(params.row);
-                                            }
-                                        }
-                                    },
-                                    "删除"
-                                ),
-                                enableOrDisable,
-                            ]);
-                        }
-                    }
-                ],
-                data: [], // 表单数据
-                total: 0 // 表单数据总数
-            };
+        {
+          title: "导航名称",
+          key: "navigationName",
+          minWidth: 120,
+          sortable: false,
         },
-        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.$refs.searchForm.resetFields();
-                this.searchForm.pageNumber = 1;
-                this.searchForm.pageSize = 10;
-                // 重新加载数据
-                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;
-            },
-            getDataList() {
-                this.searchForm.clientType = this.type
-                this.loading = true;
-                // 带多条件搜索参数获取表单数据 请自行修改接口
-                getNavigationData(this.searchForm).then(res => {
-                    this.loading = false;
-                    if (res.success) {
-                        this.data = res.result.records;
-                        this.total = res.result.total;
-                    }
-                });
-                this.total = this.data.length;
-                this.loading = false;
-            },
-            handleSubmit() {
-                this.$refs.form.validate(valid => {
-                    if (valid) {
-                        this.submitLoading = true;
-                        this.form.clientType = this.type
-                        if (this.modalType === 0) {
-                            // 添加 避免编辑后传入id等数据 记得删除
-                            delete this.form.id;
-                            save(this.form).then(res => {
-                                this.submitLoading = false;
-                                if (res.success) {
-                                    this.$Message.success("操作成功");
-                                    this.getDataList();
-                                    this.modalVisible = false;
-                                }
-                            });
-                        } else {
-                            // 编辑
-                            update(this.form).then(res => {
-                                this.submitLoading = false;
-                                if (res.success) {
-                                    this.$Message.success("操作成功");
-                                    this.getDataList();
-                                    this.modalVisible = false;
-                                }
-                            });
-                        }
-                    }
-                });
-            },
-            add() {
-                this.modalType = 0;
-                this.modalTitle = "添加";
-                this.$refs.form.resetFields();
-                delete this.form.id;
-                this.modalVisible = true;
-            },
-            edit(v) {
-                this.modalType = 1;
-                this.modalTitle = "编辑";
-                this.$refs.form.resetFields();
-                // 转换null为""
-                for (let attr in v) {
-                    if (v[attr] === null) {
-                        v[attr] = "";
-                    }
-                }
-                let str = JSON.stringify(v);
-                let data = JSON.parse(str);
-                this.form = data;
-                this.modalVisible = true;
-            },
-            enable(v){
-                this.$Modal.confirm({
-                    title: "确认启用",
-                    // 记得确认修改此处
-                    content: "您确认要确认启用 " + v.navigationName + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        enableNavigation(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            disable(v) {
-                this.$Modal.confirm({
-                    title: "确认禁用",
-                    // 记得确认修改此处
-                    content: "您确认要禁用 " + v.navigationName + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        disableNavigation(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            disableAll() {
-                if (this.selectCount <= 0) {
-                    this.$Message.warning("您还未选择要禁用的数据");
-                    return;
-                }
-                this.$Modal.confirm({
-                    title: "确认禁用",
-                    content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
-                    loading: true,
-                    onOk: () => {
-                        let ids = "";
-                        this.selectList.forEach(function (e) {
-                            ids += e.id + ",";
-                        });
-                        ids = ids.substring(0, ids.length - 1);
-                        // 批量禁用
-                        disableNavigation(ids).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.clearSelectAll();
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
-            },
-            del(v) {
-                this.$Modal.confirm({
-                    title: "确认删除",
-                    // 记得确认修改此处
-                    content: "您确认要永久性删除 " + v.navigationName + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        delNavigation(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getDataList();
-                            }
-                        });
-                    }
-                });
+        {
+          title: "状态",
+          key: "status",
+          minWidth: 100,
+          sortable: false,
+          render: (h, params) => {
+            if (params.row.status == "CLOSE") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "禁用",
+                  },
+                }),
+              ]);
+            } else if (params.row.status == "OPEN") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "启用",
+                  },
+                }),
+              ]);
             }
+          },
         },
-
-        mounted() {
-            this.init();
-        }
+        {
+          title: "图片",
+          key: "image",
+          minWidth: 120,
+          sortable: false,
+          render: (h, params) => {
+            return h("img", {
+              attrs: {
+                src: params.row.image,
+                alt: "加载图片失败",
+              },
+              style: {
+                cursor: "pointer",
+                width: "80px",
+                height: "60px",
+                margin: "10px 0",
+                "object-fit": "contain",
+              },
+            });
+          },
+        },
+        {
+          title: "排序",
+          key: "sort",
+          minWidth: 120,
+          sortable: false,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 250,
+          render: (h, params) => {
+            console.warn(params.status);
+            let enableOrDisable = "";
+            if (params.row.status == "CLOSE") {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    type: "success",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.enable(params.row);
+                    },
+                  },
+                },
+                "启用"
+              );
+            } else {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.disable(params.row);
+                    },
+                  },
+                },
+                "禁用"
+              );
+            }
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.del(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+              enableOrDisable,
+            ]);
+          },
+        },
+      ],
+      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.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      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;
+    },
+    getDataList() {
+      this.searchForm.clientType = this.type;
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getNavigationData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          this.form.clientType = this.type;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            save(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            update(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加";
+      this.$refs.form.resetFields();
+      delete this.form.id;
+      this.modalVisible = true;
+    },
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑";
+      this.$refs.form.resetFields();
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] === null) {
+          v[attr] = "";
+        }
+      }
+      let str = JSON.stringify(v);
+      let data = JSON.parse(str);
+      this.form = data;
+      this.modalVisible = true;
+    },
+    enable(v) {
+      this.$Modal.confirm({
+        title: "确认启用",
+        // 记得确认修改此处
+        content: "您确认要确认启用 " + v.navigationName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          enableNavigation(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    disable(v) {
+      this.$Modal.confirm({
+        title: "确认禁用",
+        // 记得确认修改此处
+        content: "您确认要禁用 " + v.navigationName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          disableNavigation(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    disableAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要禁用的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认禁用",
+        content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量禁用
+          disableNavigation(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    del(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要永久性删除 " + v.navigationName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delNavigation(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss">
-    // 建议引入通用样式 可删除下面样式代码
-    // @import "@/styles/table-common.scss";
-    .search {
-        .operation {
-            margin-bottom: 2vh;
-        }
-        .select-count {
-            font-weight: 600;
-            color: #40a9ff;
-        }
-        .select-clear {
-            margin-left: 10px;
-        }
-        .page {
-            margin-top: 2vh;
-        }
-        .drop-down {
-            margin-left: 5px;
-        }
-    }
+// 建议引入通用样式 可删除下面样式代码
+// @import "@/styles/table-common.scss";
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+  .select-clear {
+    margin-left: 10px;
+  }
+  .page {
+    margin-top: 2vh;
+  }
+  .drop-down {
+    margin-left: 5px;
+  }
+}
 </style>
diff --git a/manager/src/views/page/navigation/pcNavigation.vue b/manager/src/views/page/navigation/pcNavigation.vue
index d77af994..c17e6fdf 100644
--- a/manager/src/views/page/navigation/pcNavigation.vue
+++ b/manager/src/views/page/navigation/pcNavigation.vue
@@ -1,7 +1,5 @@
 <template>
     <div class="search">
-        <Row>
-            <Col>
                 <Card>
                     <Row class="operation">
                         <Button @click="add" type="primary" icon="md-add">添加</Button>
@@ -15,18 +13,14 @@
                             <a class="select-clear" @click="clearSelectAll">清空</a>
                         </Alert>
                     </Row>
-                    <Row>
-                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-                               @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-                    </Row>
+                    <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+                            @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
                     <Row type="flex" justify="end" class="page">
                         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
                               @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
                               size="small" show-total show-elevator show-sizer></Page>
                     </Row>
                 </Card>
-            </Col>
-        </Row>
         <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
             <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
                 <FormItem label="导航栏名称" prop="navigationName">
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
index 18ee967b..5ea885b3 100644
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -42,46 +42,37 @@
         <Button @click="delAll">批量下架</Button>
         <!-- <Button @click="upAll" >批量上架</Button> -->
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        >
-          <template slot-scope="{ row }" slot="action">
-            <!-- <Button
-              type="info"
-              size="small"
-              style="margin-right: 10px"
-              @click="receiveInfo(row)"
-              >查看</Button
-            > -->
-            <Button
-              v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
-              type="primary"
-              size="small"
-              style="margin-right: 10px"
-              @click="edit(row)"
-            >编辑
-            </Button
-            >
-            <Button
-              v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
-              type="error"
-              size="small"
-              style="margin-right: 10px"
-              @click="remove(row)"
-            >下架
-            </Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
+            type="primary"
+            size="small"
+            style="margin-right: 10px"
+            @click="edit(row)"
+          >编辑
+          </Button
+          >
+          <Button
+            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
+            type="error"
+            size="small"
+            style="margin-right: 10px"
+            @click="remove(row)"
+          >下架
+          </Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
diff --git a/manager/src/views/promotion/coupon/couponInfo.vue b/manager/src/views/promotion/coupon/couponInfo.vue
index e1f75856..87061b89 100644
--- a/manager/src/views/promotion/coupon/couponInfo.vue
+++ b/manager/src/views/promotion/coupon/couponInfo.vue
@@ -72,9 +72,7 @@
           </div>
           <h4>适用品类范围</h4>
           <div>
-            <Row>
-              <Table :loading="loading" border :columns="columns1" :data="data1" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-            </Row>
+            <Table :loading="loading" border :columns="columns1" :data="data1" 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>
diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue
index cc017088..07102b18 100644
--- a/manager/src/views/promotion/coupon/couponPublish.vue
+++ b/manager/src/views/promotion/coupon/couponPublish.vue
@@ -70,7 +70,7 @@
 
             <FormItem style="width: 100%" v-if="form.scopeType == 'PORTION_GOODS'">
               <div style="display: flex; margin-bottom: 10px">
-                <Button type="primary" @click="$refs.skuSelect.open('goods')">选择商品</Button>
+                <Button type="primary" @click="openSkuList">选择商品</Button>
                 <Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
               </div>
               <Table border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
@@ -392,6 +392,14 @@ export default {
       );
       this.$router.go(-1);
     },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
+    },
     changeSelect(e) {
       // 已选商品批量选择
       this.selectedGoods = e;
@@ -424,25 +432,19 @@ export default {
     },
     selectedGoodsData(item) {
       // 回显已选商品
-      let ids = [];
       let list = [];
-      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
           list.push({
             goodsName: e.goodsName,
             price: e.price,
             originalPrice: e.price,
             quantity: e.quantity,
             storeId: e.storeId,
-            sellerName: e.sellerName,
+            storeName: e.storeName,
             skuId: e.id,
           });
-        }
       });
-      this.form.promotionGoodsList.push(...list);
+      this.form.promotionGoodsList = list;
     },
     getGoodsCategory(e) {
       // 获取级联选择器商品分类id
diff --git a/manager/src/views/promotion/coupon/memberReceiveCoupon.vue b/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
index f2d4c92f..2a5dcd3e 100644
--- a/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
+++ b/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
@@ -1,51 +1,45 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <template slot-scope="{ row }" slot="rangeTime">
-                <div>{{ row.startTime }} ~ {{ row.endTime }}</div>
-              </template>
-              <template slot-scope="{ row }" slot="action">
-                <Button
-                  type="error"
-                  ghost
-                  size="small"
-                  :disabled="row.memberCouponStatus != 'NEW'"
-                  @click="remove(row)"
-                  >作废</Button
-                >
-              </template>
-            </Table>
-          </Row>
-          <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]"
+    <Card>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        >
+          <template slot-scope="{ row }" slot="rangeTime">
+            <div>{{ row.startTime }} ~ {{ row.endTime }}</div>
+          </template>
+          <template slot-scope="{ row }" slot="action">
+            <Button
+              type="error"
+              ghost
               size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+              :disabled="row.memberCouponStatus != 'NEW'"
+              @click="remove(row)"
+              >作废</Button
+            >
+          </template>
+        </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/manager/src/views/promotion/fullCut/full-cut.vue b/manager/src/views/promotion/fullCut/full-cut.vue
index 2fd322ac..b31ad74d 100644
--- a/manager/src/views/promotion/fullCut/full-cut.vue
+++ b/manager/src/views/promotion/fullCut/full-cut.vue
@@ -43,35 +43,33 @@
           <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
         </Form>
       </Row>
-      <Row class="padding-row">
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-        >
-          <template slot-scope="{ row }" slot="applyEndTime">
-            {{ unixDate(row.applyEndTime) }}
-          </template>
-          <template slot-scope="{ row }" slot="promotionType">
-            {{ row.isFullMinus ? "满减" : "满折" }}
-          </template>
-          <template slot-scope="{ row }" slot="hours">
-            <Tag v-for="item in unixHours(row.hours)" :key="item">{{
-              item
-            }}</Tag>
-          </template>
-          <template slot-scope="{ row }" slot="action">
-            <div>
-              <Button type="success" size="small" @click="view(row)"
-                >查看</Button
-              >&nbsp;
-            </div>
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+      >
+        <template slot-scope="{ row }" slot="applyEndTime">
+          {{ unixDate(row.applyEndTime) }}
+        </template>
+        <template slot-scope="{ row }" slot="promotionType">
+          {{ row.isFullMinus ? "满减" : "满折" }}
+        </template>
+        <template slot-scope="{ row }" slot="hours">
+          <Tag v-for="item in unixHours(row.hours)" :key="item">{{
+            item
+          }}</Tag>
+        </template>
+        <template slot-scope="{ row }" slot="action">
+          <div>
+            <Button type="success" size="small" @click="view(row)"
+              >查看</Button
+            >&nbsp;
+          </div>
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page operation">
         <Page
           :current="searchForm.pageNumber + 1"
diff --git a/manager/src/views/promotion/pintuan/pintuan.vue b/manager/src/views/promotion/pintuan/pintuan.vue
index 9ff6813b..7d6a44db 100644
--- a/manager/src/views/promotion/pintuan/pintuan.vue
+++ b/manager/src/views/promotion/pintuan/pintuan.vue
@@ -45,7 +45,6 @@
           >
         </Form>
       </Row>
-      <Row class="padding-row">
         <Table
           :loading="loading"
           border
@@ -72,7 +71,6 @@
             </Button>
           </template>
         </Table>
-      </Row>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
diff --git a/manager/src/views/promotion/pintuan/pintuanGoods.vue b/manager/src/views/promotion/pintuan/pintuanGoods.vue
index 8e0f6db1..93c93d5b 100644
--- a/manager/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/manager/src/views/promotion/pintuan/pintuanGoods.vue
@@ -10,10 +10,10 @@
       ></Table>
 
       <h4>商品信息</h4>
-      <Row class="operation">
         <Table
           :loading="loading"
           border
+          class="operation"
           :columns="goodsColumns"
           :data="goodsData"
           ref="table"
@@ -34,7 +34,6 @@
           </template>
         
         </Table>
-      </Row>
       <Row type="flex" justify="end" class="page operation">
         <Page
           :current="searchForm.pageNumber + 1"
diff --git a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
index 895f23c7..3e4244f0 100644
--- a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
@@ -7,9 +7,7 @@
           <div class="form-item-view">
             <FormItem astyle="width: 100%">
               <div style="display: flex; margin-bottom: 10px">
-                <Button type="primary" @click="$refs.skuSelect.open('goods')"
-                  >选择商品</Button
-                >
+                <Button type="primary" @click="openSkuList">选择商品</Button>
                 <Button
                   type="error"
                   ghost
@@ -20,22 +18,19 @@
               </div>
               <Table
                 border
+                v-if="showTable"
                 :columns="columns"
-                :data="form.promotionGoodsList"
+                :data="promotionGoodsList"
                 @on-selection-change="changeSelect"
               >
                 <template slot-scope="{ row }" slot="skuId">
                   <div>{{ row.skuId }}</div>
                 </template>
 
-                <template slot-scope="{ row, index }" slot="settlementPrice">
+                <template slot-scope="{ index }" slot="settlementPrice">
                   <Input
                     type="number"
-                    v-model="row.settlementPrice"
-                    @input="
-                      pointsGoodsList[index].settlementPrice =
-                        row.settlementPrice
-                    "
+                    v-model="promotionGoodsList[index].settlementPrice"
                   />
                 </template>
 
@@ -44,7 +39,7 @@
                   slot="pointsGoodsCategory"
                 >
                   <Select
-                    v-model="pointsGoodsList[index].pointsGoodsCategoryId"
+                    v-model="promotionGoodsList[index].pointsGoodsCategoryId"
                     transfer="true"
                     label-in-value="true"
                     @on-change="
@@ -62,21 +57,17 @@
                   </Select>
                 </template>
 
-                <template slot-scope="{ row, index }" slot="activeStock">
+                <template slot-scope="{ index }" slot="activeStock">
                   <Input
                     type="number"
-                    v-model="row.activeStock"
-                    @input="
-                      pointsGoodsList[index].activeStock = row.activeStock
-                    "
+                    v-model="promotionGoodsList[index].activeStock"
                   />
                 </template>
 
-                <template slot-scope="{ row, index }" slot="points">
+                <template slot-scope="{ index }" slot="points">
                   <Input
                     type="number"
-                    v-model="row.points"
-                    @input="pointsGoodsList[index].points = row.points"
+                    v-model="promotionGoodsList[index].points"
                   />
                 </template>
               </Table>
@@ -151,22 +142,10 @@ export default {
     };
     return {
       form: {
-        /** 店铺承担比例 */
-        sellerCommission: 0,
-        /** 发行数量 */
-        publishNum: 1,
-        /** 运费承担者 */
-        scopeType: "ALL",
-        /** 限领数量 */
-        couponLimitNum: 1,
-        /** 活动类型 */
-        couponType: "PRICE",
-        /** 优惠券名称 */
-        couponName: "",
-        getType: "FREE",
-        promotionGoodsList: [],
+        promotionGoodsList: [], // 活动商品列表
       },
-      pointsGoodsList: [], // 积分商品列表
+      showTable: true,
+      promotionGoodsList: [], // 活动商品列表
       categoryList: [], // 分类列表
       submitLoading: false, // 添加或编辑提交状态
       selectedGoods: [], // 已选商品列表，便于删除
@@ -226,6 +205,12 @@ export default {
           title: "商品名称",
           key: "goodsName",
           minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              params.row.goodsSku.goodsName
+            );
+          },
         },
         {
           title: "SKU编码",
@@ -236,6 +221,12 @@ export default {
           title: "店铺名称",
           key: "storeName",
           minWidth: 60,
+          render: (h, params) => {
+            return h(
+              "div",
+              params.row.goodsSku.storeName
+            );
+          },
         },
         {
           title: "商品价格",
@@ -244,7 +235,7 @@ export default {
           render: (h, params) => {
             return h(
               "div",
-              this.$options.filters.unitPrice(params.row.price, "￥")
+              this.$options.filters.unitPrice(params.row.goodsSku.price, "￥")
             );
           },
         },
@@ -252,6 +243,12 @@ export default {
           title: "库存",
           key: "quantity",
           minWidth: 20,
+          render: (h, params) => {
+            return h(
+              "div",
+              params.row.goodsSku.quantity
+            );
+          },
         },
         {
           title: "结算价格",
@@ -313,11 +310,11 @@ export default {
       let res = await getPointsGoodsCategoryList();
       this.categoryList = res.result.records;
     },
-    /** 保存平台优惠券 */
+    /** 保存积分商品 */
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          let params = this.pointsGoodsList;
+          let params = this.promotionGoodsList;
           const start = this.$options.filters.unixToDate(
             this.form.startTime / 1000
           );
@@ -355,7 +352,8 @@ export default {
       this.$router.go(-1);
     },
     changeCategory(val, index) {
-      this.pointsGoodsList[index].pointsGoodsCategoryName = val.label;
+      this.promotionGoodsList[index].pointsGoodsCategoryName = val.label;
+      console.log(this.promotionGoodsList);
     },
     changeSelect(e) {
       // 已选商品批量选择
@@ -363,7 +361,7 @@ export default {
     },
     delSelectGoods() {
       // 多选删除商品
-      if (this.pointsGoodsList.length <= 0) {
+      if (this.selectedGoods.length <= 0) {
         this.$Message.warning("您还未选择要删除的数据");
         return;
       }
@@ -375,55 +373,42 @@ export default {
           this.selectedGoods.forEach(function (e) {
             ids.push(e.id);
           });
-          this.form.promotionGoodsList = this.form.promotionGoodsList.filter(
+          this.promotionGoodsList = this.promotionGoodsList.filter(
             (item) => {
               return !ids.includes(item.id);
             }
           );
-          this.pointsGoodsList = this.pointsGoodsList.filter((item) => {
-            return !ids.includes(item.id);
-          });
         },
       });
     },
     delGoods(index) {
       // 删除商品
-      this.form.promotionGoodsList.splice(index, 1);
-      this.pointsGoodsList.splice(index, 1);
+      this.promotionGoodsList.splice(index, 1);
+    },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
     },
     selectedGoodsData(item) {
       // 回显已选商品
-      let ids = [];
       let list = [];
-      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
-          list.push({
-            goodsName: e.goodsName,
-            price: e.price,
-            originalPrice: e.price,
-            quantity: e.quantity,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            skuId: e.id,
-            ...e,
-          });
-          this.pointsGoodsList.push({
-            settlementPrice: 0,
-            pointsGoodsCategoryId: 0,
-            pointsGoodsCategoryName: "",
-            activeStock: 0,
-            points: 0,
-            goodsSku: {
-              ...e,
-            },
-            skuId: e.id,
-          });
+        const obj = {
+          settlementPrice: e.settlementPrice || 0,
+          pointsGoodsCategoryId: e.pointsGoodsCategoryId || 0,
+          pointsGoodsCategoryName:e.pointsGoodsCategoryName || "",
+          activeStock:e.activeStock || 0,
+          points:e.points || 0,
+          skuId: e.id,
+          goodsSku: e.goodsSku || e
         }
+        list.push(obj);
       });
-      this.form.promotionGoodsList.push(...list);
+      this.promotionGoodsList = list;
     },
   },
 };
diff --git a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue
index d8646b58..082b27ac 100644
--- a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue
@@ -5,19 +5,19 @@
         <div class="base-info-item">
           <h4>积分商品信息</h4>
           <div class="form-item-view">
-            <FormItem label="商品名称" prop="goodsName">
+            <FormItem label="商品名称">
               <div>{{ form.goodsSku.goodsName }}</div>
             </FormItem>
-            <FormItem label="SKU编码" prop="skuId">
+            <FormItem label="SKU编码">
               <div>{{ form.goodsSku.id }}</div>
             </FormItem>
-            <FormItem label="店铺名称" prop="sellerName">
-              <div>{{ form.goodsSku.sellerName }}</div>
+            <FormItem label="店铺名称">
+              <div>{{ form.goodsSku.storeName }}</div>
             </FormItem>
-            <FormItem label="商品价格" prop="goodsPrice">
+            <FormItem label="商品价格">
               <div>{{ form.goodsSku.price | unitPrice('￥') }}</div>
             </FormItem>
-            <FormItem label="库存" prop="quantity">
+            <FormItem label="库存">
               <div>{{ form.goodsSku.quantity }}</div>
             </FormItem>
             <FormItem label="结算价格" prop="settlementPrice">
@@ -90,9 +90,7 @@
             </FormItem>
           </div>
           <div class="footer">
-            <Button @click="closeCurrentPage" style="margin-right: 5px"
-              >返回</Button
-            >
+            <Button @click="closeCurrentPage" style="margin-right: 5px">返回</Button>
             <Button
               type="primary"
               :loading="submitLoading"
diff --git a/manager/src/views/promotion/pointsGoods/pointsGoods.vue b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
index 3ea6a2a2..975875d2 100644
--- a/manager/src/views/promotion/pointsGoods/pointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
@@ -61,73 +61,71 @@
         <Button @click="addPointsGoods" type="primary" >添加积分商品</Button>
 
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-        >
-          <template slot-scope="{ row }" slot="goodsName">
-            <div>
-              <a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.goodsSku.skuId)">{{row.goodsSku.goodsName}}</a>
-              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                <div slot="content">
-                  <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                </div>
-                <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
-              </Poptip>
-            </div>
-          </template>
-          <template slot-scope="{ row }" slot="price">
-            <div>{{ row.goodsSku.price | unitPrice("￥") }}</div>
-          </template>
-          <template slot-scope="{ row }" slot="settlementPrice">
-            <div>{{ row.settlementPrice | unitPrice("￥") }}</div>
-          </template>
-          <template slot-scope="{ row }" slot="quantity">
-            <div>{{ row.goodsSku.quantity }}</div>
-          </template>
-          <template slot-scope="{ row }" slot="startTime">
-            <div>{{ row.startTime }}</div>
-            <div>{{ row.endTime }}</div>
-          </template>
-          
-          <template slot-scope="{ row }" slot="action">
-            <Button
-              v-if="row.promotionStatus == 'NEW'"
-              type="info"
-              size="small"
-              @click="edit(row.id)"
-              style="margin-right: 5px"
-              >编辑</Button
-            >
-            <Button
-              v-if="row.promotionStatus == 'START'"
-              type="warning"
-              size="small"
-              @click="statusChanged(row.id, 'CLOSE')"
-              style="margin-right: 5px"
-              >停用</Button
-            >
-            <Button
-              v-if="row.promotionStatus == 'CLOSE'"
-              type="warning"
-              size="small"
-              @click="statusChanged(row.id, 'START')"
-              style="margin-right: 5px"
-              >启用</Button
-            >
-            <Button type="error" size="small" @click="close(row.id)"
-              >删除</Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+      >
+        <template slot-scope="{ row }" slot="goodsName">
+          <div>
+            <a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.goodsSku.skuId)">{{row.goodsSku.goodsName}}</a>
+            <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+              <div slot="content">
+                <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+              </div>
+              <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
+            </Poptip>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="price">
+          <div>{{ row.goodsSku.price | unitPrice("￥") }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="settlementPrice">
+          <div>{{ row.settlementPrice | unitPrice("￥") }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="quantity">
+          <div>{{ row.goodsSku.quantity }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="startTime">
+          <div>{{ row.startTime }}</div>
+          <div>{{ row.endTime }}</div>
+        </template>
+        
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            v-if="row.promotionStatus == 'NEW'"
+            type="info"
+            size="small"
+            @click="edit(row.id)"
+            style="margin-right: 5px"
+            >编辑</Button
+          >
+          <Button
+            v-if="row.promotionStatus == 'START'"
+            type="warning"
+            size="small"
+            @click="statusChanged(row.id, 'CLOSE')"
+            style="margin-right: 5px"
+            >停用</Button
+          >
+          <Button
+            v-if="row.promotionStatus == 'CLOSE'"
+            type="warning"
+            size="small"
+            @click="statusChanged(row.id, 'START')"
+            style="margin-right: 5px"
+            >启用</Button
+          >
+          <Button type="error" size="small" @click="close(row.id)"
+            >删除</Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
-          :current="searchForm.pageNumber + 1"
+          :current="searchForm.pageNumber"
           :total="total"
           :page-size="searchForm.pageSize"
           @on-change="changePage"
@@ -157,7 +155,7 @@ export default {
       loading: true, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
-        pageNumber: 0, // 当前页数
+        pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
         order: "desc", // 默认排序方式
       },
@@ -248,18 +246,17 @@ export default {
       this.$router.push({ name: "add-points-goods" });
     },
     changePage(v) {
-      this.searchForm.pageNumber = v - 1;
+      this.searchForm.pageNumber = v;
       this.getDataList();
-      this.clearSelectAll();
     },
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
     handleSearch() {
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
-      if (this.searchForm.pointsS !== "") {
+      if (this.searchForm.pointsS) {
         this.searchForm.points =
           this.searchForm.pointsS +
           "_" +
diff --git a/manager/src/views/promotion/seckill/addSeckill.vue b/manager/src/views/promotion/seckill/addSeckill.vue
index 4750c9f6..83e8c8b4 100644
--- a/manager/src/views/promotion/seckill/addSeckill.vue
+++ b/manager/src/views/promotion/seckill/addSeckill.vue
@@ -148,11 +148,11 @@ export default {
         }
       });
     },
-    addPeriod() {
+    addPeriod() { // 添加时间段显示input
       this.addPeriodTime();
       this.showAddPeriod = true;
     },
-    addPeriodTime() {
+    addPeriodTime() { // 添加秒杀时间段
       this.showAddPeriod = false;
       if (
         this.periodTime !== null &&
@@ -161,20 +161,10 @@ export default {
         this.form.seckillPeriod.push(this.periodTime);
       }
     },
-    removePeriodTime(event, name) {
+    removePeriodTime(event, name) { // 移除秒杀时间段
       this.form.seckillPeriod = this.form.seckillPeriod.filter((i) => i !== name);
     },
-    handleSelectLink(item, index) {
-      // 调起选择链接弹窗
-      if (item) this.selectedNav = item;
-      this.$refs.liliDialog.open('link')
-    },
-    changeScope(val) {
-      if (val === "PORTION_GOODS") {
-        this.handleSelectLink();
-      }
-    },
-    /** 保存平台优惠券 */
+    /** 添加秒杀活动 */
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue
index 1b45efd9..16ef3934 100644
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/manager/src/views/promotion/seckill/seckill.vue
@@ -53,66 +53,64 @@
       <Row class="operation padding-row">
         <Button type="primary" @click="add">添加活动</Button>
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          class="page"
-        >
-          <template slot-scope="{ row }" slot="action">
-            <Button
-              type="info"
-              size="small"
-              class="mr_5"
-              v-if="row.promotionStatus == 'NEW'"
-              @click="edit(row)"
-              >编辑</Button
-            >
-            &nbsp;
-            <Button
-              type="info"
-              size="small"
-              class="mr_5"
-              v-else
-              @click="manage(row)"
-              >查看</Button
-            >
-            &nbsp;
-            <Button
-              type="primary"
-              size="small"
-              class="mr_5"
-              v-if="row.promotionStatus == 'NEW'"
-              @click="manage(row)"
-              >管理</Button
-            >
-            &nbsp;
-            <!-- <Button type="success" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW' || row.promotionStatus == 'END'" @click="upper(row)">上架</Button>   -->
-            <Button
-              type="error"
-              size="small"
-              v-if="
-                row.promotionStatus == 'START' || row.promotionStatus == 'NEW'
-              "
-              class="mr_5"
-              @click="off(row)"
-              >下架</Button
-            >
-            &nbsp;
-            <Button
-              type="error"
-              size="small"
-              v-if="row.promotionStatus == 'CLOSE'"
-              ghost
-              @click="expire(row)"
-              >删除</Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        class="page"
+      >
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            type="info"
+            size="small"
+            class="mr_5"
+            v-if="row.promotionStatus == 'NEW'"
+            @click="edit(row)"
+            >编辑</Button
+          >
+          &nbsp;
+          <Button
+            type="info"
+            size="small"
+            class="mr_5"
+            v-else
+            @click="manage(row)"
+            >查看</Button
+          >
+          &nbsp;
+          <Button
+            type="primary"
+            size="small"
+            class="mr_5"
+            v-if="row.promotionStatus == 'NEW'"
+            @click="manage(row)"
+            >管理</Button
+          >
+          &nbsp;
+          <!-- <Button type="success" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW' || row.promotionStatus == 'END'" @click="upper(row)">上架</Button>   -->
+          <Button
+            type="error"
+            size="small"
+            v-if="
+              row.promotionStatus == 'START' || row.promotionStatus == 'NEW'
+            "
+            class="mr_5"
+            @click="off(row)"
+            >下架</Button
+          >
+          &nbsp;
+          <Button
+            type="error"
+            size="small"
+            v-if="row.promotionStatus == 'CLOSE'"
+            ghost
+            @click="expire(row)"
+            >删除</Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
diff --git a/manager/src/views/promotion/seckill/seckillGoods.vue b/manager/src/views/promotion/seckill/seckillGoods.vue
index 6b69bf24..44566ce2 100644
--- a/manager/src/views/promotion/seckill/seckillGoods.vue
+++ b/manager/src/views/promotion/seckill/seckillGoods.vue
@@ -29,10 +29,10 @@
           <a class="select-clear" @click="clearSelectAll">清空</a>
         </Alert>
       </Row>
-      <Row class="operation">
         <Table
           :loading="loading"
           border
+          class="operation"
           :columns="goodsColumns"
           :data="goodsList"
           ref="table"
@@ -106,7 +106,6 @@
             >
           </template>
         </Table>
-      </Row>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
diff --git a/manager/src/views/seller/bill/accountStatementBill.vue b/manager/src/views/seller/bill/accountStatementBill.vue
index 519e8789..8ef67236 100644
--- a/manager/src/views/seller/bill/accountStatementBill.vue
+++ b/manager/src/views/seller/bill/accountStatementBill.vue
@@ -1,58 +1,26 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="账单编号" prop="sn">
-              <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="出帐时间" prop="createTime">
-              <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
-              </DatePicker>
-            </Form-item>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="账单编号" prop="sn">
+            <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
+          </Form-item>
+          <Form-item label="出帐时间" prop="createTime">
+            <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
+            </DatePicker>
+          </Form-item>
 
-            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          </Form>
-        </Row>
-        <Row>
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-          </Table>
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-            size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-      </Col>
-    </Row>
-    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
-      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-        <FormItem label="账单号" prop="sn">
-          <Input v-model="form.sn" clearable style="width: 100%" />
-        </FormItem>
-        <FormItem label="店铺名称" prop="sellerName">
-          <Input v-model="form.sellerName" clearable style="width: 100%" />
-        </FormItem>
-        <FormItem label="结算开始时间" prop="startTime">
-          <DatePicker v-model="form.startTime" valueType="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%"></DatePicker>
-        </FormItem>
-        <FormItem label="结算结束时间" prop="endTime">
-          <DatePicker type="date" v-model="form.endTime" clearable style="width: 100%"></DatePicker>
-        </FormItem>
-
-        <FormItem label="最终结算金额" prop="billPrice">
-          <Input v-model="form.billPrice" clearable style="width: 100%" />
-        </FormItem>
-
-      </Form>
-      <div slot="footer">
-        <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交
-        </Button>
-      </div>
-    </Modal>
+          <Button @click="handleSearch" type="primary" icon="ios-search" 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>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
@@ -65,9 +33,6 @@ export default {
   data() {
     return {
       loading: true, // 表单加载状态
-      modalType: 0, // 添加或编辑标识
-      modalVisible: false, // 添加或编辑显示
-      modalTitle: "", // 添加或编辑标题
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
@@ -78,17 +43,6 @@ export default {
         endDate: "", // 终止时间
       },
       selectDate: null, // 选择一个事件段
-      form: {
-        // 添加或编辑表单对象初始化数据
-        sn: "",
-        sellerName: "",
-        startTime: "",
-        endTime: "",
-        billPrice: "",
-      },
-      // 表单验证规则
-      formValidate: {},
-      submitLoading: false, // 添加或编辑提交状态
       selectList: [], // 多选数据
       selectCount: 0, // 多选计数
       columns: [
@@ -227,8 +181,6 @@ export default {
     getDataList() {
       this.loading = true;
 
-      // this.searchForm
-
       this.searchForm.startTime &&
         (this.searchForm.startTime = this.$options.filters.unixToDate(
           this.searchForm.startTime / 1000
@@ -248,35 +200,6 @@ export default {
       this.total = this.data.length;
       this.loading = false;
     },
-    handleSubmit() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.submitLoading = true;
-          if (this.modalType === 0) {
-            // 添加 避免编辑后传入id等数据 记得删除
-            delete this.form.id;
-            this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.getDataList();
-                this.modalVisible = false;
-              }
-            });
-          } else {
-            // 编辑
-            this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.getDataList();
-                this.modalVisible = false;
-              }
-            });
-          }
-        }
-      });
-    },
     detail(v) {
       let id = v.id;
       this.$router.push({
diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue
index f5bbad04..00c86956 100644
--- a/manager/src/views/seller/bill/bill-detail.vue
+++ b/manager/src/views/seller/bill/bill-detail.vue
@@ -48,15 +48,13 @@
       <Tabs active-key="key1" @on-click="clickTabs">
         <Tab-pane label="入账流水" key="key1">
           <Card>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="orderColumns"
-                :data="order"
-                ref="table"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="orderColumns"
+              :data="order"
+              ref="table"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="orderParam.pageNumber"
@@ -73,15 +71,13 @@
         </Tab-pane>
         <Tab-pane label="退款流水" key="key2">
           <Card>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="refundColumns"
-                :data="refund"
-                ref="table"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="refundColumns"
+              :data="refund"
+              ref="table"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="refundParam.pageNumber"
diff --git a/manager/src/views/seller/bill/bill.vue b/manager/src/views/seller/bill/bill.vue
index d014ce8e..5fa888f7 100644
--- a/manager/src/views/seller/bill/bill.vue
+++ b/manager/src/views/seller/bill/bill.vue
@@ -1,69 +1,36 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="账单编号" prop="sn">
-              <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="出帐时间" prop="createTime">
-              <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
-              </DatePicker>
-            </Form-item>
-            <Form-item label="筛选状态">
-              <Select v-model="searchForm.billStatus" style="width:160px">
-                <Option value="">全部</Option>
-                <Option value="OUT">已出账</Option>
-                <Option value="CHECK">已核对</Option>
-                <Option value="COMPLETE">已完成</Option>
-              </Select>
-            </Form-item>
-            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          </Form>
-        </Row>
-        <Row class="operation padding-row">
-          <Button @click="add" type="primary">添加</Button>
-          <Button @click="delAll">批量删除</Button>
-        </Row>
-        <Row>
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-          </Table>
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-            size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-      </Col>
-    </Row>
-    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
-      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-        <FormItem label="账单号" prop="sn">
-          <Input v-model="form.sn" clearable style="width: 100%" />
-        </FormItem>
-        <FormItem label="店铺名称" prop="sellerName">
-          <Input v-model="form.sellerName" clearable style="width: 100%" />
-        </FormItem>
-        <FormItem label="结算开始时间" prop="startTime">
-          <DatePicker v-model="form.startTime" valueType="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%"></DatePicker>
-        </FormItem>
-        <FormItem label="结算结束时间" prop="endTime">
-          <DatePicker type="date" v-model="form.endTime" clearable style="width: 100%"></DatePicker>
-        </FormItem>
-
-        <FormItem label="最终结算金额" prop="billPrice">
-          <Input v-model="form.billPrice" clearable style="width: 100%" />
-        </FormItem>
-
-      </Form>
-      <div slot="footer">
-        <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交
-        </Button>
-      </div>
-    </Modal>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="账单编号" prop="sn">
+            <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
+          </Form-item>
+          <Form-item label="出帐时间" prop="createTime">
+            <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
+            </DatePicker>
+          </Form-item>
+          <Form-item label="筛选状态">
+            <Select v-model="searchForm.billStatus" style="width:160px">
+              <Option value="">全部</Option>
+              <Option value="OUT">已出账</Option>
+              <Option value="CHECK">已核对</Option>
+              <Option value="COMPLETE">已完成</Option>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="delAll">批量删除</Button>
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-selection-change="changeSelect">
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
@@ -76,9 +43,6 @@ export default {
   data() {
     return {
       loading: true, // 表单加载状态
-      modalType: 0, // 添加或编辑标识
-      modalVisible: false, // 添加或编辑显示
-      modalTitle: "", // 添加或编辑标题
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
@@ -90,17 +54,6 @@ export default {
         billStatus:"" //状态
       },
       selectDate: null, // 选择一个时间段
-      form: {
-        // 添加或编辑表单对象初始化数据
-        sn: "",
-        sellerName: "",
-        startTime: "",
-        endTime: "",
-        billPrice: "",
-      },
-      // 表单验证规则
-      formValidate: {},
-      submitLoading: false, // 添加或编辑提交状态
       selectList: [], // 多选数据
       selectCount: 0, // 多选计数
       columns: [
@@ -201,28 +154,20 @@ export default {
     init() {
       this.getDataList();
     },
-    changePage(v) {
+    changePage(v) { // 改变页码
       this.searchForm.pageNumber = v;
       this.getDataList();
     },
-    changePageSize(v) {
+    changePageSize(v) { // 改变页数
       this.searchForm.pageSize = v;
       this.getDataList();
     },
-    handleSearch() {
+    handleSearch() { // 搜索
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       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) {
+    changeSelect(e) { // 表格选中
       this.selectList = e;
       this.selectCount = e.length;
     },
@@ -235,8 +180,6 @@ export default {
     getDataList() {
       this.loading = true;
 
-      // this.searchForm
-
       this.searchForm.startTime &&
         (this.searchForm.startTime = this.$options.filters.unixToDate(
           this.searchForm.startTime / 1000
@@ -256,43 +199,7 @@ export default {
       this.total = this.data.length;
       this.loading = false;
     },
-    handleSubmit() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.submitLoading = true;
-          if (this.modalType === 0) {
-            // 添加 避免编辑后传入id等数据 记得删除
-            delete this.form.id;
-            this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.getDataList();
-                this.modalVisible = false;
-              }
-            });
-          } else {
-            // 编辑
-            this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.getDataList();
-                this.modalVisible = false;
-              }
-            });
-          }
-        }
-      });
-    },
-    add() {
-      this.modalType = 0;
-      this.modalTitle = "添加";
-      this.$refs.form.resetFields();
-      delete this.form.id;
-      this.modalVisible = true;
-    },
-    detail(v) {
+    detail(v) { // 账单详情
       let id = v.id;
       this.$router.push({
         name: "bill-detail",
@@ -314,14 +221,10 @@ export default {
               this.getDataList();
             }
           });
-          // 模拟请求成功
-          //this.$Message.success("操作成功");
-          //this.$Modal.remove();
-          //this.getDataList();
         },
       });
     },
-    delAll() {
+    delAll() { // 多选删除数据
       if (this.selectCount <= 0) {
         this.$Message.warning("您还未选择要删除的数据");
         return;
diff --git a/manager/src/views/seller/shop/shopAuditList.vue b/manager/src/views/seller/shop/shopAuditList.vue
index 701f5f30..2101d6c7 100644
--- a/manager/src/views/seller/shop/shopAuditList.vue
+++ b/manager/src/views/seller/shop/shopAuditList.vue
@@ -1,44 +1,38 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  placeholder="请输入会员名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="店铺名称" prop="storeName">
-                <Input
-                  type="text"
-                  v-model="searchForm.storeName"
-                  placeholder="请输入店铺名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="创建时间" prop="createTime">
-                <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-                  size="small" show-total show-elevator show-sizer></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              placeholder="请输入会员名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="店铺名称" prop="storeName">
+            <Input
+              type="text"
+              v-model="searchForm.storeName"
+              placeholder="请输入店铺名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="创建时间" prop="createTime">
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+              size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue
index 3737568d..ab3cb70a 100644
--- a/manager/src/views/seller/shop/shopDetail.vue
+++ b/manager/src/views/seller/shop/shopDetail.vue
@@ -246,22 +246,20 @@
             </Form>
           </Row>
           <div style="min-height: 180px">
-            <Row class="padding-row">
-              <Table
-                :loading="loading"
-                border
-                :columns="orderColumns"
-                :data="orderData"
-                ref="table"
-                sortable="custom"
-                @on-sort-change="orderChangeSort"
-              >
-                <!-- 订单详情格式化 -->
-                <template slot="orderSlot" slot-scope="scope">
-                  <a @click="$router.push({name: 'order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
-                </template>
-              </Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="orderColumns"
+              :data="orderData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="orderChangeSort"
+            >
+              <!-- 订单详情格式化 -->
+              <template slot="orderSlot" slot-scope="scope">
+                <a @click="$router.push({name: 'order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
+              </template>
+            </Table>
 
             <Row type="flex" justify="end" class="page" style="margin-top: 10px">
               <Page
@@ -349,44 +347,42 @@
             </Form>
           </Row>
           <div style="min-height: 180px">
-            <Row class="padding-row">
-              <Table
-                :loading="loading"
-                border
-                :columns="refundGoodsOrderColumns"
-                :data="refundGoodsOrderData"
-                ref="table"
-                sortable="custom"
-                @on-sort-change="refundGoodsOrderChangeSort"
-              >
-                <!-- 商品栏目格式化 -->
-                <template slot="goodsSlot" slot-scope="scope">
-                  <div style="margin-top: 5px;height: 80px; display: flex;">
-                    <div style="">
-                      <img :src="scope.row.goodsImage" style="height: 60px;margin-top: 3px">
-                    </div>
-
-                    <div style="margin-left: 13px;margin-top: 3px;">
-                      <div class="div-zoom">
-                        <a>{{scope.row.goodsName}}</a>
-                      </div>
-                    </div>
+            <Table
+              :loading="loading"
+              border
+              :columns="refundGoodsOrderColumns"
+              :data="refundGoodsOrderData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="refundGoodsOrderChangeSort"
+            >
+              <!-- 商品栏目格式化 -->
+              <template slot="goodsSlot" slot-scope="scope">
+                <div style="margin-top: 5px;height: 80px; display: flex;">
+                  <div style="">
+                    <img :src="scope.row.goodsImage" style="height: 60px;margin-top: 3px">
                   </div>
 
-                </template>
+                  <div style="margin-left: 13px;margin-top: 3px;">
+                    <div class="div-zoom">
+                      <a>{{scope.row.goodsName}}</a>
+                    </div>
+                  </div>
+                </div>
 
-                <!-- 订单详情格式化 -->
-                <template slot="orderSlot" slot-scope="scope">
-                  <a
-                    @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
-                </template>
+              </template>
 
-                <!-- 售后单详情格式化 -->
-                <template slot="refundGoodsOrderSlot" slot-scope="scope">
-                  <a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
-                </template>
-              </Table>
-            </Row>
+              <!-- 订单详情格式化 -->
+              <template slot="orderSlot" slot-scope="scope">
+                <a
+                  @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+              </template>
+
+              <!-- 售后单详情格式化 -->
+              <template slot="refundGoodsOrderSlot" slot-scope="scope">
+                <a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
+              </template>
+            </Table>
 
             <Row type="flex" justify="end" class="page" style="margin-top: 10px">
               <Page
@@ -474,44 +470,42 @@
             </Form>
           </Row>
           <div style="min-height: 180px">
-            <Row class="padding-row">
-              <Table
-                :loading="loading"
-                border
-                :columns="refundGoodsOrderColumns"
-                :data="refundOrderData"
-                ref="table"
-                sortable="custom"
-                @on-sort-change="refundOrderChangeSort"
-              >
-                <!-- 商品栏目格式化 -->
-                <template slot="goodsSlot" slot-scope="scope">
-                  <div style="margin-top: 5px;height: 80px; display: flex;">
-                    <div style="">
-                      <img :src="scope.row.goodsImage" style="height: 60px;margin-top: 3px">
-                    </div>
-
-                    <div style="margin-left: 13px;margin-top: 3px;">
-                      <div class="div-zoom">
-                        <a>{{scope.row.goodsName}}</a>
-                      </div>
-                    </div>
+            <Table
+              :loading="loading"
+              border
+              :columns="refundGoodsOrderColumns"
+              :data="refundOrderData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="refundOrderChangeSort"
+            >
+              <!-- 商品栏目格式化 -->
+              <template slot="goodsSlot" slot-scope="scope">
+                <div style="margin-top: 5px;height: 80px; display: flex;">
+                  <div style="">
+                    <img :src="scope.row.goodsImage" style="height: 60px;margin-top: 3px">
                   </div>
 
-                </template>
+                  <div style="margin-left: 13px;margin-top: 3px;">
+                    <div class="div-zoom">
+                      <a>{{scope.row.goodsName}}</a>
+                    </div>
+                  </div>
+                </div>
 
-                <!-- 订单详情格式化 -->
-                <template slot="orderSlot" slot-scope="scope">
-                  <a
-                    @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
-                </template>
+              </template>
 
-                <!-- 售后单详情格式化 -->
-                <template slot="refundGoodsOrderSlot" slot-scope="scope">
-                  <a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
-                </template>
-              </Table>
-            </Row>
+              <!-- 订单详情格式化 -->
+              <template slot="orderSlot" slot-scope="scope">
+                <a
+                  @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+              </template>
+
+              <!-- 售后单详情格式化 -->
+              <template slot="refundGoodsOrderSlot" slot-scope="scope">
+                <a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
+              </template>
+            </Table>
 
             <Row type="flex" justify="end" class="page" style="margin-top: 10px">
               <Page
diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue
index 05961284..1f02d887 100644
--- a/manager/src/views/seller/shop/shopList.vue
+++ b/manager/src/views/seller/shop/shopList.vue
@@ -1,56 +1,50 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="会员名称" prop="memberName">
-              <Input
-                type="text"
-                v-model="searchForm.memberName"
-                placeholder="请输入会员名称"
-                clearable
-                style="width: 200px"
-              />
-            </Form-item>
-            <Form-item label="店铺名称" prop="storeName">
-              <Input
-                type="text"
-                v-model="searchForm.storeName"
-                placeholder="请输入店铺名称"
-                clearable
-                style="width: 200px"
-              />
-            </Form-item>
-            <Form-item label="店铺状态" prop="shopDisable">
-              <Select v-model="searchForm.shopDisable" clearable style="width: 200px">
-                <Option value="OPEN">开启中</Option>
-                <Option value="CLOSED">已关闭</Option>
-                <Option value="APPLY">申请中</Option>
-                <Option value="APPLYING">审核中</Option>
-                <Option value="REFUSED">审核拒绝</Option>
-              </Select>
-            </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-              <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-            </Form-item>
-            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          </Form>
-        </Row>
-        <Row class="operation padding-row">
-          <Button @click="add" type="primary">添加</Button>
-        </Row>
-        <Row>
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-            size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              placeholder="请输入会员名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="店铺名称" prop="storeName">
+            <Input
+              type="text"
+              v-model="searchForm.storeName"
+              placeholder="请输入店铺名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="店铺状态" prop="shopDisable">
+            <Select v-model="searchForm.shopDisable" clearable style="width: 200px">
+              <Option value="OPEN">开启中</Option>
+              <Option value="CLOSED">已关闭</Option>
+              <Option value="APPLY">申请中</Option>
+              <Option value="APPLYING">审核中</Option>
+              <Option value="REFUSED">审核拒绝</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="创建时间" prop="createTime">
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="add" type="primary">添加</Button>
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue
index e3db7ae4..05295e05 100644
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -65,9 +65,17 @@
               <FormItem label="详细地址" prop="salesConsigneeDetail">
                 <Input v-model="shopForm.salesConsigneeDetail" clearable style="width: 350px" />
               </FormItem>
+              <!-- <Divider orientation="left">腾讯云智服</Divider>
+              <FormItem label="唯一标识" prop="salesConsigneeDetail">
+                <Input v-model="shopForm.yzfSign" clearable style="width: 350px" />
+              </FormItem>
+              <FormItem label="小程序唯一标识" prop="salesConsigneeDetail">
+                <Input v-model="shopForm.yzfMpSign" clearable style="width: 350px" />
+              </FormItem> -->
               <Spin fix v-if="loading"></Spin>
             </div>
           </TabPane>
+          <!-- 入驻信息 -->
           <TabPane label="入驻信息" class="tab" name="sms">
             <!-- 遮罩层  -->
             <div v-if="isRead" class="mask">只读不可修改</div>
diff --git a/manager/src/views/sensitiveWords/index.vue b/manager/src/views/sensitiveWords/index.vue
index dba70f7f..beb50ee4 100644
--- a/manager/src/views/sensitiveWords/index.vue
+++ b/manager/src/views/sensitiveWords/index.vue
@@ -1,41 +1,35 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row class="operation">
-            <Button @click="add" type="primary">添加</Button>
-            <Button @click="delAll">批量删除</Button>
-          </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row class="operation">
+        <Button @click="add" type="primary">添加</Button>
+        <Button @click="delAll">批量删除</Button>
+      </Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
index 5c56535a..308af93e 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -305,7 +305,7 @@ export default {
         },
         {
           title: "商家名称",
-          key: "sellerName",
+          key: "storeName",
         },
         {
           title: "售后单类型",
diff --git a/manager/src/views/statistics/order/refundOrder.vue b/manager/src/views/statistics/order/refundOrder.vue
index 6e37b7fe..65753284 100644
--- a/manager/src/views/statistics/order/refundOrder.vue
+++ b/manager/src/views/statistics/order/refundOrder.vue
@@ -38,7 +38,7 @@
         </div>
         <div class="label-item">
           <span>店铺名称</span>
-          <span>{{res.sellerName}}</span>
+          <span>{{res.storeName}}</span>
         </div>
         <div class="label-item">
           <span>创建时间</span>
diff --git a/manager/src/views/sys/log-manage/logManage.vue b/manager/src/views/sys/log-manage/logManage.vue
index ba04bb14..57e541a9 100644
--- a/manager/src/views/sys/log-manage/logManage.vue
+++ b/manager/src/views/sys/log-manage/logManage.vue
@@ -55,7 +55,6 @@
           </i-switch>
         </Alert>
       </Row>
-      <Row>
 
         <Table
           v-if="showDev"
@@ -78,8 +77,6 @@
         >
         </Table>
 
-
-      </Row>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber"
diff --git a/manager/src/views/sys/message/noticeMessageTemplate.vue b/manager/src/views/sys/message/noticeMessageTemplate.vue
index ef3bc3da..cd7e8a08 100644
--- a/manager/src/views/sys/message/noticeMessageTemplate.vue
+++ b/manager/src/views/sys/message/noticeMessageTemplate.vue
@@ -35,18 +35,16 @@
               <Row class="operation" style="margin-top: 20px">
                 <Button @click="sendMessage" type="primary">发送消息</Button>
               </Row>
-              <Row>
-                <Table
-                  :loading="loading"
-                  border
-                  :columns="messageColumns"
-                  :data="messageData"
-                  ref="table"
-                  sortable="custom"
-                  @on-sort-change="messageChangeSort"
-                  @on-selection-change="messageChangeSelect"
-                ></Table>
-              </Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="messageColumns"
+                :data="messageData"
+                ref="table"
+                sortable="custom"
+                @on-sort-change="messageChangeSort"
+                @on-selection-change="messageChangeSelect"
+              ></Table>
               <Row type="flex" justify="end" class="page">
                 <Page
                   :current="searchMessageForm.pageNumber"
@@ -64,18 +62,16 @@
             </TabPane>
 
             <TabPane label="通知类站内信" name="SETTING">
-              <Row>
-                <Table
-                  :loading="loading"
-                  border
-                  :columns="noticeColumns"
-                  :data="noticeData"
-                  ref="table"
-                  sortable="custom"
-                  @on-sort-change="changeSort"
-                  @on-selection-change="changeSelect"
-                ></Table>
-              </Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="noticeColumns"
+                :data="noticeData"
+                ref="table"
+                sortable="custom"
+                @on-sort-change="changeSort"
+                @on-selection-change="changeSelect"
+              ></Table>
               <Row type="flex" justify="end" class="page">
                 <Page
                   :current="searchForm.pageNumber"
@@ -206,18 +202,16 @@
           </RadioGroup>
         </FormItem>
         <FormItem label="指定商家">
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="messageDetailColumns"
-              :data="shopMessageData"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="messageChangeSort"
-              @on-selection-change="messageChangeSelect"
-            ></Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="messageDetailColumns"
+            :data="shopMessageData"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="messageChangeSort"
+            @on-selection-change="messageChangeSelect"
+          ></Table>
           <Row type="flex" justify="end" class="page">
             <Page
               :current="searchShopMessageForm.pageNumber"
diff --git a/manager/src/views/sys/message/sms.vue b/manager/src/views/sys/message/sms.vue
index 71f09635..b863d8ee 100644
--- a/manager/src/views/sys/message/sms.vue
+++ b/manager/src/views/sys/message/sms.vue
@@ -1,17 +1,13 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
       <Card>
         <Tabs value="LIST" @on-click="paneChange">
           <TabPane label="发送任务列表" name="LIST">
             <Row class="operation" style="margin-bottom: 10px">
               <Button @click="sendBatchSmsModal" type="primary">发送短信</Button>
             </Row>
-            <Row>
-              <Table :loading="loading" border :columns="smsColumns" :data="smsData" ref="table" sortable="custom" @on-sort-change="templateChangeSort">
-              </Table>
-            </Row>
+            <Table :loading="loading" border :columns="smsColumns" :data="smsData" ref="table" sortable="custom" @on-sort-change="templateChangeSort">
+            </Table>
 
             <Row type="flex" justify="end" class="page">
               <Page :current="smsSearchForm.pageNumber" :total="smsTotal" :page-size="smsSearchForm.pageSize" @on-change="smsChangePage" @on-page-size-change="smsChangePageSize"
@@ -23,10 +19,8 @@
               <Button @click="addTemplate" type="primary">添加短信模板</Button>
               <Button @click="syncTemplate" type="info">同步</Button>
             </Row>
-            <Row>
-              <Table :loading="loading" border :columns="templateColumns" :data="templateData" ref="table" sortable="custom" @on-sort-change="smsChangeSort">
-              </Table>
-            </Row>
+            <Table :loading="loading" border :columns="templateColumns" :data="templateData" ref="table" sortable="custom" @on-sort-change="smsChangeSort">
+            </Table>
             <Row type="flex" justify="end" class="page">
               <Page :current="templateSearchForm.pageNumber" :total="templateTotal" :page-size="templateSearchForm.pageSize" @on-change="templateChangePage"
                 @on-page-size-change="templateChangePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
@@ -37,36 +31,30 @@
               <Button @click="addSign" type="primary">添加短信签名</Button>
               <Button @click="syncSign" type="info">同步</Button>
             </Row>
-            <Row>
-              <Table :loading="loading" border :columns="signColumns" :data="signData" ref="table" sortable="custom" @on-sort-change="signChangeSort">
-                <template slot="signStatus" slot-scope="scope">
-                  <div v-if="scope.row.signStatus ==2 ">
-                    审核拒绝
-                    <Poptip trigger="hover" :content=scope.row.reason placement="top-start" transfer>
-                      <span style="color: #ed3f14">【原因】</span>
-                    </Poptip>
-                  </div>
-                  <div v-if="scope.row.signStatus ==0 ">
-                    审核中
-                  </div>
-                  <div v-if="scope.row.signStatus ==1 ">
-                    审核通过
-                  </div>
+            <Table :loading="loading" border :columns="signColumns" :data="signData" ref="table" sortable="custom" @on-sort-change="signChangeSort">
+              <template slot="signStatus" slot-scope="scope">
+                <div v-if="scope.row.signStatus ==2 ">
+                  审核拒绝
+                  <Poptip trigger="hover" :content=scope.row.reason placement="top-start" transfer>
+                    <span style="color: #ed3f14">【原因】</span>
+                  </Poptip>
+                </div>
+                <div v-if="scope.row.signStatus ==0 ">
+                  审核中
+                </div>
+                <div v-if="scope.row.signStatus ==1 ">
+                  审核通过
+                </div>
 
-                </template>
-              </Table>
-            </Row>
+              </template>
+            </Table>
             <Row type="flex" justify="end" class="page">
               <Page :current="signSearchForm.pageNumber" :total="signTotal" :page-size="signSearchForm.pageSize" @on-change="signChangePage" @on-page-size-change="signChangePageSize"
                 :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
             </Row>
-
           </TabPane>
         </Tabs>
-
       </Card>
-      </Col>
-    </Row>
     <Modal :title="templateModalTitle" v-model="templateModalVisible" :mask-closable="false" :width="500">
       <Form ref="templateForm" :model="templateForm" :label-width="100" :rules="templateFormValidate">
         <FormItem label="模板名称" prop="templateName">
diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue
index 0553b143..db6dbed4 100644
--- a/manager/src/views/sys/oss-manage/ossManage.vue
+++ b/manager/src/views/sys/oss-manage/ossManage.vue
@@ -103,18 +103,16 @@
             >
           </Alert>
         </Row>
-        <Row>
-          <Table
-            :loading="loading"
-            border
-            :columns="columns"
-            :data="data"
-            ref="table"
-            sortable="custom"
-            @on-sort-change="changeSort"
-            @on-selection-change="changeSelect"
-          ></Table>
-        </Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        ></Table>
       </div>
       <div v-show="showType == 'thumb'">
         <div class="oss-wrapper">
diff --git a/manager/src/views/sys/role-manage/roleManage.vue b/manager/src/views/sys/role-manage/roleManage.vue
index 8059d46b..3e1f46c3 100644
--- a/manager/src/views/sys/role-manage/roleManage.vue
+++ b/manager/src/views/sys/role-manage/roleManage.vue
@@ -9,18 +9,16 @@
         <Button @click="addRole" type="primary">添加角色</Button>
         <Button @click="delAll">批量删除</Button>
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        ></Table>
-      </Row>
+      <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="pageNumber"
diff --git a/manager/src/views/sys/slider/slider.vue b/manager/src/views/sys/slider/slider.vue
index 50f8d868..e9b94ea7 100644
--- a/manager/src/views/sys/slider/slider.vue
+++ b/manager/src/views/sys/slider/slider.vue
@@ -1,100 +1,88 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Tabs value="RESOURCE" @on-click="handleClickType">
-            <TabPane label="图片源" name="RESOURCE">
-              <Row>
-                <Col>
-                  <Row class="operation" style="margin-bottom: 10px">
-                    <Button @click="add" type="primary">添加</Button>
-                  </Row>
-                  <Row>
-                    <Table
-                      :loading="loading"
-                      border
-                      :columns="columns"
-                      :data="data"
-                      ref="table"
-                      sortable="custom"
-                      @on-sort-change="changeSort"
-                      @on-selection-change="changeSelect"
-                    >
-
-                      <!-- 商品栏目格式化 -->
-                      <template slot="imageSlot" slot-scope="scope">
-                        <div style="">
-                          <img :src="scope.row.resource" style="height: 60px;margin-top: 1px;width: 90px">
-                        </div>
-                      </template>
-
-                    </Table>
-                  </Row>
-                  <Row type="flex" justify="end" class="page">
-                    <Page
-                      :current="searchForm.pageNumber"
-                      :total="total"
-                      :page-size="searchForm.pageSize"
-                      @on-change="changePage"
-                      @on-page-size-change="changePageSize"
-                      :page-size-opts="[10, 20, 50]"
-                      size="small"
-                      show-total
-                      show-elevator
-                      show-sizer
-                    >
-                    </Page>
-                  </Row>
-                </Col>
-              </Row>
-            </TabPane>
-            <TabPane label="滑块源" name="SLIDER">
-              <Row>
-                <Col>
-                  <Row class="operation" style="margin-bottom: 10px">
-                    <Button @click="add" type="primary" icon="md-add">添加</Button>
-                  </Row>
-                  <Row>
-                    <Table
-                      :loading="loading"
-                      border
-                      :columns="columns"
-                      :data="data"
-                      ref="table"
-                      sortable="custom"
-                      @on-sort-change="changeSort"
-                      @on-selection-change="changeSelect"
-                    >
-                      <!-- 商品栏目格式化 -->
-                      <template slot="imageSlot" slot-scope="scope">
-                        <div style="">
-                          <img :src="scope.row.resource" style="height: 60px;margin-top: 1px;width: 60px">
-                        </div>
-                      </template>
-                    </Table>
-                  </Row>
-                  <Row type="flex" justify="end" class="page">
-                    <Page
-                      :current="searchForm.pageNumber"
-                      :total="total"
-                      :page-size="searchForm.pageSize"
-                      @on-change="changePage"
-                      @on-page-size-change="changePageSize"
-                      :page-size-opts="[10, 20, 50]"
-                      size="small"
-                      show-total
-                      show-elevator
-                      show-sizer
-                    ></Page>
-                  </Row>
-                </Col>
-              </Row>
-            </TabPane>
-          </Tabs>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Tabs value="RESOURCE" @on-click="handleClickType">
+        <TabPane label="图片源" name="RESOURCE">
+          <Row class="operation" style="margin-bottom: 10px">
+            <Button @click="add" type="primary">添加</Button>
+          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect"
+          >
+            <!-- 商品栏目格式化 -->
+            <template slot="imageSlot" slot-scope="scope">
+              <div style="">
+                <img
+                  :src="scope.row.resource"
+                  style="height: 60px; margin-top: 1px; width: 90px"
+                />
+              </div>
+            </template>
+          </Table>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            >
+            </Page>
+          </Row>
+        </TabPane>
+        <TabPane label="滑块源" name="SLIDER">
+          <Row class="operation" style="margin-bottom: 10px">
+            <Button @click="add" type="primary" icon="md-add">添加</Button>
+          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect"
+          >
+            <!-- 商品栏目格式化 -->
+            <template slot="imageSlot" slot-scope="scope">
+              <div style="">
+                <img
+                  :src="scope.row.resource"
+                  style="height: 60px; margin-top: 1px; width: 60px"
+                />
+              </div>
+            </template>
+          </Table>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </TabPane>
+      </Tabs>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
@@ -103,10 +91,15 @@
     >
       <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
         <FormItem label="名称" prop="name">
-          <Input v-model="form.name" maxlength="20" clearable style="width: 100%"/>
+          <Input
+            v-model="form.name"
+            maxlength="20"
+            clearable
+            style="width: 100%"
+          />
         </FormItem>
         <FormItem label="图片" prop="resource">
-          <Input v-model="form.resource" clearable style="width: 100%"/>
+          <Input v-model="form.resource" clearable style="width: 100%" />
         </FormItem>
         <FormItem label="类型" prop="type">
           <radio-group v-model="form.type" type="button">
@@ -118,9 +111,8 @@
       <div slot="footer">
         <Button type="text" @click="modalVisible = false">取消</Button>
         <Button type="primary" :loading="submitLoading" @click="handleSubmit"
-        >提交
-        </Button
-        >
+          >提交
+        </Button>
       </div>
     </Modal>
   </div>
@@ -131,7 +123,7 @@ import * as API_Setting from "@/api/setting";
 export default {
   data() {
     return {
-      modalVisible: false,//添加验证码源弹出框
+      modalVisible: false, //添加验证码源弹出框
       modalTitle: "", //添加验证码源弹出框标题
       loading: true, // 表单加载状态
       selectList: [], // 多选数据
@@ -142,7 +134,7 @@ export default {
         name: "",
         resource: "",
         type: "RESOURCE",
-      },//添加编辑表单
+      }, //添加编辑表单
       formValidate: {
         name: [
           {
@@ -165,18 +157,19 @@ export default {
         pageSize: 10, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
-        type: "RESOURCE"
+        type: "RESOURCE",
       },
       columns: [
         {
           title: "名称",
           key: "name",
           minWidth: 80,
-        },{
+        },
+        {
           title: "图片",
           key: "resource",
           width: 150,
-          slot: "imageSlot"
+          slot: "imageSlot",
         },
         {
           title: "创建人",
@@ -213,13 +206,13 @@ export default {
                     size: "small",
                   },
                   style: {
-                    marginRight: "5px"
+                    marginRight: "5px",
                   },
                   on: {
                     click: () => {
                       this.edit(params.row);
-                    }
-                  }
+                    },
+                  },
                 },
                 "编辑"
               ),
@@ -233,17 +226,17 @@ export default {
                   on: {
                     click: () => {
                       this.remove(params.row);
-                    }
-                  }
+                    },
+                  },
                 },
                 "删除"
-              )
+              ),
             ]);
           },
         },
       ],
       data: [], // 表单数据
-      total: 0,//条数
+      total: 0, //条数
     };
   },
 
@@ -264,15 +257,15 @@ export default {
     },
     //切换tab
     handleClickType(v) {
-      this.searchForm.pageNumber = 1 // 当前页数
-      this.searchForm.pageSize = 10 // 页面大小
+      this.searchForm.pageNumber = 1; // 当前页数
+      this.searchForm.pageSize = 10; // 页面大小
       //图片源
       if (v == "RESOURCE") {
-        this.searchForm.type = "RESOURCE"
+        this.searchForm.type = "RESOURCE";
       }
       //滑块源
       if (v == "SLIDER") {
-        this.searchForm.type = "SLIDER"
+        this.searchForm.type = "SLIDER";
       }
       this.getDataList();
     },
@@ -283,7 +276,7 @@ export default {
         this.loading = false;
         if (res.success) {
           this.data = res.result.records;
-          this.total = res.result.total
+          this.total = res.result.total;
         }
       });
       this.loading = false;
@@ -294,25 +287,25 @@ export default {
     },
     //添加验证码源
     add() {
-      this.form.type = this.searchForm.type
-      this.modalVisible = true
-      this.modalType = 0
-      this.modalTitle = "添加验证码源"
+      this.form.type = this.searchForm.type;
+      this.modalVisible = true;
+      this.modalType = 0;
+      this.modalTitle = "添加验证码源";
     },
     //修改验证码源
     edit(v) {
-      this.form.name = v.name
-      this.form.id = v.id
-      this.form.resource = v.resource
-      this.form.type = v.type
+      this.form.name = v.name;
+      this.form.id = v.id;
+      this.form.resource = v.resource;
+      this.form.type = v.type;
 
-      this.modalType = 1
-      this.modalVisible = true
-      this.modalTitle = "修改验证码源"
+      this.modalType = 1;
+      this.modalVisible = true;
+      this.modalTitle = "修改验证码源";
     },
     //提交表单
     handleSubmit() {
-      this.form.type = this.searchForm.type
+      this.form.type = this.searchForm.type;
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.submitLoading = true;
@@ -329,14 +322,16 @@ export default {
             });
           } else {
             // 编辑
-            API_Setting.editVerification(this.form.id, this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("修改成功");
-                this.getDataList();
-                this.modalVisible = false;
+            API_Setting.editVerification(this.form.id, this.form).then(
+              (res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("修改成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
               }
-            });
+            );
           }
         }
       });
@@ -359,8 +354,7 @@ export default {
           });
         },
       });
-    }
-
+    },
   },
   mounted() {
     this.getDataList();
diff --git a/manager/src/views/sys/user-manage/userManage.vue b/manager/src/views/sys/user-manage/userManage.vue
index 48043823..f63bb892 100644
--- a/manager/src/views/sys/user-manage/userManage.vue
+++ b/manager/src/views/sys/user-manage/userManage.vue
@@ -43,18 +43,16 @@
         <Button @click="delAll">批量删除</Button>
         <Button @click="resetPass">重置密码</Button>
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="showSelect"
-          ref="table"
-        ></Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="showSelect"
+        ref="table"
+      ></Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber"
diff --git a/seller/src/api/promotion.js b/seller/src/api/promotion.js
index aaa436a5..ebc8941c 100644
--- a/seller/src/api/promotion.js
+++ b/seller/src/api/promotion.js
@@ -1,5 +1,23 @@
 // 统一请求路径前缀在libs/axios.js中修改
-import { getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios';
+import { getRequest, postRequest, postRequestWithNoForm, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios';
+
+
+// 获取店铺直播间列表
+export const getLivesList = (params) => {
+  return getRequest('/broadcast/studio', params)
+}
+
+// 获取店铺直播商品
+export const getLiveGoods = (params) => {
+  return getRequest('/broadcast/commodity', params)
+}
+
+// 添加店铺直播商品
+export const addLiveGoods = (params) => {
+  return postRequestWithNoForm('/broadcast/commodity', params)
+}
+
+
 
 // 获取拼团列表
 export const getPintuanList = (params) => {
@@ -128,4 +146,4 @@ export const getFullDiscountById = (id) => {
 // 删除满减活动
 export const delFullDiscount = (id) => {
     return deleteRequest(`/promotion/fullDiscount/${id}`)
-}
\ No newline at end of file
+}
diff --git a/seller/src/libs/axios.js b/seller/src/libs/axios.js
index e22c1354..037a4c0f 100644
--- a/seller/src/libs/axios.js
+++ b/seller/src/libs/axios.js
@@ -216,19 +216,20 @@ export const postRequestWithNoForm = (url, params) => {
   });
 };
 
-// export const postRequestWithHeaders = (url, params) => {
-//   let accessToken = getStore("accessToken");
-//   return axios({
-//     method: "post",
-//     url: `${url}`,
-//     data: params,
+export const postRequestWithHeaders = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return axios({
+    method: "post",
+    url: `${url}`,
+    data: params,
+
+    headers: {
+      accessToken: accessToken,
+      "Content-Type": "application/x-www-form-urlencoded"
+    }
+  });
+};
 
-//     headers: {
-//       accessToken: accessToken,
-//       "Content-Type": "application/x-www-form-urlencoded"
-//     }
-//   });
-// };
 
 export const putRequest = (url, params,headers) => {
   let accessToken = getStore("accessToken");
diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js
index 781e35e4..3cbf4372 100644
--- a/seller/src/libs/routerJson.js
+++ b/seller/src/libs/routerJson.js
@@ -425,6 +425,34 @@ export const result = [
             url: "",
             permTypes: [],
             children: null
+          },
+          {
+            name: "live",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "直播管理",
+            path: "live",
+            component: "promotion/live/live",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "liveGoods",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "直播商品",
+            path: "liveGoods",
+            component: "promotion/live/liveGoods",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
           }
         ]
       },
@@ -656,7 +684,7 @@ export const result = [
             showAlways: true,
             level: 2,
             type: 0,
-            title: "自提点管理",
+            title: "自提管理",
             path: "shopAddress",
             component: "shop/shopAddress",
             icon: "md-log-in",
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
index eaf49412..1a1828a3 100644
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -71,6 +71,12 @@ export const otherRouter = {
       name: "add-coupon",
       component: () => import("@/views/promotion/coupon/couponPublish.vue")
     },
+    {
+      path: "add-live",
+      title: "创建直播",
+      name: "add-live",
+      component: () => import("@/views/promotion/live/addLive.vue")
+    },
     {
       path: "bill-detail",
       title: "结算单详情",
diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue
index 434db17e..8fb04bc0 100644
--- a/seller/src/views/Main.vue
+++ b/seller/src/views/Main.vue
@@ -11,7 +11,7 @@
       <shrinkable-menu></shrinkable-menu>
     </div>
     <!-- 顶部标题栏主体 -->
-    <div class="main-header-con" style="padding-left:240px">
+    <div class="main-header-con">
       <div class="main-header">
         <div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}">
           <!-- 用户头像 -->
diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue
index 90c2d864..93421b32 100644
--- a/seller/src/views/distribution/distributionGoods.vue
+++ b/seller/src/views/distribution/distributionGoods.vue
@@ -1,56 +1,50 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="商品名称" prop="goodsName">
-                <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px"/>
-              </Form-item>
-              <!-- <Form-item label="店铺名称">
-                  <Select v-model="searchForm.shopId" placeholder="请选择" @on-query-change="searchChange" filterable clearable style="width: 200px">
-                      <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
-                  </Select>
-              </Form-item> -->
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="operation padding-row">
-            <Button @click="add" type="primary">添加</Button>
-          <!--  <Button @click="add" type="default">批量删除</Button>-->
-          </Row>
-          <Row>
-            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="{row}">
-                <div style="margin-top: 5px;height: 70px; display: flex;">
-                  <div style="">
-                    <img :src="row.thumbnail" style="height: 60px;margin-top: 3px;width: 60px">
-                  </div>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="商品名称" prop="goodsName">
+            <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px"/>
+          </Form-item>
+          <!-- <Form-item label="店铺名称">
+              <Select v-model="searchForm.shopId" placeholder="请选择" @on-query-change="searchChange" filterable clearable style="width: 200px">
+                  <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
+              </Select>
+          </Form-item> -->
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="add" type="primary">添加</Button>
+      <!--  <Button @click="add" type="default">批量删除</Button>-->
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin-top: 5px;height: 70px; display: flex;">
+            <div style="">
+              <img :src="row.thumbnail" style="height: 60px;margin-top: 3px;width: 60px">
+            </div>
 
-                  <div style="margin-left: 13px;">
-                    <div class="div-zoom">
-                      <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
-                    </div>
-                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                      <div slot="content">
-                        <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                      </div>
-                      <img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                    </Poptip>
-                  </div>
+            <div style="margin-left: 13px;">
+              <div class="div-zoom">
+                <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
                 </div>
+                <img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
 
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
     <liliDialog
       ref="liliDialog"
       @selectedGoodsData="selectedGoodsData"
diff --git a/seller/src/views/distribution/distributionOrder.vue b/seller/src/views/distribution/distributionOrder.vue
index 67e56d72..27ccafbc 100644
--- a/seller/src/views/distribution/distributionOrder.vue
+++ b/seller/src/views/distribution/distributionOrder.vue
@@ -1,30 +1,24 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row v-show="openSearch" @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="订单编号" prop="orderSn">
-              <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单编号" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="订单时间">
-              <DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间" style="width: 210px"></DatePicker>
-            </Form-item>
-            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          </Form>
-        </Row>
+    <Card>
+      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单编号" prop="orderSn">
+            <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单编号" clearable style="width: 200px" />
+          </Form-item>
+          <Form-item label="订单时间">
+            <DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间" style="width: 210px"></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
 
-        <Row class="padding-row">
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small"
-            show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-      </Col>
-    </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small"
+          show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
 
   </div>
 </template>
diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss
index d4730d99..dda4752a 100644
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -222,14 +222,13 @@ div.base-info-item {
 
 /** 底部步骤 */
 .footer {
-  width: 88.7%;
+  width: 100%;
   padding: 10px;
   background-color: #ffc;
-  position: fixed;
+  position: sticky;
   bottom: 0px;
-  left: 10%;
   text-align: center;
-  z-index: 9999;
+  z-index: 9;
 }
 
 /*图片上传组件第一张图设置封面*/
diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue
index 5b7e6b91..fdd63905 100644
--- a/seller/src/views/goods/goods-seller/draftGoods.vue
+++ b/seller/src/views/goods/goods-seller/draftGoods.vue
@@ -1,88 +1,82 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row v-show="openSearch" @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
+    <Card>
+      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="商品名称" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              placeholder="请输入商品名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <span v-if="drop">
+            <Form-item label="状态" prop="status">
+              <Select
+                v-model="searchForm.marketEnable"
+                placeholder="请选择"
+                clearable
+                style="width: 200px"
+              >
+                <Option value="DOWN">下架</Option>
+                <Option value="UPPER">上架</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="商品编号" prop="sn">
+              <Input
+                type="text"
+                v-model="searchForm.sn"
+                placeholder="商品编号"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+          </span>
+          <Form-item style="margin-left: -35px" class="br">
+            <Button @click="handleSearch" type="primary" icon="ios-search"
+              >搜索</Button
             >
-              <Form-item label="商品名称" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  placeholder="请输入商品名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <span v-if="drop">
-                <Form-item label="状态" prop="status">
-                  <Select
-                    v-model="searchForm.marketEnable"
-                    placeholder="请选择"
-                    clearable
-                    style="width: 200px"
-                  >
-                    <Option value="DOWN">下架</Option>
-                    <Option value="UPPER">上架</Option>
-                  </Select>
-                </Form-item>
-                <Form-item label="商品编号" prop="sn">
-                  <Input
-                    type="text"
-                    v-model="searchForm.sn"
-                    placeholder="商品编号"
-                    clearable
-                    style="width: 200px"
-                  />
-                </Form-item>
-              </span>
-              <Form-item style="margin-left: -35px" class="br">
-                <Button @click="handleSearch" type="primary" icon="ios-search"
-                  >搜索</Button
-                >
-                <Button @click="handleReset">重置</Button>
-                <a class="drop-down" @click="dropDown">
-                  {{ dropDownContent }}
-                  <Icon :type="dropDownIcon"></Icon>
-                </a>
-              </Form-item>
-            </Form>
-          </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+            <Button @click="handleReset">重置</Button>
+            <a class="drop-down" @click="dropDown">
+              {{ dropDownContent }}
+              <Icon :type="dropDownIcon"></Icon>
+            </a>
+          </Form-item>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index 165f9944..75f8123d 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="search">
-
     <Card>
       <Row @keydown.enter.native="handleSearch">
         <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@@ -31,7 +30,7 @@
             <DropdownItem name="uppers">批量上架</DropdownItem>
             <DropdownItem name="lowers">批量下架</DropdownItem>
             <DropdownItem name="deleteAll">批量删除</DropdownItem>
-            <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem>
+            <!-- <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem> -->
           </DropdownMenu>
         </Dropdown>
       </Row>
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 24b6be3f..1458178b 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="goods-operation">
     <div style="height: 45px">
       <steps
         :current="activestep"
@@ -522,7 +522,7 @@
                 <span slot="append">kg</span>
               </Input>
             </FormItem>
-            <FormItem class="form-item-view-el" label="运费" prop="skuList">
+            <!-- <FormItem class="form-item-view-el" label="运费" prop="skuList">
               <RadioGroup type="button" button-style="solid"
                 @on-change="logisticsTemplateChange"
                 v-model="baseInfoForm.freightPayer"
@@ -534,7 +534,7 @@
                   <span>使用物流规则</span>
                 </Radio>
               </RadioGroup>
-            </FormItem>
+            </FormItem> -->
             <FormItem
               class="form-item-view-el"
               label="物流模板"
@@ -699,7 +699,7 @@ export default {
         this.baseInfoForm = {
           salesModel: "RETAIL",
           goodsParamsList: [],
-          freightPayer: "STORE",
+          // freightPayer: "STORE",
           weight: "",
           goodsGalleryFiles: [],
           release: "true",
@@ -844,7 +844,7 @@ export default {
         /** 商品参数列表 */
         goodsParamsList: [],
         /** 运费承担者 */
-        freightPayer: "STORE",
+        // freightPayer: "STORE",
         /** 商品重量 */
         weight: "",
         /** 商品相册列表 */
@@ -1007,7 +1007,7 @@ export default {
       this.baseInfoForm = {
         salesModel: "RETAIL",
         goodsParamsList: [],
-        freightPayer: "STORE",
+        // freightPayer: "STORE",
         weight: "",
         goodsGalleryFiles: [],
         release: "true",
@@ -1235,14 +1235,14 @@ export default {
         ...response.result,
       };
       console.warn(this.baseInfoForm);
-      if (this.baseInfoForm.freightPayer === "BUYER") {
-        API_Shop.getShipTemplate().then((res) => {
-          if (res.success) {
-            this.logisticsTemplate = res.result;
-          }
-        });
-        this.logisticsTemplateShow = true;
-      }
+      // if (this.baseInfoForm.freightPayer === "BUYER") {
+      //   API_Shop.getShipTemplate().then((res) => {
+      //     if (res.success) {
+      //       this.logisticsTemplate = res.result;
+      //     }
+      //   });
+      //   this.logisticsTemplateShow = true;
+      // }
       this.baseInfoForm.release = "true";
       this.baseInfoForm.recommend = this.baseInfoForm.recommend
         ? "true"
@@ -1840,9 +1840,9 @@ export default {
             return;
           }
           //如果选择的是卖家承担运费 则运费模板重置为0
-          if (this.baseInfoForm.freightPayer !== "BUYER") {
-            this.baseInfoForm.templateId = 0;
-          }
+          // if (this.baseInfoForm.freightPayer !== "BUYER") {
+          //   this.baseInfoForm.templateId = 0;
+          // }
 
           this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
             delete sku._index;
diff --git a/seller/src/views/goods/goods-seller/goodsStock.vue b/seller/src/views/goods/goods-seller/goodsStock.vue
index 2b0fb9e4..abd1b5a7 100644
--- a/seller/src/views/goods/goods-seller/goodsStock.vue
+++ b/seller/src/views/goods/goods-seller/goodsStock.vue
@@ -68,18 +68,16 @@
               <a class="select-clear" @click="clearSelectAll">清空</a>
             </Alert>
           </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
+          <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"
diff --git a/seller/src/views/lili-dialog/goods-dialog.vue b/seller/src/views/lili-dialog/goods-dialog.vue
index b3064aa1..9703e8c5 100644
--- a/seller/src/views/lili-dialog/goods-dialog.vue
+++ b/seller/src/views/lili-dialog/goods-dialog.vue
@@ -41,12 +41,17 @@
 <script>
 import * as API_Goods from "@/api/goods";
 export default {
-  data() {
+  props: {
+    selectedWay: {
+      type: Array,
+      default: new Array()
+    }
+  },
+  data () {
     return {
       type: "multiple", //单选或者多选 single  multiple
 
       cateList: [], // 商品分类列表
-      selectedWay: [], //选中商品集合
       total: "", // 商品总数
       goodsParams: { // 请求商品列表参数
         pageNumber: 1,
@@ -64,18 +69,17 @@ export default {
       loading: false, // 商品加载loading
     };
   },
-  props: ["clearFlag"],
   watch: {
     category(val) {
       this.goodsParams.categoryPath = val[2];
     },
     selectedWay: {
-      handler() {
+      handler(val) {
         this.$emit("selected", this.selectedWay);
       },
       deep: true,
+      immediate: true
     },
-
     "goodsParams.categoryPath": {
       handler: function () {
         this.goodsData = [];
@@ -88,7 +92,7 @@ export default {
     this.init();
   },
   methods: {
-    handleReachBottom() {
+    handleReachBottom() { // 页面触底触发加载
       setTimeout(() => {
         if (
           this.goodsParams.pageNumber * this.goodsParams.pageSize <=
@@ -99,17 +103,24 @@ export default {
         }
       }, 1500);
     },
-    getQueryGoodsList() {
+    getQueryGoodsList() { // 根据商品分类筛选商品
       API_Goods.getGoodsSkuData(this.goodsParams).then((res) => {
         this.initGoods(res);
       });
     },
 
-    initGoods(res) {
+    initGoods(res) { // 获取商品列表
       if (res.result.records.length !=0) {
-        res.result.records.forEach((item) => {
+        let data = res.result.records;
+        data.forEach((item) => {
           item.selected = false;
           item.___type = "goods"; //设置为goods让pc wap知道标识
+
+          this.selectedWay.forEach(e => {
+            if (e.id === item.id) {
+              item.selected = true 
+            }
+          })
         });
         /**
          * 解决数据请求中，滚动栏会一直上下跳动
@@ -141,7 +152,6 @@ export default {
     deepGroup(val) {
       val.forEach((item) => {
         let childWay = []; //第二级
-        let grandWay = []; //第三级
         // 第二层
         if (item.children) {
           item.children.forEach((child) => {
@@ -196,7 +206,12 @@ export default {
         this.selectedWay.push(val);
       } else {
         val.selected = false;
-        this.selectedWay.splice(index, 1);
+        for (let i = 0; i<this.selectedWay.length; i++ ) {
+          if (this.selectedWay[i].id===val.id) {
+            this.selectedWay.splice(i,1)
+            break;
+          }
+        }
       }
     },
   },
diff --git a/seller/src/views/lili-dialog/index.vue b/seller/src/views/lili-dialog/index.vue
index ec565191..e9d748ff 100644
--- a/seller/src/views/lili-dialog/index.vue
+++ b/seller/src/views/lili-dialog/index.vue
@@ -10,20 +10,13 @@
     scrollable
   >
     <goodsDialog
-      @selected="
-        (val) => {
-          goodsData = val;
-        }
-      "
+      @selected="(val) => {goodsData = val;}"
+      :selectedWay='goodsData'
       ref="goodsDialog"
       v-if="goodsFlag"
     />
     <linkDialog
-      @selectedLink="
-        (val) => {
-          linkData = val;
-        }
-      "
+      @selectedLink="(val) => {linkData = val;}"
       v-else
       class="linkDialog"
     />
@@ -41,14 +34,11 @@ export default {
     return {
       title: "选择", // 模态框标题
       goodsFlag: false, // 是否商品选择器
-      goodsData: "", //选择的商品
+      goodsData: [], //选择的商品
       linkData: "", //选择的链接
       flag: false, // 控制模态框显隐
     };
   },
-  props: ["types"],
-  watch: {},
-  mounted() {},
   methods: {
     // 关闭弹窗
     clickClose() {
@@ -58,7 +48,6 @@ export default {
 
     // 单选商品
     singleGoods(){
-
       var timer = setInterval(() => {
         if (this.$refs.goodsDialog) {
 
@@ -66,19 +55,16 @@ export default {
          clearInterval(timer);
         }
       }, 100);
-
-
     },
-    clickOK() {
+    clickOK() { // 确定按钮回调，
       if (this.goodsFlag) {
         this.$emit("selectedGoodsData", this.goodsData);
       } else {
         this.$emit("selectedLink", this.linkData);
       }
       this.clickClose();
-      // this.clearFlag = false
     },
-    open(type){
+    open (type) { // 父组件通过ref调用，打开商品选择器
       this.flag = true;
       if(type == 'goods'){
         this.goodsFlag = true;
@@ -87,7 +73,7 @@ export default {
       }
 
     },
-    close(){
+    close(){ // 关闭组件
       this.flag = false;
     }
   },
diff --git a/seller/src/views/logistics/index.vue b/seller/src/views/logistics/index.vue
index 5fd36898..a8e7bc91 100644
--- a/seller/src/views/logistics/index.vue
+++ b/seller/src/views/logistics/index.vue
@@ -1,51 +1,45 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch"> </Row>
-          <Row class="operation">
-            <Button @click="add" type="primary" icon="md-add">添加</Button>
-            <Button @click="getDataList" icon="md-refresh">刷新</Button>
-            <Button type="dashed" @click="openTip = !openTip">{{
-              openTip ? "关闭提示" : "开启提示"
-            }}</Button>
-          </Row>
-          <Row v-show="openTip">
-            <Alert show-icon>
-              已选择 <span class="select-count">{{ selectCount }}</span> 项
-              <a class="select-clear" @click="clearSelectAll">清空</a>
-            </Alert>
-          </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch"> </Row>
+      <Row class="operation">
+        <Button @click="add" type="primary" icon="md-add">添加</Button>
+        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+        <Button type="dashed" @click="openTip = !openTip">{{
+          openTip ? "关闭提示" : "开启提示"
+        }}</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择 <span class="select-count">{{ selectCount }}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index 031824a7..ba04942a 100644
--- a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -5,7 +5,7 @@
 <template>
   <div class="ivu-shrinkable-menu">
     <!-- 一级菜单 -->
-    <Menu ref="sideMenu" width="110px" theme="dark"  :active-name="currNav" @on-select="selectNav">
+    <Menu ref="sideMenu" width="80px" theme="dark"  :active-name="currNav" @on-select="selectNav">
       <MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
         {{item.title}}
       </MenuItem>
@@ -14,7 +14,7 @@
     <Menu
       ref="childrenMenu"
       :active-name="$route.name"
-      width="130px"
+      width="100px"
       @on-select="changeMenu"
     >
       <template v-for="item in menuList">
diff --git a/seller/src/views/main-components/shrinkable-menu/styles/menu.scss b/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
index 59962e14..9169a5dc 100644
--- a/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
+++ b/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
@@ -1,6 +1,6 @@
 .ivu-shrinkable-menu{
   height: calc(100% - 60px);
-  width: 240px;
+  width: 180px;
   display: flex;
 }
 .ivu-menu-vertical .ivu-menu-item-group-title {
diff --git a/seller/src/views/main.scss b/seller/src/views/main.scss
index 15864933..3bd07e64 100644
--- a/seller/src/views/main.scss
+++ b/seller/src/views/main.scss
@@ -52,7 +52,7 @@
     box-sizing: border-box;
     position: fixed;
     display: block;
-    padding-left: 200px;
+    padding-left: 180px;
     width: 100%;
     height: 100px;
     z-index: 20;
@@ -253,14 +253,13 @@
 
   .single-page-con {
     min-width: 740px;
-    left: 240px;
+    left: 180px;
     position: relative;
     top: 100px;
     right: 0;
     bottom: 0;
-    height: calc(100% + 200px);
-    
-    width: calc(100% - 240px);
+    height: calc(100% - 110px);
+    width: calc(100% - 180px);
     background-color: #f0f0f0;
     z-index: 1;
     transition: left 0.3s;
diff --git a/seller/src/views/member/memberComment.vue b/seller/src/views/member/memberComment.vue
index 6e39f8b9..c4eb28ff 100644
--- a/seller/src/views/member/memberComment.vue
+++ b/seller/src/views/member/memberComment.vue
@@ -1,79 +1,73 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="商品名称" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  clearable
-                  placeholder="请输入商品名"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="评价" prop="orderStatus">
-                <Select v-model="searchForm.grade" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="GOOD">好评</Option>
-                  <Option value="MODERATE">中评</Option>
-                  <Option value="WORSE">差评</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="评论日期">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="商品名称" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              clearable
+              placeholder="请输入商品名"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="评价" prop="orderStatus">
+            <Select v-model="searchForm.grade" placeholder="请选择" clearable style="width: 200px">
+              <Option value="GOOD">好评</Option>
+              <Option value="MODERATE">中评</Option>
+              <Option value="WORSE">差评</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="评论日期">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/seller/src/views/order/after-order/orderComplaint.vue b/seller/src/views/order/after-order/orderComplaint.vue
index 4f0b8986..0b3f8fcf 100644
--- a/seller/src/views/order/after-order/orderComplaint.vue
+++ b/seller/src/views/order/after-order/orderComplaint.vue
@@ -1,82 +1,76 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="订单号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入商品名"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="状态" prop="status">
-                <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="NEW">新投诉</Option>
-                  <Option value="CANCEL">已撤销</Option>
-                  <Option value="WAIT_APPEAL">待申诉</Option>
-                  <Option value="COMMUNICATION">对话中</Option>
-                  <Option value="WAIT_ARBITRATION">等待仲裁</Option>
-                  <Option value="COMPLETE">已完成</Option>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="订单号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入商品名"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="状态" prop="status">
+            <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px">
+              <Option value="NEW">新投诉</Option>
+              <Option value="CANCEL">已撤销</Option>
+              <Option value="WAIT_APPEAL">待申诉</Option>
+              <Option value="COMMUNICATION">对话中</Option>
+              <Option value="WAIT_ARBITRATION">等待仲裁</Option>
+              <Option value="COMPLETE">已完成</Option>
 
-                </Select>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <template slot-scope="{row}" slot="goodsName">
-                <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                  <div slot="content">
-                    <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                  </div>
-                  <img src="../../../assets/qrcode.svg" style="vertical-align:bottom;" class="hover-pointer" width="20" height="20" alt="">
-                </Poptip>
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <template slot-scope="{row}" slot="goodsName">
+          <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+          <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+            <div slot="content">
+              <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+            </div>
+            <img src="../../../assets/qrcode.svg" style="vertical-align:bottom;" class="hover-pointer" width="20" height="20" alt="">
+          </Poptip>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue
index 0d1092b5..297ffb39 100644
--- a/seller/src/views/order/after-order/returnGoodsOrder.vue
+++ b/seller/src/views/order/after-order/returnGoodsOrder.vue
@@ -1,105 +1,99 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="商品" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  clearable
-                  placeholder="请输入商品名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入订单编号"
-                  style="width: 200px"
-                />
-              </Form-item>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="商品" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入订单编号"
+              style="width: 200px"
+            />
+          </Form-item>
 
-              <Form-item label="申请时间">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
+          <Form-item label="申请时间">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
 
-              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="{row}">
-                <div style="margin-top: 5px;height: 90px; display: flex;">
-                  <div style="">
-                    <img :src="row.goodsImage" style="height: 80px;margin-top: 3px">
-                  </div>
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin-top: 5px;height: 90px; display: flex;">
+            <div style="">
+              <img :src="row.goodsImage" style="height: 80px;margin-top: 3px">
+            </div>
 
-                  <div style="margin-left: 13px;">
-                    <div class="div-zoom">
-                      <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                    </div>
-                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                      <div slot="content">
-                        <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                      </div>
-                      <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                    </Poptip>
-                  </div>
+            <div style="margin-left: 13px;">
+              <div class="div-zoom">
+                <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
                 </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
 
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue
index 66db4536..cc41f994 100644
--- a/seller/src/views/order/after-order/returnMoneyOrder.vue
+++ b/seller/src/views/order/after-order/returnMoneyOrder.vue
@@ -1,105 +1,99 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="商品" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  clearable
-                  placeholder="请输入商品名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入订单编号"
-                  style="width: 200px"
-                />
-              </Form-item>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="商品" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入订单编号"
+              style="width: 200px"
+            />
+          </Form-item>
 
-              <Form-item label="申请时间">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
+          <Form-item label="申请时间">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
 
-              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="{row}">
-                <div style="margin-top: 5px;height: 90px; display: flex;">
-                  <div style="">
-                    <img :src="row.goodsImage" style="height: 80px;margin-top: 3px">
-                  </div>
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin-top: 5px;height: 90px; display: flex;">
+            <div style="">
+              <img :src="row.goodsImage" style="height: 80px;margin-top: 3px">
+            </div>
 
-                  <div style="margin-left: 13px;">
-                    <div class="div-zoom">
-                      <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                    </div>
-                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                      <div slot="content">
-                        <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                      </div>
-                      <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                    </Poptip>
-                  </div>
+            <div style="margin-left: 13px;">
+              <div class="div-zoom">
+                <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
                 </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
 
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 38dd451c..cfda0899 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -1,179 +1,173 @@
 <template>
   <div class="search">
-    <Row>
-      <Col style="width:100%;">
-      <Row style="flex-direction: column;width: 100%;">
-        <Card style="height: 60px">
-          <div style="">
-            <Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button>
-            <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址
-            </Button>
-            <Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button>
-            <Button @click="orderLog" type="primary">订单日志</Button>
-            <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
-            <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
-          </div>
-        </Card>
+    <Card style="height: 60px">
+      <div style="">
+        <Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button>
+        <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址
+        </Button>
+        <Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button>
+        <Button @click="orderLog" type="primary">订单日志</Button>
+        <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
+        <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
+      </div>
+    </Card>
 
-          <Card style="height: 400px">
-            <div style="width: 30%; float: left; margin-left: 20px">
-              <div class="div-item">
-                <div class="div-item-left">订单号：</div>
-                <div class="div-item-right">{{ orderInfo.order.sn }}</div>
-              </div>
-              <div class="div-item">
-                <div class="div-item-left">订单来源：</div>
-                <div class="div-item-right">
-                  {{ orderInfo.order.clientType }}
-                </div>
-              </div>
-            </div>
-
-            <div class="div-item">
-              <div class="div-item-left">订单状态：</div>
-              <div class="div-item-right">
-                {{ orderInfo.orderStatusValue }}
-              </div>
-            </div>
-
-            <div class="div-item">
-              <div class="div-item-left">下单时间：</div>
-              <div class="div-item-right">
-                {{ orderInfo.order.createTime }}
-              </div>
-            </div>
-
-
-            <div style="width: 30%; float: left; margin-left: 20px">
-              <div class="div-item" v-if="orderInfo.order.needReceipt == false">
-                <div class="div-item-left">发票信息：</div>
-                <div class="div-item-right">暂无发票信息</div>
-              </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票抬头：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
-              <div class="div-item-left">发票税号：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票内容：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票金额：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
-            </div>
-
-              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-                <div class="div-item-left">是否开票：</div>
-                <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
-              </div>
-            </div>
-            <div style="width: 36%; float: left">
-              <div class="div-item">
-                <div class="div-item-left">收货信息：</div>
-                <div class="div-item-right">
-                  {{ orderInfo.order.consigneeName }}
-                  {{ orderInfo.order.consigneeMobile }}
-                  {{ orderInfo.order.consigneeAddressPath }}
-                  {{ orderInfo.order.consigneeDetail }}
-                </div>
-              </div>
-              <div class="div-item">
-                <div class="div-item-left">支付方式：</div>
-                <div class="div-item-right">
-                  {{ orderInfo.paymentMethodValue }}
-                </div>
-              </div>
-
-              <div class="div-item">
-                <div class="div-item-left">买家留言：</div>
-                <div class="div-item-right">{{ orderInfo.order.remark }}</div>
-              </div>
-
-            <div class="div-item">
-              <div class="div-item-left">配送方式：</div>
-              <div class="div-item-right">
-                {{
-                    orderInfo.deliveryMethodValue
-                      ? orderInfo.deliveryMethodValue
-                      : "暂无配送方式"
-                  }}
-              </div>
-            </div>
-          </div>
-        </Card>
-      </Row>
-      </Col>
-
-      <Card>
-        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
-          <!-- 商品栏目格式化 -->
-          <template slot="goodsSlot" slot-scope="{row}">
-            <div style="margin-top: 5px; height: 80px; display: flex">
-              <div style="">
-                <img :src="row.image" style="height: 60px; margin-top: 1px; width: 60px" />
-              </div>
-
-              <div style="margin-left: 13px">
-                <div class="div-zoom">
-                  <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                </div>
-                <span v-for="(item, key) in JSON.parse(row.specs)">
-                  <span v-show="key!='images'" style="font-size: 12px;color: #999999;">
-                    {{key}} : {{item}}
-                  </span>
-                </span>
-                <Poptip trigger="hover" style="display: block;" title="扫码在手机中查看" transfer>
-                  <div slot="content">
-                    <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                  </div>
-                  <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                </Poptip>
-              </div>
-            </div>
-          </template>
-        </Table>
-        <div class="goods-total">
-          <ul>
-            <li>
-              <span class="label">商品总额：</span>
-              <span class="txt">{{ orderInfo.order.priceDetailDTO.goodsPrice | unitPrice('￥')}}</span>
-            </li>
-            <li>
-              <span class="label">优惠金额：</span>
-              <span class="txt">
-                {{
-                  orderInfo.order.priceDetailDTO.couponPrice +
-                  orderInfo.order.priceDetailDTO.discountPrice
-                | unitPrice('￥')}}
-              </span>
-            </li>
-            <li>
-              <span class="label">运费：</span>
-              <span class="txt">{{ orderInfo.order.freightPrice | unitPrice('￥')}}</span>
-            </li>
-            <li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
-              <span class="label">使用积分：</span>
-              <span class="txt">{{
-                orderInfo.order.priceDetailDTO.payPoint
-              }}</span>
-            </li>
-
-            <li>
-              <span class="label">应付金额：</span>
-              <span class="txt flowPrice">¥{{ orderInfo.order.flowPrice | unitPrice }}</span>
-            </li>
-          </ul>
+    <Card style="height: 400px">
+      <div style="width: 30%; float: left; margin-left: 20px">
+        <div class="div-item">
+          <div class="div-item-left">订单号：</div>
+          <div class="div-item-right">{{ orderInfo.order.sn }}</div>
         </div>
-      </Card>
-    </Row>
+        <div class="div-item">
+          <div class="div-item-left">订单来源：</div>
+          <div class="div-item-right">
+            {{ orderInfo.order.clientType }}
+          </div>
+        </div>
+      </div>
+
+      <div class="div-item">
+        <div class="div-item-left">订单状态：</div>
+        <div class="div-item-right">
+          {{ orderInfo.orderStatusValue }}
+        </div>
+      </div>
+
+      <div class="div-item">
+        <div class="div-item-left">下单时间：</div>
+        <div class="div-item-right">
+          {{ orderInfo.order.createTime }}
+        </div>
+      </div>
+
+
+      <div style="width: 30%; float: left; margin-left: 20px">
+        <div class="div-item" v-if="orderInfo.order.needReceipt == false">
+          <div class="div-item-left">发票信息：</div>
+          <div class="div-item-right">暂无发票信息</div>
+        </div>
+
+      <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+        <div class="div-item-left">发票抬头：</div>
+        <div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
+      </div>
+
+      <div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
+        <div class="div-item-left">发票税号：</div>
+        <div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
+      </div>
+
+      <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+        <div class="div-item-left">发票内容：</div>
+        <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
+      </div>
+
+      <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+        <div class="div-item-left">发票金额：</div>
+        <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
+      </div>
+
+        <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+          <div class="div-item-left">是否开票：</div>
+          <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
+        </div>
+      </div>
+      <div style="width: 36%; float: left">
+        <div class="div-item">
+          <div class="div-item-left">收货信息：</div>
+          <div class="div-item-right">
+            {{ orderInfo.order.consigneeName }}
+            {{ orderInfo.order.consigneeMobile }}
+            {{ orderInfo.order.consigneeAddressPath }}
+            {{ orderInfo.order.consigneeDetail }}
+          </div>
+        </div>
+        <div class="div-item">
+          <div class="div-item-left">支付方式：</div>
+          <div class="div-item-right">
+            {{ orderInfo.paymentMethodValue }}
+          </div>
+        </div>
+
+        <div class="div-item">
+          <div class="div-item-left">买家留言：</div>
+          <div class="div-item-right">{{ orderInfo.order.remark }}</div>
+        </div>
+
+      <div class="div-item">
+        <div class="div-item-left">配送方式：</div>
+        <div class="div-item-right">
+          {{
+              orderInfo.deliveryMethodValue
+                ? orderInfo.deliveryMethodValue
+                : "暂无配送方式"
+            }}
+        </div>
+      </div>
+    </div>
+  </Card>
+
+    <Card>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin-top: 5px; height: 80px; display: flex">
+            <div style="">
+              <img :src="row.image" style="height: 60px; margin-top: 1px; width: 60px" />
+            </div>
+
+            <div style="margin-left: 13px">
+              <div class="div-zoom">
+                <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <span v-for="(item, key) in JSON.parse(row.specs)" :key="key">
+                <span v-show="key!='images'" style="font-size: 12px;color: #999999;">
+                  {{key}} : {{item}}
+                </span>
+              </span>
+              <Poptip trigger="hover" style="display: block;" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
+        </template>
+      </Table>
+      <div class="goods-total">
+        <ul>
+          <li>
+            <span class="label">商品总额：</span>
+            <span class="txt">{{ orderInfo.order.priceDetailDTO.goodsPrice | unitPrice('￥')}}</span>
+          </li>
+          <li>
+            <span class="label">优惠金额：</span>
+            <span class="txt">
+              {{
+                orderInfo.order.priceDetailDTO.couponPrice +
+                orderInfo.order.priceDetailDTO.discountPrice
+              | unitPrice('￥')}}
+            </span>
+          </li>
+          <li>
+            <span class="label">运费：</span>
+            <span class="txt">{{ orderInfo.order.freightPrice | unitPrice('￥')}}</span>
+          </li>
+          <li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
+            <span class="label">使用积分：</span>
+            <span class="txt">{{
+              orderInfo.order.priceDetailDTO.payPoint
+            }}</span>
+          </li>
+
+          <li>
+            <span class="label">应付金额：</span>
+            <span class="txt flowPrice">¥{{ orderInfo.order.flowPrice | unitPrice }}</span>
+          </li>
+        </ul>
+      </div>
+    </Card>
     <Modal v-model="modal" width="530">
       <p slot="header">
         <Icon type="edit"></Icon>
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index fa3a2274..7b53d2c3 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -1,84 +1,78 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入订单编号"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="buyerName">
-                <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">
-                  <Option value="UNPAID">未付款</Option>
-                  <Option value="PAID">已付款</Option>
-                  <Option value="UNDELIVERED">待发货</Option>
-                  <Option value="DELIVERED">已发货</Option>
-                  <Option value="COMPLETED">已完成</Option>
-                  <Option value="TAKE">待核验</Option>
-                  <Option value="CANCELLED">已取消</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="下单时间">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入订单编号"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="buyerName">
+            <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">
+              <Option value="UNPAID">未付款</Option>
+              <Option value="PAID">已付款</Option>
+              <Option value="UNDELIVERED">待发货</Option>
+              <Option value="DELIVERED">已发货</Option>
+              <Option value="COMPLETED">已完成</Option>
+              <Option value="TAKE">待核验</Option>
+              <Option value="CANCELLED">已取消</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="下单时间">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 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>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue
index 6a4c67a1..d03ff3eb 100644
--- a/seller/src/views/order/receiptManager/receipt.vue
+++ b/seller/src/views/order/receiptManager/receipt.vue
@@ -1,88 +1,82 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入订单编号"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="发票抬头" prop="receiptTitle">
-                <Input
-                  type="text"
-                  v-model="searchForm.receiptTitle"
-                  clearable
-                  placeholder="请输入发票抬头"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="状态" prop="receiptStatus">
-                <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="0">未开票</Option>
-                  <Option value="1">已开票</Option>
-                </Select>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <!-- 订单详情格式化 -->
-              <template slot="orderSlot" slot-scope="scope">
-                <a
-                  @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入订单编号"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="发票抬头" prop="receiptTitle">
+            <Input
+              type="text"
+              v-model="searchForm.receiptTitle"
+              clearable
+              placeholder="请输入发票抬头"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="状态" prop="receiptStatus">
+            <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
+              <Option value="0">未开票</Option>
+              <Option value="1">已开票</Option>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <!-- 订单详情格式化 -->
+        <template slot="orderSlot" slot-scope="scope">
+          <a
+            @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 17de56cc..5bdde01e 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -55,36 +55,34 @@
         <Button @click="delAll" class="ml_10">批量下架</Button>
         <!-- <Button @click="upAll">批量上架</Button> -->
       </Row>
-      <Row class="padding-row">
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        >
-          <template slot-scope="{ row }" slot="action">
-            <Button
-              v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
-              type="info"
-              size="small"
-              style="margin-right: 10px"
-              @click="edit(row)"
-              >编辑</Button
-            >
-            <Button
-              v-if="row.promotionStatus !== 'CLOSE'"
-              type="error"
-              size="small"
-              @click="remove(row)"
-              >下架</Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
+            type="info"
+            size="small"
+            style="margin-right: 10px"
+            @click="edit(row)"
+            >编辑</Button
+          >
+          <Button
+            v-if="row.promotionStatus !== 'CLOSE'"
+            type="error"
+            size="small"
+            @click="remove(row)"
+            >下架</Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
@@ -223,7 +221,7 @@ export default {
         {
           title: "状态",
           key: "promotionStatus",
-          minWidth: 100,
+          width: 100,
           fixed: "right",
           render: (h, params) => {
             let text = "未知",
@@ -250,9 +248,9 @@ export default {
                   },
                 },
                 text
-              ),
+              )
             ]);
-          },
+          }
         },
         {
           title: "操作",
@@ -430,7 +428,7 @@ export default {
   },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 @import "@/styles/table-common.scss";
 .search-form {
   width: 100% !important;
diff --git a/seller/src/views/promotion/coupon/couponPublish.vue b/seller/src/views/promotion/coupon/couponPublish.vue
index 9d3d5cb9..e9daf0da 100644
--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@@ -114,9 +114,8 @@
               v-if="form.scopeType == 'PORTION_GOODS'"
             >
               <div style="display: flex; margin-bottom: 10px">
-                <Button type="primary" @click="$refs.skuSelect.open('goods')"
-                  >选择商品</Button
-                >
+                <Button type="primary" @click="openSkuList"
+                  >选择商品</Button>
                 <Button
                   type="error"
                   ghost
@@ -466,6 +465,14 @@ export default {
         name: "coupon",
       });
     },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
+    },
     changeSelect(e) {
       // 已选商品批量选择
       this.selectedGoods = e;
@@ -497,15 +504,9 @@ export default {
       this.form.promotionGoodsList.splice(index, 1);
     },
     selectedGoodsData(item) {
-      console.log(item);
       // 回显已选商品
-      let ids = [];
       let list = [];
-      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
           list.push({
             goodsName: e.goodsName,
             price: e.price,
@@ -515,9 +516,8 @@ export default {
             sellerName: e.sellerName,
             skuId: e.id,
           });
-        }
       });
-      this.form.promotionGoodsList.push(...list);
+      this.form.promotionGoodsList = list;
     },
     getGoodsCategory(e) {
       // 获取级联选择器商品分类id
diff --git a/seller/src/views/promotion/fullCut/fullCut.vue b/seller/src/views/promotion/fullCut/fullCut.vue
index 3a18d8f7..bfd2a8fa 100644
--- a/seller/src/views/promotion/fullCut/fullCut.vue
+++ b/seller/src/views/promotion/fullCut/fullCut.vue
@@ -47,50 +47,48 @@
       <Row class="operation">
         <Button type="primary" @click="newAct">新增</Button>
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-        >
-          <template slot-scope="{ row }" slot="applyEndTime">
-            {{ unixDate(row.applyEndTime) }}
-          </template>
-          <template slot-scope="{ row }" slot="promotionType">
-            {{ row.isFullMinus ? "满减" : "满折" }}
-          </template>
-          <template slot-scope="{ row }" slot="hours">
-            <Tag v-for="item in unixHours(row.hours)" :key="item">{{
-              item
-            }}</Tag>
-          </template>
-          <template slot-scope="{ row }" slot="action">
-            <div>
-              <Button
-                type="primary"
-                v-if="row.promotionStatus == 'NEW'"
-                size="small"
-                @click="edit(row)"
-                >编辑</Button
-              >&nbsp;
-              <Button type="success" v-else size="small" @click="edit(row)"
-                >查看</Button
-              >&nbsp;
-              <Button
-                type="error"
-                :disabled="row.promotionStatus == 'START'"
-                ghost
-                size="small"
-                @click="del(row)"
-                >删除</Button
-              >
-            </div>
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+      >
+        <template slot-scope="{ row }" slot="applyEndTime">
+          {{ unixDate(row.applyEndTime) }}
+        </template>
+        <template slot-scope="{ row }" slot="promotionType">
+          {{ row.isFullMinus ? "满减" : "满折" }}
+        </template>
+        <template slot-scope="{ row }" slot="hours">
+          <Tag v-for="item in unixHours(row.hours)" :key="item">{{
+            item
+          }}</Tag>
+        </template>
+        <template slot-scope="{ row }" slot="action">
+          <div>
+            <Button
+              type="primary"
+              v-if="row.promotionStatus == 'NEW'"
+              size="small"
+              @click="edit(row)"
+              >编辑</Button
+            >&nbsp;
+            <Button type="success" v-else size="small" @click="edit(row)"
+              >查看</Button
+            >&nbsp;
+            <Button
+              type="error"
+              :disabled="row.promotionStatus == 'START'"
+              ghost
+              size="small"
+              @click="del(row)"
+              >删除</Button
+            >
+          </div>
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page operation">
         <Page
           :current="searchForm.pageNumber + 1"
@@ -140,12 +138,12 @@ export default {
         {
           title: "活动类型",
           slot: "promotionType",
-          minWidth: 60,
+          width: 100,
         },
         {
           title: "活动状态",
           key: "promotionStatus",
-          minWidth: 60,
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "default";
diff --git a/seller/src/views/promotion/fullCut/newFullCut.vue b/seller/src/views/promotion/fullCut/newFullCut.vue
index 6dee1a8f..9f44bb6d 100644
--- a/seller/src/views/promotion/fullCut/newFullCut.vue
+++ b/seller/src/views/promotion/fullCut/newFullCut.vue
@@ -183,7 +183,7 @@
                 style="display: flex; margin-bottom: 10px"
                 v-if="form.promotionStatus == 'NEW'"
               >
-                <Button type="primary" @click="$refs.skuSelect.open('goods')"
+                <Button type="primary" @click="openSkuList"
                   >选择商品</Button
                 >
                 <Button
@@ -376,6 +376,14 @@ export default {
       );
       this.$router.go(-1);
     },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
+    },
     getDetail() {
       // 获取活动详情
       getFullDiscountById(this.id).then((res) => {
@@ -496,28 +504,20 @@ export default {
       this.form.promotionGoodsList.splice(index, 1);
     },
     selectedGoodsData(item) {
-      console.log(item);
       // 回显已选商品
-      let ids = [];
       let list = [];
-      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
-          list.push({
-            goodsName: e.goodsName,
-            price: e.price,
-            quantity: e.quantity,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            thumbnail: e.thumbnail,
-            skuId: e.id,
-          });
-        }
+        list.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          quantity: e.quantity,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          thumbnail: e.thumbnail,
+          skuId: e.id,
+        });
       });
-      console.log(list);
-      this.form.promotionGoodsList.push(...list);
+      this.form.promotionGoodsList = list;
     },
     getCouponList(query) {
       // 优惠券列表
diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue
new file mode 100644
index 00000000..a345e731
--- /dev/null
+++ b/seller/src/views/promotion/live/addLive.vue
@@ -0,0 +1,297 @@
+<template>
+  <div>
+    <Card>
+      <Alert type="warning">
+        创建直播
+        <template slot="desc">
+          为了方便在创建直播间时从选择商品，请尽量提前提审直播商品
+        </template>
+      </Alert>
+
+      <Form :model="liveForm" ref="liveForm" :rules="liveRulesForm" :label-width="120">
+        <FormItem label="直播标题" prop="name">
+          <Input v-model="liveForm.name" style="width:460px"></Input>
+          <div class="tips">直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符</div>
+        </FormItem>
+        <FormItem label="主播昵称" prop="anchorName">
+          <Input v-model="liveForm.anchorName" style="width:360px"></Input>
+          <div class="tips">主播昵称，最短2个汉字，最长15个汉字，1个汉字相当于2个字符</div>
+        </FormItem>
+        <FormItem label="直播时间" prop="startTime">
+
+          <DatePicker format="yyyy-MM-dd HH:mm" type="datetimerange" @on-change="handleChangeTime" :options="optionsTime" placeholder="直播计划开始时间-直播计划结束时间" style="width: 300px"></DatePicker>
+          <div class="tips">直播开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后</div>
+        </FormItem>
+
+        <FormItem label="主播微信号" prop="anchorWechat">
+          <Input v-model="liveForm.anchorWechat" style="width:360px" placeholder="主播微信号"></Input>
+          <div class="tips">主播微信号，如果未实名认证，需要先前往“小程序直播”小程序进行<a target="_black" href="https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh">实名验证</a></div>
+        </FormItem>
+
+        <!-- 分享卡片 -->
+        <FormItem label="分享卡片封面" prop="feedsImg">
+          <div class="upload-list" v-if="liveForm.feedsImg">
+            <template>
+              <img :src="liveForm.feedsImg">
+              <div class="upload-list-cover">
+                <Icon type="ios-eye-outline" @click.native="handleView(item.name)"></Icon>
+                <Icon type="ios-trash-outline" @click.native="handleRemove(item)"></Icon>
+              </div>
+            </template>
+
+          </div>
+          <Upload v-if="liveForm.feedsImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleFeedsImgSuccess" :default-file-list="defaultImgList" :format="['jpg','jpeg','png']"
+            :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag" :action="action" :headers="accessToken"
+            style="display: inline-block;width:58px;">
+            <div style="width: 58px;height:58px;line-height: 58px;">
+              <Icon type="ios-camera" size="20"></Icon>
+            </div>
+          </Upload>
+          <div class="tips">
+            直播间分享图，图片规则：建议像素800*640，大小不超过1M；
+          </div>
+        </FormItem>
+
+        <!-- 直播间背景墙 -->
+        <FormItem label="直播间背景墙" prop="coverImg">
+
+          <div class="upload-list" v-if="liveForm.coverImg">
+            <template>
+              <img :src="liveForm.coverImg">
+              <div class="upload-list-cover">
+                <Icon type="ios-eye-outline" @click.native="handleView(item)"></Icon>
+                <Icon type="ios-trash-outline" @click.native="handleRemove(item,'coverImg')"></Icon>
+              </div>
+            </template>
+          </div>
+          <Upload v-if="liveForm.coverImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleCoverImgSuccess" :default-file-list="defaultImgList" :format="['jpg','jpeg','png']"
+            :on-format-error="handleFormatError" :max-size="2048" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag" :action="action" :headers="accessToken"
+            style="display: inline-block;width:58px;">
+            <div style="width: 58px;height:58px;line-height: 58px;">
+              <Icon type="ios-camera" size="20"></Icon>
+            </div>
+          </Upload>
+          <div class="tips"> 直播间背景图，图片规则：建议像素1080*1920，大小不超过2M</div>
+        </FormItem>
+        <FormItem label="商品" >
+          <Button type="primary" ghost icon="md-add">添加商品</Button>
+          <Table class="goods-table" :columns="liveColumns" :data="liveData"></Table>
+        </FormItem>
+
+        <FormItem>
+          <Button type="primary" @click="createLives()">保存</Button>
+          <Button style="margin-left: 8px">取消</Button>
+        </FormItem>
+      </Form>
+    </Card>
+    <!-- 浏览图片 -->
+    <Modal title="查看图片" v-model="imageVisible">
+      <img :src="imageSrc" v-if="imageVisible" style="width: 100%">
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from "@/api/index";
+import { getLiveGoods } from "@/api/promotion";
+export default {
+  data() {
+    return {
+      imageVisible: false, //查看图片的dailog
+      imageSrc: "", //查看图片的路径
+      action: uploadFile, // 上传地址
+      accessToken: {}, // 验证token
+      // 不能选择今天以前的时间
+      optionsTime: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+      // 直播间数据上传规则
+      liveRulesForm: {
+        name: [
+          { required: true, message: "请输入直播标题", trigger: "blur" },
+          { max: 17, min: 3, message: "直播间名字最短3个汉字，最长17个汉字" },
+        ],
+        anchorName: [
+          { required: true, message: "请输入主播昵称", trigger: "blur" },
+          { max: 15, min: 2, message: "主播昵称最短2个汉字，最长15个汉字" },
+        ],
+        anchorWechat: [
+          { required: true, message: "请输入主播微信号", trigger: "blur" },
+        ],
+        startTime: [
+          {
+            required: true,
+            message: "请输入开始时间以及结束时间",
+            trigger: "blur",
+          },
+        ],
+        feedsImg: [
+          { required: true, message: "分享卡片封面不能为空", trigger: "blur" },
+        ],
+        coverImg: [
+          { required: true, message: "直播间背景墙不能为空", trigger: "blur" },
+        ],
+      },
+      liveForm: {
+        feedsImg: "", //分享卡片封面
+        coverImg: "", //直播间背景墙
+      },
+      // 直播商品表格表头
+      liveColumns: [
+        {
+          title: "商品",
+        },
+        {
+          title: "价格",
+        },
+        {
+          title: "库存",
+        },
+        {
+          title: "链接",
+        },
+        {
+          title: "操作",
+        },
+      ],
+      liveData: [], //直播商品集合
+    };
+  },
+  mounted() {
+    this.accessToken = {
+      accessToken: this.getStore("accessToken"),
+    };
+  },
+  methods: {
+    /**
+     * 上传图片查看图片
+     */
+    handleView(src) {
+      this.imageVisible = true;
+      this.imageSrc = src;
+    },
+
+    /**
+     * 删除上传的图片
+     */
+    handleRemove(val, type) {
+      if (type == "coverImg") {
+        this.liveForm.coverImg = "";
+      } else {
+        this.liveForm.feedsImg = "";
+      }
+    },
+    /**
+     * 直播间背景图上传成功回调
+     */
+    handleCoverImgSuccess(res) {
+      this.liveForm.coverImg = res.result;
+    },
+
+    /**
+     * 分享卡片封面上传成功回调
+     */
+    handleFeedsImgSuccess(res) {
+      this.liveForm.feedsImg = res.result;
+    },
+
+    /**
+     * 直播间背景图
+     */
+    handleCoverImgSuccess(res) {
+      this.liveForm.coverImg.push(res.result);
+    },
+
+    /**
+     * 选择时间后的回调
+     */
+    handleChangeTime(daterange) {
+      this.liveForm.startTime = new Date(daterange[0]).getTime() / 1000;
+      this.liveForm.endTime = new Date(daterange[1]).getTime() / 1000;
+    },
+
+    /**
+     * 对图片错误进行回调
+     */
+    handleFormatError(file) {
+      this.$Notice.warning({
+        title: "请上传正确的图片格式！",
+        desc: file.name + " 格式不为 jpg or png.",
+      });
+    },
+
+    /**
+     * 对图片的大小进行处理回调
+     */
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "图片超过限制大小！",
+        desc: file.name + "图片超过规定限制大小，请重新上传",
+      });
+    },
+
+    /**
+     * 限制只能上传一张图片
+     */
+    handleBeforeUpload() {
+      const check = this.liveForm.feedsImg.length < 1;
+      if (!check) {
+        this.$Notice.warning({
+          title: "最多上传一张图片",
+        });
+      }
+      return check;
+    },
+    createLives() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.tips {
+  color: #999;
+  font-size: 12px;
+}
+.goods-table {
+  width: 800px;
+  margin: 10px 0;
+}
+.upload-list {
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  margin-right: 4px;
+}
+.upload-list img {
+  width: 100%;
+  height: 100%;
+}
+.upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+.upload-list:hover .upload-list-cover {
+  display: block;
+}
+.upload-list-cover i {
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+</style>
diff --git a/seller/src/views/promotion/live/live.vue b/seller/src/views/promotion/live/live.vue
new file mode 100644
index 00000000..8360e046
--- /dev/null
+++ b/seller/src/views/promotion/live/live.vue
@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="100" class="search-form">
+        <Form-item label="优惠券名称">
+          <Input type="text" v-model="searchForm.couponName" placeholder="请输入优惠券名称" clearable style="width: 200px" />
+        </Form-item>
+        <Form-item label="活动状态" prop="promotionStatus">
+          <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
+            <Option value="NEW">未开始</Option>
+            <Option value="START">已开始/上架</Option>
+            <Option value="END">已结束/下架</Option>
+            <Option value="CLOSE">紧急关闭/作废</Option>
+          </Select>
+        </Form-item>
+        <Form-item label="活动时间">
+          <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px"></DatePicker>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
+      </Form>
+      <div class="btns">
+        <Button @click="createLive()" type="primary">创建直播</Button>
+      </div>
+      <Tabs>
+        <!-- 标签栏 -->
+        <TabPane v-for="(item,index) in tabs" :key="index" :label="item.title">
+          <Table :columns="liveColumns" :data="liveData"></Table>
+          <Row type="flex" justify="end" class="page">
+            <Page :current="searchForm.pageNumber + 1" :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>
+        </TabPane>
+
+      </Tabs>
+
+    </Card>
+  </div>
+</template>
+
+<script>
+import { getLivesList } from "@/api/promotion.js";
+export default {
+  data() {
+    return {
+      // 查询数据的总数
+      total: "",
+      // 查询的form
+      searchForm: {
+        pageSize: 10,
+        pageNumber: 1,
+      },
+      // 直播tab选项栏
+      tabs: [
+        {
+          title: "全部",
+        },
+        {
+          title: "直播中",
+        },
+        {
+          title: "未开始",
+        },
+        {
+          title: "已结束",
+        },
+      ],
+      liveColumns: [
+        {
+          title: "直播标题",
+          key: "a",
+        },
+        {
+          title: "直播时间",
+          key: "a",
+        },
+        {
+          title: "主播昵称",
+          key: "a",
+        },
+        {
+          title: "直播状态",
+          key: "a",
+        },
+        {
+          title: "操作",
+          key: "a",
+        },
+      ], //table中显示的title
+      liveData: [], //table中显示的直播数据
+    };
+  },
+  mounted() {
+    this.getStoreLives();
+  },
+  methods: {
+    /**
+     * 获取店铺直播间列表
+     */
+    async getStoreLives() {
+      let result = await getLivesList();
+      if (result.success) {
+        this.liveData = result.records;
+      }
+    },
+
+    /**
+     * 获取
+     */
+
+    /**
+     * 创建直播
+     */
+    createLive(){
+      this.$router.push({path:'/add-live'})
+    },
+
+    /**
+     * 点击分页数据回调
+     */
+    changePageSize() {},
+    /**
+     * 点击分页回调
+     */
+    changePage() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/table-common.scss";
+.btns{
+  margin-top: 10px;
+}
+</style>
diff --git a/seller/src/views/promotion/live/liveGoods.vue b/seller/src/views/promotion/live/liveGoods.vue
new file mode 100644
index 00000000..62c7780f
--- /dev/null
+++ b/seller/src/views/promotion/live/liveGoods.vue
@@ -0,0 +1,209 @@
+<template>
+  <div class="wrapper">
+    <Card>
+      <Alert banner type="warning">
+
+        <template slot="desc">
+          由于直播商品需经过小程序直播平台的审核，你需要在此先提审商品，为了不影响直播间选取商品，请提前1天提审商品；
+          每次最多可提审20款商品，每个店铺最多可维护200款商品，每款SPU只需选择其中一款SKU即可；
+        </template>
+
+      </Alert>
+
+      <div>
+        <Tabs :value="params.auditStatus">
+          <TabPane v-for="(item,index) in liveTabWay" :key="index" :label="item.label" :name="item.type">
+
+          </TabPane>
+
+        </Tabs>
+      </div>
+
+      <Button type="primary" style="margin-bottom:10px;" @click="addNewLiveGoods" icon="md-add">选择商品</Button>
+
+      <Table disabled-hover :columns="liveGoodsColumns" :data="liveGoodsData">
+        <template slot-scope="{ row }" slot="goodsName">
+          <div class="flex-goods">
+            <img class="thumbnail" :src="row.thumbnail">
+            {{ row.goodsName }}
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="price">
+          <RadioGroup v-model="row.priceType">
+            <div class="price-item">
+              <Radio label="1">一口价:</Radio> <Input v-if="row.priceType == '1'" style="width:100px" v-model="row.price"></Input>
+            </div>
+            <div class="price-item">
+              <Radio label="2">区间价:</Radio> <span v-if="row.priceType == '2'"><Input style="width:100px" v-model="row.price" />至<Input style="width:100px" v-model="row.price2" /></span>
+            </div>
+            <div class="price-item">
+              <Radio label="3">折扣价:</Radio> <span v-if="row.priceType == '3'">现价<Input style="width:100px" v-model="row.price"></Input>原价<Input style="width:100px" v-model="row.price2" /></span>
+            </div>
+          </RadioGroup>
+        </template>
+
+        <template slot-scope="{ row,index }" slot="action">
+          <Button type="primary" @click="()=>{liveGoodsData.splice(index,1)}">删除</Button>
+        </template>
+      </Table>
+    </Card>
+    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
+    <div class="submit">
+      <Button type="primary" @click="saveLiveGoods">保存商品</Button>
+    </div>
+  </div>
+</template>
+
+<script>
+import skuSelect from "@/views/lili-dialog"; //选择商品组件
+import { addLiveGoods } from "@/api/promotion.js";
+export default {
+  components: {
+    skuSelect,
+  },
+  data() {
+    return {
+      params: {
+        pageNumber: 1,
+        pageSize: 10,
+        auditStatus: 0,
+      },
+      // 商品审核状态
+      liveTabWay: [
+        {
+          label: "待提审",
+          type: 0,
+        },
+        {
+          label: "审核中",
+          type: 1,
+        },
+        {
+          label: "已审核",
+          type: 2,
+        },
+        {
+          label: "审核未通过",
+          type: 3,
+        },
+      ],
+
+      // 商品表格columns
+      liveGoodsColumns: [
+        {
+          title: "商品",
+          slot: "goodsName",
+        },
+        {
+          title: "价格",
+          slot: "price",
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          width: 100,
+        },
+
+        {
+          title: "操作",
+          slot: "action",
+          width: 100,
+        },
+      ],
+      // 表格商品详情
+      liveGoodsData: [],
+    };
+  },
+  methods: {
+    /**
+     * 保存直播商品
+     */
+    async saveLiveGoods() {
+      //  this.$Spin.show();
+      let submit = this.liveGoodsData.map((element) => {
+        return {
+          goodsId: element.goodsId, //商品id
+          goodsImage: element.small, //商品图片
+          name: element.goodsName, //商品昵称
+          price: parseInt(element.price), //商品价格
+          price2: element.price2 ? parseInt(element.price2) : "", //商品价格
+          priceType: element.priceType, // priceType  Number  是  价格类型，1：一口价（只需要传入price，price2不传） 2：价格区间（price字段为左边界，price2字段为右边界，price和price2必传） 3：显示折扣价（price字段为原价，price2字段为现价， price和price2必传）
+          skuId: element.id,
+          url: `/pages/product/goods?id=${element.id}&goodsId=${element.goodsId}`, //小程序地址
+        };
+      });
+
+      let result = await addLiveGoods(submit);
+      if (result.success) {
+        this.$Message.success({
+          content: `添加成功！`,
+        });
+      }
+    },
+
+    /**
+     * 商品选择器回调的商品信息
+     */
+    selectedGoodsData(goods) {
+      goods.map((item) => {
+        return (item.priceType = "1");
+      });
+      this.liveTabWay.map((item,index)=>{
+        return item.type  == 99 && this.liveTabWay.splice(index,1)
+      })
+
+      this.liveGoodsData.push(...goods);
+    },
+
+    /**
+     * 新增商品
+     */
+    addNewLiveGoods() {
+      this.liveTabWay.push({
+        type:99,
+        label:"新增商品"
+      })
+      this.params.auditStatus = 99
+      this.$refs.skuSelect.open("goods");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.wrapper {
+  position: relative;
+}
+.thumbnail {
+  width: 100px;
+  height: 100px;
+  border-radius: 0.4em;
+}
+.flex-goods {
+  margin: 10px;
+  display: flex;
+
+  align-items: center;
+  > img {
+    margin-right: 10px;
+  }
+}
+.price-item {
+  margin: 15px 5px;
+  > * {
+    margin: 5px;
+  }
+}
+.submit {
+  box-shadow: 3px 5px 12px rgba(0, 0, 0, 0.1);
+  height: 60px;
+  background: #fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>
diff --git a/seller/src/views/promotion/pintuan/pintuan.vue b/seller/src/views/promotion/pintuan/pintuan.vue
index be4159a3..9270a0c6 100644
--- a/seller/src/views/promotion/pintuan/pintuan.vue
+++ b/seller/src/views/promotion/pintuan/pintuan.vue
@@ -1,9 +1,5 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      </Col>
-    </Row>
     <Card>
       <Row>
         <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@@ -45,66 +41,64 @@
       <Row class="operation padding-row">
         <Button @click="newAct" type="primary">添加</Button>
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        >
-          <template slot-scope="{ row }" slot="action">
-            <Button
-              type="primary"
-              size="small"
-              v-if="row.promotionStatus == 'NEW'"
-              @click="edit(row)"
-              >编辑</Button
-            >&nbsp;
-            <Button
-              type="info"
-              v-if="row.promotionStatus == 'NEW'"
-              size="small"
-              @click="manage(row, 'manager')"
-              >管理</Button
-            >&nbsp;
-            <Button
-              type="info"
-              v-if="row.promotionStatus !== 'NEW'"
-              size="small"
-              @click="manage(row, 'view')"
-              >查看</Button
-            >&nbsp;
-            <Button
-              type="error"
-              size="small"
-              v-if="row.promotionStatus != 'START'"
-              ghost
-              @click="remove(row)"
-              >删除</Button
-            >&nbsp;
-            <Button
-              type="success"
-              v-if="
-                row.promotionStatus == 'NEW' || row.promotionStatus == 'CLOSE'
-              "
-              size="small"
-              @click="open(row)"
-              >开启</Button
-            >
-            <Button
-              type="warning"
-              v-if="row.promotionStatus == 'START'"
-              size="small"
-              @click="close(row)"
-              >关闭</Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            type="primary"
+            size="small"
+            v-if="row.promotionStatus == 'NEW'"
+            @click="edit(row)"
+            >编辑</Button
+          >&nbsp;
+          <Button
+            type="info"
+            v-if="row.promotionStatus == 'NEW'"
+            size="small"
+            @click="manage(row, 'manager')"
+            >管理</Button
+          >&nbsp;
+          <Button
+            type="info"
+            v-if="row.promotionStatus !== 'NEW'"
+            size="small"
+            @click="manage(row, 'view')"
+            >查看</Button
+          >&nbsp;
+          <Button
+            type="error"
+            size="small"
+            v-if="row.promotionStatus != 'START'"
+            ghost
+            @click="remove(row)"
+            >删除</Button
+          >&nbsp;
+          <Button
+            type="success"
+            v-if="
+              row.promotionStatus == 'NEW' || row.promotionStatus == 'CLOSE'
+            "
+            size="small"
+            @click="open(row)"
+            >开启</Button
+          >
+          <Button
+            type="warning"
+            v-if="row.promotionStatus == 'START'"
+            size="small"
+            @click="close(row)"
+            >关闭</Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
@@ -155,17 +149,15 @@ export default {
         {
           title: "活动开始时间",
           key: "startTime",
-          minWidth: 120
         },
         {
           title: "活动结束时间",
           key: "endTime",
-          minWidth: 120
         },
         {
           title: "状态",
           key: "promotionStatus",
-          minWidth: 100,
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "default";
diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue
index b523b5f8..d6d6550d 100644
--- a/seller/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue
@@ -16,16 +16,14 @@
         </Alert>
       </Row>
       <h3 class="act-goods">活动商品</h3>
-      <Row class="operation">
-        <Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-          <template slot-scope="{ row, index }" slot="price">
-            <Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
-          </template>
-          <template slot-scope="{ index }" slot="action">
-            <Button type="error" size="small" ghost v-if="status === 'manager'" @click="delGoods(index)">删除</Button>
-          </template>
-        </Table>
-      </Row>
+      <Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        <template slot-scope="{ row, index }" slot="price">
+          <Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
+        </template>
+        <template slot-scope="{ index }" slot="action">
+          <Button type="error" size="small" ghost v-if="status === 'manager'" @click="delGoods(index)">删除</Button>
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page operation">
         <Page :current="searchForm.pageNumber + 1" :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>
@@ -36,7 +34,7 @@
       </Row>
     </Card>
 
-    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
+    <sku-select ref="skuSelect" :goodsData="goodsData" @selectedGoodsData="selectedGoodsData"></sku-select>
   </div>
 </template>
 <script>
@@ -65,7 +63,7 @@ export default {
       data: [], // 表单数据
       total: 0, // 表单数据总数
       status: this.$route.query.status, // 查看还是修改
-      columns: [
+      columns: [ // 活动详情表头
         {
           title: "活动名称",
           key: "promotionName",
@@ -111,7 +109,7 @@ export default {
           },
         },
       ],
-      goodsColumns: [
+      goodsColumns: [ // 活动商品表头
         { type: "selection", width: 60, align: "center" },
         {
           title: "商品名称",
@@ -202,7 +200,6 @@ export default {
 
     handleReset() {
       // 重置
-      // this.$refs.searchForm.resetFields();
       this.searchForm.pageNumber = 0;
       this.searchForm.promotionName = "";
       this.selectDate = null;
@@ -211,7 +208,7 @@ export default {
       this.getDataList();
     },
 
-    clearSelectAll() {
+    clearSelectAll() { // 清空所有已选项
       this.$refs.table.selectAll(false);
     },
     changeSelect(e) {
@@ -220,7 +217,7 @@ export default {
       this.selectCount = e.length;
     },
 
-    getDataList() {
+    getDataList() { // 获取商品列表
       this.loading = true;
       this.searchForm.pintuanId = this.$route.query.id;
 
@@ -233,14 +230,12 @@ export default {
       });
     },
 
-    getPintuanMsg() {
-      // 获取拼团详情
+    getPintuanMsg() { // 获取拼团详情
       getPintuanDetail(this.$route.query.id).then((res) => {
         if (res.success) this.data.push(res.result);
       });
     },
-    delGoods(index) {
-      // 删除商品
+    delGoods(index) { // 删除商品
       this.goodsData.splice(index, 1);
     },
     delAll() { // 批量删除商品
@@ -263,13 +258,9 @@ export default {
       });
     },
     selectedGoodsData(item) { // 选择商品
-      let ids = [];
+      console.log(item);
       let list = [];
-      this.goodsData.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
           list.push({
             goodsName: e.goodsName,
             price: e.price,
@@ -281,15 +272,19 @@ export default {
             skuId: e.id,
             categoryPath: e.categoryPath,
           });
-        }
       });
-      this.goodsData.push(...list);
+      this.goodsData = list;
     },
     openSkuList() { // 显示商品选择器
       this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.goodsData))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
     },
   },
-  mounted() {
+  mounted () {
     this.init();
   },
 };
diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue
index 49d4ced7..7b1ae4a7 100644
--- a/seller/src/views/promotion/seckill/seckill.vue
+++ b/seller/src/views/promotion/seckill/seckill.vue
@@ -45,41 +45,39 @@
         </Form>
       </Row>
 
-      <Row class="padding-row">
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-        >
-          <template slot-scope="{ row }" slot="applyEndTime">
-            {{ unixDate(row.applyEndTime) }}
-          </template>
-          <template slot-scope="{ row }" slot="hours">
-            <Tag v-for="item in unixHours(row.hours)" :key="item">{{
-              item
-            }}</Tag>
-          </template>
-          <template slot-scope="{ row }" slot="action">
-            <Button
-              v-if="row.promotionStatus === 'NEW'"
-              type="primary"
-              size="small"
-              @click="manage(row)"
-              >管理</Button
-            >
-            <Button
-              v-else
-              type="info"
-              size="small"
-              @click="manage(row)"
-              >查看</Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+      >
+        <template slot-scope="{ row }" slot="applyEndTime">
+          {{ unixDate(row.applyEndTime) }}
+        </template>
+        <template slot-scope="{ row }" slot="hours">
+          <Tag v-for="item in unixHours(row.hours)" :key="item">{{
+            item
+          }}</Tag>
+        </template>
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            v-if="row.promotionStatus === 'NEW'"
+            type="primary"
+            size="small"
+            @click="manage(row)"
+            >管理</Button
+          >
+          <Button
+            v-else
+            type="info"
+            size="small"
+            @click="manage(row)"
+            >查看</Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
@@ -134,6 +132,7 @@ export default {
         {
           title: "状态",
           key: "promotionStatus",
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "default";
diff --git a/seller/src/views/promotion/seckill/seckillGoods.vue b/seller/src/views/promotion/seckill/seckillGoods.vue
index 074bc207..e20cda2b 100644
--- a/seller/src/views/promotion/seckill/seckillGoods.vue
+++ b/seller/src/views/promotion/seckill/seckillGoods.vue
@@ -318,19 +318,19 @@ export default {
     },
     delGoods(index, id) {
       // 删除商品
-      if (id) {
-        removeSeckillGoods(this.$route.query.id, id).then((res) => {
-          if (res.success) {
-            this.goodsList[this.tabIndex].list.splice(index, 1);
-            this.$Message.success("删除成功！");
-          }
-        });
-      } else {
+      // if (id) {
+      //   removeSeckillGoods(this.$route.query.id, id).then((res) => {
+      //     if (res.success) {
+      //       this.goodsList[this.tabIndex].list.splice(index, 1);
+      //       this.$Message.success("删除成功！");
+      //     }
+      //   });
+      // } else {
         this.goodsList[this.tabIndex].list.splice(index, 1);
         this.$Message.success("删除成功！");
-      }
+      // }
     },
-    delAll() {
+    delAll() { // 删除当前时段全部数据
       if (this.selectCount <= 0) {
         this.$Message.warning("您还未选择要删除的数据");
         return;
@@ -350,43 +350,46 @@ export default {
           ].list.filter((item) => {
             return !ids.includes(item.id);
           });
-          removeSeckillGoods(this.$route.query.id, ids).then((res) => {
-            if (res.success) {
-              this.$Message.success("删除成功！");
-            }
-          });
+          // removeSeckillGoods(this.$route.query.id, ids).then((res) => {
+          //   if (res.success) {
+          //     this.$Message.success("删除成功！");
+          //   }
+          // });
         },
       });
     },
     selectedGoodsData(item) {
       // 选择器添加商品
-      let ids = [];
       let list = [];
-
-      this.goodsList[this.tabIndex].list.forEach((e) => {
-        ids.push(e.skuId);
-      });
+      console.log(item);
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
-          list.push({
-            goodsName: e.goodsName,
-            price: e.price,
-            originalPrice: e.price,
-            promotionApplyStatus: "",
-            quantity: e.quantity,
-            seckillId: this.$route.query.id,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            skuId: e.id,
-            timeLine: this.data[0].hours.split(",")[this.tabIndex],
-          });
-        }
+        list.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          originalPrice: e.price,
+          promotionApplyStatus: e.promotionApplyStatus || '',
+          quantity: e.quantity,
+          seckillId: this.$route.query.id,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          skuId: e.id,
+          timeLine: this.data[0].hours.split(",")[this.tabIndex],
+
+        });
       });
 
-      this.goodsList[this.tabIndex].list.push(...list);
+      this.goodsList[this.tabIndex].list = list;
+      this.$nextTick(()=> {
+        this.$forceUpdate()
+      })
     },
-    openSkuList() {
+    openSkuList() { // 显示商品选择器
       this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.goodsList[this.tabIndex].list))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
     },
     unixDate(time) {
       // 处理报名截止时间
diff --git a/seller/src/views/shop/bill/accountStatementBill.vue b/seller/src/views/shop/bill/accountStatementBill.vue
index 116a6c5c..e944f432 100644
--- a/seller/src/views/shop/bill/accountStatementBill.vue
+++ b/seller/src/views/shop/bill/accountStatementBill.vue
@@ -1,70 +1,64 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="开始时间" prop="startDay">
-                <DatePicker
-                  type="date"
-                  v-model="searchForm.startDate"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="请选择"
-                  clearable
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Form-item label="结束时间" prop="endDate">
-                <DatePicker
-                  type="date"
-                  v-model="searchForm.endDate"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  di
-                  placeholder="请选择"
-                  clearable
-                  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>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="开始时间" prop="startDay">
+            <DatePicker
+              type="date"
+              v-model="searchForm.startDate"
+              format="yyyy-MM-dd HH:mm:ss"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Form-item label="结束时间" prop="endDate">
+            <DatePicker
+              type="date"
+              v-model="searchForm.endDate"
+              format="yyyy-MM-dd HH:mm:ss"
+              di
+              placeholder="请选择"
+              clearable
+              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>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue
index d30a8a41..d513fb03 100644
--- a/seller/src/views/shop/bill/billDetail.vue
+++ b/seller/src/views/shop/bill/billDetail.vue
@@ -47,15 +47,13 @@
       <Tabs active-key="tab" @on-click="clickTabs">
         <Tab-pane label="订单列表" name="order">
           <Card>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="orderColumns"
-                :data="orderData"
-                ref="table"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="orderColumns"
+              :data="orderData"
+              ref="table"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="orderParam.pageNumber"
@@ -72,15 +70,13 @@
         </Tab-pane>
         <Tab-pane label="退单列表" name="refund">
           <Card>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="refundColumns"
-                :data="refundData"
-                ref="table"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="refundColumns"
+              :data="refundData"
+              ref="table"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="refundParam.pageNumber"
@@ -97,15 +93,13 @@
         </Tab-pane>
         <Tab-pane label="分销费用列表" name="distribution">
           <Card>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="distributionColumns"
-                :data="distributionData"
-                ref="table"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="distributionColumns"
+              :data="distributionData"
+              ref="table"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="distributionParam.pageNumber"
diff --git a/seller/src/views/shop/bill/storeBill.vue b/seller/src/views/shop/bill/storeBill.vue
index d0a73b27..1797db66 100644
--- a/seller/src/views/shop/bill/storeBill.vue
+++ b/seller/src/views/shop/bill/storeBill.vue
@@ -43,18 +43,16 @@
               <Button @click="handleReset" class="search-btn">重置</Button>
             </Form>
           </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
+          <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"
diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue
index 17453748..94fe169e 100644
--- a/seller/src/views/shop/ship/logistics.vue
+++ b/seller/src/views/shop/ship/logistics.vue
@@ -1,25 +1,17 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-
-        </Card>
-      </Col>
-    </Row>
-
+    <Card>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        ></Table>
+    </Card>
   </div>
 </template>
 
diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue
index e86405e8..813c4664 100644
--- a/seller/src/views/shop/ship/shipTemplate.vue
+++ b/seller/src/views/shop/ship/shipTemplate.vue
@@ -1,47 +1,41 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row>
-          <Button @click="refresh">刷新</Button>
-          <Button @click="add" type="primary">添加</Button>
-        </Row>
-        <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
-          <TabPane label="运费模板" name="INFO">
-            <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
-              <tbody>
-                <tr>
-                  <td class="sep-row" colspan="20"></td>
-                </tr>
-                <tr>
-                  <th colspan="20">
-                    <h3>{{item.name}}</h3>
-                    <span class="fr m-r-5">
-                      <time style="margin-right: 20px" title="最后编辑时间">
-                        <i class="icon-time"></i>{{item.updateTime}}
-                      </time>
-                      <Button @click="edit(item)" type="info">修改</Button>
-                      <Button @click="remove(item.id)" type="error">删除</Button>
-                    </span>
-                  </th>
-                </tr>
-                <tr>
-                  <td class="w10 bdl"></td>
-                  <td class="cell-area tl">运送到</td>
-                  <td class="w150">首件(重)
-
-                  </td>
-                  <td class="w150">运费</td>
-                  <td class="w150">续件(重)
-
-                  </td>
-                  <td class="w150 bdr">运费</td>
-                </tr>
-
-                <tr v-for="(children,index) in item.freightTemplateChildList">
+    <Card>
+      <Row>
+        <Button @click="refresh">刷新</Button>
+        <Button @click="add" type="primary">添加</Button>
+      </Row>
+      <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
+        <TabPane label="运费模板" name="INFO">
+          <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
+            <tbody>
+              <tr>
+                <td class="sep-row" colspan="20"></td>
+              </tr>
+              <tr>
+                <th colspan="20">
+                  <span class="temp-name">{{item.name}}</span>
+                  <span class="fr m-r-5">
+                    <time style="margin-right: 20px" title="最后编辑时间">
+                      <i class="icon-time"></i>{{item.updateTime}}
+                    </time>
+                    <Button @click="edit(item)" type="info">修改</Button>
+                    <Button @click="remove(item.id)" type="error">删除</Button>
+                  </span>
+                </th>
+              </tr>
+              <tr v-if="item.pricingMethod!=='FREE'">
+                <td class="w10 bdl"></td>
+                <td class="cell-area tl w150">运送到</td>
+                <td class="w150">首件(重)</td>
+                <td class="w150">运费</td>
+                <td class="w150">续件(重)</td>
+                <td class="w150 bdr">运费</td>
+              </tr>
+              <template v-if="item.pricingMethod!=='FREE'">
+                <tr v-for="(children,index) in item.freightTemplateChildList" :key="index">
                   <td class="bdl"></td>
-                  <td class="cell-area tl" style="width: 60%">{{children.area}}</td>
+                  <td class="cell-area tl w150" style="width: 60%;white-space:normal;">{{children.area}}</td>
                   <td>
                     {{children.firstCompany}}
                   </td>
@@ -55,103 +49,101 @@
                     <span class="yuan">￥</span><span class="integer">{{children.continuedPrice | unitPrice}}</span>
                   </td>
                 </tr>
-              </tbody>
-
-            </table>
-
-          </TabPane>
-          <TabPane v-if="csTab" :label=title :name=operation>
-            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-              <FormItem label="模板名称" prop="name">
-                <Input v-model="form.name" maxlength="10" clearable style="width: 20%" />
-              </FormItem>
-              <FormItem label="计价方式" prop="pricingMethod">
-                <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
-                  <Radio label="WEIGHT">按重量</Radio>
-                  <Radio label="NUM">按件数</Radio>
-                </RadioGroup>
-              </FormItem>
-              <FormItem label="详细设置">
-                <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
-                  <div class="entity">
-                    <div class="tbl-except">
-                      <table cellspacing="0" class="ncsc-default-table">
-                        <thead>
-                          <tr style="border-bottom: 1px solid #ddd;">
-                            <th class="w10"></th>
-                            <th class="tl">运送到</th>
-                            <th class="w10"></th>
-                            <th class="w50">首件(重)</th>
-                            <th class="w110">首费</th>
-                            <th class="w50">续件(重)</th>
-                            <th class="w110">续费</th>
-                            <th class="w150">操作</th>
-                          </tr>
-                        </thead>
-                        <tbody>
-                          <tr class="bd-line" data-group="n1" v-for="(item,index) in form.freightTemplateChildList">
-                            <td></td>
-                            <td class="tl cell-area">
-                              <span class="area-group">
-                                <p style="display:inline-block;white-space:pre;">{{item.area}}</p>
-                              </span>
-                            </td>
-                            <td></td>
-                            <td>
-                              <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable />
-                            </td>
-                            <td>
-                              <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable /><em class="add-on">
-                                元
-                              </em>
-                            </td>
-                            <td>
-                              <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6" clearable />
-                            </td>
-                            <td>
-                              <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6" clearable /><em class="add-on">
-                                元
-                              </em>
-                            </td>
-                            <td class="nscs-table-handle">
-                              <Button @click="editRegion(item,index)" type="info" size="small" style="margin-bottom: 5px">修改
-                              </Button>
-                              <Button @click="removeTemplateChildren(index)" :loading="submitLoading" type="error" size="small" style="margin-bottom: 5px">删除
-                              </Button>
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
+              </template>
+            </tbody>
+          </table>
+        </TabPane>
+        <TabPane v-if="csTab" :label="title" :name="operation">
+          <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+            <FormItem label="模板名称" prop="name">
+              <Input v-model="form.name" maxlength="10" clearable style="width: 20%" />
+            </FormItem>
+            <FormItem label="计价方式" prop="pricingMethod">
+              <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
+                <Radio label="WEIGHT">按重量</Radio>
+                <Radio label="NUM">按件数</Radio>
+                <Radio label="FREE">包邮</Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem label="详细设置" v-if="form.pricingMethod !== 'FREE'">
+              <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
+                <div class="entity">
+                  <div class="tbl-except">
+                    <table cellspacing="0" class="ncsc-default-table">
+                      <thead>
+                        <tr style="border-bottom: 1px solid #ddd;">
+                          <th class="w10"></th>
+                          <th class="tl">运送到</th>
+                          <th class="w10"></th>
+                          <th class="w50">首件(重)</th>
+                          <th class="w110">首费</th>
+                          <th class="w50">续件(重)</th>
+                          <th class="w110">续费</th>
+                          <th class="w150">操作</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr class="bd-line" data-group="n1" v-for="(item,index) in form.freightTemplateChildList" :key="index">
+                          <td></td>
+                          <td class="tl cell-area">
+                            <span class="area-group">
+                              <p style="display:inline-block">{{item.area}}</p>
+                            </span>
+                          </td>
+                          <td></td>
+                          <td>
+                            <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable />
+                          </td>
+                          <td>
+                            <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable >
+                              <span slot="append">元</span>
+                            </Input>
+                          </td>
+                          <td>
+                            <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6" clearable />
+                          </td>
+                          <td>
+                            <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6" clearable>
+                              <span slot="append">元</span>
+                            </Input>
+                          </td>
+                          <td class="nscs-table-handle">
+                            <Button @click="editRegion(item,index)" type="info" size="small" style="margin-bottom: 5px">修改
+                            </Button>
+                            <Button @click="removeTemplateChildren(index)" :loading="submitLoading" type="error" size="small" style="margin-bottom: 5px">删除
+                            </Button>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                  <div class="tbl-attach p-5">
+                    <div class="div-error" v-if="saveError">
+                      <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+                      <Icon type="ios-information-circle-outline" />
+                      指定地区城市为空或指定错误
+                      <Icon type="ios-information-circle-outline" />
+                      首费应输入正确的金额
+                      <Icon type="ios-information-circle-outline" />
+                      续费应输入正确的金额
+                      <Icon type="ios-information-circle-outline" />
+                      首(续)件(重)费应输入大于0的整数
                     </div>
-                    <div class="tbl-attach p-5">
-                      <div class="div-error" v-if="saveError">
-                        <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-                        <Icon type="ios-information-circle-outline" />
-                        指定地区城市为空或指定错误
-                        <Icon type="ios-information-circle-outline" />
-                        首费应输入正确的金额
-                        <Icon type="ios-information-circle-outline" />
-                        续费应输入正确的金额
-                        <Icon type="ios-information-circle-outline" />
-                        首(续)件(重)费应输入大于0的整数
-                      </div>
 
-                    </div>
                   </div>
                 </div>
-              </FormItem>
-              <Form-item>
-                <Button @click="addShipTemplateChildren(index)" :loading="submitLoading" icon="ios-create-outline" >为指定城市设置运费模板
-                </Button>
-                <Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">保存
-                </Button>
-              </Form-item>
-            </Form>
-          </TabPane>
-        </Tabs>
-      </Card>
-      </Col>
-    </Row>
+              </div>
+            </FormItem>
+            <Form-item>
+              <Button @click="addShipTemplateChildren(index)" v-if="form.pricingMethod !== 'FREE'" icon="ios-create-outline" >为指定城市设置运费模板
+              </Button>
+              <Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">保存
+              </Button>
+            </Form-item>
+          </Form>
+        </TabPane>
+      </Tabs>
+    </Card>
     <multiple-region ref="region" @selected="handleSelect" @closed="handleClose">
 
     </multiple-region>
@@ -312,35 +304,39 @@ export default {
         const regNumber = /^\+?[1-9][0-9]*$/;
         const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
         if (valid) {
-          //校验运费模板详细信息
-          for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
-            if (
-              this.form.freightTemplateChildList[i].area == "" ||
-              this.form.freightTemplateChildList[i].firstCompany == "" ||
-              this.form.freightTemplateChildList[i].firstPrice == "" ||
-              this.form.freightTemplateChildList[i].continuedCompany == "" ||
-              this.form.freightTemplateChildList[i].continuedPrice == ""
-            ) {
-              this.saveError = true;
-              return;
-            }
-            if (
-              regNumber.test(
-                this.form.freightTemplateChildList[i].firstCompany
-              ) == false ||
-              regNumber.test(
-                this.form.freightTemplateChildList[i].continuedCompany
-              ) == false ||
-              regMoney.test(this.form.freightTemplateChildList[i].firstPrice) ==
-                false ||
-              regMoney.test(
-                this.form.freightTemplateChildList[i].continuedPrice
-              ) == false
-            ) {
-              this.saveError = true;
-              return;
+          if (this.form.pricingMethod != 'FREE') {
+            //校验运费模板详细信息
+            for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
+              if (
+                this.form.freightTemplateChildList[i].area == "" ||
+                this.form.freightTemplateChildList[i].firstCompany == "" ||
+                this.form.freightTemplateChildList[i].firstPrice == "" ||
+                this.form.freightTemplateChildList[i].continuedCompany == "" ||
+                this.form.freightTemplateChildList[i].continuedPrice == ""
+              ) {
+                this.saveError = true;
+                return;
+              }
+              if (
+                regNumber.test(
+                  this.form.freightTemplateChildList[i].firstCompany
+                ) == false ||
+                regNumber.test(
+                  this.form.freightTemplateChildList[i].continuedCompany
+                ) == false ||
+                regMoney.test(this.form.freightTemplateChildList[i].firstPrice) ==
+                  false ||
+                regMoney.test(
+                  this.form.freightTemplateChildList[i].continuedPrice
+                ) == false
+              ) {
+                this.saveError = true;
+                return;
+              }
             }
           }
+          
+
           if (this.operation == "ADD") {
             API_Shop.addShipTemplate(this.form, headers).then((res) => {
               if (res.success) {
@@ -473,13 +469,12 @@ export default {
   border-left: 1px solid #e6e6e6;
 }
 
-.order tbody tr th h3 {
+.order tbody tr th .temp-name {
+  float: left;
   font-size: 14px;
-  line-height: 20px;
   color: #555;
-  vertical-align: middle;
-  display: inline-block;
-  margin: 0 10px;
+  // line-height: 44px;
+  margin: 7px 0 0 10px;
 }
 
 .m-r-5 {
@@ -541,7 +536,8 @@ textarea {
 }
 
 .w60 {
-  width: 80px !important;
+  width: 100px !important;
+  margin: 0 auto;
 }
 
 Input[type="text"],
@@ -555,18 +551,6 @@ Input.password {
   outline: 0 none;
 }
 
-.add-on {
-  line-height: 28px;
-  background-color: #f6f7fb;
-  vertical-align: top;
-  display: inline-block;
-  text-align: center;
-  width: 30px;
-  height: 30px;
-  border: solid #e6e9ee;
-  border-width: 1px 1px 1px 0;
-}
-
 ncsc-default-table {
   line-height: 20px;
   width: 100%;
diff --git a/seller/src/views/shop/shopAddress.vue b/seller/src/views/shop/shopAddress.vue
index 13cbe0f4..707a635c 100644
--- a/seller/src/views/shop/shopAddress.vue
+++ b/seller/src/views/shop/shopAddress.vue
@@ -7,17 +7,15 @@
           <Row class="operation">
             <Button @click="add" type="primary">添加</Button>
           </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-selection-change="changeSelect"
+          ></Table>
           <Row type="flex" justify="end" class="page">
             <Page
               :current="searchForm.pageNumber"
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index 64e96abb..ab431343 100644
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@@ -150,7 +150,6 @@
         </div>
         <div>
           <Table stripe :columns="columns" :data="data"></Table>
-
         </div>
         <Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="page" show-total show-elevator :total="total" />
 
diff --git a/seller/src/views/statistics/order/orderStatistics.vue b/seller/src/views/statistics/order/orderStatistics.vue
index 2330a69d..642bdb22 100644
--- a/seller/src/views/statistics/order/orderStatistics.vue
+++ b/seller/src/views/statistics/order/orderStatistics.vue
@@ -59,17 +59,14 @@
 
 
         <Card style="margin-top: 2px">
-          <Row>
-            <Table :loading="loading"
-                   border
-                   :columns="columns"
-                   :data="data" ref="table"
-                   sortable="custom"
-                   @on-sort-change="changeSort"
-                   @on-selection-change="changeSelect">
-
-            </Table>
-          </Row>
+          <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"