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

2026-11-13 04:18:55 +08:00 · 2026-05-17 19:54:19 +08:00
parent 9c51523352 aa4bc81da4
commit 14d53fa48d
232 changed files with 12850 additions and 4525 deletions
--- a/manager/src/views/promotions/coupon-activity/coupon-publish.vue
+++ b/manager/src/views/promotions/coupon-activity/coupon-publish.vue
@@ -211,12 +211,12 @@ export default {
          align: "center",
          render: (h, params) => {
            return h(
-              "Button",
+              "a",
              {
-                props: {
-                  size: "small",
-                  type: "error",
-                  ghost: true,
+                style: {
+                  color: "#2d8cf0",
+                  cursor: "pointer",
+                  textDecoration: "none"
                },
                on: {
                  click: () => {
--- a/manager/src/views/promotions/coupon-activity/coupon.vue
+++ b/manager/src/views/promotions/coupon-activity/coupon.vue
@@ -13,20 +13,19 @@
        sortable="custom"
      >
        <template slot-scope="{ row }" slot="action">
-          <Button type="info" size="small" style="margin-right: 10px" @click="info(row)">
-            查看
-          </Button>
-          <Button
-            v-if="
-              (!checked && row.promotionStatus === 'START') ||
-              row.promotionStatus === 'NEW'
-            "
-            type="error"
-            size="small"
-            style="margin-right: 10px"
+          <a
+            :style="{ color: '#2d8cf0', cursor: 'pointer', textDecoration: 'none' }"
+            @click="info(row)"
+          >查看</a>
+          <span
+            v-if="(!checked && row.promotionStatus === 'START') || row.promotionStatus === 'NEW'"
+            style="margin: 0 8px; color: #dcdee2"
+          >|</span>
+          <a
+            v-if="(!checked && row.promotionStatus === 'START') || row.promotionStatus === 'NEW'"
+            :style="{ color: '#2d8cf0', cursor: 'pointer', textDecoration: 'none' }"
            @click="remove(row)"
-            >关闭
-          </Button>
+          >关闭</a>
        </template>
      </Table>
      <Row type="flex" justify="end" class="mt_10">
@@ -36,7 +35,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePage"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -60,13 +59,13 @@ export default {
      modalType: 0, // 添加或编辑标识
      modalVisible: false, // 添加或编辑显示
      modalTitle: "", // 添加或编辑标题
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
      form: {
        // 添加或编辑表单对象初始化数据
        promotionName: "",
@@ -202,7 +201,7 @@ export default {
    //搜索活动
    handleSearch() {
      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
      this.getDataList();
    },
    //数据获取
--- a/manager/src/views/promotions/coupon/coupon-receive.vue
+++ b/manager/src/views/promotions/coupon/coupon-receive.vue
@@ -1,7 +1,9 @@
 <template>
+  
  <div class="search">
+    <Button style="margin-bottom: 10px" @click="back()">返回</Button>
    <Card>
-      <Button style="margin-bottom: 10px" @click="back()">返回</Button>
+      
      <Form
        ref="searchForm"
        :model="searchForm"
@@ -15,7 +17,7 @@
            v-model="searchForm.couponName"
            placeholder="请输入优惠券名称"
            clearable
-            style="width: 200px"
+            style="width: 240px"
          />
        </Form-item>
        <Form-item label="会员名称" prop="memberName">
@@ -24,7 +26,7 @@
            v-model="searchForm.memberName"
            placeholder="请输入会员名称"
            clearable
-            style="width: 200px"
+            style="width: 240px"
          />
        </Form-item>
        <Form-item label="获取方式" prop="getType">
@@ -32,7 +34,7 @@
            v-model="searchForm.getType"
            placeholder="请选择"
            clearable
-            style="width: 200px"
+            style="width: 240px"
          >
            <Option value="FREE">免费获取</Option>
            <Option value="ACTIVITY">活动获取</Option>
@@ -43,7 +45,7 @@
            v-model="searchForm.memberCouponStatus"
            placeholder="请选择"
            clearable
-            style="width: 200px"
+            style="width: 240px"
          >
            <Option value="NEW">已领取</Option>
            <Option value="USED">已使用</Option>
@@ -57,7 +59,7 @@
            type="daterange"
            clearable
            placeholder="选择起始时间"
-            style="width: 200px"
+            style="width: 240px"
          ></DatePicker>
        </Form-item>
        <Button
@@ -68,6 +70,8 @@
          >搜索</Button
        >
      </Form>
+    </Card>
+    <Card>
      <Table
        v-if="refreshTable"
        :loading="loading"
@@ -86,7 +90,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePage"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -108,15 +112,15 @@ export default {
  data() {
    return {
      loading: true, // 表单加载状态
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "create_time", // 默认排序字段
-        order: "desc", // 默认排序方式
-        getType: "", // 默认排序方式
-        couponId: this.$route.query.couponId, // 优惠券id
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+          sort: "create_time", // 默认排序字段
+          order: "desc", // 默认排序方式
+          getType: "", // 默认排序方式
+          couponId: this.$route.query.couponId, // 优惠券id
+        },
      selectList: [], // 多选数据
      selectCount: 0, // 多选计数
      columns: [
@@ -280,7 +284,7 @@ export default {
    handleSearch() {
      // 搜索
      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
      this.getDataList();
    },
    /**
--- a/manager/src/views/promotions/coupon/coupon.vue
+++ b/manager/src/views/promotions/coupon/coupon.vue
@@ -14,7 +14,7 @@
            v-model="searchForm.couponName"
            placeholder="请输入优惠券名称"
            clearable
-            style="width: 200px"
+            style="width: 240px"
          />
        </Form-item>
        <Form-item label="获取方式" prop="getType">
@@ -22,7 +22,7 @@
            v-model="searchForm.getType"
            placeholder="请选择"
            clearable
-            style="width: 200px"
+            style="width: 240px"
          >
            <Option value="FREE">免费获取</Option>
            <Option value="ACTIVITY">活动获取</Option>
@@ -33,7 +33,7 @@
            v-model="searchForm.promotionStatus"
            placeholder="请选择"
            clearable
-            style="width: 200px"
+            style="width: 240px"
          >
            <Option value="NEW">未开始</Option>
            <Option value="START">已开始/上架</Option>
@@ -47,7 +47,7 @@
            type="daterange"
            clearable
            placeholder="选择起始时间"
-            style="width: 200px"
+            style="width: 240px"
          ></DatePicker>
        </Form-item>
        <Button
@@ -58,6 +58,8 @@
          >搜索</Button
        >
      </Form>
+    </Card>
+    <Card>
      <Row class="operation padding-row" v-if="getType !== 'ACTIVITY'">
        <Button @click="add" type="primary">添加优惠券</Button>
        <Button @click="delAll">批量关闭</Button>
@@ -73,49 +75,30 @@
        @on-selection-change="changeSelect"
      >
        <template slot-scope="{ row }" slot="action">
-          <Button
-            v-if="
-              row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'
-            "
-            type="info"
-            size="small"
+          <a
+            v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
+            :style="{ color: '#2d8cf0', cursor: 'pointer', textDecoration: 'none' }"
            @click="see(row)"
-            >编辑
-          </Button>
-          <Button
+            >编辑</a>
+          <a
            v-else
-            type="default"
-            size="small"
+            :style="{ color: '#2d8cf0', cursor: 'pointer', textDecoration: 'none' }"
            @click="see(row, 'onlyView')"
-            >查看
-          </Button>
-          <Button
-            class="ml_5"
-            v-if="
-              row.promotionStatus === 'START' || row.promotionStatus === 'NEW'
-            "
-            type="error"
-            size="small"
+            >查看</a>
+          <span
+            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
+            style="margin: 0 8px; color: #dcdee2"
+            >|</span>
+          <a
+            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
+            :style="{ color: '#2d8cf0', cursor: 'pointer', textDecoration: 'none' }"
            @click="close(row)"
-            >关闭
-          </Button>
-          <!--<Button-->
-            <!--class="ml_5"-->
-            <!--v-if="-->
-              <!--row.promotionStatus === 'CLOSE' || row.promotionStatus === 'END'-->
-            <!--"-->
-            <!--type="error"-->
-            <!--size="small"-->
-            <!--@click="remove(row)"-->
-            <!--&gt;删除-->
-          <!--</Button>-->
-          <Button
-            style="margin: 5px"
-            type="info"
-            size="small"
+            >关闭</a>
+          <span style="margin: 0 8px; color: #dcdee2">|</span>
+          <a
+            :style="{ color: '#2d8cf0', cursor: 'pointer', textDecoration: 'none' }"
            @click="receivePage(row.id)"
-            >领取记录
-          </Button>
+            >领取记录</a>
        </template>
      </Table>
      <Row type="flex" justify="end" class="mt_10">
@@ -125,7 +108,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePage"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -144,6 +127,7 @@ import {
 import {
  promotionsStatusRender,
  promotionsScopeTypeRender,
+  promotionsCouponActivityTimeRender,
 } from "@/utils/promotions";

 export default {
@@ -151,27 +135,28 @@ export default {
  data() {
    return {
      loading: true, // 表单加载状态
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "create_time", // 默认排序字段
-        order: "desc", // 默认排序方式
-        getType: "", // 默认排序方式
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+          sort: "create_time", // 默认排序字段
+          order: "desc", // 默认排序方式
+          getType: "", // 默认排序方式
+        },
      selectList: [], // 多选数据
      selectCount: 0, // 多选计数
      columns: [
        // 表头
        {
          type: "selection",
-          width: 100,
+          width: 52,
          align: "center",
-          fixed: "left",
+          /* 不使用 fixed：左侧固定列与主体表格分开渲染，叠加全局 .ivu-table table{width:100%} 易在接缝处留白；勾选列无需横向钉住 */
        },
        {
          title: "优惠券名称",
          key: "couponName",
+          minWidth: 140,
          width: 180,
          tooltip: true,
        },
@@ -255,21 +240,7 @@ export default {
        {
          title: "活动时间",
          width: 200,
-          render: (h, params) => {
-            if (
-              params?.row?.getType === "ACTIVITY" &&
-              params?.row?.rangeDayType === "DYNAMICTIME"
-            ) {
-              return h("div", "长期有效");
-            } else if (params?.row?.startTime && params?.row?.endTime) {
-              return h("div", {
-                domProps: {
-                  innerHTML:
-                    params.row.startTime + "<br/>" + params.row.endTime,
-                },
-              });
-            }
-          },
+          render: promotionsCouponActivityTimeRender,
        },
        {
          title: "状态",
@@ -386,7 +357,7 @@ export default {
    handleSearch() {
      // 搜索
      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
      this.getDataList();
    },
    clearSelectAll() {
--- a/manager/src/views/promotions/full-discount/full-discount-detail.vue
+++ b/manager/src/views/promotions/full-discount/full-discount-detail.vue
@@ -285,8 +285,8 @@ export default {
    getCouponList(query) {
      // 优惠券列表
      let params = {
-        pageSize: 10,
-        pageNumber: 0,
+        pageSize: 20,
+        pageNumber: 1,
        getType: "ACTIVITY",
        storeId: "",
        couponName: query,
@@ -303,7 +303,7 @@ export default {
    getGiftList(query) {
      // 赠品列表
      let params = {
-        pageSize: 10,
+        pageSize: 20,
        pageNumber: 1,
        id: query === this.form.giftId ? this.form.giftId : null,
        goodsName: query === this.form.giftId ? null : query,
--- a/manager/src/views/promotions/full-discount/full-discount.vue
+++ b/manager/src/views/promotions/full-discount/full-discount.vue
@@ -15,7 +15,7 @@
              v-model="searchForm.promotionName"
              placeholder="请输入活动名称"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            />
          </Form-item>
          <Form-item label="活动状态" prop="promotionStatus">
@@ -23,7 +23,7 @@
              v-model="searchForm.promotionStatus"
              placeholder="请选择"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            >
              <Option value="NEW">未开始</Option>
              <Option value="START">已开始/上架</Option>
@@ -37,7 +37,7 @@
              type="daterange"
              clearable
              placeholder="选择起始时间"
-              style="width: 200px"
+              style="width: 240px"
            >
            </DatePicker>
          </Form-item>
@@ -50,6 +50,8 @@
          >
        </Form>
      </Row>
+      </Card>
+    <Card>
      <Table
        :loading="loading"
        border
@@ -70,15 +72,19 @@
        </template>
        <template slot-scope="{ row }" slot="action">
          <div>
-            <Button type="info" size="small" @click="view(row)">查看</Button>
-            <Button
-              type="error"
+            <a
+              :style="{ color: '#2d8cf0', cursor: 'pointer', textDecoration: 'none' }"
+              @click="view(row)"
+            >查看</a>
+            <span
              v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'START'"
-              style="margin-left: 5px"
-              size="small"
+              style="margin: 0 8px; color: #dcdee2"
+            >|</span>
+            <a
+              v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'START'"
+              :style="{ color: '#2d8cf0', cursor: 'pointer', textDecoration: 'none' }"
              @click="openOrClose(row)"
-              >关闭</Button
-            >
+            >关闭</a>
          </div>
        </template>
      </Table>
@@ -89,7 +95,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePage"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -109,13 +115,13 @@ export default {
      selectDate: [],
      total: 0,
      loading: false, // 表单加载状态
-      searchForm: {
-        // 请求参数
-        pageNumber: 1,
-        pageSize: 10,
-        sort: "createTime",
-        order: "desc",
-      },
+        searchForm: {
+          // 请求参数
+          pageNumber: 1,
+          pageSize: 20,
+          sort: "createTime",
+          order: "desc",
+        },
      columns: [
        // 表头
        {
@@ -203,7 +209,7 @@ export default {
    handleSearch() {
      // 搜索
      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
      this.getDataList();
    },
    // 获取列表数据
--- a/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
+++ b/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
@@ -15,7 +15,7 @@
              v-model="searchForm.goodsName"
              placeholder="请输入商品名称"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            />
          </Form-item>
          <Form-item label="活动状态" prop="promotionStatus">
@@ -23,7 +23,7 @@
              v-model="searchForm.promotionStatus"
              placeholder="请选择"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            >
              <Option value="NEW">未开始</Option>
              <Option value="START">已开始/上架</Option>
@@ -37,7 +37,7 @@
              type="daterange"
              clearable
              placeholder="选择起始时间"
-              style="width: 200px"
+              style="width: 240px"
            >
            </DatePicker>
          </Form-item>
@@ -50,6 +50,8 @@
          >
        </Form>
      </Row>
+      </Card>
+    <Card>
      <Row class="operation padding-row">
        <Button @click="add" type="primary">添加砍价</Button>
      </Row>
@@ -96,28 +98,18 @@
          <div>{{ row.stock }}</div>
        </template>
        <template slot-scope="{ row }" slot="action">
-          <Button
+          <a
            v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
-            type="info"
-            size="small"
-            style="margin-right: 10px"
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:10px"
            @click="edit(row)"
            >编辑
-          </Button>
-          <Button
+          </a>
+          <a
            v-else
-            size="small"
-            style="margin-right: 10px"
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:10px"
            @click="edit(row, 'onlyView')"
            >查看
-          </Button>
-          <!--<Button-->
-            <!--type="error"-->
-            <!--size="small"-->
-            <!--style="margin-right: 10px"-->
-            <!--@click="delAll(row)"-->
-            <!--&gt;删除-->
-          <!--</Button>-->
+          </a>
        </template>
      </Table>
      <Row type="flex" justify="end" class="page">
@@ -127,7 +119,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePage"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -156,14 +148,14 @@ export default {
      modalType: 0, // 添加或编辑标识
      modalVisible: false, // 添加或编辑显示
      modalTitle: "", // 添加或编辑标题
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
-        goodsName: "",
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          goodsName: "",
+        },
      form: {
        // 添加或编辑表单对象初始化数据
      },
@@ -281,7 +273,7 @@ export default {
    },
    handleSearch() {
      this.searchForm.pageNumber = 0;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
      this.getDataList();
    },
    changeSort(e) {
--- a/manager/src/views/promotions/live/live-detail.vue
+++ b/manager/src/views/promotions/live/live-detail.vue
@@ -236,7 +236,7 @@ export default {
 <style lang="scss" scoped>
 .action {
  display: flex;
-  /deep/ .ivu-btn {
+  ::v-deep .ivu-btn {
    margin: 0 5px !important;
  }
 }
--- a/manager/src/views/promotions/live/live.vue
+++ b/manager/src/views/promotions/live/live.vue
@@ -19,7 +19,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePageNumber"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -39,7 +39,7 @@ export default {
      total: 0,
      // 查询的form
      searchForm: {
-        pageSize: 10,
+        pageSize: 20,
        pageNumber: 1,
        status: "NEW",
      },
--- a/manager/src/views/promotions/pintuan/pintuan-goods.vue
+++ b/manager/src/views/promotions/pintuan/pintuan-goods.vue
@@ -48,7 +48,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePage"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -70,11 +70,11 @@ export default {
  data() {
    return {
      loading: false, // 表单加载状态
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+        },

      data: [], // 表单数据
      total: 0, // 表单数据总数
--- a/manager/src/views/promotions/pintuan/pintuan.vue
+++ b/manager/src/views/promotions/pintuan/pintuan.vue
@@ -14,7 +14,7 @@
            v-model="searchForm.promotionName"
            placeholder="请输入活动名称"
            clearable
-            style="width: 200px"
+            style="width: 240px"
          />
        </Form-item>
        <Form-item label="活动状态" prop="promotionStatus">
@@ -22,7 +22,7 @@
            v-model="searchForm.promotionStatus"
            placeholder="请选择"
            clearable
-            style="width: 200px"
+            style="width: 240px"
          >
            <Option value="NEW">未开始</Option>
            <Option value="START">已开始/上架</Option>
@@ -36,11 +36,13 @@
            type="daterange"
            clearable
            placeholder="选择起始时间"
-            style="width: 200px"
+            style="width: 240px"
          ></DatePicker>
        </Form-item>
        <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
      </Form>
+    </Card>
+    <Card>
      <Table
        :loading="loading"
        border
@@ -50,16 +52,19 @@
        class="mt_10"
      >
        <template slot-scope="{ row }" slot="action">
-          <Button type="info" size="small" @click="view(row)" style="margin-right: 5px"
-            >查看</Button
-          >
-          <Button
-            type="error"
-            size="small"
+          <a
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:5px"
+            @click="view(row)"
+          >查看</a>
+          <span
            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
+            style="margin:0 8px;color:#dcdee2"
+          >|</span>
+          <a
+            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none"
            @click="close(row)"
-            >关闭
-          </Button>
+          >关闭</a>
        </template>
      </Table>
      <Row type="flex" justify="end" class="mt_10">
@@ -69,7 +74,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePage"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -90,13 +95,13 @@ export default {
    return {
      selectDate: [], //选中的数据
      loading: true, // 表单加载状态
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime",
-        order: "desc", // 默认排序方式
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+          sort: "createTime",
+          order: "desc", // 默认排序方式
+        },
      columns: [
        // 表头
        {
@@ -161,11 +166,11 @@ export default {
      this.getDataList();
    },
    // 搜索
-    handleSearch() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.getDataList();
-    },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 20;
+        this.getDataList();
+      },
    // 获取拼团列表
    getDataList() {
      this.loading = true;
--- a/manager/src/views/promotions/points-goods-category/points-goods-category.vue
+++ b/manager/src/views/promotions/points-goods-category/points-goods-category.vue
@@ -18,10 +18,31 @@
        primary-key="id"
      >
        <template slot="action" slot-scope="scope">
-          <Button @click.native="edit(scope.row)" style="margin-right:10px;" size="small">编辑</Button>
-          <Button @click.native="remove(scope.row)" type="primary" size="small">删除</Button>
+          <a
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:10px"
+            @click.native="edit(scope.row)"
+            >编辑</a>
+          <span style="margin:0 8px;color:#dcdee2">|</span>
+          <a
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none"
+            @click.native="remove(scope.row)"
+            >删除</a>
        </template>
      </tree-table>
+      <Row type="flex" justify="end" class="mt_10">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[20, 50, 100]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
    </Card>
    <Modal
      :title="modalTitle"
@@ -74,6 +95,12 @@ export default {
      modalTitle: "", // 添加或编辑标题
      showParent: false, // 是否展示上级菜单
      parentTitle: "", // 父级菜单名称
+      searchForm: {
+        pageNumber: 1,
+        pageSize: 20,
+        sort: "sortOrder",
+        order: "asc"
+      },
      formAdd: {
        // 添加或编辑表单对象初始化数据
        parentId: 0,
@@ -92,6 +119,11 @@ export default {
          key: "name",
          minWidth: "120px",
        },
+        {
+          title: "排序值",
+          key: "sortOrder",
+          minWidth: "120px",
+        },
        {
          title: "操作",
          key: "action",
@@ -103,6 +135,7 @@ export default {
        },
      ],
      tableData: [], // 表格数据
+      total: 0
    };
  },
  methods: {
@@ -185,13 +218,34 @@ export default {
    // 获取所有分类
    getAllList() {
      this.loading = true;
-      getPointsGoodsCategoryList().then((res) => {
+      getPointsGoodsCategoryList(this.searchForm).then((res) => {
        this.loading = false;
        if (res.success) {
-          this.tableData = res.result.records;
+          const records = res.result.records || [];
+          const sortFn = (a, b) => (a.sortOrder || 0) - (b.sortOrder || 0);
+          const sortRecursively = (list = []) => {
+            list.sort(sortFn);
+            list.forEach((item) => {
+              if (Array.isArray(item.children) && item.children.length) {
+                sortRecursively(item.children);
+              }
+            });
+            return list;
+          };
+          this.tableData = sortRecursively(records);
+          this.total = res.result.total || 0;
        }
      });
    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getAllList();
+    },
+    changePageSize(v) {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = v;
+      this.getAllList();
+    }
  },
  mounted() {
    this.init();
--- a/manager/src/views/promotions/points-goods/points-goods-edit.vue
+++ b/manager/src/views/promotions/points-goods/points-goods-edit.vue
@@ -287,7 +287,7 @@ div.base-info-item {
  }

  /*teatarea*/
-  /deep/ .el-textarea {
+  ::v-deep .el-textarea {
    width: 150%;
  }

@@ -315,11 +315,11 @@ div.base-info-item {

 /*图片上传组件第一张图设置封面*/
 .goods-images {
-  /deep/ li.el-upload-list__item:first-child {
+  ::v-deep li.el-upload-list__item:first-child {
    position: relative;
  }

-  /deep/ li.el-upload-list__item:first-child:after {
+  ::v-deep li.el-upload-list__item:first-child:after {
    content: "封";
    color: #fff;
    font-weight: bold;
--- a/manager/src/views/promotions/points-goods/points-goods.vue
+++ b/manager/src/views/promotions/points-goods/points-goods.vue
@@ -15,7 +15,7 @@
              v-model="searchForm.goodsName"
              placeholder="请输入商品名称"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            />
          </Form-item>
          <Form-item label="积分区间">
@@ -24,7 +24,7 @@
              v-model="searchForm.pointsS"
              placeholder="请输入开始区间"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            />
            -
            <Input
@@ -32,11 +32,11 @@
              v-model="searchForm.pointsE"
              placeholder="请输入结束区间"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            />
          </Form-item>
          <Form-item label="状态">
-            <Select v-model="searchForm.promotionStatus" style="width: 200px">
+            <Select v-model="searchForm.promotionStatus" style="width: 240px">
              <Option v-for="item in statusList" :value="item.value" :key="item.value">{{
                item.label
              }}</Option>
@@ -48,7 +48,7 @@
              v-model="searchForm.skuId"
              placeholder="请输入SKU编码"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            />
          </Form-item>
          <Button
@@ -60,6 +60,8 @@
          >
        </Form>
      </Row>
+      </Card>
+    <Card>
      <Row class="operation padding-row">
        <Button @click="addPointsGoods" type="primary">添加积分商品</Button>
      </Row>
@@ -108,30 +110,20 @@
          <div>{{ row.endTime }}</div>
        </template>
        <template slot-scope="{ row }" slot="action">
-          <Button
+          <a
            v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
-            type="info"
-            size="small"
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:5px"
            @click="edit(row.id)"
-            style="margin-right: 5px"
-            >编辑</Button
-          >
-          <Button
+            >编辑</a>
+          <span
            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
-            type="warning"
-            size="small"
+            style="margin:0 8px;color:#dcdee2"
+            >|</span>
+          <a
+            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:5px"
            @click="statusChanged(row.id, 'CLOSE')"
-            style="margin-right: 5px"
-            >关闭</Button
-          >
-          <!--<Button-->
-            <!--v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'END'"-->
-            <!--type="error"-->
-            <!--size="small"-->
-            <!--@click="close(row.id)"-->
-            <!--style="margin-right: 5px"-->
-            <!--&gt;删除</Button-->
-          <!--&gt;-->
+            >关闭</a>
        </template>
      </Table>
      <Row type="flex" justify="end" class="mt_10">
@@ -141,7 +133,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePage"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -169,13 +161,13 @@ export default {
  data() {
    return {
      loading: true, // 表单加载状态
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime",
-        order: "desc", // 默认排序方式
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+          sort: "createTime",
+          order: "desc", // 默认排序方式
+        },
      statusList: [
        // 活动状态
        { label: "未开始", value: "NEW" },
@@ -273,17 +265,17 @@ export default {
      this.getDataList();
    },
    // 搜索
-    handleSearch() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      if (this.searchForm.pointsS) {
-        this.searchForm.points =
-          this.searchForm.pointsS +
-          "_" +
-          (this.searchForm.pointsE ? this.searchForm.pointsE : "");
-      }
-      this.getDataList();
-    },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 20;
+        if (this.searchForm.pointsS) {
+          this.searchForm.points =
+            this.searchForm.pointsS +
+            "_" +
+            (this.searchForm.pointsE ? this.searchForm.pointsE : "");
+        }
+        this.getDataList();
+      },
    // 获取列表数据
    getDataList() {
      this.loading = true;
--- a/manager/src/views/promotions/seckill/seckill-goods.vue
+++ b/manager/src/views/promotions/seckill/seckill-goods.vue
@@ -46,7 +46,7 @@
          />
        </template>
        <template slot-scope="{ row, index }" slot="action">
-          <Button type="error" size="small" @click="delGoods(index, row)">删除 </Button>
+          <a style="color:#2d8cf0;cursor:pointer;text-decoration:none" @click="delGoods(index, row)">删除</a>
        </template>
      </Table>
      <Row type="flex" justify="end" class="mt_10">
@@ -56,7 +56,7 @@
          :page-size="searchForm.pageSize"
          @on-change="changePage"
          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
          size="small"
          show-total
          show-elevator
@@ -82,11 +82,11 @@ export default {
      openTip: true, // 显示提示
      loading: false, // 表单加载状态
      submitLoading: false, // 加载状态
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+        },
      total: 0, // 总数
      selectList: [], // 多选数据
      selectCount: 0, // 多选计数
--- a/manager/src/views/promotions/seckill/seckill.vue
+++ b/manager/src/views/promotions/seckill/seckill.vue
@@ -15,7 +15,7 @@
              v-model="searchForm.promotionName"
              placeholder="请输入活动名称"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            />
          </Form-item>
          <Form-item label="活动状态" prop="promotionStatus">
@@ -23,7 +23,7 @@
              v-model="searchForm.promotionStatus"
              placeholder="请选择"
              clearable
-              style="width: 200px"
+              style="width: 240px"
            >
              <Option value="NEW">未开始</Option>
              <Option value="START">已开始/上架</Option>
@@ -37,7 +37,7 @@
              type="daterange"
              clearable
              placeholder="选择起始时间"
-              style="width: 200px"
+              style="width: 240px"
            >
            </DatePicker>
          </Form-item>
@@ -51,6 +51,8 @@
          >
        </Form>
      </Row>
+    </Card>
+    <Card>
      <Tabs value="list" class="mt_10" @on-click="clickTabPane">
        <TabPane label="秒杀活动列表" name="list">
          <Table
@@ -62,45 +64,34 @@
            class="mt_10"
          >
            <template slot-scope="{ row }" slot="action">
-              <Button
-                type="info"
-                size="small"
-                class="mr_5"
+              <a
                v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
+                style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:5px"
                @click="edit(row)"
-                >编辑</Button
-              >
-
-              <Button type="info" size="small" class="mr_5" v-else @click="manage(row)"
-                >查看</Button
-              >
-
-              <Button
-                type="success"
-                size="small"
-                class="mr_5"
-                v-if="row.promotionStatus == 'NEW'"
+                >编辑</a>
+              <a
+                v-else
+                style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:5px"
                @click="manage(row)"
-                >管理</Button
-              >
-
-              <Button
-                type="error"
-                size="small"
+                >查看</a>
+              <span
+                v-if="row.promotionStatus"
+                style="margin:0 8px;color:#dcdee2"
+                >|</span>
+              <a
+                v-if="row.promotionStatus == 'NEW'"
+                style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:5px"
+                @click="manage(row)"
+                >管理</a>
+              <span
+                v-if="row.promotionStatus == 'NEW'"
+                style="margin:0 8px;color:#dcdee2"
+                >|</span>
+              <a
                v-if="row.promotionStatus == 'START' || row.promotionStatus == 'NEW'"
-                class="mr_5"
+                style="color:#2d8cf0;cursor:pointer;text-decoration:none"
                @click="off(row)"
-                >关闭</Button
-              >
-              &nbsp;
-              <!--<Button-->
-                <!--type="error"-->
-                <!--size="small"-->
-                <!--v-if="row.promotionStatus == 'CLOSE' || row.promotionStatus == 'END'"-->
-                <!--ghost-->
-                <!--@click="expire(row)"-->
-                <!--&gt;删除</Button-->
-              <!--&gt;-->
+                >关闭</a>
            </template>
          </Table>

@@ -112,7 +103,7 @@
              :page-size="searchForm.pageSize"
              @on-change="changePage"
              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
+              :page-size-opts="[20, 50, 100]"
              size="small"
              show-total
              show-elevator
@@ -142,13 +133,13 @@ export default {
    return {
      selectDate: [],
      loading: true, // 表单加载状态
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime",
-        order: "desc", // 默认排序方式
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+          sort: "createTime",
+          order: "desc", // 默认排序方式
+        },
      setupFlag: false, //默认不请求设置
      columns: [
        // 表单
@@ -221,11 +212,11 @@ export default {
      this.getDataList();
    },
    // 搜索
-    handleSearch() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.getDataList();
-    },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 20;
+        this.getDataList();
+      },
    edit(v) {
      // 编辑
      this.$router.push({ name: "manager-seckill-add", query: { id: v.id } });