fix(goods): 移除下载结算单接口URL中的多余斜杠

- 将所有页面的默认页面大小从10调整为20
- 更新分页选项数组，将最小值从10改为20
- 统一所有分页相关组件的pageSize默认值为20
- 修改pageSizeOpts选项为[20, 50, 100]
- 确保所有涉及分页的业务逻辑使用新的默认值

README.md

@@ -1,16 +1,12 @@
 ## Lilishop B2B2C商城系统
 
-#### 欢迎交流需求，交流业务，交流技术（基础问题自行解决，其他问题先看文档后提问）
-
-#### 不用削尖脑袋往老群里加，老群活跃度较低，很多潜水党，新群相对而言活跃一些 :tw-1f606: :tw-1f606: :tw-1f606: :tw-1f606: :tw-1f606: :tw-1f606: 
 
 #### PS： **演示站点所有环境均部署master分支。如果有演示站点问题，可以反馈，如果演示站点没问题本地运行有问题，需自行处理** 
 
-##### 交流 qq 1群 961316482（已满）
-##### 交流 qq 2群 875294241（已满）
-##### 交流 qq 3群 263785057（已满）
-##### 交流 qq 4群 674617534 (已满)
-##### 交流 qq 5群 594675235 
+-   **[在线客服](https://work.weixin.qq.com/kfid/kfc4d8dc24a73c15f44)**
+-   **微信交流1群（已满）**
+-   **微信交流2群**:
+    ![微信群](https://lilishop-wechat.oss-cn-beijing.aliyuncs.com/wechat.jpg)
 
 ##### 体验 公众号/小程序/APP 体验，扫描二维码
 
@@ -19,6 +15,41 @@
 [![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)
   ![github](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=#181717)
 
+## 2025-10-10日更新
+兼容更高的node版本16
+
+这里我用的是node版本 v16.20.2
+
+npm版本 8.19.4
+
+使用yarn install 然后执行 yarn dev
+
+yarn 安装/启动
+```
+// 如果没有 yarn 安装yarn
+npm install yarn -g
+
+// 切换源
+yarn config set registry https://registry.npmmirror.com
+
+// 以buyer项目为例
+cd buyer
+
+yarn install
+
+yarn dev
+```
+
+
+
+
+没有二开过的项目直接拉最新代码即可，二开项目可以跟着提交记录一起同步修改 install出现问题检查的话删除 "package-lock.json" 重新install
+
+Q&A 为什么不升级更高的node版本？ :因为高node版本 OpenSSL 改动 导致旧版本 Webpack 插件会失效 试了好几次如果兼容的话 需要升级Webpack5以及其他的插件 升级内容较多 为了更稳定的还是尽量少动为主
+
+****
+
+
 ## 如何在本地环境运行lilishop-ui部署视频
 https://www.bilibili.com/video/BV1B28EeJEnP/
 
@@ -29,8 +60,11 @@ https://www.bilibili.com/video/BV1WD87eoE9F/
 ## 开发项目
 
 #### 安装Node.js
+
 保证`node`版本`14`,推荐 14.17.0
 
+2025-10-10日拉的代码之后不限制于node版本为14，这里只是以14版本为例子
+
 可以使用 `yarn` 或者 `npm` 进行安装
 
 #### yarn 安装/启动
@@ -49,17 +83,6 @@ yarn install
 yarn dev
 ```
 
-#### npm 安装/启动
-```
-npm config set registry https://registry.npmmirror.com
-
-// 以buyer项目为例
-cd buyer
-
-npm run install
-
-npm run dev
-```
 
 #### FAQ
 
@@ -223,19 +246,9 @@ PS：手机验证码为 ‘111111’
 
 4.限制商用，如果需要商业使用请联系我们。QQ3409056806.或者加入qq群联系群主。
 
-
-
-### 交流群
-
-##### 交流 qq 1群 961316482（已满）
-##### 交流 qq 2群 875294241（已满）
-##### 交流 qq 3群 263785057（已满）
-##### 交流 qq 4群 674617534（已满）
-##### 交流 qq 5群 594675235 
-
 ### 附录
 有人有自己的学习视频、学习记录文档、希望宣传关联开源项目等均可以私聊仓库所有者。
 
 类似：
 
-清晨敲代码同学的分析: https://blog.csdn.net/vaevaevae233/category_12103567.html
+清晨敲代码同学的分析: https://blog.csdn.net/vaevaevae233/category_12103567.html

buyer/README.md

@@ -1,19 +0,0 @@
-# new
-
-## Project setup
-```
-npm install
-```
-
-### Compiles and hot-reloads for development
-```
-npm run serve
-```
-
-### Compiles and minifies for production
-```
-npm run build
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).

buyer/package.json

@@ -3,9 +3,9 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-    "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
-    "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve"
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "dev": "vue-cli-service serve"
   },
   "engines": {
     "node": ">=14"

buyer/src/pages/home/memberCenter/AccountSafe.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import { getPwdStatus } from '@/api/account';
+// import { getPwdStatus } from '@/api/account';
 export default {
   name: 'AccountSafe',
   data () {
@@ -40,15 +40,15 @@ export default {
       this.$router.push({name: 'ModifyPwd', query: { status: 1 }})
     },
     // 获取密码状态
-    getPwdStatus () {
-      getPwdStatus().then(res => {
-        if (res) {
-          this.pwdStatus = '修改密码'
-        } else {
-          this.pwdStatus = '设置密码'
-        }
-      });
-    }
+    // getPwdStatus () {
+    //   getPwdStatus().then(res => {
+    //     if (res) {
+    //       this.pwdStatus = '修改密码'
+    //     } else {
+    //       this.pwdStatus = '设置密码'
+    //     }
+    //   });
+    // }
   }
 }
 </script>

manager/README.md

@@ -1,90 +1,5 @@
 # LILISHOP-UI
 
-# LiliShop UI Manager 的 Node.js 版本兼容性
-
-本文档概述了 LiliShop UI seller 项目的 Node.js 版本兼容性。
-
-## 摘要
-
-| Node.js 版本 | npm 版本 | 兼容性 | 备注 |
-|-----------------|-------------|--------------|-------|
-| v20.13.1 (当前 LTS) | 10.8.0 | ✅ 需要解决方案 | 安装需要 `--legacy-peer-deps` 参数，运行需要 `NODE_OPTIONS=--openssl-legacy-provider` |
-| v18.20.8 (LTS) | 10.8.2 | ✅ 需要解决方案 | 安装需要 `--legacy-peer-deps` 参数，运行需要 `NODE_OPTIONS=--openssl-legacy-provider` |
-| v16.20.2 (LTS) | 8.19.4 | ✅ 有轻微警告 | 安装需要 `--legacy-peer-deps` 参数，整体运行良好 |
-| v14.x (最低版本) | - | ❌ 不兼容 | 无法在 ARM64 架构上安装 (M系列 Mac) |
-
-## 详细发现
-
-### Node.js v20.13.1 (当前 LTS)
-- **安装**: 使用 `--legacy-peer-deps` 参数可以正常安装
-- **开发服务器**: 需要设置 `NODE_OPTIONS=--openssl-legacy-provider` 环境变量
-- **构建**: 需要设置 `NODE_OPTIONS=--openssl-legacy-provider` 环境变量
-- **问题**:
-  - vue-awesome-swiper 和 swiper 之间的依赖冲突
-  - 由于 Node.js v20 移除了旧版加密算法导致的 OpenSSL 相关错误
-  - 部分包报告不支持的引擎警告
-- **验证**: 已成功构建并验证 dist/index.html 可以正常运行
-
-### Node.js v18.20.8 (LTS)
-- **安装**: 使用 `--legacy-peer-deps` 参数可以正常安装
-- **开发服务器**: 需要设置 `NODE_OPTIONS=--openssl-legacy-provider` 环境变量
-- **构建**: 需要设置 `NODE_OPTIONS=--openssl-legacy-provider` 环境变量
-- **问题**:
-  - 部分包报告不支持的引擎警告 (v-click-outside-x, @achrinza/node-ipc)
-- **验证**: 已成功构建并验证 dist/index.html 可以正常运行
-
-### Node.js v16.20.2 (LTS)
-- **安装**: 使用 `--legacy-peer-deps` 参数可以正常安装
-- **开发服务器**: 无需额外参数即可运行
-- **构建**: 可以正常构建
-- **问题**:
-  - v-click-outside-x 包有轻微警告 (需要 npm 6.4.1)
-
-### Node.js v14.x
-- **安装**: 在 ARM64 架构 (M系列 Mac) 上无法安装
-- **开发服务器**: 未测试
-- **构建**: 可以正常构建
-- **问题**:
-  - Node.js v14 没有 ARM64 架构的二进制文件
-
-## 建议
-
-1. **最佳版本**: Node.js v16.20.2 配合 npm 8.19.4
-   - 与项目依赖最兼容
-   - 需要的解决方案最少
-   - 性能稳定
-
-2. **安装命令**:
-   ```bash
-   npm install --legacy-peer-deps
-   ```
-
-3. **开发命令**:
-   ```bash
-   # 对于 Node.js v16
-   npm run dev
-   
-   # 对于 Node.js v18 或 v20
-   NODE_OPTIONS=--openssl-legacy-provider npm run dev
-   或者 npm run dev
-   ```
-
-4. **生产构建命令**:
-   ```bash
-   # 对于 Node.js v16
-   npm run build
-   
-   # 对于 Node.js v18 或 v20
-   NODE_OPTIONS=--openssl-legacy-provider npm run build
-   或者 npm run dev
-   ```
-
-## 未来考虑
-
-1. 更新依赖以兼容较新的 Node.js 版本
-2. 解决对等依赖冲突
-3. 更新 package.json 以指定推荐的 Node.js 版本范围
-
 
 ### Customize configuration
 详情点击 [https://cli.vuejs.org/zn/config/](https://cli.vuejs.org/zn/config/).

manager/package.json

@@ -5,9 +5,9 @@
   "description": "lilishop-ui",
   "author": "lili-platform",
   "scripts": {
-    "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-    "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
-    "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve"
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "dev": "vue-cli-service serve"
   },
   "engines": {
     "node": ">=14"

manager/src/api/index.js

@@ -111,7 +111,7 @@ export const changeMobile = (params) => {
 };
 // 获取用户数据 多条件
 export const getUserListData = (params) => {
-  return getRequest("/passport/user", params);
+  return getRequest("/passport/user/getByCondition", params);
 };
 // 通过用户名搜索
 export const searchUserByName = (username, params) => {
@@ -445,6 +445,21 @@ export const getProgress = () => {
   return getRequest(`/other/elasticsearch/progress`);
 };
 
+// 删除ES中下架的商品
+export const deleteGoodsDown = () => {
+  return getRequest(`/other/elasticsearch/deleteGoodsDown`);
+};
+
+// 删除不存在的索引
+export const delSkuIndex = () => {
+  return getRequest(`/other/elasticsearch/delSkuIndex`);
+};
+
+// 生成所有商品的缓存
+export const generateGoodsCache = () => {
+  return getRequest(`/other/elasticsearch/cache`);
+};
+
 // 分页查询自定义分词
 export const getCustomWordsPage = (params) => {
   return getRequest(`/other/customWords/page`, params);

manager/src/api/pages.js

@@ -114,5 +114,5 @@ export const getPrivacy = (type) => {
 }
 //修改隐私协议数据
 export const updatePrivacy = (id,type,params) => {
-    return putRequest(`/other/article/updateArticle/${type}?id=${id}`, params, {"Content-Type": "application/json"})
+    return putRequest(`/other/article/updateArticle/${type}/${id}`, params, {"Content-Type": "application/json"})
 }

manager/src/components/affix-time.vue

@@ -40,7 +40,7 @@ export default {
       params: {
         // 请求参数
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         storeName: "",
       },
       dateList: [

manager/src/components/lili-dialog/template/marketing.vue

@@ -70,7 +70,7 @@ export default {
       params: {
         // 请求参数
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
       },
       pintuanColumns: [
         {
@@ -101,12 +101,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    // type: this.index == params.index ? "primary" : "",
-                    type: 'default',
-                    size: "small",
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -194,12 +194,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    // type: this.index == params.index ? "primary" : "",
-                    type: 'default',
-                    size: "small",
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -246,12 +246,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    // type: this.index == params.index ? "primary" : "",
-                    type: 'default',
-                    size: "small",
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {

manager/src/components/lili-dialog/template/special.vue

@@ -45,7 +45,7 @@ export default {
         order: "desc",
         pageClientType: "H5",
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         pageType: "SPECIAL",
       },
       total: 0, // 表单数据总数

manager/src/views/custom-words/index.vue

@@ -20,7 +20,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
@@ -69,7 +69,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         words: "",
@@ -124,14 +124,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -142,14 +140,17 @@ export default {
                 "修改"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {

manager/src/views/distribution/distribution.vue

@@ -59,7 +59,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
@@ -140,7 +140,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
       },
       columns: [
         {
@@ -346,7 +346,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 获取列表数据

manager/src/views/distribution/distributionApply.vue

@@ -43,7 +43,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
@@ -65,7 +65,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -115,17 +115,10 @@ export default {
           fixed: "right",
           width: 200,
           render: (h, params) => {
-            return h("div", [
+            return h("div", { class: "ops" }, [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "success",
-                    size: "small",
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
                   on: {
                     click: () => {
                       this.audit(params.row, "PASS");
@@ -134,13 +127,10 @@ export default {
                 },
                 "通过"
               ),
+              h("span", {}, "|"),
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   on: {
                     click: () => {
                       this.audit(params.row, "REFUSE");
@@ -176,7 +166,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 获取列表数据
@@ -224,3 +214,15 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
+</style>

manager/src/views/distribution/distributionCash.vue

@@ -26,7 +26,7 @@
     <Card>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></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>
+        <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" v-model="modalVisible" :mask-closable='false' :width="500">
@@ -72,7 +72,7 @@ export default {
       result: 'FAIL_AUDITING', // 是否通过
       searchForm: { // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
       },
@@ -160,50 +160,34 @@ export default {
           fixed: "right",
           width: 130,
           render: (h, params) => {
-            if(params.row.distributionCashStatus != 'APPLY'){
-                return h("div", [
-                  h(
-                    "Button",
-                    {
-                      props: {
-                        type: "primary",
-                        size: "small",
-                      },
-                      style: {
-                        marginRight: "5px"
-                      },
-                      on: {
-                        click: () => {
-                          this.view(params.row);
-                        }
+            if (params.row.distributionCashStatus != 'APPLY') {
+              return h("div", { class: "ops" }, [
+                h(
+                  "a",
+                  {
+                    on: {
+                      click: () => {
+                        this.view(params.row);
                       }
-                    },
-                    "查看"
-                  ),
-
-                ]);
-            }else {
-                return h("div", [
-                  h(
-                    "Button",
-                    {
-                      props: {
-                        type: "primary",
-                        size: "small",
-                      },
-                      style: {
-                        marginRight: "5px"
-                      },
-                      on: {
-                        click: () => {
-                          this.edit(params.row);
-                        }
+                    }
+                  },
+                  "查看"
+                ),
+              ]);
+            } else {
+              return h("div", { class: "ops" }, [
+                h(
+                  "a",
+                  {
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
                       }
-                    },
-                    "审核"
-                  ),
-
-                ]);
+                    }
+                  },
+                  "审核"
+                ),
+              ]);
             }
           }
         }
@@ -230,7 +214,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 获取列表数据
@@ -312,3 +296,15 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
+</style>

manager/src/views/distribution/distributionGoods.vue

@@ -32,7 +32,7 @@
       </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="[10,20,50]" size="small" show-total show-elevator
+          @on-page-size-change="changePageSize" :page-size-opts="[20,50,100]" size="small" show-total show-elevator
           show-sizer></Page>
       </Row>
     </Card>
@@ -53,7 +53,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
       },
@@ -137,14 +137,10 @@ export default {
           fixed: "right",
           minWidth: 100,
           render: (h, params) => {
-            return h("div", [
+            return h("div", { class: "ops" }, [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   on: {
                     click: () => {
                       this.remove(params.row);
@@ -180,7 +176,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 清除选中状态
@@ -256,5 +252,17 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
+</style>
 
 

manager/src/views/distribution/distributionOrder.vue

@@ -58,7 +58,7 @@
       </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="[10,20,50]"
+          @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>
@@ -87,7 +87,7 @@
         loading: true, // 表单加载状态
         searchForm: { // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort:"create_time",
           order:"desc"
         },
@@ -164,7 +164,7 @@
       // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
+        this.searchForm.pageSize = 20;
         this.getDataList();
       },
       // 获取列表数据
@@ -192,7 +192,7 @@
       getShopList(val) { // 获取店铺列表 搜索用
         const params = {
           pageNumber: 1,
-          pageSize: 10,
+          pageSize: 20,
           storeName: ''
         }
         if (val) {
@@ -210,7 +210,7 @@
       },
       filterStatus (status) { // 过滤订单状态
         const arr = [
-          {status: 'WAIT_BILL', title: '待结算'},
+          {status: 'NO_COMPLETED', title: '未完成'},
           {status: 'COMPLETE', title: '完成'},
           {status: 'REFUND', title: '退款'},
         ]
@@ -219,21 +219,20 @@
             return arr[i].title;
           }
         }
+        return '未完成'; // 默认返回未完成
       },
       filterStatusColor (status) { // 状态tag标签颜色
         const arr = [
-          {status: 'WAIT_BILL', color: 'blue'},
-          {status: 'WAIT_CASH', color: 'orange'},
-          {status: 'COMPLETE_CASH', color: 'green'},
-          {status: 'CANCEL', color: 'red'},
-          {status: 'NO_COMPLETED', color: 'red'},
-          {status: 'REFUND', color: 'magenta'},
+          {status: 'NO_COMPLETED', color: 'orange'},
+          {status: 'COMPLETE', color: 'green'},
+          {status: 'REFUND', color: 'red'},
         ]
         for (let i=0;i<arr.length;i++) {
           if (arr[i].status === status) {
             return arr[i].color;
           }
         }
+        return 'orange'; // 默认返回橙色
       }
     },
     mounted() {

manager/src/views/goods-unit/index.vue

@@ -21,7 +21,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,7 +70,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         name: "",
@@ -121,18 +121,17 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
+          fixed: "right",
           width: 200,
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -143,14 +142,17 @@ export default {
                 "修改"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -187,7 +189,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 清除选中

manager/src/views/goods/goods-info/goodsApply.vue

@@ -66,7 +66,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,7 +90,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "create_time", // 默认排序字段
         order: "desc", // 默认排序方式
       },
@@ -171,13 +171,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "success",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -189,13 +188,17 @@ export default {
                 "通过"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -207,11 +210,17 @@ export default {
                 "拒绝"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: 'default',
-                    size: "small",
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none"
                   },
                   on: {
                     click: () => {
@@ -247,7 +256,7 @@ export default {
     handleSearch() {
       // 搜索
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     getDataList() {

manager/src/views/goods/goods-manage/brand.vue

@@ -16,7 +16,7 @@
       <Table :loading="loading" border :columns="columns" :data="data" ref="table"></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="[10, 20, 50]" size="small"
+              @on-page-size-change="changePageSize" :page-size-opts="[20, 50, 100]" size="small"
               show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
@@ -63,7 +63,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "create_time", // 默认排序字段
         order: "desc", // 默认排序方式
       },
@@ -153,13 +153,12 @@ export default {
             let enableOrDisable = "";
             if (params.row.deleteFlag == 0) {
               enableOrDisable = h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    size: "small",
-                    type: "error",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -172,13 +171,12 @@ export default {
               );
             } else {
               enableOrDisable = h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "success",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -192,13 +190,12 @@ export default {
             }
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -209,17 +206,24 @@ export default {
                 },
                 "编辑"
               ),
-              enableOrDisable,
-
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              enableOrDisable,
+              h(
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: 'default',
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -264,7 +268,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 获取数据

manager/src/views/goods/goods-manage/category.vue

@@ -15,54 +15,31 @@
       >
         <template slot="action" slot-scope="scope">
           <Dropdown v-show="scope.row.level == 2" trigger="click">
-            <Button size="small">
+            <a class="ops-link">
               绑定
               <Icon type="ios-arrow-down"></Icon>
-            </Button>
+            </a>
             <DropdownMenu slot="list">
-              <DropdownItem @click.native="brandOperation(scope.row)"
-                >编辑绑定品牌</DropdownItem
-              >
-              <DropdownItem @click.native="specOperation(scope.row)"
-                >编辑绑定规格</DropdownItem
-              >
-              <DropdownItem @click.native="parameterOperation(scope.row)"
-                >编辑绑定参数</DropdownItem
-              >
+              <DropdownItem @click.native="brandOperation(scope.row)">编辑绑定品牌</DropdownItem>
+              <DropdownItem @click.native="specOperation(scope.row)">编辑绑定规格</DropdownItem>
+              <DropdownItem @click.native="parameterOperation(scope.row)">编辑绑定参数</DropdownItem>
             </DropdownMenu>
           </Dropdown>
-
-          &nbsp;
+          <span class="ops-sep">|</span>
           <Dropdown trigger="click">
-            <Button size="small">
+            <a class="ops-link">
               操作
               <Icon type="ios-arrow-down"></Icon>
-            </Button>
+            </a>
             <DropdownMenu slot="list">
               <DropdownItem @click.native="edit(scope.row)">编辑</DropdownItem>
-              <DropdownItem
-                v-if="scope.row.deleteFlag == 1"
-                @click.native="enable(scope.row)"
-                >启用</DropdownItem
-              >
-              <DropdownItem
-                v-if="scope.row.deleteFlag == 0"
-                @click.native="disable(scope.row)"
-                >禁用</DropdownItem
-              >
+              <DropdownItem v-if="scope.row.deleteFlag == 1" @click.native="enable(scope.row)">启用</DropdownItem>
+              <DropdownItem v-if="scope.row.deleteFlag == 0" @click.native="disable(scope.row)">禁用</DropdownItem>
               <DropdownItem @click.native="remove(scope.row)">删除</DropdownItem>
             </DropdownMenu>
           </Dropdown>
-          &nbsp;
-          <Button
-            v-show="scope.row.level != 2"
-            type="primary"
-            @click="addChildren(scope.row)"
-            size="small"
-            icon="md-add"
-            style="margin-right: 5px"
-            >添加子分类
-          </Button>
+          <span v-if="scope.row.level != 2" class="ops-sep">|</span>
+          <a v-show="scope.row.level != 2" class="ops-link" @click="addChildren(scope.row)">添加子分类</a>
         </template>
 
         <template slot="commissionRate" slot-scope="scope">
@@ -550,4 +527,14 @@ export default {
   min-height: 100vh;
   height: auto;
 }
+.ops-link {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops-sep {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
 </style>

manager/src/views/goods/goods-manage/spec.vue

@@ -19,7 +19,7 @@
       </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="[10, 20, 50]" size="small" show-total show-elevator
+          @on-page-size-change="changePageSize" :page-size-opts="[20, 50, 100]" size="small" show-total show-elevator
           show-sizer></Page>
       </Row>
     </Card>
@@ -61,7 +61,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "asc", // 默认排序方式
       },
@@ -110,13 +110,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -128,11 +127,17 @@ export default {
                 "编辑"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -172,14 +177,14 @@ export default {
     //搜索参数
     handleSearch () {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     //重置搜索参数
     handleReset () {
       this.$refs.searchForm.resetFields();
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       // 重新加载数据
       this.getDataList();
     },

manager/src/views/goods/goods-review/index.vue

@@ -23,7 +23,7 @@
       </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="[10, 20, 50]"
+              @on-page-size-change="changePageSize" :page-size-opts="[20, 50, 100]"
               size="small" show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
@@ -112,7 +112,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -189,18 +189,15 @@ export default {
           width: 150,
           align: "center",
           fixed: "right",
-
           render: (h, params) => {
-            return h("div", [
+            return h("div", { class: "ops" }, [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    size: "small",
-                    type: "info",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -211,22 +208,38 @@ export default {
                 "查看"
               ),
               h(
-                "Button",
+                "span",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    margin: "0 8px",
+                    color: "#dcdee2",
                   },
+                },
+                "|"
+              ),
+              h(
+                "Poptip",
+                {
+                  props: { confirm: true, title: "确认删除" },
                   on: {
-                    click: () => {
+                    "on-ok": () => {
                       this.remove(params.row);
                     },
                   },
                 },
-                "删除"
+                [
+                  h(
+                    "a",
+                    {
+                      style: {
+                        color: "#2d8cf0",
+                        cursor: "pointer",
+                        textDecoration: "none",
+                      },
+                    },
+                    "删除"
+                  ),
+                ]
               ),
             ]);
           },
@@ -265,7 +278,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     //列表直接选择页面是否展示
@@ -372,4 +385,14 @@ label {
   margin: 5px 0;
   span{margin-right: 20px;}
 }
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
 </style>

manager/src/views/logistics/index.vue

@@ -26,7 +26,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

manager/src/views/member/advance/recharge.vue

@@ -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
@@ -79,7 +79,7 @@
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
           startDate: "", // 起始时间
@@ -175,11 +175,11 @@
         this.getDataList();
       },
       // 搜索
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getDataList();
-      },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 20;
+      this.getDataList();
+    },
       // 时间段赋值
       selectDateRange(v) {
         if (v) {

manager/src/views/member/advance/walletLog.vue

@@ -17,7 +17,7 @@
     <Card>
       <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table"></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="[10, 20, 50]"
+        <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>
@@ -31,16 +31,16 @@ export default {
   data() {
     return {
       loading: true, // 表单加载状态
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
-        startDate: "", // 起始时间
-        endDate: "", // 终止时间
-        memberName: "",
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+        pageSize: 20, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+          memberName: "",
+        },
       selectDate: null, // 选择时间段
       columns: [
         // 表头
@@ -115,7 +115,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 时间段赋值

manager/src/views/member/advance/withdrawApply.vue

@@ -28,7 +28,7 @@
     <Card>
       <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="mt_10">
-        <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"
+        <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>
@@ -117,7 +117,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -194,49 +194,49 @@ export default {
           fixed: "right",
           render: (h, params) => {
             if (params.row.applyStatus == "APPLY") {
-              return h(
-                "Button",
-                {
-                  props: {
-                    type: "primary",
-                    size: "small",
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.showList = {};
-                      this.roleModalVisible = true;
-                      this.showList = params.row;
-                      this.audit =""
+              return h("div", { class: "ops" }, [
+                h(
+                  "a",
+                  {
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
+                    },
+                    on: {
+                      click: () => {
+                        this.showList = {};
+                        this.roleModalVisible = true;
+                        this.showList = params.row;
+                        this.audit = "";
+                      },
                     },
                   },
-                },
-                "审核"
-              );
+                  "审核"
+                ),
+              ]);
             } else {
-              return h(
-                "Button",
-                {
-                  props: {
-                    type: "default",
-                    size: "small",
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.showList = {};
-                      this.queryModalVisible = true;
-                      this.showList = params.row;
-                      this.modalTitle = "查看";
+              return h("div", { class: "ops" }, [
+                h(
+                  "a",
+                  {
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
+                    },
+                    on: {
+                      click: () => {
+                        this.showList = {};
+                        this.queryModalVisible = true;
+                        this.showList = params.row;
+                        this.modalTitle = "查看";
+                      },
                     },
                   },
-                },
-                "查看"
-              );
+                  "查看"
+                ),
+              ]);
             }
           },
         },
@@ -293,13 +293,13 @@ export default {
     },
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     handleReset() {
       this.$refs.searchForm.resetFields();
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.selectDate = null;
       this.searchForm.startDate = "";
       this.searchForm.endDate = "";
@@ -347,4 +347,16 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
+</style>
 

manager/src/views/member/list/index.vue

@@ -135,7 +135,7 @@ export default {
       searchForm: {
         // 请求参数
         pageNumber: 1,
-        pageSize: 20,
+        pageSize: 20, // 页面大小
         order: "desc",
         id: "",
         username: "",
@@ -248,15 +248,13 @@ export default {
               },
               [
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      size: "small",
-                      type: params.row.___selected ? "primary" : "default",
-                    },
                     style: {
-                      marginRight: "5px",
-                      display: this.selectedMember ? "block" : "none",
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
+                      display: this.selectedMember ? "inline-block" : "none",
                     },
                     on: {
                       click: () => {
@@ -266,17 +264,25 @@ export default {
                   },
                   params.row.___selected ? "已选择" : "选择"
                 ),
-
                 h(
-                  "Button",
+                  "span",
                   {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
                     style: {
-                      marginRight: "5px",
-                      display: this.selectedMember ? "none" : "block",
+                      margin: "0 8px",
+                      color: "#dcdee2",
+                      display: this.selectedMember ? "inline-block" : "none",
+                    },
+                  },
+                  "|"
+                ),
+                h(
+                  "a",
+                  {
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
+                      display: this.selectedMember ? "none" : "inline-block",
                     },
                     on: {
                       click: () => {
@@ -287,16 +293,24 @@ export default {
                   "查看"
                 ),
                 h(
-                  "Button",
+                  "span",
                   {
-                    props: {
-                      type: "info",
-                      size: "small",
-                      ghost: true,
-                    },
                     style: {
-                      marginRight: "5px",
-                      display: this.selectedMember ? "none" : "block",
+                      margin: "0 8px",
+                      color: "#dcdee2",
+                      display: this.selectedMember ? "none" : "inline-block",
+                    },
+                  },
+                  "|"
+                ),
+                h(
+                  "a",
+                  {
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
+                      display: this.selectedMember ? "none" : "inline-block",
                     },
                     on: {
                       click: () => {
@@ -307,15 +321,24 @@ export default {
                   "编辑"
                 ),
                 h(
-                  "Button",
+                  "span",
                   {
-                    props: {
-                      size: "small",
-                      type: "error",
-                    },
                     style: {
-                      marginRight: "5px",
-                      display: this.selectedMember ? "none" : "block",
+                      margin: "0 8px",
+                      color: "#dcdee2",
+                      display: this.selectedMember ? "none" : "inline-block",
+                    },
+                  },
+                  "|"
+                ),
+                h(
+                  "a",
+                  {
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
+                      display: this.selectedMember ? "none" : "inline-block",
                     },
                     on: {
                       click: () => {

manager/src/views/member/list/memberDetail.vue

@@ -93,14 +93,14 @@
                 :current="pointSearchForm.pageNumber"
                 :total="pointTotal"
                 :page-size="pointSearchForm.pageSize"
-                @on-change="pointChangePage"
-                @on-page-size-change="pointChangePageSize"
-                :page-size-opts="[10, 20, 50]"
-                size="small"
-                show-total
-                show-elevator
-                show-sizer
-              ></Page>
+              @on-change="pointChangePage"
+              @on-page-size-change="pointChangePageSize"
+              :page-size-opts="[20, 50, 100]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
             </Row>
           </div>
         </TabPane>
@@ -180,14 +180,14 @@
                 :current="orderSearchForm.pageNumber"
                 :total="orderTotal"
                 :page-size="orderSearchForm.pageSize"
-                @on-change="orderChangePage"
-                @on-page-size-change="orderChangePageSize"
-                :page-size-opts="[10, 20, 50]"
-                size="small"
-                show-total
-                show-elevator
-                show-sizer
-              ></Page>
+              @on-change="orderChangePage"
+              @on-page-size-change="orderChangePageSize"
+              :page-size-opts="[20, 50, 100]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
             </Row>
           </div>
         </TabPane>
@@ -210,7 +210,7 @@
               :page-size="addressSearchForm.pageSize"
               @on-change="addressChangePage"
               @on-page-size-change="addressChangePageSize"
-              :page-size-opts="[10, 20, 50]"
+              :page-size-opts="[20, 50, 100]"
               size="small"
               show-total
               show-elevator
@@ -259,7 +259,7 @@
               :page-size="walletSearchForm.pageSize"
               @on-change="walletChangePage"
               @on-page-size-change="walletChangePageSize"
-              :page-size-opts="[10, 20, 50]"
+              :page-size-opts="[20, 50, 100]"
               size="small"
               show-total
               show-elevator
@@ -304,7 +304,7 @@
               :page-size="receiptRecordSearchForm.pageSize"
               @on-change="walletChangePage"
               @on-page-size-change="walletChangePageSize"
-              :page-size-opts="[10, 20, 50]"
+              :page-size-opts="[20, 50, 100]"
               size="small"
               show-total
               show-elevator
@@ -438,7 +438,7 @@
         //历史积分数据查询form
         pointSearchForm: {
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
         },
         orderColumns: [
           {
@@ -584,13 +584,12 @@
                 }
               }, [
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
                     style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
                       marginRight: "5px",
                     },
                     on: {
@@ -611,7 +610,7 @@
         //TA的订单form
         orderSearchForm: {
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           payStatus: "",
           orderSn: "",
           orderType: "",
@@ -672,7 +671,7 @@
         //TA的收货地址form
         addressSearchForm: {
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
         },
         //消费记录
         walletColumns: [
@@ -726,7 +725,7 @@
         //TA的余额消费记录
         walletSearchForm: {
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
         },
@@ -735,7 +734,7 @@
         //TA的发票记录
         receiptRecordSearchForm: {
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
         },
@@ -854,6 +853,8 @@
       //查询TA的发票记录
       getReceiptRecordData(){
         this.loading = true;
+        this.receiptRecordSearchForm.pageNumber = 1;
+        this.receiptRecordSearchForm.pageSize = 20;
         this.receiptRecordSearchForm.memberId = this.id
         API_Order.getReceiptPage(this.receiptRecordSearchForm).then((res) => {
           this.loading = false;
@@ -868,6 +869,8 @@
       //查询TA的订单
       getOrderData() {
         this.loading = true;
+        this.orderSearchForm.pageNumber = 1;
+        this.orderSearchForm.pageSize = 20;
         this.orderSearchForm.memberId = this.id
         API_Order.getOrderList(this.orderSearchForm).then((res) => {
           this.loading = false;

manager/src/views/member/list/memberRecycle.vue

@@ -57,7 +57,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
@@ -171,7 +171,7 @@ export default {
       searchForm: {
         // 请求参数
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         order: "desc",
         username: "",
         mobile: "",
@@ -230,92 +230,56 @@ export default {
           width: 200,
           fixed: "right",
           render: (h, params) => {
+            const linkStyle = {
+              color: "#2d8cf0",
+              cursor: "pointer",
+              textDecoration: "none",
+            };
+            const sep = h(
+              "span",
+              { style: { margin: "0 8px", color: "#dcdee2" } },
+              "|"
+            );
+            const children = [];
+            if (this.selectedMember) {
+              children.push(
+                h(
+                  "a",
+                  { style: linkStyle, on: { click: () => this.callback(params.row) } },
+                  "选择"
+                )
+              );
+              children.push(sep);
+            }
+            children.push(
+              h(
+                "a",
+                { style: linkStyle, on: { click: () => this.detail(params.row) } },
+                "查看"
+              )
+            );
+            if (!this.selectedMember) {
+              children.push(sep);
+              children.push(
+                h(
+                  "a",
+                  { style: linkStyle, on: { click: () => this.enable(params.row) } },
+                  "启用"
+                )
+              );
+              children.push(sep);
+              children.push(
+                h(
+                  "a",
+                  { style: linkStyle, on: { click: () => this.editPerm(params.row) } },
+                  "编辑"
+                )
+              );
+            }
             return h(
               "div",
-              {
-                style: {
-                  display: "flex",
-                  justifyContent: "center",
-                },
-              },
-              [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                      display: this.selectedMember ? "block" : "none",
-                    },
-                    on: {
-                      click: () => {
-                        this.callback(params.row);
-                      },
-                    },
-                  },
-                  "选择"
-                ),
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.detail(params.row);
-                      },
-                    },
-                  },
-                  "查看"
-                ),
-
-                h(
-                  "Button",
-                  {
-                    props: {
-                      size: "small",
-                      type: "success",
-                    },
-                    style: {
-                      marginRight: "5px",
-                      display: this.selectedMember ? "none" : "block",
-                    },
-                    on: {
-                      click: () => {
-                        this.enable(params.row);
-                      },
-                    },
-                  },
-                  "启用"
-                ),
-
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                      ghost: true,
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.editPerm(params.row);
-                      },
-                    },
-                  },
-                  "编辑"
-                ),
-              ]
+              { class: "ops", style: { display: "flex", justifyContent: "center" } },
+              children
             );
           },
         },
@@ -347,7 +311,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getData();
     },
     //查看详情修改
@@ -465,4 +429,14 @@ export default {
   height: 60px;
   border-radius: 50%;
 }
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
 </style>

manager/src/views/member/message-manage/weChatMessageManager.vue

@@ -55,7 +55,7 @@
                 :page-size="weChatSearchForm.pageSize"
                 @on-change="changePage"
                 @on-page-size-change="changePageSize"
-                :page-size-opts="[10,20,50]"
+                :page-size-opts="[20, 50, 100]"
                 size="small"
               ></Page>
             </Row>
@@ -82,7 +82,7 @@
                 :page-size="weChatMPSearchForm.pageSize"
                 @on-change="changePage"
                 @on-page-size-change="changePageSize"
-                :page-size-opts="[10,20,50]"
+                :page-size-opts="[20, 50, 100]"
                 size="small"
               ></Page>
             </Row>
@@ -126,12 +126,12 @@ export default {
       weChatSearchForm: {
         // 搜索框对应data对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
       },
       weChatMPSearchForm: {
         // 搜索框对应data对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
       },
       weChatColumns: [
         {
@@ -178,14 +178,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "primary",
-                    size: "small"
-                  },
                   style: {
-                    marginRight: "5px"
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none"
                   },
                   on: {
                     click: () => {
@@ -196,14 +194,17 @@ export default {
                 "编辑"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small"
-                  },
                   style: {
-                    marginRight: "5px"
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none"
                   },
                   on: {
                     click: () => {

manager/src/views/member/point/point.vue

@@ -40,7 +40,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
@@ -68,7 +68,7 @@
         loading: true, // 表单加载状态
         searchForm: { // 请求参数
           pageNumber: 1,
-          pageSize: 10,
+          pageSize: 20,
         },
         columns: [
           {
@@ -141,7 +141,7 @@
       // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
+        this.searchForm.pageSize = 20;
         this.getData();
       },
       //查新积分列表

manager/src/views/order/after-order/afterSale.vue

@@ -20,7 +20,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
@@ -46,7 +46,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
@@ -72,7 +72,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
@@ -99,7 +99,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
@@ -155,7 +155,7 @@
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
           serviceType: "RETURN_MONEY"
@@ -181,43 +181,48 @@
             key: "action",
             align: "center",
             width: 200,
-            render: (h, params) => {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
-                    on: {
-                      click: () => {
-                        this.edit(params.row);
-                      }
-                    }
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "a",
+                {
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
+                    marginRight: "5px"
                   },
-                  "编辑"
-                ),
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "error",
-                      size: "small",
-                    },
-                    on: {
-                      click: () => {
-                        this.remove(params.row);
-                      }
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
                     }
+                  }
+                },
+                "编辑"
+              ),
+              h(
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
+                {
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none"
                   },
-                  "删除"
-                )
-              ]);
-            },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    }
+                  }
+                },
+                "删除"
+              )
+            ]);
+          },
           },
         ],
         data: [], // 表单数据
@@ -241,7 +246,7 @@
       //切换tab
       handleClickType(v) {
         this.searchForm.pageNumber = 1 // 当前页数
-        this.searchForm.pageSize = 10 // 页面大小
+        this.searchForm.pageSize = 20 // 页面大小
         //退款
         if (v == "RETURN_MONEY") {
           this.searchForm.serviceType = "RETURN_MONEY"

manager/src/views/order/after-order/afterSaleOrder.vue

@@ -106,7 +106,7 @@
         <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" />
+              <img :src="row.goodsImage" style="width: 60px; height: 60px; margin-top: 3px; object-fit: cover; border-radius: 4px;" />
             </div>
 
             <div style="margin-left: 13px">
@@ -282,14 +282,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none"
                   },
                   on: {
                     click: () => {

manager/src/views/order/after-order/afterSaleOrderDetail.vue

@@ -19,7 +19,7 @@
               </dd>
             </dl>
             <dl>
-              <dt>退货状态</dt>
+              <dt>售后状态</dt>
               <dd>{{ afterSaleInfo.serviceName }}</dd>
             </dl>
             <dl>
@@ -376,11 +376,11 @@ export default {
           status: "APPLY",
         },
         {
-          name: "通过",
+          name: "通过售后",
           status: "PASS",
         },
         {
-          name: "拒绝",
+          name: "拒绝售后",
           status: "REFUSE",
         },
         {
@@ -404,7 +404,7 @@ export default {
           status: "COMPLETE",
         },
         {
-          name: "等待平台退款",
+          name: "待平台退款",
           status: "WAIT_REFUND",
         },
       ],
@@ -511,7 +511,7 @@ export default {
       const ob = this.afterSaleStatusList.filter((e) => {
         return e.status === status;
       });
-      return ob[0].name;
+      return ob.length > 0 ? ob[0].name : status;
     },
     // 根据订单状态判断是否显示物流信息
     showDelivery(status) {

manager/src/views/order/after-order/orderComplaint.vue

@@ -61,7 +61,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
@@ -86,7 +86,7 @@
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
         },
@@ -144,24 +144,22 @@
             }
           },
 
-          {
-            title: "操作",
-            key: "action",
-            align: "center",
-            fixed: "right",
-            width: 150,
-            render: (h, params) => {
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 150,
+          render: (h, params) => {
               if(params.row.complainStatus === "COMPLETE"){
                 return h("div", [
                   h(
-                    "Button",
+                    "a",
                     {
-                      props: {
-                        type: "info",
-                        size: "small",
-                      },
                       style: {
-                        marginRight: "5px",
+                        color: "#2d8cf0",
+                        cursor: "pointer",
+                        textDecoration: "none",
                       },
                       on: {
                         click: () => {
@@ -175,14 +173,12 @@
               }else{
                 return h("div", [
                   h(
-                    "Button",
+                    "a",
                     {
-                      props: {
-                        type: "primary",
-                        size: "small",
-                      },
                       style: {
-                        marginRight: "5px",
+                        color: "#2d8cf0",
+                        cursor: "pointer",
+                        textDecoration: "none",
                       },
                       on: {
                         click: () => {
@@ -227,7 +223,7 @@
       // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
+        this.searchForm.pageSize = 20;
         this.getDataList();
       },
       // 获取列表数据

manager/src/views/order/flow/paymentLog.vue

@@ -29,7 +29,7 @@
     <Card>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></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="[10, 20, 50]" size="small"
+        <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>
@@ -47,7 +47,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         sn: "",
@@ -184,7 +184,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     changeDate(val) {

manager/src/views/order/flow/refundLog.vue

@@ -93,7 +93,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
@@ -115,7 +115,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -196,7 +196,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 起止时间从新赋值

manager/src/views/order/order/fictitiousOrderList.vue

@@ -30,7 +30,7 @@
         @on-sort-change="changeSort"></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="[10, 20, 50]" size="small" show-total show-elevator
+          @on-page-size-change="changePageSize" :page-size-opts="[20, 50, 100]" size="small" show-total show-elevator
           show-sizer></Page>
       </Row>
     </Card>
@@ -48,7 +48,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "", // 默认排序字段
         order: "", // 默认排序方式
         startDate: "", // 起始时间
@@ -207,7 +207,7 @@ export default {
     // 搜索
     handleSearch () {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 列表排序

manager/src/views/order/order/orderList.vue

@@ -357,17 +357,26 @@ export default {
           width: 100,
           render: (h, params) => {
             return h(
-              "Button",
-              {
-                props: { type: "info", size: "small" },
-                style: { marginRight: "5px" },
-                on: {
-                  click: () => {
-                    this.detail(params.row);
+              "div",
+              { class: "ops" },
+              [
+                h(
+                  "a",
+                  {
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
                   },
-                },
-              },
-              "查看"
+                  "查看"
+                ),
+              ]
             );
           },
         },
@@ -536,4 +545,14 @@ export default {
     font-size: 14px;
   }
 }
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
 </style>

manager/src/views/page-decoration/floorList.vue

@@ -65,7 +65,7 @@
         :total="total"
         show-sizer
         size="small"
-        :page-size-opts="[10, 20, 50]"
+        :page-size-opts="[20, 50, 100]"
         show-elevator
         style="float: right; overflow: hidden"
         @on-change="changePageNum"
@@ -109,7 +109,7 @@ export default {
       },
       searchForm: {
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         sort: "createTime",
         order: "desc",
         pageType: "INDEX",

manager/src/views/page-decoration/wap/wapList.vue

@@ -44,7 +44,7 @@
         :current="params.pageNumber"
         :page-size="params.pageSize"
         show-sizer
-        :page-size-opts="[10, 20, 50]"
+        :page-size-opts="[20, 50, 100]"
         @on-page-size-change="changePageSize"
       />
     </Card>
@@ -95,7 +95,7 @@ export default {
       params: {
         // 请求参数
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         sort: "createTime",
         order: "desc",
         pageType: "INDEX",

manager/src/views/page/article-manage/ArticleCategory.vue

@@ -19,29 +19,21 @@
         primary-key="id"
       >
         <template slot="action" slot-scope="scope">
-          <Button
-            type="info"
+          <a
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:5px"
             @click="edit(scope.row)"
-            size="small"
-            style="margin-right: 5px"
-            >编辑
-          </Button>
-
-          <Button
-            type="error"
+          >编辑</a>
+          <span style="margin:0 8px;color:#dcdee2">|</span>
+          <a
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none;margin-right:5px"
             @click="remove(scope.row)"
-            size="small"
-            style="margin-right: 5px"
-            >删除
-          </Button>
-          <Button
+          >删除</a>
+          <span v-show="scope.row.level != 1" style="margin:0 8px;color:#dcdee2">|</span>
+          <a
             v-show="scope.row.level != 1"
-            type="success"
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none"
             @click="addChildren(scope.row)"
-            size="small"
-            style="margin-right: 5px"
-            >添加子分类
-          </Button>
+          >添加子分类</a>
         </template>
       </tree-table>
     </Card>

manager/src/views/page/article-manage/articleList.vue

@@ -65,7 +65,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
@@ -165,14 +165,14 @@ export default {
       modalVisible: false, // 添加或编辑显示
       modalTitle: "", // 添加或编辑标题
       treeDataDefault: [],
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
-        categoryId: "",
-      },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 20, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          categoryId: "",
+        },
       searchTreeValue: "", // 切换
       form: {
         // 添加或编辑表单对象初始化数据
@@ -221,16 +221,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    size: "small",
-                    type:
-                      this.selectedIndex == params.index
-                        ? "primary"
-                        : "default",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                     display: this.selected ? "" : "none",
                   },
@@ -244,13 +240,17 @@ export default {
                 this.selectedIndex == params.index ? "已选" : "选择"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    size: "small",
-                    type: "info",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -262,11 +262,17 @@ export default {
                 "编辑"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -357,7 +363,7 @@ export default {
     // 搜索列表
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 获取全部文章分类

manager/src/views/page/feedback/feedback.vue

@@ -16,7 +16,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
@@ -79,7 +79,7 @@
         form: {}, // 表单数据
         searchForm: { // 请求参数
           pageNumber: 1,
-          pageSize: 10,
+          pageSize: 20,
           sort: "createTime",
           order: "desc",
         },
@@ -133,17 +133,10 @@
             align: "center",
             width: 130,
             render: (h, params) => {
-              return h("div", [
+              return h("div", { class: "ops" }, [
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      size: "small",
-                      type: "info"
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
                     on: {
                       click: () => {
                         this.detail(params.row);
@@ -208,3 +201,15 @@
     },
   };
 </script>
+<style lang="scss" scoped>
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
+</style>

manager/src/views/privacy-content/index.vue

@@ -109,16 +109,14 @@ export default {
           align: "center",
           width: 230,
           render: (h, params) => {
-            return h("div", [
+            return h("div", { class: "ops" }, [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    size: "small",
-                    type: "info",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -283,4 +281,14 @@ export default {
       overflow-y: scroll;
     }
   }
+  .ops a {
+    color: #2d8cf0;
+    cursor: pointer;
+    text-decoration: none;
+  }
+  .ops span {
+    display: inline-block;
+    margin: 0 8px;
+    color: #dcdee2;
+  }
 </style>

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: () => {

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();
     },
     //数据获取

manager/src/views/promotions/coupon/coupon-receive.vue

@@ -90,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
@@ -112,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: [
@@ -284,7 +284,7 @@ export default {
     handleSearch() {
       // 搜索
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     /**

manager/src/views/promotions/coupon/coupon.vue

@@ -75,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">
@@ -127,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
@@ -153,14 +134,14 @@ 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: [
@@ -388,7 +369,7 @@ export default {
     handleSearch() {
       // 搜索
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     clearSelectAll() {

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,

manager/src/views/promotions/full-discount/full-discount.vue

@@ -72,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>
@@ -91,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
@@ -111,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: [
         // 表头
         {
@@ -205,7 +209,7 @@ export default {
     handleSearch() {
       // 搜索
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 获取列表数据

manager/src/views/promotions/kanjia/kanjia-activity-goods.vue

@@ -98,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">
@@ -129,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
@@ -158,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: {
         // 添加或编辑表单对象初始化数据
       },
@@ -283,7 +273,7 @@ export default {
     },
     handleSearch() {
       this.searchForm.pageNumber = 0;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     changeSort(e) {

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",
       },

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, // 表单数据总数

manager/src/views/promotions/pintuan/pintuan.vue

@@ -52,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">
@@ -71,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
@@ -92,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: [
         // 表头
         {
@@ -163,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;

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();

manager/src/views/promotions/points-goods/points-goods.vue

@@ -110,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">
@@ -143,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
@@ -171,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" },
@@ -275,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;

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, // 多选计数

manager/src/views/promotions/seckill/seckill.vue

@@ -64,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>
 
@@ -114,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
@@ -144,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: [
         // 表单
@@ -223,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 } });

manager/src/views/seller/bill/accountStatementBill.vue

@@ -17,7 +17,7 @@
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10" @on-selection-change="changeSelect">
       </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="[10, 20, 50]"
+        <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>
@@ -36,7 +36,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -110,16 +110,14 @@ export default {
           fixed: "right",
           width: 120,
           render: (h, params) => {
-            return h("div", [
+            return h("div", { class: "ops" }, [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -216,4 +214,14 @@ export default {
 ::v-deep .ivu-col {
   min-height: 100vh;
 }
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
 </style>

manager/src/views/seller/bill/bill-detail.vue

@@ -44,7 +44,7 @@
           <Row type="flex" justify="end" class="mt_10">
             <Page :current="orderParam.pageNumber" :total="orderTotal" :page-size="orderParam.pageSize"
                   @on-change="orderChangePage" @on-page-size-change="orderChangePageSize" size="small" show-total
-                  show-elevator></Page>
+                  :page-size-opts="[20, 50, 100]" show-elevator show-sizer></Page>
           </Row>
         </Tab-pane>
       </Tabs>
@@ -304,7 +304,7 @@ export default {
       orderParam: {
         // 请求参数
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "id", // 默认排序字段
         order: "desc", // 默认排序方式
         // flowType: "PAY",

manager/src/views/seller/bill/bill.vue

@@ -27,7 +27,7 @@
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-selection-change="changeSelect">
       </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="[10, 20, 50]"
+        <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>
@@ -46,7 +46,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -121,16 +121,14 @@ export default {
           fixed: "right",
           width: 120,
           render: (h, params) => {
-            return h("div", [
+            return h("div", { class: "ops" }, [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -162,7 +160,7 @@ export default {
     },
     handleSearch() { // 搜索
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     changeSelect(e) { // 表格选中
@@ -254,3 +252,15 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.ops a {
+  color: #2d8cf0;
+  cursor: pointer;
+  text-decoration: none;
+}
+.ops span {
+  display: inline-block;
+  margin: 0 8px;
+  color: #dcdee2;
+}
+</style>

manager/src/views/seller/shop/shopAuditList.vue

@@ -29,7 +29,7 @@
     <Card>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></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="[10, 20, 50]"
+        <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>
@@ -48,7 +48,7 @@
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
           startDate: "", // 起始时间
@@ -167,6 +167,7 @@
       // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 20;
         this.getDataList();
       },
       // 起止时间从新赋值

manager/src/views/seller/shop/shopDetail.vue

@@ -304,7 +304,7 @@
                 :page-size="orderSearchForm.pageSize"
                 @on-change="orderChangePage"
                 @on-page-size-change="orderChangePageSize"
-                :page-size-opts="[10, 20, 50]"
+                :page-size-opts="[20, 50, 100]"
                 size="small"
                 show-total
                 show-elevator
@@ -427,7 +427,7 @@
                 :page-size="refundGoodsOrderSearchForm.pageSize"
                 @on-change="refundGoodsOrderChangePage"
                 @on-page-size-change="refundGoodsOrderChangePageSize"
-                :page-size-opts="[10, 20, 50]"
+                :page-size-opts="[20, 50, 100]"
                 size="small"
                 show-total
                 show-elevator
@@ -550,7 +550,7 @@
                 :page-size="refundOrderSearchForm.pageSize"
                 @on-change="refundOrderChangePage"
                 @on-page-size-change="refundOrderChangePageSize"
-                :page-size-opts="[10, 20, 50]"
+                :page-size-opts="[20, 50, 100]"
                 size="small"
                 show-total
                 show-elevator
@@ -731,7 +731,7 @@
         //TA的订单form
         orderSearchForm: {
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           payStatus: "",
           orderSn: "",
           orderType: "",
@@ -834,12 +834,12 @@
         //TA的退货单form
         refundGoodsOrderSearchForm: {
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
         },
         //TA的退款单form
         refundOrderSearchForm: {
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
         },
         refundOrderData: [],//售后单数据
         refundOrderTotal: 0,//售后单总条数

manager/src/views/seller/shop/shopList.vue

@@ -41,7 +41,7 @@
       </Row>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table"></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="[10, 20, 50]"
+        <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>
@@ -63,7 +63,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -152,14 +152,12 @@ export default {
             let enableOrDisable = "";
             if (params.row.storeDisable == "OPEN") {
               enableOrDisable = h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    size: "small",
-                    type: "error"
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -171,14 +169,12 @@ export default {
               );
             } else if (params.row.storeDisable == "CLOSED") {
               enableOrDisable = h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "success",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -191,14 +187,12 @@ export default {
             } else if (params.row.storeDisable == "APPLYING") {
               return h("div", [
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
                     style: {
-                      marginRight: "5px",
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
                     },
                     on: {
                       click: () => {
@@ -209,14 +203,17 @@ export default {
                   "审核"
                 ),
                 h(
-                  "Button",
+                  "span",
+                  { style: { margin: "0 8px", color: "#dcdee2" } },
+                  "|"
+                ),
+                h(
+                  "a",
                   {
-                    props: {
-                      type: "primary",
-                      size: "small",
-                    },
                     style: {
-                      marginRight: "5px",
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
                     },
                     on: {
                       click: () => {
@@ -231,14 +228,12 @@ export default {
 
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type:"default",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     display: this.selectedShop ? "inline-block" : "none",
                   },
                   on: {
@@ -250,14 +245,17 @@ export default {
                 "选择"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2", display: this.selectedShop ? "inline-block" : "none" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -268,15 +266,17 @@ export default {
                 "查看"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                    ghost:true
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -286,6 +286,11 @@ export default {
                 },
                 "修改"
               ),
+              h(
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
               enableOrDisable,
             ]);
           },
@@ -320,7 +325,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 起止时间分别赋值

manager/src/views/sensitive-words/index.vue

@@ -20,7 +20,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
@@ -65,7 +65,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         sensitiveWord: "",
@@ -123,13 +123,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -141,14 +140,22 @@ export default {
                 "修改"
               ),
               h(
-                "Button",
+                "span",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    margin: "0 8px",
+                    color: "#dcdee2",
+                  },
+                },
+                "|"
+              ),
+              h(
+                "a",
+                {
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {

manager/src/views/statistics/order.vue

@@ -192,6 +192,7 @@
           show-sizer
           show-elevator
           :total="total"
+          :page-size-opts="[20, 50, 100]"
         />
       </div>
     </Card>
@@ -301,20 +302,26 @@ export default {
           title: "操作",
           key: "action",
           render: (h, params) => {
-            return h('Button',{
-              props:{
-                size:'small'
-              },
-              on:{
-                click: () => {
-                 const { sn } = params.row
-                  this.$router.push({
-                    query: {sn},
-                    path: this.orderOrRefund == 1 ? 'order-detail' : 'after-order-detail' + '?sn='+sn
-                  })
+            return h(
+              'a',
+              {
+                style: {
+                  color: '#2d8cf0',
+                  cursor: 'pointer',
+                  textDecoration: 'none'
+                },
+                on: {
+                  click: () => {
+                    const { sn } = params.row
+                    this.$router.push({
+                      query: { sn },
+                      path: this.orderOrRefund == 1 ? 'order-detail' : 'after-order-detail' + '?sn=' + sn
+                    })
+                  }
                 }
-              }
-            },'查看')
+              },
+              '查看'
+            )
           },
         },
       ],
@@ -487,7 +494,7 @@ export default {
       // 退单订单
       refundParams: {
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         searchType: "LAST_SEVEN",
         storeId: "",
         year: "",
@@ -579,7 +586,7 @@ export default {
       this.overViewParams = callback;
       this.refundParams = callback;
       this.refundParams.pageNumber = 1
-      this.refundParams.pageSize = 10
+      this.refundParams.pageSize = 20
     },
 
     // 实例化订单概览

manager/src/views/sys/app-version/appVersion.vue

@@ -17,7 +17,7 @@
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"  ></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="[10, 20, 50]" size="small"
+        <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>
@@ -132,7 +132,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         type: "",
@@ -213,18 +213,17 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
+          fixed: "right",
           width: 230,
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -235,16 +234,17 @@ export default {
                 "查看"
               ),
               h(
-                "Button",
-
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                    ghost: true,
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -255,14 +255,17 @@ export default {
                 "修改"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {

manager/src/views/sys/log-manage/logManage.vue

@@ -87,7 +87,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-totalzx
           show-elevator
@@ -115,7 +115,7 @@ export default {
         key: "",
         operatorName: "",
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         startDate: "",
         endDate: "",
         sort: "createTime",

manager/src/views/sys/message/noticeMessageTemplate.vue

@@ -47,7 +47,7 @@
                   :page-size="searchMessageForm.pageSize"
                   @on-change="messageChangePage"
                   @on-page-size-change="messageChangePageSize"
-                  :page-size-opts="[10, 20, 50]"
+                  :page-size-opts="[20, 50, 100]"
                   size="small"
                   show-total
                   show-elevator
@@ -71,7 +71,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
@@ -241,7 +241,7 @@
               :page-size="searchShopMessageForm.pageSize"
               @on-change="shopMessageChangePage"
               @on-page-size-change="shopMessageChangePageSize"
-              :page-size-opts="[10, 20, 50]"
+              :page-size-opts="[20, 50, 100]"
               size="small"
               show-total
               show-elevator
@@ -268,7 +268,7 @@
               :page-size="searchMemberMessageForm.pageSize"
               @on-change="memberMessageChangePage"
               @on-page-size-change="memberMessageChangePageSize"
-              :page-size-opts="[10, 20, 50]"
+              :page-size-opts="[20, 50, 100]"
               size="small"
               show-total
               show-elevator
@@ -311,7 +311,7 @@
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
         },
@@ -329,19 +329,19 @@
         searchMessageForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
         },
         //发送给店铺的消息
         searchShopMessageForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
         },
         //发送给会员的消息
         searchMemberMessageForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
         },
         form: {
           noticeNode: "",
@@ -411,14 +411,8 @@
               let enableOrDisable = "";
               if (params.row.noticeStatus == "OPEN") {
                 enableOrDisable = h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
                     on: {
                       click: () => {
                         this.disable(params.row);
@@ -429,15 +423,8 @@
                 );
               } else {
                 enableOrDisable = h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      type: "success",
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
                     on: {
                       click: () => {
                         this.enable(params.row);
@@ -447,18 +434,16 @@
                   "开启"
                 );
               }
-              return h("div", [
+              return h("div", { class: "ops" }, [
                 enableOrDisable,
                 h(
-                  "Button",
+                  "span",
+                  { style: { margin: "0 8px", color: "#dcdee2" } },
+                  "|"
+                ),
+                h(
+                  "a",
                   {
-                    props: {
-                      type: "primary",
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
                     on: {
                       click: () => {
                         this.edit(params.row);
@@ -491,22 +476,19 @@
             minWidth: 50,
             align: "center",
             render: (h, params) => {
-              return h(
-                "Button",
-                {
-                  props: {
-                    size: "small",
-                    type: "error",
-                    ghost: true,
-                  },
-                  on: {
-                    click: () => {
-                      this.delUser(params.index);
+              return h("div", { class: "ops" }, [
+                h(
+                  "a",
+                  {
+                    on: {
+                      click: () => {
+                        this.delUser(params.index);
+                      },
                     },
                   },
-                },
-                "删除"
-              );
+                  "删除"
+                )
+              ]);
             },
           },
         ],
@@ -574,17 +556,10 @@
             fixed: "right",
             width: 140,
             render: (h, params) => {
-              return h("div", [
+              return h("div", { class: "ops" }, [
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      type: "info",
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
                     on: {
                       click: () => {
                         this.detail(params.row);
@@ -594,15 +569,13 @@
                   "详细"
                 ),
                 h(
-                  "Button",
+                  "span",
+                  { style: { margin: "0 8px", color: "#dcdee2" } },
+                  "|"
+                ),
+                h(
+                  "a",
                   {
-                    props: {
-                      type: "error",
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
                     on: {
                       click: () => {
                         this.delete(params.row.id);
@@ -1025,3 +998,15 @@
 <style lang="scss">
   @import "sms.scss";
 </style>
+<style lang="scss" scoped>
+  .ops a {
+    color: #2d8cf0;
+    cursor: pointer;
+    text-decoration: none;
+  }
+  .ops span {
+    display: inline-block;
+    margin: 0 8px;
+    color: #dcdee2;
+  }
+</style>

manager/src/views/sys/message/sms.vue

@@ -11,7 +11,7 @@
 
             <Row type="flex" justify="end" class="mt_10">
               <Page :current="smsSearchForm.pageNumber" :total="smsTotal" :page-size="smsSearchForm.pageSize" @on-change="smsChangePage" @on-page-size-change="smsChangePageSize"
-                :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
+                :page-size-opts="[20, 50, 100]" size="small" show-total show-elevator show-sizer></Page>
             </Row>
           </TabPane>
           <TabPane label="短信模板" name="TEMPLATE">
@@ -23,7 +23,7 @@
             </Table>
             <Row type="flex" justify="end" class="mt_10">
               <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>
+                @on-page-size-change="templateChangePageSize" :page-size-opts="[20, 50, 100]" size="small" show-total show-elevator show-sizer></Page>
             </Row>
           </TabPane>
           <TabPane label="短信签名" name="SIGN">
@@ -49,7 +49,7 @@
             </Table>
             <Row type="flex" justify="end" class="mt_10">
               <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>
+                :page-size-opts="[20, 50, 100]" size="small" show-total show-elevator show-sizer></Page>
             </Row>
           </TabPane>
         </Tabs>
@@ -181,12 +181,12 @@ export default {
       signSearchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
       },
       //短信模板查询form
       templateSearchForm: {
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
       },
       //会员条数查询form
       memberSearchFrom: {
@@ -203,7 +203,7 @@ export default {
         sort: "createTime",
         order: "desc",
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
       },
       smsForm: { // 短信模板数据
         smsName: "",
@@ -279,18 +279,17 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
+          fixed: "right",
           width: 150,
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "primary",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -343,20 +342,16 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small"
-                  },
                   style: {
-                    marginRight: "5px",
-                  },
-                  attrs: {
-                    disabled: params.row.templateStatus == 2 ? false : true,
+                    color: params.row.templateStatus == 2 ? "#2d8cf0" : "#c5c8ce",
+                    cursor: params.row.templateStatus == 2 ? "pointer" : "not-allowed",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
+                      if (params.row.templateStatus != 2) return;
                       this.editTemplate(params.row);
                     },
                   },
@@ -364,20 +359,21 @@ export default {
                 "编辑"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
-                  },
-                  attrs: {
-                    disabled: params.row.templateStatus == 0 ? true : false,
+                    color: params.row.templateStatus == 0 ? "#c5c8ce" : "#2d8cf0",
+                    cursor: params.row.templateStatus == 0 ? "not-allowed" : "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
+                      if (params.row.templateStatus == 0) return;
                       this.deleteSmsTemplate(params.row);
                     },
                   },
@@ -415,21 +411,16 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                    icon: "ios-create-outline",
-                  },
-                  attrs: {
-                    disabled: params.row.signStatus == 2 ? false : true,
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: params.row.signStatus == 2 ? "#2d8cf0" : "#c5c8ce",
+                    cursor: params.row.signStatus == 2 ? "pointer" : "not-allowed",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
+                      if (params.row.signStatus != 2) return;
                       this.editSign(params.row);
                     },
                   },
@@ -437,21 +428,21 @@ export default {
                 "编辑"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                    icon: "ios-create-outline",
-                  },
-                  attrs: {
-                    disabled: params.row.signStatus == 0 ? true : false,
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: params.row.signStatus == 0 ? "#c5c8ce" : "#2d8cf0",
+                    cursor: params.row.signStatus == 0 ? "not-allowed" : "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
+                      if (params.row.signStatus == 0) return;
                       this.deleteSmsSign(params.row);
                     },
                   },

manager/src/views/sys/oss-manage/ossManage.vue

@@ -635,16 +635,14 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "default",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
-                    display:
-                      this.selectImage === true ? "inline-block" : "none",
+                    display: this.selectImage === true ? "inline-block" : "none",
                   },
                   on: {
                     click: () => {
@@ -655,13 +653,23 @@ export default {
                 "选择"
               ),
               h(
-                "Button",
+                "span",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
+                    margin: "0 8px",
+                    color: "#dcdee2",
+                    display: this.selectImage === true ? "inline-block" : "none",
+                  },
+                },
+                "|"
+              ),
+              h(
+                "a",
+                {
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                     display: this.selectImage == true ? "none" : "inline-block",
                   },
@@ -674,13 +682,23 @@ export default {
                 "下载"
               ),
               h(
-                "Button",
+                "span",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   style: {
+                    margin: "0 8px",
+                    color: "#dcdee2",
+                    display: this.selectImage == true ? "none" : "inline-block",
+                  },
+                },
+                "|"
+              ),
+              h(
+                "a",
+                {
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     display: this.selectImage == true ? "none" : "inline-block",
                   },
                   on: {

manager/src/views/sys/role-manage/roleManage.vue

@@ -7,7 +7,7 @@
       </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="mt_10">
-        <Page :current="pageNumber" :total="total" :page-size="pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total
+        <Page :current="pageNumber" :total="total" :page-size="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>
@@ -165,13 +165,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "warning",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -183,13 +182,17 @@ export default {
                 "菜单权限"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    size: "small",
-                    type: "info",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -201,11 +204,17 @@ export default {
                 "编辑"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -221,7 +230,7 @@ export default {
       ],
       data: [], // 角色数据
       pageNumber: 1, // 页数
-      pageSize: 10, // 每页数量
+      pageSize: 20, // 每页数量
       total: 0, // 总数
       permData: [], // 菜单权限数据
       editRolePermId: "", // 编辑权限id

manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue

@@ -54,9 +54,14 @@
           </Input>
         </FormItem>
       </div>
-      <div class="label-btns">
+     <div class="label-btns">
         <Button type="primary" @click="submit('formValidate')">保存</Button>
-        <Button type="primary" style="margin-left: 100px" @click="createIndex()">重新生成所有商品索引</Button>
+        <div class="es-buttons">
+          <Button type="success" @click="createIndex()">重新生成所有商品索引</Button>
+          <Button type="info" @click="deleteDownGoods()">删除ES中下架的商品</Button>
+          <Button type="warning" @click="generateCache()">生成所有商品的缓存</Button>
+          <Button type="error" @click="deleteNotExistIndex()">删除不存在的索引</Button>
+        </div>
         <div class="progress-item" v-if="showProgress">
           <i-progress :percent="progressVal"></i-progress>
         </div>
@@ -65,7 +70,7 @@
   </div>
 </template>
 <script>
-import { setSetting, createIndex, getProgress } from "@/api/index";
+import { setSetting, createIndex, getProgress, deleteGoodsDown, generateGoodsCache, delSkuIndex } from "@/api/index";
 import { handleSubmit } from "./validate";
 export default {
   props: ["res", "type"],
@@ -140,6 +145,36 @@ export default {
         }
       });
     },
+    //删除ES中下架的商品
+    deleteDownGoods() {
+      deleteGoodsDown().then((res) => {
+        if (res.success) {
+          this.$Message.success("删除成功!");
+        } else {
+          this.$Message.error("删除失败!");
+        }
+      });
+    },
+    //生成所有商品的缓存
+    generateCache() {
+      generateGoodsCache().then((res) => {
+        if (res.success) {
+          this.$Message.success("生成成功!");
+        } else {
+          this.$Message.error("生成失败!");
+        }
+      });
+    },
+    //删除不存在的索引
+    deleteNotExistIndex() {
+      delSkuIndex().then((res) => {
+        if (res.success) {
+          this.$Message.success("删除成功!");
+        } else {
+          this.$Message.error("删除失败!");
+        }
+      });
+    },
     // 保存设置
     setupSetting() {
       setSetting(this.type, this.formValidate).then((res) => {

manager/src/views/sys/slider/slider.vue

@@ -31,7 +31,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
@@ -69,7 +69,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
@@ -151,7 +151,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         type: "RESOURCE",
@@ -196,13 +196,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -214,11 +213,17 @@ export default {
                 "编辑"
               ),
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -253,7 +258,7 @@ export default {
     //切换tab
     handleClickType(v) {
       this.searchForm.pageNumber = 1; // 当前页数
-      this.searchForm.pageSize = 10; // 页面大小
+      this.searchForm.pageSize = 20; // 页面大小
       //图片源
       if (v == "RESOURCE") {
         this.searchForm.type = "RESOURCE";

manager/src/views/sys/user-manage/userManage.vue

@@ -49,7 +49,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
@@ -135,7 +135,7 @@ export default {
         departmentId: "",
         mobile: "",
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         sort: "createTime",
         order: "desc"
       },
@@ -266,13 +266,12 @@ export default {
             let enableOrDisable = "";
             if (params.row.status == true) {
               enableOrDisable = h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: 'default',
-                    size: "small"
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px"
                   },
                   on: {
@@ -285,13 +284,12 @@ export default {
               );
             } else {
               enableOrDisable = h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "success",
-                    size: "small"
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px"
                   },
                   on: {
@@ -305,13 +303,12 @@ export default {
             }
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small"
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px"
                   },
                   on: {
@@ -322,13 +319,24 @@ export default {
                 },
                 "编辑"
               ),
+              h(
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
               enableOrDisable,
               h(
-                "Button",
+                "span",
+                { style: { margin: "0 8px", color: "#dcdee2" } },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small"
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none"
                   },
                   on: {
                     click: () => {
@@ -391,7 +399,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getUserList();
     },
     // 排序

seller/README.md

@@ -4,87 +4,6 @@
 
 本文档概述了 LiliShop UI seller 项目的 Node.js 版本兼容性。
 
-## 摘要
-
-| Node.js 版本 | npm 版本 | 兼容性 | 备注 |
-|-----------------|-------------|--------------|-------|
-| v20.13.1 (当前 LTS) | 10.8.0 | ✅ 需要解决方案 | 安装需要 `--legacy-peer-deps` 参数，运行需要 `NODE_OPTIONS=--openssl-legacy-provider` |
-| v18.20.8 (LTS) | 10.8.2 | ✅ 需要解决方案 | 安装需要 `--legacy-peer-deps` 参数，运行需要 `NODE_OPTIONS=--openssl-legacy-provider` |
-| v16.20.2 (LTS) | 8.19.4 | ✅ 有轻微警告 | 安装需要 `--legacy-peer-deps` 参数，整体运行良好 |
-| v14.x (最低版本) | - | ❌ 不兼容 | 无法在 ARM64 架构上安装 (M系列 Mac) |
-
-## 详细发现
-
-### Node.js v20.13.1 (当前 LTS)
-- **安装**: 使用 `--legacy-peer-deps` 参数可以正常安装
-- **开发服务器**: 需要设置 `NODE_OPTIONS=--openssl-legacy-provider` 环境变量
-- **构建**: 需要设置 `NODE_OPTIONS=--openssl-legacy-provider` 环境变量
-- **问题**:
-  - vue-awesome-swiper 和 swiper 之间的依赖冲突
-  - 由于 Node.js v20 移除了旧版加密算法导致的 OpenSSL 相关错误
-  - 部分包报告不支持的引擎警告
-- **验证**: 已成功构建并验证 dist/index.html 可以正常运行
-
-### Node.js v18.20.8 (LTS)
-- **安装**: 使用 `--legacy-peer-deps` 参数可以正常安装
-- **开发服务器**: 需要设置 `NODE_OPTIONS=--openssl-legacy-provider` 环境变量
-- **构建**: 需要设置 `NODE_OPTIONS=--openssl-legacy-provider` 环境变量
-- **问题**:
-  - 部分包报告不支持的引擎警告 (v-click-outside-x, @achrinza/node-ipc)
-- **验证**: 已成功构建并验证 dist/index.html 可以正常运行
-
-### Node.js v16.20.2 (LTS)
-- **安装**: 使用 `--legacy-peer-deps` 参数可以正常安装
-- **开发服务器**: 无需额外参数即可运行
-- **构建**: 可以正常构建
-- **问题**:
-  - v-click-outside-x 包有轻微警告 (需要 npm 6.4.1)
-
-### Node.js v14.x
-- **安装**: 在 ARM64 架构 (M系列 Mac) 上无法安装
-- **开发服务器**: 未测试
-- **构建**: 可以正常构建
-- **问题**:
-  - Node.js v14 没有 ARM64 架构的二进制文件
-
-## 建议
-
-1. **最佳版本**: Node.js v16.20.2 配合 npm 8.19.4
-   - 与项目依赖最兼容
-   - 需要的解决方案最少
-   - 性能稳定
-
-2. **安装命令**:
-   ```bash
-   npm install --legacy-peer-deps
-   ```
-
-3. **开发命令**:
-   ```bash
-   # 对于 Node.js v16
-   npm run dev
-   
-   # 对于 Node.js v18 或 v20
-   NODE_OPTIONS=--openssl-legacy-provider npm run dev
-   或者 npm run dev
-   ```
-
-4. **生产构建命令**:
-   ```bash
-   # 对于 Node.js v16
-   npm run build
-   
-   # 对于 Node.js v18 或 v20
-   NODE_OPTIONS=--openssl-legacy-provider npm run build
-   或者 npm run dev
-   ```
-
-## 未来考虑
-
-1. 更新依赖以兼容较新的 Node.js 版本
-2. 解决对等依赖冲突
-3. 更新 package.json 以指定推荐的 Node.js 版本范围
-
 
 ### Customize configuration
 详情点击 [https://cli.vuejs.org/zn/config/](https://cli.vuejs.org/zn/config/).

seller/package.json

@@ -8,9 +8,9 @@
     "node": ">=14"
   },
   "scripts": {
-    "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-    "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-    "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build"
+    "serve": "vue-cli-service serve",
+    "dev": "vue-cli-service serve",
+    "build": "vue-cli-service build"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "0.0.7",

seller/src/api/goods.js

@@ -371,7 +371,7 @@ export const refundPriceStatistics = params => {
 
 //下载结算单
 export const downLoadGoods = () => {
-  return getRequest(`/goods/import/downLoad/`, {}, 'blob')
+  return getRequest(`/goods/import/downLoad`, {}, 'blob')
 }
 
 // 上传待发货的订单列表

seller/src/views/Main.vue

@@ -29,6 +29,11 @@
               class="user-dropdown-innercon"
             >
               <ul class="nav-list">
+                <li class="nav-item " @click="im">
+                  <Tooltip content="联系客服">
+                    <Button type="info" size="small" :loading='load' icon="md-chatbubbles">客服</Button>
+                  </Tooltip>
+                </li>
                 <li class="nav-item " @click="handleClickSetting">
                   <Tooltip content="设置">
                     <Icon size="16" type="md-settings" />
@@ -88,6 +93,8 @@ import configDrawer from "@/views/main-components/config-drawer.vue";
 import Cookies from "js-cookie";
 import util from "@/libs/util.js";
 import { logout } from "@/api/index";
+import { getIMDetail } from "@/api/common";
+import { userMsg } from "@/api/index";
 const config = require("@/config/index.js");
 export default {
   components: {
@@ -103,6 +110,8 @@ export default {
       userInfo: {}, // 用户信息
 
       storeSideLogo: "", //logo图片
+      IMLink: "", // IM链接
+      load: false, // 加载IM状态
     };
   },
   computed: {
@@ -131,6 +140,34 @@ export default {
     handleClickSetting() {
       this.$refs.config.open();
     },
+    
+    /**
+     * 点击登录im的时候需要去判断一下当前店铺信息是否失效
+     * 失效的话重新请求刷新token保证最新的token去访问im
+     */
+    async im () {
+       // 获取访问Token
+       let accessToken = this.getStore("accessToken");
+       this.load = true
+       await this.getIMDetailMethods();
+       const userInfo = await userMsg();
+       this.load = false
+       if (userInfo.success && this.IMLink) {
+         window.open(`${this.IMLink}?token=` + accessToken);
+       }
+       else{
+         this.$Message.error("请登录后再联系客服");
+       }
+     },
+
+    // 获取im信息
+     async getIMDetailMethods () {
+       let res = await getIMDetail();
+       if (res.success) {
+         this.IMLink = res.result;
+       }
+     },
+    
     // 初始化方法
     init() {
       // 菜单

seller/src/views/distribution/distributionGoods.vue

@@ -153,20 +153,21 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small"
+                  style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
                       this.remove(params.row);
-                    }
-                  }
+                    },
+                  },
                 },
                 "删除"
-              )
+              ),
             ]);
           }
         }

seller/src/views/distribution/distributionOrder.vue

@@ -63,16 +63,14 @@ export default {
           width: 100,
           sortable: false,
           render: (h, params) => {
-            if (params.row.distributionOrderStatus == "COMPLETE_CASH") {
-              return h("Tag", { props: { color: "green" } },"提现完成");
-            } else if (params.row.distributionOrderStatus == "WAIT_BILL") {
-              return h("Tag", { props: { color: "blue" } } ,"待结算");
-            } else if (params.row.distributionOrderStatus == "WAIT_CASH") {
-              return h("Tag", { props: { color: "orange" } }, "待提现");
-            } else if (params.row.distributionOrderStatus == "CANCEL") {
-              return h("Tag", { props: { color: "red" } }, "订单已取消");
-            }else if (params.row.distributionOrderStatus == "REFUND") {
-              return h("Tag", { props: { color: "magenta" } }, "退款");
+            if (params.row.distributionOrderStatus == "NO_COMPLETED") {
+              return h("Tag", { props: { color: "orange" } }, "未完成");
+            } else if (params.row.distributionOrderStatus == "COMPLETE") {
+              return h("Tag", { props: { color: "green" } }, "完成");
+            } else if (params.row.distributionOrderStatus == "REFUND") {
+              return h("Tag", { props: { color: "red" } }, "退款");
+            } else {
+              return h("Tag", { props: { color: "orange" } }, "未完成");
             }
 
           },

seller/src/views/goods/goods-manage/category.vue

@@ -7,7 +7,7 @@
       </div>
       <tree-table
         ref="treeTable"
-        size="default"
+        size="small"
         :loading="loading"
         :data="tableData"
 
@@ -18,29 +18,11 @@
         :expand-type="false"
         primary-key="id">
         <template slot="action" slot-scope="scope">
-          <Button
-            type="dashed"
-            @click="edit(scope.row)"
-            size="small"
-            style="margin-right:5px"
-          >编辑
-          </Button>
-          <Button
-            v-show="scope.row.level != 1 "
-            type="info"
-            @click="addChildren(scope.row)"
-            size="small"
-            style="margin-right:5px"
-          >添加子分类
-          </Button>
-          <Button
-            type="error"
-            @click="remove(scope.row)"
-            size="small"
-            style="margin-right:5px"
-          >删除
-          </Button>
-
+          <a @click="edit(scope.row)" style="color:#2d8cf0;cursor:pointer;text-decoration:none">编辑</a>
+          <span style="margin:0 8px;color:#dcdee2">|</span>
+          <a v-show="scope.row.level != 1" @click="addChildren(scope.row)" style="color:#2d8cf0;cursor:pointer;text-decoration:none">添加子分类</a>
+          <span style="margin:0 8px;color:#dcdee2">|</span>
+          <a @click="remove(scope.row)" style="color:#2d8cf0;cursor:pointer;text-decoration:none">删除</a>
         </template>
       </tree-table>
 

seller/src/views/goods/goods-seller/alertQuantity.vue

@@ -306,13 +306,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "default",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {

seller/src/views/goods/goods-seller/draftGoods.vue

@@ -104,13 +104,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "success",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {
@@ -122,14 +121,19 @@ export default {
                 "编辑"
               ),
               h(
-                "Button",
+                "span",
+                {
+                  style: { margin: "0 8px", color: "#dcdee2" },
+                },
+                "|"
+              ),
+              h(
+                "a",
                 {
-                  props: {
-                    type: "error",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {

seller/src/views/main.scss

@@ -188,6 +188,20 @@
         align-items: center;
       }
 
+      /* 顶部右侧自定义按钮列表，确保水平排列 */
+      .nav-list {
+        display: inline-flex;
+        align-items: center;
+        gap: 10px;
+        list-style: none;
+        margin: 0;
+        padding: 0;
+      }
+      .nav-list .nav-item {
+        display: inline-flex;
+        align-items: center;
+      }
+
 
       .full-screen-btn-con {
         display: inline-block;

seller/src/views/member/memberComment.vue

@@ -169,18 +169,16 @@ export default {
           key: "action",
           align: "center",
           fixed: 'right',
-          width: 120,
+          width: 200,
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {

seller/src/views/message/message.vue

@@ -79,7 +79,7 @@
               {{ mes.time }}
           </p>
           <div class="message-content-body">
-            <p class="message-content" v-html="mes.content">{{ mes.content }}</p>
+            <p class="message-content" v-html="mes.content"></p>
           </div>
         </div>
       </transition>
@@ -95,15 +95,15 @@
     data() {
       const markAsReadBtn = (h, params) => {
         return h(
-          "Button",
+          "a",
           {
-            props: {
-              icon: "md-eye-off",
-              size: "small"
+            style: {
+              color: "#2d8cf0",
+              cursor: "pointer",
+              textDecoration: "none",
             },
             on: {
               click: () => {
-                // 标记已读
                 let v = params.row;
                 this.loading = true;
                 API_Index.read(v.id).then(res => {
@@ -112,87 +112,82 @@
                     this.getAll();
                   }
                 });
-              }
-            }
+              },
+            },
           },
           "标为已读"
         );
       };
       const deleteMesBtn = (h, params) => {
         return h(
-          "Button",
+          "a",
           {
-            props: {
-              icon: "md-trash",
-              size: "small",
-              type: "error"
+            style: {
+              color: "#2d8cf0",
+              cursor: "pointer",
+              textDecoration: "none",
             },
             on: {
               click: () => {
-                // 移除
                 let v = params.row;
                 this.loading = true;
                 API_Index.deleteMessage(v.id).then(res => {
                   this.loading = false;
                   if (res.success) {
-                    this.refreshMessage()
+                    this.refreshMessage();
                   }
                 });
-              }
-            }
+              },
+            },
           },
           "删除"
         );
       };
       const restoreBtn = (h, params) => {
         return h(
-          "Button",
+          "a",
           {
-            props: {
-              icon: "md-redo",
-              size: "small"
-            },
             style: {
-              margin: "0 5px 0 0"
+              color: "#2d8cf0",
+              cursor: "pointer",
+              textDecoration: "none",
             },
             on: {
               click: () => {
-                // 还原
                 let v = params.row;
                 API_Index.reductionMessage(v.id).then(res => {
                   this.loading = false;
                   if (res.success) {
-                    this.refreshMessage()
+                    this.refreshMessage();
                   }
                 });
-              }
-            }
+              },
+            },
           },
           "还原"
         );
       };
       const deleteRealBtn = (h, params) => {
         return h(
-          "Button",
+          "a",
           {
-            props: {
-              icon: "md-trash",
-              size: "small",
-              type: "error"
+            style: {
+              color: "#2d8cf0",
+              cursor: "pointer",
+              textDecoration: "none",
             },
             on: {
               click: () => {
-                // 彻底删除
                 let v = params.row;
                 this.loading = true;
                 API_Index.clearMessage(v.id).then(res => {
                   this.loading = false;
                   if (res.success) {
-                    this.refreshMessage()
+                    this.refreshMessage();
                   }
                 });
-              }
-            }
+              },
+            },
           },
           "彻底删除"
         );
@@ -287,6 +282,7 @@
               } else {
                 return h("div", [
                   restoreBtn(h, params),
+                  h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"),
                   deleteRealBtn(h, params)
                 ]);
               }

seller/src/views/order/after-order/orderComplaint.vue

@@ -63,7 +63,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,7 +90,7 @@
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
         },
@@ -141,19 +141,18 @@
             title: "操作",
             key: "action",
             align: "center",
-            width: 120,
+            fixed: 'right',
+            width: 200,
             render: (h, params) => {
-              if(params.row.complainStatus === "COMPLETE"){
+              if (params.row.complainStatus === "COMPLETE") {
                 return h("div", [
                   h(
-                    "Button",
+                    "a",
                     {
-                      props: {
-                        type: "info",
-                        size: "small"
-                      },
                       style: {
-                        marginRight: "5px",
+                        color: "#2d8cf0",
+                        cursor: "pointer",
+                        textDecoration: "none",
                       },
                       on: {
                         click: () => {
@@ -164,17 +163,15 @@
                     "详情"
                   ),
                 ]);
-              }else{
+              } else {
                 return h("div", [
                   h(
-                    "Button",
+                    "a",
                     {
-                      props: {
-                        type: "primary",
-                        size: "small"
-                      },
                       style: {
-                        marginRight: "5px",
+                        color: "#2d8cf0",
+                        cursor: "pointer",
+                        textDecoration: "none",
                       },
                       on: {
                         click: () => {
@@ -213,14 +210,14 @@
       // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
+        this.searchForm.pageSize = 20;
         this.getDataList();
       },
       // 重置
       handleReset() {
         this.searchForm = {}
         this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
+        this.searchForm.pageSize = 20;
         this.getDataList();
       },
       // 获取数据

seller/src/views/order/after-order/returnGoodsOrder.vue

@@ -195,18 +195,16 @@
             key: "action",
             align: "center",
             fixed: 'right',
-            width: 120,
+            width: 200,
             render: (h, params) => {
               return h("div", [
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
                     style: {
-                      marginRight: "5px",
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
                     },
                     on: {
                       click: () => {

seller/src/views/order/after-order/returnMoneyOrder.vue

@@ -85,7 +85,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
@@ -107,7 +107,7 @@
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
           startDate: "", // 起始时间
@@ -184,18 +184,17 @@
             title: "操作",
             key: "action",
             align: "center",
-            width: 100,
+            fixed: 'right',
+            width: 200,
             render: (h, params) => {
               return h("div", [
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
                     style: {
-                      marginRight: "5px",
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none",
                     },
                     on: {
                       click: () => {
@@ -231,7 +230,7 @@
       // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
+        this.searchForm.pageSize = 20;
         this.getDataList();
       },
       // 重置
@@ -239,7 +238,7 @@
         this.searchForm = {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
           startDate: "", // 起始时间

seller/src/views/order/after-order/reurnGoodsOrderDetail.vue

@@ -23,6 +23,10 @@
                 <dt>退货退款编号</dt>
                 <dd>{{ afterSaleInfo.sn }}</dd>
               </dl>
+              <dl>
+                <dt>售后状态</dt>
+                <dd>{{ filterStatus(afterSaleInfo.serviceStatus) }}</dd>
+              </dl>
               <dl>
                 <dt>退货退款原因</dt>
                 <dd>{{ afterSaleInfo.reason }}</dd>
@@ -390,17 +394,17 @@ export default {
       },
       // 售后状态
       afterSaleStatus: [
-        { status: "APPLY", label: "申请售后" },
-        { status: "PASS", label: "申请通过" },
-        { status: "REFUSE", label: "申请拒绝" },
+        { status: "APPLY", label: "申请中" },
+        { status: "PASS", label: "通过售后" },
+        { status: "REFUSE", label: "拒绝售后" },
         { status: "BUYER_RETURN", label: "买家退货，待卖家收货" },
         { status: "SELLER_RE_DELIVERY", label: "商家换货" },
         { status: "SELLER_CONFIRM", label: "卖家确认收货" },
         { status: "SELLER_TERMINATION", label: "卖家终止售后" },
         { status: "BUYER_CONFIRM", label: "买家确认收货" },
         { status: "BUYER_CANCEL", label: "买家取消售后" },
-        { status: "WAIT_REFUND", label: "等待平台退款" },
-        { status: "COMPLETE", label: "已完成" },
+        { status: "WAIT_REFUND", label: "待平台退款" },
+        { status: "COMPLETE", label: "完成售后" },
       ],
     };
   },

seller/src/views/order/order/orderList.vue

@@ -111,7 +111,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
@@ -138,7 +138,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "", // 默认排序字段
         order: "", // 默认排序方式
         startDate: "", // 起始时间
@@ -302,18 +302,17 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
-          width: 100,
+          fixed: "right",
+          width: 200,
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
-                    marginRight: "5px",
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                   },
                   on: {
                     click: () => {
@@ -416,7 +415,7 @@ export default {
     // 搜索订单
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
       this.getOrderNumData(); // 新增：搜索时也更新数量统计
     },
@@ -424,7 +423,7 @@ export default {
     handleReset() {
       this.searchForm = {};
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.selectDate = null;
       this.searchForm.startDate = "";
       this.searchForm.endDate = "";

seller/src/views/order/order/virtualOrderList.vue

@@ -42,7 +42,7 @@
       </div>
       <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort"></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="[10, 20, 50]" size="small"
+        <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>
@@ -61,7 +61,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -153,13 +153,12 @@ export default {
           render: (h, params) => {
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
                   style: {
+                    color: "#2d8cf0",
+                    cursor: "pointer",
+                    textDecoration: "none",
                     marginRight: "5px",
                   },
                   on: {

seller/src/views/order/receiptManager/receipt.vue

@@ -159,33 +159,20 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
-          width: 80,
+          fixed: 'right',
+          width: 200,
           render: (h, params) => {
+            const disabled = !(((params.row.orderStatus === "COMPLETED" || params.row.orderStatus === "DELIVERED")) && params.row.receiptStatus === 0);
+            const style = disabled
+              ? { color: "#c5c8ce", cursor: "not-allowed", textDecoration: "none" }
+              : { color: "#2d8cf0", cursor: "pointer", textDecoration: "none" };
+            const on = disabled ? {} : { click: () => { this.invoicing(params.row); } };
             return h("div", [
               h(
-                "Button",
+                "a",
                 {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
-                  attrs: {
-                    disabled:
-                      !(
-                        (params.row.orderStatus === "COMPLETED"
-                          ||params.row.orderStatus === "DELIVERED")
-
-                        &&
-                        params.row.receiptStatus === 0),
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.invoicing(params.row);
-                    },
-                  },
+                  style,
+                  on,
                 },
                 "开票"
               ),

seller/src/views/promotion/coupon/coupon-publish.vue

@@ -314,13 +314,16 @@ export default {
           minWidth: 50,
           align: "center",
           render: (h, params) => {
+            if (this.disabled) {
+              return h("div");
+            }
             return h(
-              "Button",
+              "a",
               {
-                props: {
-                  size: "small",
-                  type: "error",
-                  ghost: true,
+                style: {
+                  color: "#2d8cf0",
+                  cursor: "pointer",
+                  textDecoration: "none",
                 },
                 on: {
                   click: () => {

seller/src/views/promotion/coupon/coupon.vue

@@ -67,35 +67,30 @@
         @on-selection-change="changeSelect"
       >
         <template slot-scope="{ row }" slot="action">
-          <Button
-            v-if="
-              row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'
-            "
-            type="info"
-            size="small"
+          <a
+            v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none"
             @click="see(row)"
-            >编辑</Button
-          >
-          <Button v-else type="default" size="small" @click="see(row, 'only')"
-            >查看</Button
-          >
-          <Button
-            v-if="
-              row.promotionStatus === 'START' || row.promotionStatus === 'NEW'
-            "
-            type="error"
-            size="small"
-            :style="{ marginLeft: '5px' }"
+          >编辑</a>
+          <a
+            v-else
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none"
+            @click="see(row, 'only')"
+          >查看</a>
+          <span 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="remove(row)"
-            >关闭</Button
-          >
-          <Button
-            style="margin: 5px"
-            type="info"
-            size="small"
+          >关闭</a>
+          <span
+            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
+            style="margin: 0 8px; color: #dcdee2"
+          >|</span>
+          <a
+            style="color:#2d8cf0;cursor:pointer;text-decoration:none"
             @click="receivePage(row.id)"
-            >领取记录
-          </Button>
+          >领取记录</a>
         </template>
       </Table>
       <Row type="flex" justify="end" class="mt_10">

seller/src/views/promotion/full-discount/full-discount-add.vue

@@ -91,8 +91,11 @@
                   <img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
                 </template>
                 <template slot-scope="{ index }" slot="action">
-                  <Button type="error" :disabled="form.promotionStatus != 'NEW' && !!id" size="small" ghost
-                    @click="delGoods(index)">删除</Button>
+                  <a
+                    v-if="form.promotionStatus == 'NEW' || !id"
+                    style="color:#2d8cf0;cursor:pointer;text-decoration:none"
+                    @click="delGoods(index)"
+                  >删除</a>
                 </template>
               </Table>
             </FormItem>

seller/src/views/promotion/full-discount/full-discount.vue

@@ -39,20 +39,17 @@
         </template>
         <template slot-scope="{ row }" slot="action">
           <div>
-            <Button type="primary" v-if="row.promotionStatus == 'NEW'" size="small" @click="edit(row)">编辑</Button>
-            <Button type="info" v-else size="small" @click="edit(row)">查看</Button>
-            <Button type="success" v-if="row.promotionStatus === 'START'" style="margin-left: 5px" size="small"
-              @click="openOrClose(row)">关闭</Button>
-            <Button type="success" v-if="row.promotionStatus === 'CLOSE'" style="margin-left: 5px" size="small"
-              @click="openOrClose(row)">开启</Button>
-            <!--<Button type="error" :disabled="row.promotionStatus == 'START'" style="margin-left: 5px" size="small"-->
-              <!--@click="del(row)">删除</Button>-->
+            <a v-if="row.promotionStatus == 'NEW'" @click="edit(row)" style="color:#2d8cf0;cursor:pointer;text-decoration:none">编辑</a>
+            <a v-else @click="edit(row)" style="color:#2d8cf0;cursor:pointer;text-decoration:none">查看</a>
+            <span v-if="row.promotionStatus === 'START' || row.promotionStatus === 'CLOSE'" style="margin:0 8px;color:#dcdee2">|</span>
+            <a v-if="row.promotionStatus === 'START'" @click="openOrClose(row)" style="color:#2d8cf0;cursor:pointer;text-decoration:none">关闭</a>
+            <a v-if="row.promotionStatus === 'CLOSE'" @click="openOrClose(row)" style="color:#2d8cf0;cursor:pointer;text-decoration:none">开启</a>
           </div>
         </template>
       </Table>
       <Row type="flex" justify="end" class="page operation">
         <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
+          @on-page-size-change="changePageSize" :page-size-opts="[20, 50, 100]" size="small" show-total show-elevator
           show-sizer></Page>
       </Row>
     </Card>
@@ -74,7 +71,7 @@ export default {
       searchForm: {
         // 列表请求参数
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         sort: "startTime",
         order: "desc",
       },
@@ -173,7 +170,7 @@ export default {
       this.searchForm = {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "startTime", // 默认排序字段
         order: "desc", // 默认排序方式
       };