Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

2021-06-23 18:19:47 +08:00 · 2021-06-23 18:19:47 +08:00 · f8f205d0e8
commit f8f205d0e8
parent 4d7b4eb2b4 b7dd7f1c3b
18 changed files with 350 additions and 512 deletions
--- a/buyer/src/pages/forgetPassword.vue
+++ b/buyer/src/pages/forgetPassword.vue
@ -93,13 +93,13 @@
    </div>
    <div class="foot">
      <Row type="flex" justify="space-around" class="help">
-        <a class="item" href="https://lilishop.com" target="_blank">帮助</a>
-        <a class="item" href="https://lilishop.com" target="_blank">隐私</a>
-        <a class="item" href="https://lilishop.com" target="_blank">条款</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">帮助</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">隐私</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">条款</a>
      </Row>
      <Row type="flex" justify="center" class="copyright">
        Copyright © 2020 - Present
-        <a href="http://lili.cn" target="_blank" style="margin: 0 5px"
+        <a href="https://pickmall.cn/" target="_blank" style="margin: 0 5px"
          >lili-shop</a
        >
        版权所有
--- a/manager/src/views/distribution/distributionGoods.vue
+++ b/manager/src/views/distribution/distributionGoods.vue
@ -67,10 +67,12 @@ export default {
        {
          type: "selection",
          width: 60,
-          align: "center"
+          align: "center",
+          fixed: "left",
        },
        {
          title: "商品图片",
+          fixed: "left",
          key: "thumbnail",
          width: 120,
          align: "center",
--- a/manager/src/views/main-components/footer.vue
+++ b/manager/src/views/main-components/footer.vue
@ -8,7 +8,7 @@
    <Row type="flex" justify="center" class="copyright">
      Copyright © 2020 - Present
      <a
-        href="http://lili.cn"
+        href="https://pickmall.cn/"
        target="_blank"
        style="margin:0 5px;"
      >lili-shop</a> {{ $t('rights') }}
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@ -40,7 +40,7 @@
      </Row>
      <div>
        <download-excel class="export-excel-wrapper" :data="data" :fields="fields" name="商品订单.xls">
-          <Button type="primary" class="export">
+          <Button type="info" class="export">
            导出Excel
          </Button>
        </download-excel>
@ -72,10 +72,6 @@ export default {
        订单编号: "sn",
        下单时间: "createTime",
        客户名称: "memberName",
-        客户账号: "",
-        收货人: "",
-        收货人手机号: "",
-        收货人地址: "",
        支付方式: {
          field: "clientType",
          callback: (value) => {
@ -92,15 +88,7 @@ export default {
            }
          },
        },
-        配送方式: "",
-        配送费用: "",
-        订单商品金额: "",
-        订单优惠金额: "",
-        订单应付金额: "",
-        商品SKU编号: "",
        商品数量: "groupNum",
-        买家备注: "",
-        订单状态: "",
        付款状态: {
          field: "payStatus",
          callback: (value) => {
@ -111,9 +99,6 @@ export default {
              : "";
          },
        },
-        发货状态: "",
-        发票类型: "",
-        发票抬头: "",
        店铺: "storeName",
      },
      loading: true, // 表单加载状态
@ -222,56 +207,23 @@ export default {
          title: "下单时间",
          key: "createTime",
          width: 170,
-          sortable: true,
-          sortType: "desc",
        },
-
        {
          title: "操作",
          key: "action",
          align: "center",
          width: 150,
          render: (h, params) => {
-            return h("div", [
-              h(
-                "Button",
-
-                {
-                  props: {
-                    type: "primary",
-                    size: "small",
-                  },
-                  attrs: {
-                    disabled: params.row.orderStatus == "UNPAID" ? false : true,
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.confirmPrice(params.row);
-                    },
-                  },
-                },
-                "收款"
+            return h("div", [h("Button", {props: {type: "primary", size: "small",},
+                attrs: {disabled: params.row.orderStatus == "UNPAID" ? false : true,},
+                style: {marginRight: "5px",},
+                on: {click: () => {this.confirmPrice(params.row);},},
+                }, "收款"
              ),
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.detail(params.row);
-                    },
-                  },
-                },
-                "查看"
+              h("Button", {props: {type: "info", size: "small",},
+                  style: {marginRight: "5px",},
+                  on: {click: () => {this.detail(params.row);},},
+                }, "查看"
              ),
            ]);
          },
--- a/manager/src/views/page/article-manage/articleList.vue
+++ b/manager/src/views/page/article-manage/articleList.vue
@ -57,7 +57,7 @@
                <Input type="number" v-model="form.sort" clearable style="width: 10%" />
              </FormItem>
              <FormItem class="form-item-view-el" label="文章内容" prop="content">
-                <editor openXss v-model="form.content"></editor>
+                <editor  openXss v-model="form.content"></editor>
              </FormItem>
              <FormItem label="是否展示" prop="openStatus">
                <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
@ -435,28 +435,13 @@ export default {
          this.form.categoryId = res.result.categoryId;
          this.treeValue = data.articleCategoryName;
          this.form.id = data.id;
-          this.form.content = htmlEscape(res.result.content);
+          this.form.content =res.result.content;
          this.form.title = res.result.title;
          this.form.sort = res.result.sort;
          this.form.openStatus = res.result.openStatus;
        }
      });
    },
-
-    htmlEscape(text) {
-      return text.replace(/[<>"&]/g, function (match, pos, originalText) {
-        switch (match) {
-          case "<":
-            return "&lt;";
-          case ">":
-            return "&gt;";
-          case "&":
-            return "&amp;";
-          case '"':
-            return "&quot;";
-        }
-      });
-    },
    remove(v) {
      this.$Modal.confirm({
        title: "确认删除",
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@ -161,7 +161,7 @@ export default {
        },
        {
          title: "活动时间",
-
+          width: 150,
          render: (h, params) => {
            if (params.row.getType === "ACTIVITY") {
              return h("div", "长期有效");
--- a/manager/src/views/promotion/pointsGoods/pointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
@ -2,78 +2,37 @@
  <div class="search">
    <Card>
      <Row>
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
          <Form-item label="商品名称">
-            <Input
-              type="text"
-              v-model="searchForm.goodsName"
-              placeholder="请输入商品名称"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px" />
          </Form-item>
          <Form-item label="积分区间">
-            <Input
-              type="text"
-              v-model="searchForm.pointsS"
-              placeholder="请输入开始区间"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.pointsS" placeholder="请输入开始区间" clearable style="width: 200px" />
            -
-            <Input
-              type="text"
-              v-model="searchForm.pointsE"
-              placeholder="请输入结束区间"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.pointsE" placeholder="请输入结束区间" clearable style="width: 200px" />
          </Form-item>
          <Form-item label="状态">
            <Select v-model="searchForm.promotionStatus" style="width: 200px">
-              <Option
-                v-for="item in statusList"
-                :value="item.value"
-                :key="item.value"
-                >{{ item.label }}</Option
-              >
+              <Option v-for="item in statusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
            </Select>
          </Form-item>
          <Form-item label="SKU编码">
-            <Input
-              type="text"
-              v-model="searchForm.skuId"
-              placeholder="请输入SKU编码"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.skuId" placeholder="请输入SKU编码" 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="addPointsGoods" type="primary" >添加积分商品</Button>
+        <Button @click="addPointsGoods" type="primary">添加积分商品</Button>

      </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-      >
+      <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>
+                <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>
@ -94,48 +53,15 @@
        </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
-          >
+          <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"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
      </Row>
    </Card>
  </div>
@ -159,55 +85,62 @@ export default {
        pageSize: 10, // 页面大小
        order: "desc", // 默认排序方式
      },
-      statusList: [ // 活动状态
+      statusList: [
+        // 活动状态
        { label: "未开始", value: "NEW" },
        { label: "已开始", value: "START" },
        { label: "已结束", value: "END" },
        { label: "已关闭", value: "CLOSE" },
      ],
-      columns: [ // 表头
+      columns: [
+        // 表头
        {
          title: "商品名称",
          slot: "goodsName",
-          minWidth: 120,
+          minWidth: 150,
+          fixed: "left",
          tooltip: true,
        },
        {
          title: "市场价",
          slot: "price",
+          width: 100,
        },
        {
          title: "结算价",
          slot: "settlementPrice",
+          width: 100,
        },
-        {
-          title: "分类",
-          key: "pointsGoodsCategoryName",
-        },
+
        {
          title: "库存数量",
          slot: "quantity",
+          width: 100,
        },
        {
          title: "活动剩余库存",
          key: "activeStock",
+          width: 150,
        },
        {
          title: "兑换积分",
          key: "points",
+          width: 100,
        },
        {
          title: "所属店铺",
          key: "storeName",
+          width: 100,
        },
        {
          title: "活动开始时间",
          slot: "startTime",
-          minWidth:100
+          minWidth: 150,
        },
        {
          title: "状态",
          key: "promotionStatus",
+          width: 100,
          render: (h, params) => {
            let text = "未知",
              color = "";
@ -227,10 +160,16 @@ export default {
            return h("div", [h("Tag", { props: { color: color } }, text)]);
          },
        },
+        {
+          title: "分类",
+          key: "pointsGoodsCategoryName",
+          width: 100,
+        },
        {
          title: "操作",
          slot: "action",
          align: "center",
+          fixed: "right",
          width: 150,
        },
      ],
@ -327,5 +266,5 @@ export default {
 };
 </script>
 <style lang="scss">
-  @import "@/styles/table-common.scss";
+@import "@/styles/table-common.scss";
 </style>
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/manager/src/views/promotion/seckill/seckill.vue
@ -102,13 +102,13 @@ export default {
          width: 100,
          render: (h, params) => {
            if (params.row.promotionStatus == "NEW") {
-              return h("Tag", {props: {color: "volcano",},},"新建");
+              return h("Tag", {props: {color: "geekblue",},},"新建");
            } else if (params.row.promotionStatus == "START") {
-              return h("Tag", {props: {color: "blue",},},"开始");
+              return h("Tag", {props: {color: "green",},},"开始");
            } else if (params.row.promotionStatus == "END") {
-              return h("Tag", {props: {color: "green",},},"结束");
-            } else if (params.row.promotionStatus == "CLOSE") {
              return h("Tag", {props: {color: "volcano",},},"结束");
+            } else if (params.row.promotionStatus == "CLOSE") {
+              return h("Tag", {props: {color: "red",},},"结束");
            }
          },
        },
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@ -4,7 +4,7 @@
      <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"/>
+            <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px" />
          </Form-item>
          <Form-item label="状态" prop="status">
            <Select v-model="searchForm.marketEnable" placeholder="请选择" clearable style="width: 200px">
@ -19,7 +19,7 @@
            </Select>
          </Form-item>
          <Form-item label="商品编号" prop="sn">
-            <Input type="text" v-model="searchForm.sn" placeholder="商品编号" clearable style="width: 200px"/>
+            <Input type="text" v-model="searchForm.sn" placeholder="商品编号" clearable style="width: 200px" />
          </Form-item>
          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
          <Button @click="handleReset" class="search-btn">重置</Button>
@ -55,8 +55,7 @@
              </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>
+                  <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>
@ -67,15 +66,21 @@
      </Table>

      <Row type="flex" justify="end" class="page">
-        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
-              @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
-              show-total show-elevator show-sizer></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
      </Row>
    </Card>

    <Modal title="更新库存" v-model="updateStockModalVisible" :mask-closable="false" :width="500">
-      <Input type="number" v-model="stockAllUpdate" placeholder="全部修改，如不需全部修改，则不需输入"/>
-      <Table :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
+      <Tabs value="updateStock">
+        <TabPane label="手动规格更新" name="updateStock">
+          <Table :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
+        </TabPane>
+        <TabPane label="批量规格更新" name="stockAll">
+          <Input type="number" v-model="stockAllUpdate" placeholder="统一规格修改" />
+        </TabPane>
+      </Tabs>
+
      <div slot="footer">
        <Button type="text" @click="updateStockModalVisible = false">取消</Button>
        <Button type="primary" @click="updateStock">更新</Button>
@ -86,8 +91,7 @@
    <Modal title="批量设置运费模板" v-model="shipTemplateModal" :mask-closable="false" :width="500">
      <Form ref="shipTemplateForm" :model="shipTemplateForm" :label-width="120">
        <FormItem class="form-item-view-el" label="运费" prop="freightPayer">
-          <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange"
-                      v-model="shipTemplateForm.freightPayer">
+          <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange" v-model="shipTemplateForm.freightPayer">
            <Radio label="STORE">
              <span>卖家承担运费</span>
            </Radio>
@ -397,10 +401,10 @@ export default {
      this.getDataList();
    },
    addGoods() {
-      this.$router.push({name: "goods-operation"});
+      this.$router.push({ name: "goods-operation" });
    },
    editGoods(v) {
-      this.$router.push({name: "goods-operation-edit", query: {id: v.id}});
+      this.$router.push({ name: "goods-operation-edit", query: { id: v.id } });
    },

    //批量操作
@ -423,7 +427,7 @@ export default {
      }
    },
    getStockDetail(id) {
-      getGoodsSkuListDataSeller({goodsId: id, pageSize: 1000}).then((res) => {
+      getGoodsSkuListDataSeller({ goodsId: id, pageSize: 1000 }).then((res) => {
        if (res.success) {
          this.updateStockModalVisible = true;
          this.stockAllUpdate = undefined;
@ -433,7 +437,7 @@ export default {
    },
    updateStock() {
      let updateStockList = this.stockList.map((i) => {
-        let j = {skuId: i.id, quantity: i.quantity};
+        let j = { skuId: i.id, quantity: i.quantity };
        if (this.stockAllUpdate) {
          j.quantity = this.stockAllUpdate;
        }
--- a/seller/src/views/login.vue
+++ b/seller/src/views/login.vue
@ -162,7 +162,7 @@ export default {
 }
 .login {
  height: 100%;
-  background: url("../assets/background.svg") no-repeat;
+  background: url("../assets/background.png") no-repeat;
  background-size: 100%;
  background-position-y: bottom;
  background-color: #edf0f3;
--- a/seller/src/views/main-components/footer.vue
+++ b/seller/src/views/main-components/footer.vue
@ -1,14 +1,14 @@
 <template>
  <div class="foot">
    <Row type="flex" justify="space-around" class="help">
-      <a class="item" href="https://lilishop.com" target="_blank">{{ $t('help') }}</a>
-      <a class="item" href="https://lilishop.com" target="_blank">{{ $t('privacy') }}</a>
-      <a class="item" href="https://lilishop.com" target="_blank">{{ $t('terms') }}</a>
+      <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('help') }}</a>
+      <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('privacy') }}</a>
+      <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('terms') }}</a>
    </Row>
    <Row type="flex" justify="center" class="copyright">
      Copyright © 2020 - Present
      <a
-        href="http://lili.cn"
+        href="https://pickmall.cn/"
        target="_blank"
        style="margin:0 5px;"
      >lili-shop</a> {{ $t('rights') }}
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@ -53,8 +53,8 @@ export default {
        // 搜索框初始化对象
        pageNumber: 1, // 当前页数
        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
+        sort: "", // 默认排序字段
+        order: "", // 默认排序方式
        startDate: "", // 起始时间
        endDate: "", // 终止时间
        orderSn: "",
@ -80,7 +80,7 @@ export default {
        {
          title: "订单号",
          key: "sn",
-          minWidth: 240,
+          minWidth: 200,
          tooltip: true,
        },
        {
@ -95,7 +95,7 @@ export default {
            } else if (params.row.clientType == "WECHAT_MP") {
              return h("div", {}, "小程序端");
            } else if (params.row.clientType == "APP") {
-              return h("div", {}, "移动应用端");
+              return h("div", {}, "APP端");
            } else {
              return h("div", {}, params.row.clientType);
            }
@ -145,11 +145,8 @@ export default {
        {
          title: "下单时间",
          key: "createTime",
-          width: 170,
-          sortable: true,
-          sortType: "desc",
+          width: 170
        },
-
        {
          title: "操作",
          key: "action",
--- a/seller/src/views/order/order/virtualOrderList.vue
+++ b/seller/src/views/order/order/virtualOrderList.vue
@ -69,7 +69,7 @@ export default {
        orderSn: "",
        buyerName: "",
        orderStatus: "",
-        orderType:"VIRTUAL"
+        orderType: "VIRTUAL",
      },
      selectDate: null,
      form: {
@ -200,8 +200,6 @@ export default {
      let result = await verificationCode(this.orderCode);

      if (result.success) {
-
-
        this.$router.push({
          name: "order-detail",
          query: { sn: result.result.sn || this.orderCode },
@ -228,6 +226,7 @@ export default {
      this.searchForm = {};
      this.searchForm.pageNumber = 1;
      this.searchForm.pageSize = 10;
+      this.searchForm.orderType = "VIRTUAL";
      this.selectDate = null;
      this.searchForm.startDate = "";
      this.searchForm.endDate = "";
--- a/seller/src/views/order/receiptManager/receipt.vue
+++ b/seller/src/views/order/receiptManager/receipt.vue
@ -2,39 +2,15 @@
  <div class="search">
    <Card>
      <Row @keydown.enter.native="handleSearch">
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
          <Form-item label="订单编号" prop="orderSn">
-            <Input
-              type="text"
-              v-model="searchForm.orderSn"
-              clearable
-              placeholder="请输入订单编号"
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.orderSn" clearable placeholder="请输入订单编号" style="width: 200px" />
          </Form-item>
          <Form-item label="会员名称" prop="memberName">
-            <Input
-              type="text"
-              v-model="searchForm.memberName"
-              clearable
-              placeholder="请输入会员名称"
-              style="width: 200px"
-            />
+            <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"
-            />
+            <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">
@ -46,268 +22,280 @@
          <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 :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>
+          <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>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
      </Row>
    </Card>
  </div>
 </template>

 <script>
-  import * as API_Order from "@/api/order";
+import * as API_Order from "@/api/order";

-  export default {
-    name: "storeBill",
-    components: {},
-    data() {
-      return {
-        loading: true, // 表单加载状态
-        searchForm: {
-          // 搜索框初始化对象
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
-          receiptStatus: "", // 起始时间
+export default {
+  name: "storeBill",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        receiptStatus: "", // 起始时间
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        sn: "",
+        sellerName: "",
+        startTime: "",
+        endTime: "",
+        billPrice: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "订单号",
+          key: "orderSn",
+          minWidth: 120,
+          slot: "orderSlot",
        },
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 90,
+          tooltip: true,
        },
-        // 表单验证规则
-        formValidate: {},
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
-        columns: [
-          {
-            title: "订单号",
-            key: "orderSn",
-            minWidth: 120,
-            slot: "orderSlot",
-          },
-          {
-            title: "会员名称",
-            key: "memberName",
-            minWidth: 90,
-            tooltip: true
-          },

-          {
-            title: "发票抬头",
-            key: "receiptTitle",
-            minWidth: 90,
-            tooltip: true
+        {
+          title: "发票抬头",
+          key: "receiptTitle",
+          minWidth: 90,
+          tooltip: true,
+          render: (h, params) => {
+            return h("div", params.row.receiptTitle || "暂未填写");
          },
-          {
-            title: "纳税人识别号",
-            key: "taxpayerId",
-            minWidth: 100,
-            tooltip: true
-
+        },
+        {
+          title: "纳税人识别号",
+          key: "taxpayerId",
+          minWidth: 100,
+          tooltip: true,
+          render: (h, params) => {
+            return h("div", params.row.taxpayerId || "暂未填写");
          },
-          {
-            title: "发票内容",
-            key: "receiptContent",
-            minWidth: 120,
-            tooltip: true
+        },
+        {
+          title: "发票内容",
+          key: "receiptContent",
+          minWidth: 120,
+          tooltip: true,
+          render: (h, params) => {
+            return h("div", params.row.receiptContent || "暂未填写");
          },
-          {
-            title: "发票金额",
-            key: "billPrice",
-            width: 90,
-            render: (h, params) => {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.receiptPrice, "￥")
-              );
-            },
+        },
+        {
+          title: "发票金额",
+          key: "billPrice",
+          width: 150,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.receiptPrice, "￥")
+            );
          },
-          {
-            title: "发票状态",
-            key: "receiptStatus",
-            width: 90,
-            tooltip: true,
-            render: (h, params) => {
-              if(params.row.receiptStatus == 0){
-                return h("div", [h("tag", {props: {color: "volcano"}}, "未开票")]);
-              }else{
-                return h("div", [h("tag", {props: {color: "green"}}, "未开票")]);
-              }
-            },
-          },
-          {
-            title: "订单状态",
-            key: "orderStatus",
-            width: 90,
-            render: (h, params) => {
-              if (params.row.orderStatus == "UNPAID") {
-                return h("div", [h("tag", {props: {color: "magenta"}}, "未付款")]);
-              } else if (params.row.orderStatus == "PAID") {
-                return h("div", [h("tag", {props: {color: "blue"}}, "已付款")]);
-              } else if (params.row.orderStatus == "UNDELIVERED") {
-                return h("div", [h("tag", {props: {color: "geekblue"}}, "待发货")]);
-              } else if (params.row.orderStatus == "DELIVERED") {
-                return h("div", [h("tag", {props: {color: "cyan"}}, "已发货")]);
-              } else if (params.row.orderStatus == "COMPLETED") {
-                return h("div", [h("tag", {props: {color: "green"}}, "已完成")]);
-              } else if (params.row.orderStatus == "TAKE") {
-                return h("div", [h("tag", {props: {color: "volcano"}}, "待核验")]);
-              } else if (params.row.orderStatus == "CANCELLED") {
-                return h("div", [h("tag", {props: {color: "red"}}, "已取消")]);
-              }
+        },
+        {
+          title: "发票状态",
+          key: "receiptStatus",
+          width: 90,
+          tooltip: true,
+          render: (h, params) => {
+            if (params.row.receiptStatus == 0) {
+              return h("div", [
+                h("tag", { props: { color: "volcano" } }, "未开票"),
+              ]);
+            } else {
+              return h("div", [
+                h("tag", { props: { color: "green" } }, "未开票"),
+              ]);
            }
          },
-          {
-            title: "操作",
-            key: "action",
-            align: "center",
-            width: 80,
-            render: (h, params) => {
+        },
+        {
+          title: "订单状态",
+          key: "orderStatus",
+          width: 90,
+          render: (h, params) => {
+            if (params.row.orderStatus == "UNPAID") {
              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
-                    attrs: {
-                      disabled: params.row.orderStatus == "COMPLETED"  && params.row.receiptStatus == 0? false : true,
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.invoicing(params.row);
-                      },
+                h("tag", { props: { color: "magenta" } }, "未付款"),
+              ]);
+            } else if (params.row.orderStatus == "PAID") {
+              return h("div", [
+                h("tag", { props: { color: "blue" } }, "已付款"),
+              ]);
+            } else if (params.row.orderStatus == "UNDELIVERED") {
+              return h("div", [
+                h("tag", { props: { color: "geekblue" } }, "待发货"),
+              ]);
+            } else if (params.row.orderStatus == "DELIVERED") {
+              return h("div", [
+                h("tag", { props: { color: "cyan" } }, "已发货"),
+              ]);
+            } else if (params.row.orderStatus == "COMPLETED") {
+              return h("div", [
+                h("tag", { props: { color: "green" } }, "已完成"),
+              ]);
+            } else if (params.row.orderStatus == "TAKE") {
+              return h("div", [
+                h("tag", { props: { color: "volcano" } }, "待核验"),
+              ]);
+            } else if (params.row.orderStatus == "CANCELLED") {
+              return h("div", [
+                h("tag", { props: { color: "red" } }, "已取消"),
+              ]);
+            }
+          },
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 80,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  attrs: {
+                    disabled:
+                      params.row.orderStatus == "COMPLETED" &&
+                      params.row.receiptStatus == 0
+                        ? false
+                        : true,
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.invoicing(params.row);
                    },
                  },
-                  "开票"
-                ),
-              ]);
-            },
+                },
+                "开票"
+              ),
+            ]);
          },
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-      };
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getData();
    },
-    methods: {
-      init() {
-        this.getData();
-      },
-      changePage(v) {
-        this.searchForm.pageNumber = v;
-        this.getData();
-        this.clearSelectAll();
-      },
-      changePageSize(v) {
-        this.searchForm.pageSize = v;
-        this.getData();
-      },
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getData();
-      },
-      handleReset() {
-        this.searchForm = {}
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getData();
-      },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getData();
-      },
-      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];
-        }
-      },
-      getData() {
-        this.loading = true;
-        API_Order.getReceiptPage(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;
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getData();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getData();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getData();
+    },
+    handleReset() {
+      this.searchForm = {};
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getData();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getData();
+    },
+    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];
+      }
+    },
+    getData() {
+      this.loading = true;
+      API_Order.getReceiptPage(this.searchForm).then((res) => {
        this.loading = false;
-      },
-      //开发票
-      invoicing(params){
-        this.$Modal.confirm({
-          title: "确认开票",
-          content: "您确认已经开具发票 ?",
-          loading: true,
-          onOk: () => {
-            API_Order.invoicing(params.id).then((res) => {
-              if (res.success) {
-                this.$Message.success("开票成功");
-              }
-              this.$Modal.remove();
-              this.getData();
-            });
-
-
-          }
-        });
-      },
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
    },
-    activated() {
-      this.init();
+    //开发票
+    invoicing(params) {
+      this.$Modal.confirm({
+        title: "确认开票",
+        content: "您确认已经开具发票 ?",
+        loading: true,
+        onOk: () => {
+          API_Order.invoicing(params.id).then((res) => {
+            if (res.success) {
+              this.$Message.success("开票成功");
+            }
+            this.$Modal.remove();
+            this.getData();
+          });
+        },
+      });
    },
-  };
+  },
+  mounted() {
+    this.init();
+  },
+  activated() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss">
-  // 建议引入通用样式 可删除下面样式代码
-   @import "@/styles/table-common.scss";
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
 </style>
--- a/seller/src/views/promotion/live/addLive.vue
+++ b/seller/src/views/promotion/live/addLive.vue
@ -517,7 +517,7 @@ export default {
              if (res.success) {
                this.$Message.success("修改成功!");

-                this.$router.push({ path: "/storePromotion/live" });
+                this.$router.push({ path: "/promotion/live" });
              }
              this.spinShow = false;
            });
@ -528,7 +528,7 @@ export default {
              if (res.success) {
                this.$Message.success("添加成功!");

-                this.$router.push({ path: "/storePromotion/live" });
+                this.$router.push({ path: "/promotion/live" });
              }
              this.spinShow = false;
            });
--- a/seller/src/views/promotion/pintuan/pintuan.scss
+++ b/seller/src/views/promotion/pintuan/pintuan.scss
@ -1,41 +1,11 @@
-
 .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;
-  }
 }
-
-.newPromotionView {
-  width: 80%;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-
-
-  Input {
-    flex-direction: row;
-  }
-
-  .slotSpan {
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-  }
+.row {
+  margin-bottom: 5px;
 }
--- a/seller/src/views/promotion/pintuan/pintuan.vue
+++ b/seller/src/views/promotion/pintuan/pintuan.vue
@ -52,6 +52,7 @@
        @on-selection-change="changeSelect"
      >
        <template slot-scope="{ row }" slot="action">
+          <div  class="row">
          <Button
            type="primary"
            size="small"
@ -97,6 +98,7 @@
            @click="close(row)"
            >关闭</Button
          >
+          </div>
        </template>
      </Table>
      <Row type="flex" justify="end" class="page">
--- a/seller/src/views/promotion/seckill/seckill.vue
+++ b/seller/src/views/promotion/seckill/seckill.vue
@ -105,13 +105,13 @@ export default {
              color = "default";
            if (params.row.promotionStatus == "NEW") {
              text = "未开始";
-              color = "default";
+              color = "geekblue";
            } else if (params.row.promotionStatus == "START") {
              text = "已开始";
              color = "green";
            } else if (params.row.promotionStatus == "END") {
              text = "已结束";
-              color = "red";
+              color = "volcano";
            } else if (params.row.promotionStatus == "CLOSE") {
              text = "已关闭";
              color = "red";