Merge branch 'release/1.5.0'

no message

.gitignore

@@ -5,5 +5,8 @@
 target/
 application-dev.yml
 application-pro.yml
+application-dem.yml
 application-prod.yml
-application-test.yml
+application-test.yml
+/public/uploads/*
+!/public/uploads/index.html

LICENSE

@@ -1,201 +1,21 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+MIT License
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright (c) 2022 likeshop技术社区
 
-   1. Definitions.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,15 +1,36 @@
  <h1 align="center">likeadmin通用管理后台（Java）</h1>
-<h4 align="center">🚀快速开发、🛠️ 一键生成代码、📱手机自适应</h4> 
+<h4 align="center">⚡️快速开发、🛠️ 一键生成代码、✅后台多端自适应、📱手机端、🖥️PC（电脑）端前台</h4> 
 <p align="center">
 <a href="https://www.java.com/zh-CN/download/"><img src="https://img.shields.io/badge/JAVA-8-d74f11"> </a><a href="#"> <img src="https://img.shields.io/badge/Spring Boot-2-5ea931"> </a><a href="https://www.tslang.cn/"><img src="https://img.shields.io/badge/TypeScript-3-294e80"></a> <a href="#"><img src="https://img.shields.io/badge/Vue.js-3-4eb883"> </a><a href="#"><img src="https://img.shields.io/badge/vite-2-ffc018"> </a><a href="#"><img src="https://img.shields.io/badge/Element Plus-2-409eff"> </a><a target="_blank" href="https://www.docker.com/"><img src="https://img.shields.io/badge/Docker--139cff"></a>
+</p>
+<p align="center">
+<a href="https://mp.weixin.qq.com/"><img src="https://img.shields.io/badge/微信-公众号-05ce66"></a>
+<a href="https://mp.weixin.qq.com/"><img src="https://img.shields.io/badge/微信-小程序-05ce66"></a>
+<a href="https://open.weixin.qq.com/"><img src="https://img.shields.io/badge/微信-开放平台-05ce66"></a>
+<a href="https://cloud.tencent.com/"><img src="https://img.shields.io/badge/腾讯云-COS-00a3ff"></a>
+<a href="https://cloud.tencent.com/"><img src="https://img.shields.io/badge/腾讯云-短信-00a3ff"></a>
+<a href="https://www.aliyun.com/"><img src="https://img.shields.io/badge/阿里云-OSS-ff6a00"></a>
+<a href="https://www.aliyun.com/"><img src="https://img.shields.io/badge/阿里云-短信-ff6a00"></a>
+<a href="https://www.qiniu.com/"><img src="https://img.shields.io/badge/七牛云-OSS-07beff"></a>
+</p>
 <div align="center">
   <img  width="80%"  src="https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=9cf02b831e49d6a411bafbc4d79f51d4" /><br>
 </div>
  <br>
 
-## 👀体验后台
-地址：https://demo-java.likeadmin.cn <br>
+
+## 👀体验
+### 管理后台
+地址：https://java-admin.likeadmin.cn <br>
 账号：admin 密码：123456
+### 手机端uniapp前台
+<img  width="40%"  src="https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=260c0869d9ba7e692b2db1e216078241" /><br>
+### 手机端网页前台
+https://java-front.likeadmin.cn/mobile
+### PC（电脑）端网页前台
+https://java-front.likeadmin.cn/pc/
+### 开发文档 
+地址：[https://www.likeadmin.cn](https://www.likeadmin.cn "https://www.likeadmin.cn")
 
 
 ## 👨‍💻‍简介
@@ -17,27 +38,33 @@
 <br>
 ##  🧐进一步了解
 ### 🧰场景介绍
-1.likeadmin已经搭建好前后端分离的底层，包含程序安装、登录、登出、工作台、菜单权限控制、角色、管理员、部门管理、岗位管理、素材管理、网站设置、图库管理等基础功能，无需重复造轮子。更有开发者工具功能，一生成代码，大大节省开发时间。<br>
+1.likeadmin已经搭建好前后端分离的底层，包含程序安装、登录、登出、工作台、菜单权限控制、角色、管理员、部门管理、岗位管理、素材管理、网站设置、图库管理等基础功能，无需重复造轮子。更有开发者工具功能，一键生成代码，大大节省开发时间。<br>
 2.可视化系统程序安装界面，可自定义安装数据，开发者可快速扩展发行自己的软件产品。<br>
 3.likeadmin定位为通用的软件系统管理后台，方便开发者快速开发软件系统，文档清晰、代码易懂、简单易用。<br>
-4.未来将持续集成通用的微信/支付宝支付，阿里云/腾讯云短信，阿里云/腾讯云OSS等通用模块。
+4.手机端uniapp前台，含导导航配置、微信登录、个人登录等等基础功能，方便根据业务开发含手机前台的项目。
+
 
 ### 🐙 后端架构方面
-1.服务端使用JAVA8开发，性能有突破性的提升。<br>
-2.使用Spring Boot2.5框架，目前国内流行的JAVA框架，高性能、简单易用、文档齐全、支持Mave高级项目管理工具、支持Redis等。
+1.服务端使用Java8开发，性能有突破性的提升。<br>
+2.使用Spring Boot2.7.5框架，目前国内流行的Java框架，高性能、简单易用、文档齐全、支持Mave高级项目管理工具、支持Redis等。
 ### 🐹 前端架构方面
+#### 后台
 1.使用最流性的前后端分离方案typescript、vue3、vite开发，保持了代码的简洁、一致和规范。<br>
 2.后台界面使用element-plus UI框架，简单精美的后台界面，丰富的组件库，方便快速开发，满足各种后台交互。
 <br>
+### 前台
+手机端uniapp前台，可以编译成手机H5网页、微信小程序、安卓App，苹果App等客户端。<br>
 ### 🛠️ 代码生成器
-一键生成前后端业务代码，大大提示开发效率。
-
-### 🖥️界面预览
-![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=9cf02b831e49d6a411bafbc4d79f51d4)<br>
-![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=eb83547d55b4f41f0d92fd6a3e01d87e)
-![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=818d843fb9cba396226e32dad1a58f3c)<br>
-![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=194ab31919cd4dd619e6c453d7a44304)<br>
-![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=f6770e2a8069d7b6ea3d83b91204b9d6)<br>
+一键生成前后端业务代码，大大提示开发效率。<br>
+## 界面预览
+### 🖥️后台页面
+![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=9cf02b831e49d6a411bafbc4d79f51d4) <br>
+![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=eb83547d55b4f41f0d92fd6a3e01d87e) <br>
+![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=818d843fb9cba396226e32dad1a58f3c) <br>
+![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=194ab31919cd4dd619e6c453d7a44304) <br>
+![](https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=f6770e2a8069d7b6ea3d83b91204b9d6) <br>
 <br>
-### 🪐接口文档
-[点击这里进入更多更详细文档。](https://www.likeadmin.cn "点击这里进入更多更详细文档。")
+### 📱手机端前台界面
+<div class="half">
+<img  width="30%"  src="https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=2dbac190afadfb6650a04c8af44980e1" />  <img  width="30%"  src="https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=73adbdb91ff5c43ca3e694a99effae7a" />  <img  width="30%"  src="https://md.likeshop.cn/server/index.php?s=/api/attachment/visitFile&sign=55b51eaebd7d696f96ccbf60d4694368" />
+</div><br>

admin/.env.development

@@ -1,4 +0,0 @@
-NODE_ENV = 'development'
-
-# 请求域名
-VITE_APP_BASE_URL='https://likeadmin-java.yixiangonline.com'

admin/.env.development.example

@@ -0,0 +1,4 @@
+NODE_ENV = 'development'
+
+# 请求域名
+VITE_APP_BASE_URL=''

admin/.gitignore

@@ -30,3 +30,6 @@ components.d.ts
 *.sln
 *.sw?
 
+# .env
+.env.development
+.env.production

admin/package.json

@@ -55,6 +55,7 @@
     "vite": "^3.0.0",
     "vite-plugin-style-import": "^2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
+    "vite-plugin-vue-setup-extend": "^0.4.0",
     "vue-tsc": "^0.38.1"
   }
 }

admin/scripts/build.mjs

@@ -4,7 +4,7 @@ import fsExtra from 'fs-extra'
 const { existsSync, remove, copy } = fsExtra
 const cwd = process.cwd()
 //打包发布路径，谨慎改动
-const releaseRelativePath = '../frontend'
+const releaseRelativePath = '../public/admin'
 const distPath = path.resolve(cwd, 'dist')
 const releasePath = path.resolve(cwd, releaseRelativePath)
 

admin/src/api/app.ts

@@ -2,10 +2,10 @@ import request from '@/utils/request'
 
 // 配置
 export function getConfig() {
-    return request.get({ url: '/common/index/config' })
+    return request.get({ url: '/index/config' })
 }
 
 // 工作台主页
 export function getWorkbench() {
-    return request.get({ url: '/common/index/console' })
+    return request.get({ url: '/index/console' })
 }

admin/src/api/app/recharge.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+export function getRechargeConfig() {
+    return request.get({ url: '/marketing/recharge/detail' })
+}
+
+// 设置
+export function setRechargeConfig(params: any) {
+    return request.post({ url: '/marketing/recharge/save', params })
+}

admin/src/api/channel/wx_oa.ts

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { firstToUpperCase } from '@/utils/util'
 
 // 微信公众号配置保存
 export function setOaConfig(params: any) {
@@ -47,12 +48,11 @@ export function setOaMenuPublish(params: Menu | any) {
 }
 
 /**
- * @return { Promise }
- * @param { string } type
- * @description 获取回复列表
+ * @description 默认回复列表
  */
-export function getOaReplyList(params: { type: string }) {
-    return request.get({ url: '/channel/oaReply/list', params })
+export function getOaReplyList(params: any) {
+    const type = firstToUpperCase(params.type)
+    return request.get({ url: `/channel/oaReply${type}/list`, params })
 }
 
 /**
@@ -60,8 +60,9 @@ export function getOaReplyList(params: { type: string }) {
  * @param { number } id
  * @description 回复列表删除
  */
-export function oaReplyDel(params: { id: number }) {
-    return request.post({ url: '/channel/oaReply/del', params })
+export function oaReplyDel(params: any) {
+    const type = firstToUpperCase(params.type)
+    return request.post({ url: `/channel/oaReply${type}/del`, params })
 }
 
 /**
@@ -69,8 +70,9 @@ export function oaReplyDel(params: { id: number }) {
  * @param { number } id
  * @description 回复状态修改
  */
-export function changeOaReplyStatus(params: { id: number }) {
-    return request.post({ url: '/channel/oaReply/status', params })
+export function changeOaReplyStatus(params: any) {
+    const type = firstToUpperCase(params.type)
+    return request.post({ url: `/channel/oaReply${type}/status`, params })
 }
 
 export interface Reply {
@@ -85,25 +87,26 @@ export interface Reply {
 }
 /**
  * @return { Promise }
- * @description 回复添加
+ * @description 默认回复编辑
  */
 export function oaReplyAdd(params: Reply) {
-    return request.post({ url: '/channel/oaReply/add', params })
+    const type = firstToUpperCase(params.type)
+    return request.post({ url: `/channel/oaReply${type}/add`, params })
 }
 
 /**
  * @return { Promise }
- * @description 回复编辑
+ * @description 默认回复编辑
  */
 export function oaReplyEdit(params: Reply) {
-    return request.post({ url: '/channel/oaReply/edit', params })
+    const type = firstToUpperCase(params.type)
+    return request.post({ url: `/channel/oaReply${type}/edit`, params })
 }
 
 /**
- * @return { Promise }
- * @param { string } type
- * @description 获取回复详情
+ * @description 默认回复详情
  */
-export function getOaReplyDetail(params: { id: number }) {
-    return request.get({ url: '/channel/oaReply/detail', params })
+export function getOaReplyDetail(params: any) {
+    const type = firstToUpperCase(params.type)
+    return request.get({ url: `/channel/oaReply${type}/detail`, params })
 }

admin/src/api/channel/wx_op.ts

@@ -2,10 +2,10 @@ import request from '@/utils/request'
 
 // 微信开发平台配置保存
 export function setWxDevConfig(params: any) {
-    return request.post({ url: '/channel/wx/save', params })
+    return request.post({ url: '/channel/op/save', params })
 }
 
 // 微信开发平台配置详情
 export function getWxDevConfig() {
-    return request.get({ url: '/channel/wx/detail' })
+    return request.get({ url: '/channel/op/detail' })
 }

admin/src/api/file.ts

@@ -1,39 +1,39 @@
 import request from '@/utils/request'
 
 export function fileCateAdd(params: Record<string, any>) {
-    return request.post({ url: '/common/album/cateAdd', params })
+    return request.post({ url: '/albums/cateAdd', params })
 }
 
 export function fileCateEdit(params: Record<string, any>) {
-    return request.post({ url: '/common/album/cateRename', params })
+    return request.post({ url: '/albums/cateRename', params })
 }
 
 // 文件分类删除
 export function fileCateDelete(params: Record<string, any>) {
-    return request.post({ url: '/common/album/cateDel', params })
+    return request.post({ url: '/albums/cateDel', params })
 }
 
 // 文件分类列表
 export function fileCateLists(params: Record<string, any>) {
-    return request.get({ url: '/common/album/cateList', params })
+    return request.get({ url: '/albums/cateList', params })
 }
 
 // 文件列表
 export function fileList(params: Record<string, any>) {
-    return request.get({ url: '/common/album/albumList', params })
+    return request.get({ url: '/albums/albumList', params })
 }
 
 // 文件删除
 export function fileDelete(params: Record<string, any>) {
-    return request.post({ url: '/common/album/albumDel', params })
+    return request.post({ url: '/albums/albumDel', params })
 }
 
 // 文件移动
 export function fileMove(params: Record<string, any>) {
-    return request.post({ url: '/common/album/albumMove', params })
+    return request.post({ url: '/albums/albumMove', params })
 }
 
 // 文件重命名
 export function fileRename(params: { id: number; name: string }) {
-    return request.post({ url: '/common/album/albumRename', params })
+    return request.post({ url: '/albums/albumRename', params })
 }

admin/src/api/finance.ts

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+// 余额明细
+export function accountLog(params?: any) {
+    return request.get({ url: '/finance/wallet/list', params })
+}
+
+// 充值记录
+export function rechargeLists(params?: any) {
+    return request.get({ url: '/finance/recharger/list', params }, { ignoreCancelToken: true })
+}
+
+//退款
+export function refund(params?: any) {
+    return request.post({ url: '/finance/recharger/refund', params })
+}
+
+//重新退款
+export function refundAgain(params?: any) {
+    return request.post({ url: '/finance/recharger/refundAgain', params })
+}
+
+//退款记录
+export function refundRecord(params?: any) {
+    return request.get({ url: '/finance/refund/list', params })
+}
+
+//退款日志
+export function refundLog(params?: any) {
+    return request.get({ url: '/finance/refund/log', params })
+}

admin/src/api/setting/pay.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 获取支付方式
+export function getPayWay() {
+    return request.get({ url: '/setting/payment/method' })
+}
+
+// 设置支付方式
+export function setPayWay(params: any) {
+    return request.post({ url: '/setting/payment/editMethod', params })
+}
+
+// 获取支付方式
+export function getPayConfigLists() {
+    return request.get({ url: '/setting/payment/list' })
+}
+
+// 设置支付方式
+export function setPayConfig(params: any) {
+    return request.post({ url: '/setting/payment/editConfig', params })
+}
+
+// 设置支付方式
+export function getPayConfig(params: any) {
+    return request.get({ url: '/setting/payment/detail', params })
+}

admin/src/api/setting/system.ts

@@ -14,3 +14,33 @@ export function systemLogLists(params: any) {
 export function systemCache() {
     return request.get({ url: '/monitor/cache' })
 }
+
+// 定时任务列表
+export function crontabLists(params: any) {
+    return request.get({ url: '/crontab/list', params })
+}
+
+// 添加定时任务
+export function crontabAdd(params: any) {
+    return request.post({ url: '/crontab/add', params })
+}
+
+// 定时任务详情
+export function crontabDetail(params: any) {
+    return request.get({ url: '/crontab/detail', params })
+}
+
+// 编辑定时任务
+export function crontabEdit(params: any) {
+    return request.post({ url: '/crontab/edit', params })
+}
+
+// 删除定时任务
+export function crontabDel(params: any) {
+    return request.post({ url: '/crontab/del', params })
+}
+
+// 获取登录日志列表
+export function loginLogLists(params: any) {
+    return request.get({ url: '/system/log/login', params })
+}

admin/src/api/tools/code.ts

@@ -10,6 +10,15 @@ export function dataTable(params: any) {
     return request.get({ url: '/gen/db', params })
 }
 
+// 数据表所有列表接口
+export function dataTableAll() {
+    return request.get({ url: '/gen/dbAll' })
+}
+
+//表名查字段
+export function dataTableToColumn(params: any) {
+    return request.get({ url: '/gen/dbColumn', params })
+}
 //选择要生成代码的数据表
 export function selectTable(params: any) {
     return request.post(

admin/src/api/user.ts

@@ -6,6 +6,11 @@ export function login(params: Record<string, any>) {
     return request.post({ url: '/system/login', params: { ...params, terminal: config.terminal } })
 }
 
+// 登录
+export function loginCaptcha() {
+    return request.get({ url: '/system/captcha' })
+}
+
 // 退出登录
 export function logout() {
     return request.post({ url: '/system/logout' })

admin/src/components/dict-value/index.vue

@@ -6,10 +6,15 @@
     </div>
 </template>
 <script lang="ts" setup>
-const props = defineProps<{
-    options: any[]
-    value: any
-}>()
+const props = withDefaults(
+    defineProps<{
+        options: any[]
+        value: any
+    }>(),
+    {
+        options: () => []
+    }
+)
 
 const values = computed(() => {
     if (props.value !== null && typeof props.value !== 'undefined') {

admin/src/components/editor/index.vue

@@ -15,9 +15,10 @@
         />
         <material-picker
             ref="materialPickerRef"
+            :type="fileType"
             :limit="-1"
             hidden-upload
-            @change="imageSelectChange"
+            @change="selectChange"
         />
     </div>
 </template>
@@ -39,12 +40,10 @@ const props = withDefaults(
     }>(),
     {
         modelValue: '',
-        mode: 'simple',
+        mode: 'default',
         height: '100%',
         width: 'auto',
-        toolbarConfig: () => ({
-            excludeKeys: ['fullScreen']
-        })
+        toolbarConfig: () => ({})
     }
 )
 
@@ -55,16 +54,24 @@ const emit = defineEmits<{
 // 编辑器实例，必须用 shallowRef
 const editorRef = shallowRef()
 const materialPickerRef = shallowRef<InstanceType<typeof MaterialPicker>>()
+const fileType = ref('')
 
-let insertImageFn: any
+let insertFn: any
 
 const editorConfig: Partial<IEditorConfig> = {
     MENU_CONF: {
         uploadImage: {
-            customBrowseAndUpload(insertFn: any) {
-                console.log(insertFn)
+            customBrowseAndUpload(insert: any) {
+                fileType.value = 'image'
                 materialPickerRef.value?.showPopup(-1)
-                insertImageFn = insertFn
+                insertFn = insert
+            }
+        },
+        uploadVideo: {
+            customBrowseAndUpload(insert: any) {
+                fileType.value = 'video'
+                materialPickerRef.value?.showPopup(-1)
+                insertFn = insert
             }
         }
     }
@@ -83,9 +90,9 @@ const valueHtml = computed({
     }
 })
 
-const imageSelectChange = (image: string[]) => {
-    image.forEach((url) => {
-        insertImageFn(url)
+const selectChange = (fileUrl: string[]) => {
+    fileUrl.forEach((url) => {
+        insertFn(url)
     })
 }
 
@@ -100,3 +107,37 @@ const handleCreated = (editor: any) => {
     editorRef.value = editor // 记录 editor 实例，重要！
 }
 </script>
+
+<style lang="scss">
+.w-e-full-screen-container {
+    z-index: 999;
+}
+.w-e-text-container [data-slate-editor] ul {
+    list-style: disc;
+}
+.w-e-text-container [data-slate-editor] ol {
+    list-style: decimal;
+}
+h1 {
+    font-size: 2em;
+}
+h2 {
+    font-size: 1.5em;
+}
+h3 {
+    font-size: 1.17em;
+}
+h4 {
+    font-size: 1em;
+}
+h5 {
+    font-size: 0.83em;
+}
+h1,
+h2,
+h3,
+h4,
+h5 {
+    font-weight: bold;
+}
+</style>

admin/src/components/image-contain/index.vue

@@ -20,7 +20,11 @@ const props = defineProps({
         type: [String, Number],
         default: 0
     },
-    ...imageProps
+    ...imageProps,
+    hideOnClickModal: {
+        type: Boolean,
+        default: true
+    }
 })
 
 const styles = computed<CSSProperties>(() => {

admin/src/components/link/shop-pages.vue

@@ -92,6 +92,11 @@ const linkList = ref([
         path: '/pages/search/search',
         name: '搜索',
         type: LinkTypeEnum.SHOP_PAGES
+    },
+    {
+        path: '/packages/pages/user_wallet/user_wallet',
+        name: '我的钱包',
+        type: LinkTypeEnum.SHOP_PAGES
     }
 ])
 

admin/src/components/material/file.vue

@@ -1,8 +1,14 @@
 <template>
     <div>
-        <div class="file-item" :style="{ height: fileSize, width: fileSize }">
+        <div class="file-item relative" :style="{ height: fileSize, width: fileSize }">
             <el-image class="image" v-if="type == 'image'" fit="contain" :src="uri"></el-image>
             <video class="video" v-else-if="type == 'video'" :src="uri"></video>
+            <div
+                v-if="type == 'video'"
+                class="absolute left-1/2 top-1/2 translate-x-[-50%] translate-y-[-50%] rounded-full w-5 h-5 flex justify-center items-center bg-[rgba(0,0,0,0.3)]"
+            >
+                <icon name="el-icon-CaretRight" :size="18" color="#fff" />
+            </div>
             <slot></slot>
         </div>
     </div>

admin/src/components/material/hook.ts

@@ -45,8 +45,7 @@ export function useCate(type: number) {
     }
 
     // 添加分组
-    const handleAddCate = async () => {
-        const { value } = await feedback.prompt('', '添加分组')
+    const handleAddCate = async (value: string) => {
         await fileCateAdd({
             type,
             name: value,
@@ -56,8 +55,7 @@ export function useCate(type: number) {
     }
 
     // 编辑分组
-    const handleEditCate = async (name: string, id: number) => {
-        const { value } = await feedback.prompt('', '重命分组', { inputValue: name })
+    const handleEditCate = async (value: string, id: number) => {
         await fileCateEdit({
             id,
             name: value
@@ -180,8 +178,7 @@ export function useFile(
         clearSelect()
     }
 
-    const handleFileRename = async (name: string, id: number) => {
-        const { value } = await feedback.prompt('', '重命名', { inputValue: name })
+    const handleFileRename = async (value: string, id: number) => {
         await fileRename({
             id,
             name: value

admin/src/components/material/index.vue

@@ -24,24 +24,31 @@
                                         <overflow-tooltip :content="data.name" />
                                     </span>
                                     <el-dropdown
-                                        v-perms="[
-                                            'common:album:cateRename',
-                                            'common:album:cateDel'
-                                        ]"
+                                        v-perms="['albums:cateRename', 'albums:cateDel']"
                                         v-if="data.id > 0"
                                         :hide-on-click="false"
                                     >
                                         <span class="muted m-r-10">···</span>
                                         <template #dropdown>
                                             <el-dropdown-menu>
-                                                <div
-                                                    v-perms="['common:album:cateRename']"
-                                                    @click="handleEditCate(data.name, data.id)"
+                                                <popover-input
+                                                    v-perms="['albums:cateRename']"
+                                                    @confirm="handleEditCate($event, data.id)"
+                                                    size="default"
+                                                    :value="data.name"
+                                                    width="400px"
+                                                    :limit="20"
+                                                    show-limit
+                                                    teleported
                                                 >
-                                                    <el-dropdown-item>命名分组</el-dropdown-item>
-                                                </div>
+                                                    <div>
+                                                        <el-dropdown-item>
+                                                            命名分组
+                                                        </el-dropdown-item>
+                                                    </div>
+                                                </popover-input>
                                                 <div
-                                                    v-perms="['common:album:cateDel']"
+                                                    v-perms="['albums:cateDel']"
                                                     @click="handleDeleteCate(data.id)"
                                                 >
                                                     <el-dropdown-item>删除分组</el-dropdown-item>
@@ -57,9 +64,17 @@
             </div>
 
             <div class="flex justify-center p-2 border-t border-br">
-                <el-button @click="handleAddCate" v-perms="['common:album:cateAdd']">
-                    添加分组
-                </el-button>
+                <popover-input
+                    v-perms="['albums:cateAdd']"
+                    @confirm="handleAddCate"
+                    size="default"
+                    width="400px"
+                    :limit="20"
+                    show-limit
+                    teleported
+                >
+                    <el-button> 添加分组 </el-button>
+                </popover-input>
             </div>
         </div>
         <div class="material__center flex flex-col">
@@ -67,7 +82,7 @@
                 <div class="flex-1 flex">
                     <upload
                         v-if="type == 'image'"
-                        v-perms="['common:upload:image']"
+                        v-perms="['upload:image']"
                         class="mr-3"
                         :data="{ cid: cateId }"
                         :type="type"
@@ -78,7 +93,7 @@
                     </upload>
                     <upload
                         v-if="type == 'video'"
-                        v-perms="['common:upload:video']"
+                        v-perms="['upload:video']"
                         class="mr-3"
                         :data="{ cid: cateId }"
                         :type="type"
@@ -88,7 +103,7 @@
                         <el-button type="primary">本地上传</el-button>
                     </upload>
                     <el-button
-                        v-perms="['common:album:albumDel']"
+                        v-perms="['albums:albumDel']"
                         v-if="mode == 'page'"
                         :disabled="!select.length"
                         @click.stop="batchFileDelete()"
@@ -97,7 +112,7 @@
                     </el-button>
 
                     <popup
-                        v-perms="['common:album:albumMove']"
+                        v-perms="['albums:albumMove']"
                         v-if="mode == 'page'"
                         class="ml-3"
                         @confirm="batchFileMove"
@@ -195,14 +210,18 @@
 
                             <overflow-tooltip class="mt-1" :content="item.name" />
                             <div class="operation-btns flex items-center">
-                                <el-button
-                                    v-perms="['common:album:albumRename']"
-                                    type="primary"
-                                    link
-                                    @click="handleFileRename(item.name, item.id)"
+                                <popover-input
+                                    v-perms="['albums:albumRename']"
+                                    @confirm="handleFileRename($event, item.id)"
+                                    size="default"
+                                    :value="item.name"
+                                    width="400px"
+                                    :limit="50"
+                                    show-limit
+                                    teleported
                                 >
-                                    重命名
-                                </el-button>
+                                    <el-button type="primary" link> 重命名 </el-button>
+                                </popover-input>
                                 <el-button type="primary" link @click="handlePreview(item.uri)">
                                     查看
                                 </el-button>
@@ -226,34 +245,40 @@
                             <el-checkbox :modelValue="isSelect(row.id)" @change="selectFile(row)" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="图片" width="60">
+                    <el-table-column label="图片" width="100">
                         <template #default="{ row }">
-                            <file-item :uri="row.uri" file-size="40px"></file-item>
+                            <file-item :uri="row.uri" file-size="50px" :type="type"></file-item>
                         </template>
                     </el-table-column>
                     <el-table-column label="名称" min-width="100" show-overflow-tooltip>
                         <template #default="{ row }">
-                            <el-link @click.stop="handlePreview(row.uri)">{{ row.name }}</el-link>
+                            <el-link @click.stop="handlePreview(row.uri)" :underline="false">
+                                {{ row.name }}
+                            </el-link>
                         </template>
                     </el-table-column>
                     <el-table-column prop="createTime" label="上传时间" min-width="100" />
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
-                            <div class="inline-block" v-perms="['common:album:albumRename']">
-                                <el-button
-                                    type="primary"
-                                    link
-                                    @click.stop="handleFileRename(row.name, row.id)"
+                            <div class="inline-block" v-perms="['albums:albumRename']">
+                                <popover-input
+                                    @confirm="handleFileRename($event, row.id)"
+                                    size="default"
+                                    :value="row.name"
+                                    width="400px"
+                                    :limit="50"
+                                    show-limit
+                                    teleported
                                 >
-                                    重命名
-                                </el-button>
+                                    <el-button type="primary" link> 重命名 </el-button>
+                                </popover-input>
                             </div>
                             <div class="inline-block">
                                 <el-button type="primary" link @click.stop="handlePreview(row.uri)">
                                     查看
                                 </el-button>
                             </div>
-                            <div class="inline-block" v-perms="['common:album:albumDel']">
+                            <div class="inline-block" v-perms="['albums:albumDel']">
                                 <el-button
                                     type="primary"
                                     link
@@ -287,14 +312,14 @@
                             </el-checkbox>
                         </span>
                         <el-button
-                            v-perms="['common:album:albumDel']"
+                            v-perms="['albums:albumDel']"
                             :disabled="!select.length"
                             @click="batchFileDelete()"
                         >
                             删除
                         </el-button>
                         <popup
-                            v-perms="['common:album:albumMove']"
+                            v-perms="['albums:albumMove']"
                             class="ml-3 inline"
                             @confirm="batchFileMove"
                             :disabled="!select.length"

admin/src/components/material/picker.vue

@@ -83,6 +83,7 @@ import FileItem from './file.vue'
 import Material from './index.vue'
 import Preview from './preview.vue'
 import useAppStore from '@/stores/modules/app'
+import { useThrottleFn } from '@vueuse/shared'
 export default defineComponent({
     components: {
         Popup,
@@ -170,17 +171,21 @@ export default defineComponent({
             if (limit.value == -1) return null
             return limit.value - fileList.value.length
         })
-        const handleConfirm = () => {
-            const selectUri = select.value.map((item) =>
-                props.excludeDomain ? item.path : item.uri
-            )
-            if (!isAdd.value) {
-                fileList.value.splice(currentIndex.value, 1, selectUri.shift())
-            } else {
-                fileList.value = [...fileList.value, ...selectUri]
-            }
-            handleChange()
-        }
+        const handleConfirm = useThrottleFn(
+            () => {
+                const selectUri = select.value.map((item) =>
+                    props.excludeDomain ? item.path : item.uri
+                )
+                if (!isAdd.value) {
+                    fileList.value.splice(currentIndex.value, 1, selectUri.shift())
+                } else {
+                    fileList.value = [...fileList.value, ...selectUri]
+                }
+                handleChange()
+            },
+            1000,
+            false
+        )
         const showPopup = (index: number) => {
             if (disabled.value) return
             if (index >= 0) {
@@ -214,6 +219,7 @@ export default defineComponent({
 
         const handleClose = () => {
             nextTick(() => {
+                if (props.hiddenUpload) fileList.value = []
                 materialRef.value?.clearSelect()
             })
         }

admin/src/components/popover-input/index.vue

@@ -6,16 +6,18 @@
             :width="width"
             trigger="contextmenu"
             class="popover-input"
-            :teleported="false"
+            :teleported="teleported"
+            :persistent="false"
+            popper-class="!p-0"
         >
-            <div class="flex">
+            <div class="flex p-3" @click.stop="">
                 <div class="popover-input__input mr-[10px] flex-1">
                     <el-select
                         class="flex-1"
-                        size="small"
+                        :size="size"
                         v-if="type == 'select'"
                         v-model="inputValue"
-                        :teleported="false"
+                        :teleported="teleported"
                     >
                         <el-option
                             v-for="item in options"
@@ -27,14 +29,17 @@
                     <el-input
                         v-else
                         v-model.trim="inputValue"
+                        :maxlength="limit"
+                        :show-word-limit="showLimit"
                         :type="type"
-                        size="small"
+                        :size="size"
+                        clearable
                         :placeholder="placeholder"
                     />
                 </div>
                 <div class="popover-input__btns flex-none">
-                    <el-button link @click="visible = false">取消</el-button>
-                    <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+                    <el-button link @click="close">取消</el-button>
+                    <el-button type="primary" :size="size" @click="handleConfirm">确定</el-button>
                 </div>
             </div>
             <template #reference>
@@ -60,7 +65,7 @@ const props = defineProps({
     },
     width: {
         type: [Number, String],
-        default: 250
+        default: '300px'
     },
     placeholder: String,
     disabled: {
@@ -70,6 +75,22 @@ const props = defineProps({
     options: {
         type: Array as PropType<any[]>,
         default: () => []
+    },
+    size: {
+        type: String as PropType<'default' | 'small' | 'large'>,
+        default: 'default'
+    },
+    limit: {
+        type: Number,
+        default: 200
+    },
+    showLimit: {
+        type: Boolean,
+        default: false
+    },
+    teleported: {
+        type: Boolean,
+        default: true
     }
 })
 const emit = defineEmits(['confirm'])
@@ -99,7 +120,8 @@ watch(
         immediate: true
     }
 )
-useEventListener(document.body, 'click', () => {
+
+useEventListener(document.documentElement, 'click', () => {
     if (inPopover.value) return
     close()
 })

admin/src/components/upload/index.vue

@@ -12,6 +12,7 @@
             :on-success="handleSuccess"
             :on-exceed="handleExceed"
             :on-error="handleError"
+            :accept="getAccept"
         >
             <slot></slot>
         </el-upload>
@@ -78,9 +79,9 @@ export default defineComponent({
     setup(props, { emit }) {
         const userStore = useUserStore()
         const uploadRefs = shallowRef<InstanceType<typeof ElUpload>>()
-        const action = ref(`${config.baseUrl}${config.urlPrefix}/common/upload/${props.type}`)
+        const action = ref(`${config.baseUrl}${config.urlPrefix}/upload/${props.type}`)
         const headers = computed(() => ({
-            token: userStore.token,
+            ['like-admin']: userStore.token,
             version: config.version
         }))
         const visible = ref(false)
@@ -110,18 +111,30 @@ export default defineComponent({
             emit('error')
         }
         const handleExceed = () => {
-            feedback.msgError('超出上传上限，请重新上传')
+            feedback.msgError(`超出上传上限${props.limit}，请重新上传`)
         }
         const handleClose = () => {
             uploadRefs.value?.clearFiles()
             visible.value = false
         }
+
+        const getAccept = computed(() => {
+            switch (props.type) {
+                case 'image':
+                    return '.jpj,.png,.gif,.jpeg,.ico,.bmp'
+                case 'video':
+                    return '.wmv,.avi,.mov,.mp4,.flv,.rmvb'
+                default:
+                    return '*'
+            }
+        })
         return {
             uploadRefs,
             action,
             headers,
             visible,
             fileList,
+            getAccept,
             handleProgress,
             handleSuccess,
             handleError,

admin/src/components/video-player/index.vue

@@ -37,7 +37,7 @@ const options = reactive({
     mirror: false, //镜像画面
     ligthOff: false, //关灯模式
     volume: 0.3, //默认音量大小
-    control: false, //是否显示控制器
+    control: true, //是否显示控制器
     title: '', //视频名称
     poster: '', //封面
     ...props

admin/src/config/index.ts

@@ -1,10 +1,10 @@
 const config = {
-    terminal: 1,
-    title: '后台管理系统',
-    version: '1.1.6',
-    baseUrl: `${import.meta.env.VITE_APP_BASE_URL}/`,
-    urlPrefix: 'api',
-    timeout: 20 * 1000
+    terminal: 1, //终端
+    title: '后台管理系统', //网站默认标题
+    version: '1.4.0', //版本号
+    baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名
+    urlPrefix: 'api', //请求默认前缀
+    timeout: 10 * 1000 //请求超时时长
 }
 
 export default config

admin/src/config/setting.ts

@@ -1,13 +1,18 @@
 const defaultSetting = {
-    sideWidth: 200,
-    sideTheme: 'light',
-    sideDarkColor: '#1d2124',
-    theme: '#4A5DFF',
-    openMultipleTabs: true,
-    successTheme: '#67c23a',
-    warningTheme: '#e6a23c',
-    dangerTheme: '#f56c6c',
-    errorTheme: '#f56c6c',
-    infoTheme: '#909399'
+    showCrumb: true, // 是否显示面包屑
+    showLogo: true, // 是否显示logo
+    isUniqueOpened: false, //只展开一个一级菜单
+    sideWidth: 200, //侧边栏宽度
+    sideTheme: 'light', //侧边栏主题
+    sideDarkColor: '#1d2124', //侧边栏深色主题颜色
+    openMultipleTabs: true, // 是否开启多标签tab栏
+    theme: '#4A5DFF', //主题色
+    successTheme: '#67c23a', //成功主题色
+    warningTheme: '#e6a23c', //警告主题色
+    dangerTheme: '#f56c6c', //危险主题色
+    errorTheme: '#f56c6c', //错误主题色
+    infoTheme: '#909399' //信息主题色
 }
+//以上各种主题色分别对应element-plus的几种行为主题
+
 export default defaultSetting

admin/src/enums/requestEnums.ts

@@ -22,6 +22,7 @@ export enum RequestCodeEnum {
     LOGIN_DISABLE_ERROR = 331, //登陆账号已被禁用
     TOKEN_EMPTY = 332, // TOKEN参数为空
     TOKEN_INVALID = 333, // TOKEN参数无效
+    VERIFICATION_CODE_ERROR = 334, // 验证码错误
     NO_PERMISSTION = 403, //无相关权限
     REQUEST_404_ERROR = 404, //请求接口不存在
     SYSTEM_ERROR = 500 //系统错误

admin/src/hooks/useMultipleTabs.ts

@@ -0,0 +1,47 @@
+import useTabsStore from '@/stores/modules/multipleTabs'
+import useSettingStore from '@/stores/modules/setting'
+
+export default function useMultipleTabs() {
+    const router = useRouter()
+    const route = useRoute()
+    const tabsStore = useTabsStore()
+    const settingStore = useSettingStore()
+
+    const tabsLists = computed(() => {
+        return tabsStore.getTabList
+    })
+
+    const currentTab = computed(() => {
+        return route.fullPath
+    })
+
+    const addTab = () => {
+        if (!settingStore.openMultipleTabs) return
+        tabsStore.addTab(router)
+    }
+
+    const removeTab = (fullPath?: any) => {
+        if (!settingStore.openMultipleTabs) return
+        fullPath = fullPath ?? route.fullPath
+        tabsStore.removeTab(fullPath, router)
+    }
+
+    const removeOtherTab = () => {
+        if (!settingStore.openMultipleTabs) return
+        tabsStore.removeOtherTab(route)
+    }
+
+    const removeAllTab = () => {
+        if (!settingStore.openMultipleTabs) return
+        tabsStore.removeAllTab(router)
+    }
+
+    return {
+        tabsLists,
+        currentTab,
+        addTab,
+        removeTab,
+        removeOtherTab,
+        removeAllTab
+    }
+}

admin/src/hooks/usePaging.ts

@@ -1,3 +1,4 @@
+import { isFunction } from 'lodash'
 import { reactive, toRaw } from 'vue'
 
 // 分页钩子函数
@@ -7,10 +8,20 @@ interface Options {
     fetchFun: (_arg: any) => Promise<any>
     params?: Record<any, any>
     firstLoading?: boolean
+    beforeRequest?(params: Record<any, any>): Record<any, any>
+    afterRequest?(res: Record<any, any>): void
 }
 
 export function usePaging(options: Options) {
-    const { page = 1, size = 15, fetchFun, params = {}, firstLoading = false } = options
+    const {
+        page = 1,
+        size = 15,
+        fetchFun,
+        params = {},
+        firstLoading = false,
+        beforeRequest,
+        afterRequest
+    } = options
     // 记录分页初始参数
     const paramsInit: Record<any, any> = Object.assign({}, toRaw(params))
     // 分页数据
@@ -19,19 +30,28 @@ export function usePaging(options: Options) {
         size,
         loading: firstLoading,
         count: 0,
-        lists: [] as any[]
+        lists: [] as any[],
+        extend: {} as Record<any, any>
     })
     // 请求分页接口
     const getLists = () => {
         pager.loading = true
+        let requestParams = params
+        if (isFunction(beforeRequest)) {
+            requestParams = beforeRequest(params)
+        }
         return fetchFun({
             pageNo: pager.page,
             pageSize: pager.size,
-            ...params
+            ...requestParams
         })
             .then((res: any) => {
                 pager.count = res?.count
                 pager.lists = res?.lists
+                pager.extend = res?.extend
+                if (isFunction(afterRequest)) {
+                    afterRequest(res)
+                }
                 return Promise.resolve(res)
             })
             .catch((err: any) => {

admin/src/layout/default/components/header/index.vue

@@ -8,7 +8,7 @@
                 <div class="navbar-item">
                     <refresh />
                 </div>
-                <div class="flex items-center px-2" v-if="!isMobile">
+                <div class="flex items-center px-2" v-if="!isMobile && settingStore.showCrumb">
                     <breadcrumb />
                 </div>
             </div>

admin/src/layout/default/components/header/multiple-tabs.vue

@@ -3,12 +3,12 @@
         <div class="flex-1 min-w-0">
             <el-tabs
                 :model-value="currentTab"
-                :closable="tabsState.length > 1"
+                :closable="tabsLists.length > 1"
                 @tab-change="handleChange"
-                @tab-remove="handleRemove"
+                @tab-remove="removeTab($event)"
             >
-                <template v-for="item in tabsState" :key="item.path">
-                    <el-tab-pane :label="item.title" :name="item.path"></el-tab-pane>
+                <template v-for="item in tabsLists" :key="item.fullPath">
+                    <el-tab-pane :label="item.title" :name="item.fullPath"></el-tab-pane>
                 </template>
             </el-tabs>
         </div>
@@ -28,40 +28,31 @@
 </template>
 
 <script setup lang="ts">
+import useMultipleTabs from '@/hooks/useMultipleTabs'
 import { useWatchRoute } from '@/hooks/useWatchRoute'
 import useTabsStore, { getRouteParams } from '@/stores/modules/multipleTabs'
 const router = useRouter()
 const tabsStore = useTabsStore()
-const { route } = useWatchRoute((route) => {
-    tabsStore.addTab(route, router)
+const { removeOtherTab, addTab, removeAllTab, removeTab, tabsLists, currentTab } = useMultipleTabs()
+useWatchRoute(() => {
+    addTab()
 })
 
-const currentTab = computed(() => {
-    return route.path
-})
-
-const tabsState = computed(() => {
-    return tabsStore.getTabList
-})
-
-const handleChange = (path: any) => {
-    const tabItem = tabsStore.tasMap[path]
+const handleChange = (fullPath: any) => {
+    const tabItem = tabsStore.tasMap[fullPath]
     router.push(getRouteParams(tabItem))
 }
 
-const handleRemove = (path: any) => {
-    tabsStore.removeTab(path, router)
-}
 const handleCommand = (command: any) => {
     switch (command) {
         case 'closeCurrent':
-            handleRemove(route.path)
+            removeTab()
             break
         case 'closeOther':
-            tabsStore.removeOtherTab(route.path)
+            removeOtherTab()
             break
         case 'closeAll':
-            tabsStore.removeAllTab(router)
+            removeAllTab()
             break
     }
 }

admin/src/layout/default/components/main.vue

@@ -3,7 +3,9 @@
         <el-scrollbar>
             <div class="p-4">
                 <router-view v-if="isRouteShow" v-slot="{ Component, route }">
-                    <component :is="Component" :key="route.fullPath" />
+                    <keep-alive :include="includeList" :max="20">
+                        <component :is="Component" :key="route.fullPath" />
+                    </keep-alive>
                 </router-view>
             </div>
         </el-scrollbar>
@@ -12,8 +14,13 @@
 
 <script setup lang="ts">
 import useAppStore from '@/stores/modules/app'
+import useTabsStore from '@/stores/modules/multipleTabs'
+import useSettingStore from '@/stores/modules/setting'
 const appStore = useAppStore()
+const tabsStore = useTabsStore()
+const settingStore = useSettingStore()
 const isRouteShow = computed(() => appStore.isRouteShow)
+const includeList = computed(() => (settingStore.openMultipleTabs ? tabsStore.getCacheTabList : []))
 </script>
 
 <style></style>

admin/src/layout/default/components/setting/drawer.vue

@@ -47,9 +47,33 @@
                     />
                 </div>
             </div>
-            <div class="setting-item mb-5">
-                <div class="text-tx-secondary mb-4">菜单栏宽度</div>
-                <div><el-input-number v-model="sideWidth" :min="180" :max="250" /></div>
+            <div class="setting-item mb-5 flex justify-between items-center">
+                <span class="text-tx-secondary">只展开一个一级菜单</span>
+                <div>
+                    <el-switch
+                        v-model="isUniqueOpened"
+                        :active-value="true"
+                        :inactive-value="false"
+                    />
+                </div>
+            </div>
+            <div class="setting-item mb-5 flex justify-between items-center">
+                <div class="text-tx-secondary flex-none mr-3">菜单栏宽度</div>
+                <div>
+                    <el-input-number v-model="sideWidth" :min="180" :max="250" />
+                </div>
+            </div>
+            <div class="setting-item mb-5 flex justify-between items-center">
+                <div class="text-tx-secondary flex-none mr-3">显示LOGO</div>
+                <div>
+                    <el-switch v-model="showLogo" :active-value="true" :inactive-value="false" />
+                </div>
+            </div>
+            <div class="setting-item mb-5 flex justify-between items-center">
+                <div class="text-tx-secondary flex-none mr-3">显示面包屑</div>
+                <div>
+                    <el-switch v-model="showCrumb" :active-value="true" :inactive-value="false" />
+                </div>
             </div>
             <div class="setting-item mb-5 flex justify-between items-center">
                 <el-button @click="resetTheme">重置主题</el-button>
@@ -65,7 +89,6 @@ import theme_light from '@/assets/images/theme_white.png'
 import theme_dark from '@/assets/images/theme_black.png'
 
 const settingStore = useSettingStore()
-
 const predefineColors = ref(['#409EFF', '#28C76F', '#EA5455', '#FF9F43', '#01CFE8', '#4A5DFF'])
 const sideThemeList = [
     {
@@ -102,6 +125,18 @@ const openMultipleTabs = computed({
     }
 })
 
+const isUniqueOpened = computed({
+    get() {
+        return settingStore.isUniqueOpened
+    },
+    set(value) {
+        settingStore.setSetting({
+            key: 'isUniqueOpened',
+            value
+        })
+    }
+})
+
 const sideWidth = computed({
     get() {
         return settingStore.sideWidth
@@ -137,6 +172,30 @@ const theme = computed({
     }
 })
 
+const showLogo = computed({
+    get() {
+        return settingStore.showLogo
+    },
+    set(value) {
+        settingStore.setSetting({
+            key: 'showLogo',
+            value
+        })
+    }
+})
+
+const showCrumb = computed({
+    get() {
+        return settingStore.showCrumb
+    },
+    set(value) {
+        settingStore.setSetting({
+            key: 'showCrumb',
+            value
+        })
+    }
+})
+
 const isDark = useDark()
 const themeChange = () => {
     settingStore.setTheme(isDark.value)

admin/src/layout/default/components/sidebar/menu.vue

@@ -10,7 +10,7 @@
                 :default-active="activeMenu"
                 :collapse="isCollapsed"
                 mode="vertical"
-                :unique-opened="true"
+                :unique-opened="uniqueOpened"
                 @select="$emit('select')"
             >
                 <menu-item
@@ -41,6 +41,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    uniqueOpened: {
+        type: Boolean,
+        default: false
+    },
     theme: {
         type: String
     },

admin/src/layout/default/components/sidebar/side.vue

@@ -1,10 +1,11 @@
 <template>
     <div class="side" :style="sideStyle">
-        <side-logo :show-title="!isCollapsed" :theme="sideTheme" />
+        <side-logo v-if="settingStore.showLogo" :show-title="!isCollapsed" :theme="sideTheme" />
         <side-menu
             :routes="routes"
             :isCollapsed="isCollapsed"
             :width="settingStore.sideWidth"
+            :unique-opened="settingStore.isUniqueOpened"
             :config="menuProp"
             :theme="sideTheme"
             @select="handleSelect"

admin/src/main.ts

@@ -6,5 +6,6 @@ import './styles/index.scss'
 import 'virtual:svg-icons-register'
 
 const app = createApp(App)
+console.log(app)
 app.use(install)
 app.mount('#app')

admin/src/permission.ts

@@ -11,6 +11,7 @@ import { INDEX_ROUTE, INDEX_ROUTE_NAME } from './router/routes'
 import { PageEnum } from './enums/pageEnum'
 import useTabsStore from './stores/modules/multipleTabs'
 import { clearAuthInfo } from './utils/auth'
+import config from './config'
 
 // NProgress配置
 NProgress.configure({ showSpinner: false })
@@ -22,9 +23,13 @@ const whiteList: string[] = [PageEnum.LOGIN, PageEnum.ERROR_403]
 router.beforeEach(async (to, from, next) => {
     // 开始 Progress Bar
     NProgress.start()
+    document.title = to.meta.title ?? config.title
     const userStore = useUserStore()
     const tabsStore = useTabsStore()
-    if (userStore.token) {
+    if (whiteList.includes(to.path)) {
+        // 在免登录白名单，直接进入
+        next()
+    } else if (userStore.token) {
         // 获取用户信息
         const hasGetUserInfo = Object.keys(userStore.userInfo).length !== 0
         if (hasGetUserInfo) {
@@ -42,7 +47,7 @@ router.beforeEach(async (to, from, next) => {
                 const routeName = findFirstValidRoute(routes)
                 // 没有有效路由跳转到403页面
                 if (!routeName) {
-                    await userStore.logout()
+                    clearAuthInfo()
                     next(PageEnum.ERROR_403)
                     return
                 }
@@ -69,9 +74,6 @@ router.beforeEach(async (to, from, next) => {
                 next({ path: loginPath, query: { redirect: to.fullPath } })
             }
         }
-    } else if (whiteList.includes(to.path)) {
-        // 在免登录白名单，直接进入
-        next()
     } else {
         next({ path: loginPath, query: { redirect: to.fullPath } })
     }

admin/src/router/index.ts

@@ -86,8 +86,8 @@ export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefine
 }
 //通过权限字符查询路由路径
 export function getRoutePath(perms: string) {
-    const router = useRouter()
-    return router.getRoutes().find((item) => item.meta?.perms == perms)?.path || ''
+    const routerObj = useRouter() || router
+    return routerObj.getRoutes().find((item) => item.meta?.perms == perms)?.path || ''
 }
 
 // 重置路由

admin/src/stores/modules/multipleTabs.ts

@@ -11,6 +11,7 @@ import { PageEnum } from '@/enums/pageEnum'
 
 interface TabItem {
     name: RouteRecordName
+    fullPath: string
     path: string
     title?: string
     query?: LocationQuery
@@ -24,8 +25,8 @@ interface TabsSate {
     indexRouteName: RouteRecordName
 }
 
-const getHasTabIndex = (path: string, tabList: TabItem[]) => {
-    return tabList.findIndex((item) => item.path == path)
+const getHasTabIndex = (fullPath: string, tabList: TabItem[]) => {
+    return tabList.findIndex((item) => item.fullPath == fullPath)
 }
 
 const isCannotAddRoute = (route: RouteLocationNormalized, router: Router) => {
@@ -39,8 +40,12 @@ const isCannotAddRoute = (route: RouteLocationNormalized, router: Router) => {
     return false
 }
 
-const findTabsIndex = (path: string, tabList: TabItem[]) => {
-    return tabList.findIndex((item) => item.path === path)
+const findTabsIndex = (fullPath: string, tabList: TabItem[]) => {
+    return tabList.findIndex((item) => item.fullPath === fullPath)
+}
+
+const getComponentName = (route: RouteLocationNormalized) => {
+    return route.matched.at(-1)?.components?.default?.name
 }
 
 export const getRouteParams = (tabItem: TabItem) => {
@@ -63,45 +68,67 @@ const useTabsStore = defineStore({
     getters: {
         getTabList(): TabItem[] {
             return this.tabList
+        },
+        getCacheTabList(): string[] {
+            return Array.from(this.cacheTabList)
         }
     },
     actions: {
         setRouteName(name: RouteRecordName) {
             this.indexRouteName = name
         },
+        addCache(componentName?: string) {
+            if (componentName) this.cacheTabList.add(componentName)
+        },
+        removeCache(componentName?: string) {
+            if (componentName && this.cacheTabList.has(componentName)) {
+                this.cacheTabList.delete(componentName)
+            }
+            console.log(this.cacheTabList)
+        },
+        clearCache() {
+            this.cacheTabList.clear()
+        },
         resetState() {
             this.cacheTabList = new Set()
             this.tabList = []
             this.tasMap = {}
             this.indexRouteName = ''
         },
-        addTab(route: RouteLocationNormalized, router: Router) {
-            const { name, path, query, meta, params } = route
+        addTab(router: Router) {
+            const route = unref(router.currentRoute)
+            const { name, query, meta, params, fullPath, path } = route
             if (isCannotAddRoute(route, router)) return
-            const hasTabIndex = getHasTabIndex(path!, this.tabList)
-
+            const hasTabIndex = getHasTabIndex(fullPath!, this.tabList)
+            const componentName = getComponentName(route)
             const tabItem = {
                 name: name!,
                 path,
+                fullPath,
                 title: meta?.title,
                 query,
                 params
             }
-            this.tasMap[path] = tabItem
+            this.tasMap[fullPath] = tabItem
+            if (meta?.keepAlive) {
+                this.addCache(componentName)
+            }
             if (hasTabIndex != -1) {
-                this.tabList.splice(hasTabIndex, 1, tabItem)
                 return
             }
+
             this.tabList.push(tabItem)
         },
-        removeTab(path: string, router: Router) {
+        removeTab(fullPath: string, router: Router) {
             const { currentRoute, push } = router
-            const index = findTabsIndex(path, this.tabList)
+            const index = findTabsIndex(fullPath, this.tabList)
             // 移除tab
             if (this.tabList.length > 1) {
                 index !== -1 && this.tabList.splice(index, 1)
             }
-            if (path !== currentRoute.value.path) {
+            const componentName = getComponentName(currentRoute.value)
+            this.removeCache(componentName)
+            if (fullPath !== currentRoute.value.fullPath) {
                 return
             }
             // 删除选中的tab
@@ -116,17 +143,24 @@ const useTabsStore = defineStore({
             const toRoute = getRouteParams(toTab)
             push(toRoute)
         },
-        removeOtherTab(path: string) {
-            this.tabList = this.tabList.filter((item) => item.path == path)
+        removeOtherTab(route: RouteLocationNormalized) {
+            this.tabList = this.tabList.filter((item) => item.fullPath == route.fullPath)
+            const componentName = getComponentName(route)
+            this.cacheTabList.forEach((name) => {
+                if (componentName !== name) {
+                    this.removeCache(name)
+                }
+            })
         },
         removeAllTab(router: Router) {
             const { push, currentRoute } = router
-            const { path, name } = unref(currentRoute)
+            const { name } = unref(currentRoute)
             if (name == this.indexRouteName) {
-                this.removeOtherTab(path)
+                this.removeOtherTab(currentRoute.value)
                 return
             }
             this.tabList = []
+            this.clearCache()
             push(PageEnum.INDEX)
         }
     }

admin/src/stores/modules/user.ts

@@ -32,14 +32,15 @@ const useUserStore = defineStore({
             this.token = ''
             this.userInfo = {}
             this.perms = []
-            this.menu = []
         },
         login(playload: any) {
-            const { account, password } = playload
+            const { account, password, code, uuid } = playload
             return new Promise((resolve, reject) => {
                 login({
                     username: account,
-                    password: password
+                    password,
+                    code,
+                    uuid
                 })
                     .then((data) => {
                         this.token = data.token
@@ -54,8 +55,9 @@ const useUserStore = defineStore({
         logout() {
             return new Promise((resolve, reject) => {
                 logout()
-                    .then((data) => {
-                        router.push(PageEnum.LOGIN)
+                    .then(async (data) => {
+                        this.token = ''
+                        await router.push(PageEnum.LOGIN)
                         clearAuthInfo()
                         resolve(data)
                     })

admin/src/styles/element.scss

@@ -91,7 +91,7 @@
         --el-messagebox-width: 350px;
     }
     .el-date-editor {
-        --el-date-editor-width: 235px;
+        --el-date-editor-width: 280px;
         .el-range-input {
             font-size: var(--el-font-size-small);
         }
@@ -115,6 +115,9 @@
     .el-image__error {
         font-size: 12px;
     }
+    .el-tabs__nav-wrap::after {
+        height: 1px;
+    }
 }
 @media (max-width: 768px) {
     .el-pagination > .el-pagination__jump {

admin/src/utils/auth.ts

@@ -12,7 +12,7 @@ export function clearAuthInfo() {
     const userStore = useUserStore()
     const tabsStore = useTabsStore()
     userStore.resetState()
-    tabsStore.resetState()
+    tabsStore.$reset()
     cache.remove(TOKEN_KEY)
     resetRouter()
 }

admin/src/utils/request/axios.ts

@@ -71,11 +71,10 @@ export class Axios {
                     this.removeCancelToken(err.config?.url!)
                 }
 
-                if (err.code == AxiosError.ECONNABORTED) {
-                    setTimeout(() => {
-                        console.log(err)
+                if (err.code == AxiosError.ECONNABORTED || err.code == AxiosError.ERR_NETWORK) {
+                    return new Promise((resolve) => setTimeout(resolve, 500)).then(() =>
                         this.retryRequest(err)
-                    }, 500)
+                    )
                 }
                 return Promise.reject(err)
             }
@@ -103,17 +102,17 @@ export class Axios {
     retryRequest(error: AxiosError) {
         const config = error.config
         const { retryCount, isOpenRetry } = config.requestOptions
-        if (!isOpenRetry && config.method?.toUpperCase() == RequestMethodsEnum.POST) {
-            return
+        if (!isOpenRetry || config.method?.toUpperCase() == RequestMethodsEnum.POST) {
+            return Promise.reject(error)
         }
         config.retryCount = config.retryCount ?? 0
 
         if (config.retryCount >= retryCount) {
-            return
+            return Promise.reject(error)
         }
         config.retryCount++
 
-        this.axiosInstance.request(config)
+        return this.axiosInstance.request(config)
     }
     /**
      * @description get请求

admin/src/utils/request/index.ts

@@ -21,7 +21,7 @@ const axiosHooks: AxiosHooks = {
         // 添加token
         if (withToken) {
             const token = getToken()
-            headers.token = token
+            headers['like-admin'] = token
         }
         // POST请求下如果无data，则将params视为data
         if (
@@ -69,6 +69,7 @@ const axiosHooks: AxiosHooks = {
             case RequestCodeEnum.NO_PERMISSTION:
             case RequestCodeEnum.FAILED:
             case RequestCodeEnum.SYSTEM_ERROR:
+            case RequestCodeEnum.VERIFICATION_CODE_ERROR:
                 msg && feedback.msgError(msg)
                 return Promise.reject(data)
 

admin/src/utils/util.ts

@@ -160,3 +160,12 @@ export const getNonDuplicateID = (length = 8) => {
     idStr += Math.random().toString(36).substring(3, length)
     return idStr
 }
+
+/**
+ * @description 单词首字母大写
+ * @param  { String } str
+ * @return { String } id
+ */
+export const firstToUpperCase = (str = '') => {
+    return str.toLowerCase().replace(/( |^)[a-z]/g, ($1) => $1.toUpperCase())
+}

admin/src/views/account/login.vue

@@ -6,7 +6,7 @@
                     <image-contain :src="config.webBackdrop" :width="400" height="100%" />
                 </div>
                 <div
-                    class="login-form bg-body flex flex-col px-10 pt-10 md:w-[400px] w-[375px] flex-none mx-auto"
+                    class="login-form bg-body flex flex-col justify-center px-10 py-10 md:w-[400px] w-[375px] flex-none mx-auto"
                 >
                     <div class="text-center text-3xl font-medium mb-8">{{ config.webName }}</div>
                     <el-form ref="formRef" :model="formData" size="large" :rules="rules">
@@ -17,7 +17,7 @@
                                 @keyup.enter="handleEnter"
                             >
                                 <template #prepend>
-                                    <icon name="el-icon-Avatar" />
+                                    <icon name="el-icon-User" />
                                 </template>
                             </el-input>
                         </el-form-item>
@@ -34,6 +34,25 @@
                                 </template>
                             </el-input>
                         </el-form-item>
+                        <el-form-item prop="code">
+                            <div class="flex items-center">
+                                <el-input
+                                    v-model="formData.code"
+                                    placeholder="请输入验证码"
+                                    @keyup.enter="handleLogin"
+                                >
+                                    <template #prepend>
+                                        <icon name="local-icon-anquan" />
+                                    </template>
+                                </el-input>
+                                <div
+                                    class="ml-4 w-[100px] flex-none cursor-pointer"
+                                    @click="getLoginCaptcha"
+                                >
+                                    <img class="w-full" :src="codeImg" alt="" />
+                                </div>
+                            </div>
+                        </el-form-item>
                     </el-form>
                     <div class="mb-5">
                         <el-checkbox v-model="remAccount" label="记住账号"></el-checkbox>
@@ -58,6 +77,7 @@ import cache from '@/utils/cache'
 import { ACCOUNT_KEY } from '@/enums/cacheEnums'
 import { PageEnum } from '@/enums/pageEnum'
 import { useLockFn } from '@/hooks/useLockFn'
+import { loginCaptcha } from '@/api/user'
 const passwordRef = shallowRef<InputInstance>()
 const formRef = shallowRef<FormInstance>()
 const appStore = useAppStore()
@@ -66,9 +86,12 @@ const route = useRoute()
 const router = useRouter()
 const remAccount = ref(false)
 const config = computed(() => appStore.config)
+const codeImg = ref()
 const formData = reactive({
     account: '',
-    password: ''
+    password: '',
+    code: '',
+    uuid: ''
 })
 const rules = {
     account: [
@@ -84,8 +107,21 @@ const rules = {
             message: '请输入密码',
             trigger: ['blur']
         }
+    ],
+    code: [
+        {
+            required: true,
+            message: '请输入验证码',
+            trigger: ['blur']
+        }
     ]
 }
+
+const getLoginCaptcha = async () => {
+    const data = await loginCaptcha()
+    formData.uuid = data.uuid
+    codeImg.value = data.img
+}
 // 回车按键监听
 const handleEnter = () => {
     if (!formData.password) {
@@ -99,9 +135,13 @@ const handleLogin = async () => {
     // 记住账号，缓存
     cache.set(ACCOUNT_KEY, {
         remember: remAccount.value,
-        account: formData.account
+        account: remAccount.value ? formData.account : ''
     })
-    await userStore.login(formData)
+    try {
+        await userStore.login(formData)
+    } catch (error) {
+        getLoginCaptcha()
+    }
     const {
         query: { redirect }
     } = route
@@ -112,6 +152,7 @@ const { isLock, lockFn: lockLogin } = useLockFn(handleLogin)
 
 onMounted(() => {
     const value = cache.get(ACCOUNT_KEY)
+    getLoginCaptcha()
     if (value?.remember) {
         remAccount.value = value.remember
         formData.account = value.account
@@ -125,6 +166,9 @@ onMounted(() => {
     @apply min-h-screen bg-no-repeat bg-center bg-cover;
     .login-card {
         height: 400px;
+        :deep(.el-input-group__prepend) {
+            padding: 0 15px;
+        }
     }
 }
 </style>

admin/src/views/app/recharge/index.vue

@@ -0,0 +1,54 @@
+<template>
+    <div>
+        <el-card shadow="never" class="!border-none">
+            <template #header>
+                <span class="font-extrabold text-lg">充值设置</span>
+            </template>
+            <el-form :model="formData" label-width="120px">
+                <el-form-item label="状态">
+                    <div>
+                        <el-radio-group v-model="formData.openRecharge" class="ml-4">
+                            <el-radio :label="1">开启</el-radio>
+                            <el-radio :label="0">关闭</el-radio>
+                        </el-radio-group>
+                        <div class="form-tips">关闭或开启充值功能，关闭后将不显示充值入口</div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="最低充值金额">
+                    <div>
+                        <el-input
+                            v-model="formData.minRechargeMoney"
+                            placeholder="请输入最低充值金额"
+                            clearable
+                        />
+                        <div class="form-tips">
+                            最低充值金额要求，不填或填0表示不限制最低充值金额
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <footer-btns v-perms="['marketing:recharge:save']">
+            <el-button type="primary" @click="handleSubmit">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+<script lang="ts" setup>
+import { getRechargeConfig, setRechargeConfig } from '@/api/app/recharge'
+import feedback from '@/utils/feedback'
+const formData = reactive({
+    openRecharge: 1, //功能状态 1-开启 0-关闭
+    minRechargeMoney: '' //最低充值金额
+})
+
+const getConfig = async () => {
+    const data = await getRechargeConfig()
+    Object.assign(formData, data)
+}
+const handleSubmit = async () => {
+    await setRechargeConfig(formData)
+    feedback.msgSuccess('操作成功')
+    getConfig()
+}
+getConfig()
+</script>

admin/src/views/article/column/edit.vue

@@ -14,7 +14,7 @@
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" :min="0" />
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                         <div class="form-tips">默认为0， 数值越大越排前</div>
                     </div>
                 </el-form-item>

admin/src/views/article/column/index.vue

@@ -65,7 +65,7 @@
         <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="articleColumn">
 import { articleCateDelete, articleCateLists, articleCateStatus } from '@/api/article'
 import { usePaging } from '@/hooks/usePaging'
 import feedback from '@/utils/feedback'

admin/src/views/article/lists/edit.vue

@@ -18,6 +18,10 @@
                                 <el-input
                                     v-model="formData.title"
                                     placeholder="请输入文章标题"
+                                    type="textarea"
+                                    :autosize="{ minRows: 3, maxRows: 3 }"
+                                    maxlength="64"
+                                    show-word-limit
                                     clearable
                                 />
                             </div>
@@ -42,6 +46,10 @@
                                 <el-input
                                     v-model="formData.intro"
                                     placeholder="请输入文章简介"
+                                    type="textarea"
+                                    :autosize="{ minRows: 3, maxRows: 6 }"
+                                    :maxlength="200"
+                                    show-word-limit
                                     clearable
                                 />
                             </div>
@@ -50,8 +58,10 @@
                             <div class="w-80">
                                 <el-input
                                     type="textarea"
-                                    :rows="6"
+                                    :autosize="{ minRows: 6, maxRows: 6 }"
                                     v-model="formData.summary"
+                                    maxlength="200"
+                                    show-word-limit
                                     clearable
                                 />
                             </div>
@@ -71,13 +81,13 @@
                         </el-form-item>
                         <el-form-item label="排序" prop="sort">
                             <div>
-                                <el-input-number v-model="formData.sort" :min="0" />
+                                <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                                 <div class="form-tips">默认为0， 数值越大越排前</div>
                             </div>
                         </el-form-item>
                         <el-form-item label="初始浏览量" prop="visit">
                             <div>
-                                <el-input-number v-model="formData.visit" />
+                                <el-input-number v-model="formData.visit" :min="0" :max="9999" />
                             </div>
                         </el-form-item>
                         <el-form-item label="文章状态" required prop="isShow">
@@ -101,11 +111,12 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="articleListsEdit">
 import type { FormInstance } from 'element-plus'
 import feedback from '@/utils/feedback'
 import { useDictOptions } from '@/hooks/useDictOptions'
 import { articleCateAll, articleDetail, articleEdit, articleAdd } from '@/api/article'
+import useMultipleTabs from '@/hooks/useMultipleTabs'
 
 const route = useRoute()
 const router = useRouter()
@@ -123,6 +134,7 @@ const formData = reactive({
     summary: ''
 })
 
+const { removeTab } = useMultipleTabs()
 const formRef = shallowRef<FormInstance>()
 const rules = reactive({
     title: [{ required: true, message: '请输入文章标题', trigger: 'blur' }],
@@ -155,6 +167,7 @@ const handleSave = async () => {
         await articleAdd(formData)
     }
     feedback.msgSuccess('操作成功')
+    removeTab()
     router.back()
 }
 

admin/src/views/article/lists/index.vue

@@ -4,14 +4,14 @@
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
                 <el-form-item label="文章标题">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.title"
                         clearable
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
                 <el-form-item label="栏目名称">
-                    <el-select class="w-56" v-model="queryParams.cid">
+                    <el-select class="w-[280px]" v-model="queryParams.cid">
                         <el-option label="全部" value />
                         <el-option
                             v-for="item in optionsData.articleCate"
@@ -22,7 +22,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="文章状态">
-                    <el-select class="w-56" v-model="queryParams.isShow">
+                    <el-select class="w-[280px]" v-model="queryParams.isShow">
                         <el-option label="全部" value />
                         <el-option label="显示" :value="1" />
                         <el-option label="隐藏" :value="0" />
@@ -37,9 +37,9 @@
         <el-card class="!border-none mt-4" shadow="never">
             <div>
                 <router-link
-                    v-perms="['article:add']"
+                    v-perms="['article:add', 'article:add/edit']"
                     :to="{
-                        path: getRoutePath('article:edit')
+                        path: getRoutePath('article:add/edit')
                     }"
                 >
                     <el-button type="primary" class="mb-4">
@@ -54,10 +54,11 @@
                 <el-table-column label="ID" prop="id" min-width="80" />
                 <el-table-column label="封面" min-width="100">
                     <template #default="{ row }">
-                        <el-image
+                        <image-contain
                             v-if="row.image"
                             :src="row.image"
-                            class="w-[60px] h-[45px]"
+                            :width="60"
+                            :height="45"
                             :preview-src-list="[row.image]"
                             preview-teleported
                             fit="contain"
@@ -88,10 +89,10 @@
                 <el-table-column label="发布时间" prop="createTime" min-width="120" />
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
-                        <el-button v-perms="['article:edit']" type="primary" link>
+                        <el-button v-perms="['article:edit','article:add/edit']" type="primary" link>
                             <router-link
                                 :to="{
-                                    path: getRoutePath('article:edit'),
+                                    path: getRoutePath('article:add/edit'),
                                     query: {
                                         id: row.id
                                     }
@@ -117,7 +118,7 @@
         </el-card>
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="articleLists">
 import { articleLists, articleDelete, articleStatus, articleCateAll } from '@/api/article'
 import { useDictOptions } from '@/hooks/useDictOptions'
 import { usePaging } from '@/hooks/usePaging'
@@ -159,5 +160,9 @@ const handleDelete = async (id: number) => {
     getLists()
 }
 
+onActivated(() => {
+    getLists()
+})
+
 getLists()
 </script>

admin/src/views/channel/h5.vue

@@ -32,7 +32,7 @@
         </footer-btns>
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="h5Config">
 import { getH5Config, setH5Config } from '@/api/channel/h5'
 import feedback from '@/utils/feedback'
 

admin/src/views/channel/weapp.vue

@@ -140,7 +140,7 @@
         </footer-btns>
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="weappConfig">
 import { getWeappConfig, setWeappConfig } from '@/api/channel/weapp'
 import feedback from '@/utils/feedback'
 

admin/src/views/channel/wx_oa/config.vue

@@ -156,7 +156,7 @@
         </footer-btns>
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="wxOaConfig">
 import { getOaConfig, setOaConfig } from '@/api/channel/wx_oa'
 import feedback from '@/utils/feedback'
 import { useClipboard } from '@vueuse/core'

admin/src/views/channel/wx_oa/menu.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts" name="wxOaMenu">
 import OaPhone from './menu_com/oa-phone.vue'
 import OaAttr from './menu_com/oa-attr.vue'
 import { useMenuOa } from './menu_com/useMenuOa'

admin/src/views/channel/wx_oa/menu_com/useMenuOa.ts

@@ -44,6 +44,12 @@ export const rules = reactive<FormRules>({
             required: true,
             message: '必填项不能为空',
             trigger: ['blur', 'change']
+        },
+        {
+            pattern:
+                /(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/,
+            message: '请输入合法的网址链接',
+            trigger: ['blur', 'change']
         }
     ],
     appId: [
@@ -121,7 +127,6 @@ export const useMenuOa = (ref: any) => {
                 await refs[i].menuFormRef.validate()
             } catch (error) {
                 menuIndex.value = i
-                feedback.msgError(`菜单${i + 1}必填项不能为空～`)
                 return
             }
         }
@@ -137,7 +142,6 @@ export const useMenuOa = (ref: any) => {
                 await refs[i].menuFormRef.validate()
             } catch (error) {
                 menuIndex.value = i
-                feedback.msgError(`菜单${i + 1}必填项不能为空～`)
                 return
             }
         }

admin/src/views/channel/wx_oa/reply/default_reply.vue

@@ -10,24 +10,30 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button class="mb-4" type="primary" @click="handleAdd()">
+                <el-button
+                    v-perms="['channel:oaReplyDefault:add']"
+                    class="mb-4"
+                    type="primary"
+                    @click="handleAdd()"
+                >
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
                     新增
                 </el-button>
             </div>
-            <el-table size="large" :data="lists">
+            <el-table size="large" :data="pager.lists" v-loading="pager.loading">
                 <el-table-column label="规则名称" prop="name" min-width="120" />
                 <el-table-column label="回复类型" min-width="120">
                     <template #default="{ row }">
-                        {{ getContentType(1) }}
+                        {{ getContentType(row.contentType) }}
                     </template>
                 </el-table-column>
                 <el-table-column label="回复内容" prop="content" min-width="120" />
                 <el-table-column label="状态" min-width="120">
                     <template #default="{ row }">
                         <el-switch
+                            v-perms="['channel:oaReplyDefault:status']"
                             v-model="row.status"
                             :active-value="1"
                             :inactive-value="0"
@@ -38,25 +44,40 @@
                 <el-table-column label="排序" prop="sort" min-width="120" />
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
-                        <el-button type="primary" link @click="handleEdit(row)"> 编辑 </el-button>
-                        <el-button type="danger" link @click="handleDelete(row.id)">
+                        <el-button
+                            v-perms="['channel:oaReplyDefault:edit']"
+                            type="primary"
+                            link
+                            @click="handleEdit(row)"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button
+                            v-perms="['channel:oaReplyDefault:del']"
+                            type="danger"
+                            link
+                            @click="handleDelete(row.id)"
+                        >
                             删除
                         </el-button>
                     </template>
                 </el-table-column>
             </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
 <script lang="ts" setup>
 import { oaReplyDel, getOaReplyList, changeOaReplyStatus } from '@/api/channel/wx_oa'
+import { usePaging } from '@/hooks/usePaging'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const showEdit = ref(false)
-const lists = ref()
-
+const type = 'default'
 const getContentType = computed(() => {
     return (val: number) => {
         switch (val) {
@@ -66,33 +87,36 @@ const getContentType = computed(() => {
     }
 })
 
-const getLists = async () => {
-    lists.value = await getOaReplyList({ type: 'default' })
-}
+const { pager, getLists } = usePaging({
+    fetchFun: getOaReplyList,
+    params: {
+        type
+    }
+})
 
 const handleAdd = async () => {
     showEdit.value = true
     await nextTick()
-    editRef.value?.open('add', 'default')
+    editRef.value?.open('add', type)
 }
 
 const handleEdit = async (data: any) => {
     showEdit.value = true
     await nextTick()
-    editRef.value?.open('edit', 'default')
+    editRef.value?.open('edit', type)
     editRef.value?.getDetail(data)
 }
 
 const handleDelete = async (id: number) => {
     await feedback.confirm('确定要删除？')
-    await oaReplyDel({ id })
+    await oaReplyDel({ id, type })
     feedback.msgSuccess('删除成功')
     getLists()
 }
 
 const changeStatus = async (id: number) => {
     try {
-        await changeOaReplyStatus({ id })
+        await changeOaReplyStatus({ id, type })
         feedback.msgSuccess('修改成功')
         getLists()
     } catch (error) {

admin/src/views/channel/wx_oa/reply/edit.vue

@@ -5,7 +5,6 @@
             :title="popupTitle"
             :async="true"
             width="500px"
-            :clickModalClose="true"
             @confirm="handleSubmit"
             @close="handleClose"
         >
@@ -56,6 +55,8 @@
                             v-model="formData.content"
                             :autosize="{ minRows: 4, maxRows: 4 }"
                             type="textarea"
+                            maxlength="200"
+                            show-word-limit
                             placeholder="请输入回复内容"
                         />
                     </div>
@@ -70,7 +71,7 @@
                 </el-form-item> -->
                 <el-form-item label="排序">
                     <div class="flex-1">
-                        <el-input v-model="formData.sort" placeholder="请输入" />
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                     </div>
                 </el-form-item>
                 <el-form-item label="启用状态">
@@ -170,7 +171,8 @@ const setFormData = (data: Record<any, any>) => {
 
 const getDetail = async (row: Record<string, any>) => {
     const data = await getOaReplyDetail({
-        id: row.id
+        id: row.id,
+        type: formData.type
     })
     setFormData(data)
 }

admin/src/views/channel/wx_oa/reply/follow_reply.vue

@@ -10,14 +10,19 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button class="mb-4" type="primary" @click="handleAdd()">
+                <el-button
+                    v-perms="['channel:oaReplyFollow:add']"
+                    class="mb-4"
+                    type="primary"
+                    @click="handleAdd()"
+                >
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
                     新增
                 </el-button>
             </div>
-            <el-table size="large" :data="lists">
+            <el-table size="large" :data="pager.lists" v-loading="pager.loading">
                 <el-table-column label="规则名称" prop="name" min-width="120" />
                 <el-table-column label="回复类型" min-width="120">
                     <template #default="{ row }">
@@ -28,6 +33,7 @@
                 <el-table-column label="状态" min-width="120">
                     <template #default="{ row }">
                         <el-switch
+                            v-perms="['channel:oaReplyFollow:status']"
                             v-model="row.status"
                             :active-value="1"
                             :inactive-value="0"
@@ -38,25 +44,41 @@
                 <el-table-column label="排序" prop="sort" min-width="120" />
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
-                        <el-button type="primary" link @click="handleEdit(row)"> 编辑 </el-button>
-                        <el-button type="danger" link @click="handleDelete(row.id)">
+                        <el-button
+                            v-perms="['channel:oaReplyFollow:edit']"
+                            type="primary"
+                            link
+                            @click="handleEdit(row)"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button
+                            v-perms="['channel:oaReplyFollow:del']"
+                            type="danger"
+                            link
+                            @click="handleDelete(row.id)"
+                        >
                             删除
                         </el-button>
                     </template>
                 </el-table-column>
             </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
 <script lang="ts" setup>
 import { oaReplyDel, getOaReplyList, changeOaReplyStatus } from '@/api/channel/wx_oa'
+import { usePaging } from '@/hooks/usePaging'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const showEdit = ref(false)
-const lists = ref()
-
+const type = 'follow'
 const getContentType = computed(() => {
     return (val: number) => {
         switch (val) {
@@ -66,33 +88,36 @@ const getContentType = computed(() => {
     }
 })
 
-const getLists = async () => {
-    lists.value = await getOaReplyList({ type: 'follow' })
-}
+const { pager, getLists } = usePaging({
+    fetchFun: getOaReplyList,
+    params: {
+        type
+    }
+})
 
 const handleAdd = async () => {
     showEdit.value = true
     await nextTick()
-    editRef.value?.open('add', 'follow')
+    editRef.value?.open('add', type)
 }
 
 const handleEdit = async (data: any) => {
     showEdit.value = true
     await nextTick()
-    editRef.value?.open('edit', 'follow')
+    editRef.value?.open('edit', type)
     editRef.value?.getDetail(data)
 }
 
 const handleDelete = async (id: number) => {
     await feedback.confirm('确定要删除？')
-    await oaReplyDel({ id })
+    await oaReplyDel({ id, type })
     feedback.msgSuccess('删除成功')
     getLists()
 }
 
 const changeStatus = async (id: number) => {
     try {
-        await changeOaReplyStatus({ id })
+        await changeOaReplyStatus({ id, type })
         feedback.msgSuccess('修改成功')
         getLists()
     } catch (error) {

admin/src/views/channel/wx_oa/reply/keyword_reply.vue

@@ -10,14 +10,19 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button class="mb-4" type="primary" @click="handleAdd()">
+                <el-button
+                    v-perms="['channel:oaReplyKeyword:add']"
+                    class="mb-4"
+                    type="primary"
+                    @click="handleAdd()"
+                >
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
                     新增
                 </el-button>
             </div>
-            <el-table size="large" :data="lists">
+            <el-table size="large" :data="pager.lists" v-loading="pager.loading">
                 <el-table-column label="规则名称" prop="name" min-width="120" />
 
                 <el-table-column label="关键词" prop="keyword" min-width="120" />
@@ -34,6 +39,7 @@
                 <el-table-column label="状态" min-width="120">
                     <template #default="{ row }">
                         <el-switch
+                            v-perms="['channel:oaReplyKeyword:status']"
                             v-model="row.status"
                             :active-value="1"
                             :inactive-value="0"
@@ -44,24 +50,39 @@
                 <el-table-column label="排序" prop="sort" min-width="120" />
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
-                        <el-button type="primary" link @click="handleEdit(row)"> 编辑 </el-button>
-                        <el-button type="danger" link @click="handleDelete(row.id)">
+                        <el-button
+                            v-perms="['channel:oaReplyKeyword:edit']"
+                            type="primary"
+                            link
+                            @click="handleEdit(row)"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button
+                            v-perms="['channel:oaReplyKeyword:del']"
+                            type="danger"
+                            link
+                            @click="handleDelete(row.id)"
+                        >
                             删除
                         </el-button>
                     </template>
                 </el-table-column>
             </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
 <script lang="ts" setup>
 import { oaReplyDel, getOaReplyList, changeOaReplyStatus } from '@/api/channel/wx_oa'
+import { usePaging } from '@/hooks/usePaging'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const showEdit = ref(false)
-const lists = ref()
 
 const getMatchingType = computed(() => {
     return (val: number) => {
@@ -82,34 +103,37 @@ const getContentType = computed(() => {
         }
     }
 })
-
-const getLists = async () => {
-    lists.value = await getOaReplyList({ type: 'keyword' })
-}
+const type = 'keyword'
+const { pager, getLists } = usePaging({
+    fetchFun: getOaReplyList,
+    params: {
+        type
+    }
+})
 
 const handleAdd = async () => {
     showEdit.value = true
     await nextTick()
-    editRef.value?.open('add', 'keyword')
+    editRef.value?.open('add', type)
 }
 
 const handleEdit = async (data: any) => {
     showEdit.value = true
     await nextTick()
-    editRef.value?.open('edit', 'keyword')
+    editRef.value?.open('edit', type)
     editRef.value?.getDetail(data)
 }
 
 const handleDelete = async (id: number) => {
     await feedback.confirm('确定要删除？')
-    await oaReplyDel({ id })
+    await oaReplyDel({ id, type })
     feedback.msgSuccess('删除成功')
     getLists()
 }
 
 const changeStatus = async (id: number) => {
     try {
-        await changeOaReplyStatus({ id })
+        await changeOaReplyStatus({ id, type })
         feedback.msgSuccess('修改成功')
         getLists()
     } catch (error) {

admin/src/views/channel/wx_op.vue

@@ -3,14 +3,14 @@
         <el-card class="!border-none" shadow="never">
             <el-alert
                 type="warning"
-                title="温馨提示：填写微信开放平台开发配置，请前往微信开放平台创建应用并完成认证；APP应用配置主要用于APP微信登录和微信支付"
+                title="温馨提示：填写微信开放平台开发配置，请前往微信开放平台创建应用并完成认证；网站应用配置主要用于网站微信登录和微信支付"
                 :closable="false"
                 show-icon
             />
         </el-card>
         <el-form ref="formRef" :model="formData" label-width="160px">
             <el-card class="!border-none mt-4" shadow="never">
-                <div class="font-medium mb-7">APP应用</div>
+                <div class="font-medium mb-7">网站应用</div>
                 <el-form-item label="AppID" prop="appId">
                     <div class="w-80">
                         <el-input v-model="formData.appId" placeholder="请输入AppID" />
@@ -23,20 +23,15 @@
                         </div>
                     </div>
                 </el-form-item>
-                <el-form-item>
-                    <div class="form-tips">
-                        小程序账号登录微信公众平台，点击开发>开发设置->开发者ID，设置AppID和AppSecret
-                    </div>
-                </el-form-item>
             </el-card>
         </el-form>
-        <footer-btns v-perms="['channel:wx:save']">
+        <footer-btns v-perms="['channel:op:save']">
             <el-button type="primary" @click="handelSave">保存</el-button>
         </footer-btns>
     </div>
 </template>
-<script lang="ts" setup>
-import { getWxDevConfig, setWxDevConfig } from '@/api/channel/wx_dev'
+<script lang="ts" setup name="wxDevConfig">
+import { getWxDevConfig, setWxDevConfig } from '@/api/channel/wx_op'
 import feedback from '@/utils/feedback'
 
 const formData = reactive({

admin/src/views/consumer/components/account-adjust.vue

@@ -0,0 +1,104 @@
+<template>
+    <popup
+        ref="popupRef"
+        title="余额调整"
+        width="500px"
+        @confirm="handleConfirm"
+        :async="true"
+        @close="popupClose"
+    >
+        <div class="pr-8">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="当前余额">¥ {{ value }} </el-form-item>
+                <el-form-item label="余额增减" required prop="action">
+                    <el-radio-group v-model="formData.action">
+                        <el-radio :label="1">增加余额</el-radio>
+                        <el-radio :label="2">扣减余额</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="调整余额" prop="num">
+                    <el-input
+                        :model-value="formData.num"
+                        placeholder="请输入调整的金额"
+                        type="number"
+                        @input="numberValidate"
+                    />
+                </el-form-item>
+                <el-form-item label="调整后余额"> ¥ {{ adjustmentMoney }} </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="formData.remark" type="textarea" :rows="4" />
+                </el-form-item>
+            </el-form>
+        </div>
+    </popup>
+</template>
+<script lang="ts" setup>
+import Popup from '@/components/popup/index.vue'
+import type { FormInstance, FormRules } from 'element-plus'
+import feedback from '@/utils/feedback'
+const formRef = shallowRef<FormInstance>()
+const props = defineProps({
+    show: {
+        type: Boolean,
+        required: true
+    },
+    value: {
+        type: [Number, String],
+        required: true
+    }
+})
+const emit = defineEmits<{
+    (event: 'update:show', value: boolean): void
+    (event: 'confirm', value: any): void
+}>()
+const formData = reactive({
+    action: 1, //变动类型 1-增加 2-减少
+    num: '',
+    remark: ''
+})
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+const adjustmentMoney = computed(() => {
+    return Number(props.value) + Number(formData.num) * (formData.action == 1 ? 1 : -1)
+})
+
+const formRules: FormRules = {
+    num: [
+        {
+            required: true,
+            message: '请输入调整的金额'
+        }
+    ]
+}
+const numberValidate = (value: string) => {
+    if (value.includes('-')) {
+        return feedback.msgError('请输入正整数')
+    }
+    formData.num = value
+}
+const handleConfirm = async () => {
+    await formRef.value?.validate()
+    emit('confirm', formData)
+}
+
+const popupClose = () => {
+    emit('update:show', false)
+    formRef.value?.resetFields()
+}
+watch(
+    () => props.show,
+    (val) => {
+        if (val) {
+            popupRef.value?.open()
+        } else {
+            popupRef.value?.close()
+        }
+    }
+)
+watch(adjustmentMoney, (val) => {
+    if (val < 0) {
+        feedback.msgError('调整后余额需大于0')
+        formData.num = ''
+    }
+})
+</script>

admin/src/views/consumer/lists/detail.vue

@@ -5,9 +5,25 @@
         </el-card>
         <el-card class="mt-4 !border-none" header="基本资料" shadow="never">
             <el-form ref="formRef" class="ls-form" :model="formData" label-width="120px">
-                <div class="bg-page py-5 pl-20 mb-10">
-                    <div class="mb-3 text-tx-regular">用户头像</div>
-                    <el-avatar :src="formData.avatar" :size="58" />
+                <div class="bg-page flex py-5 mb-10 items-center">
+                    <div class="basis-40 flex flex-col justify-center items-center">
+                        <div class="mb-2 text-tx-regular">用户头像</div>
+                        <el-avatar :src="formData.avatar" :size="58" />
+                    </div>
+                    <div class="basis-40 flex flex-col justify-center items-center">
+                        <div class="text-tx-regular">账户余额</div>
+                        <div class="mt-2 flex items-center">
+                            ¥{{ formData.user_money }}
+                            <el-button
+                                v-perms="['user.user/adjustMoney']"
+                                type="primary"
+                                link
+                                @click="handleAdjust(formData.user_money)"
+                            >
+                                调整
+                            </el-button>
+                        </div>
+                    </div>
                 </div>
                 <el-form-item label="用户编号："> {{ formData.sn }} </el-form-item>
                 <el-form-item label="用户昵称：">
@@ -15,7 +31,11 @@
                 </el-form-item>
                 <el-form-item label="账号：">
                     {{ formData.username }}
-                    <popover-input class="ml-[10px]" @confirm="handleEdit($event, 'username')">
+                    <popover-input
+                        class="ml-[10px]"
+                        :limit="32"
+                        @confirm="handleEdit($event, 'username')"
+                    >
                         <el-button type="primary" link v-perms="['user:edit']">
                             <icon name="el-icon-EditPen" />
                         </el-button>
@@ -23,7 +43,11 @@
                 </el-form-item>
                 <el-form-item label="真实姓名：">
                     {{ formData.realName || '-' }}
-                    <popover-input class="ml-[10px]" @confirm="handleEdit($event, 'realName')">
+                    <popover-input
+                        class="ml-[10px]"
+                        :limit="32"
+                        @confirm="handleEdit($event, 'realName')"
+                    >
                         <el-button type="primary" link v-perms="['user:edit']">
                             <icon name="el-icon-EditPen" />
                         </el-button>
@@ -72,15 +96,20 @@
                 <el-form-item label="最近登录时间："> {{ formData.lastLoginTime }} </el-form-item>
             </el-form>
         </el-card>
+        <account-adjust
+            v-model:show="adjustState.show"
+            :value="adjustState.value"
+            @confirm="handleConfirmAdjust"
+        />
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="consumerDetail">
 import type { FormInstance } from 'element-plus'
 import { getUserDetail, userEdit } from '@/api/consumer'
 import feedback from '@/utils/feedback'
 import { isEmpty } from '@/utils/util'
-
+import AccountAdjust from '../components/account-adjust.vue'
 const route = useRoute()
 const formData = reactive({
     avatar: '',
@@ -97,7 +126,10 @@ const formData = reactive({
 })
 
 const formRef = shallowRef<FormInstance>()
-
+const adjustState = reactive({
+    show: false,
+    value: ''
+})
 const getDetails = async () => {
     const data = await getUserDetail({
         id: route.query.id
@@ -118,6 +150,15 @@ const handleEdit = async (value: string, field: string) => {
     feedback.msgSuccess('编辑成功')
     getDetails()
 }
+const handleAdjust = (value: string) => {
+    adjustState.show = true
+    adjustState.value = value
+}
+const handleConfirmAdjust = async (value: any) => {
+    await adjustMoney({ user_id: route.query.id, ...value })
+    adjustState.show = false
+    getDetails()
+}
 
 getDetails()
 </script>

admin/src/views/consumer/lists/index.vue

@@ -4,7 +4,7 @@
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
                 <el-form-item label="用户信息">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.keyword"
                         placeholder="用户编号/昵称/手机号码"
                         clearable
@@ -18,7 +18,7 @@
                     />
                 </el-form-item>
                 <el-form-item label="注册来源">
-                    <el-select class="w-56" v-model="queryParams.channel">
+                    <el-select class="w-[280px]" v-model="queryParams.channel">
                         <el-option
                             v-for="(item, key) in ClientMap"
                             :key="key"
@@ -44,7 +44,7 @@
                 <el-table-column label="昵称" prop="nickname" min-width="100" />
                 <el-table-column label="账号" prop="username" min-width="120" />
                 <el-table-column label="手机号码" prop="mobile" min-width="100" />
-                <el-table-column label="性别" prop="sex" min-width="100" />
+                <!-- <el-table-column label="性别" prop="sex" min-width="100" /> -->
                 <el-table-column label="注册来源" prop="channel" min-width="100" />
                 <el-table-column label="注册时间" prop="createTime" min-width="120" />
                 <el-table-column label="操作" width="120" fixed="right">
@@ -70,7 +70,7 @@
         </el-card>
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="consumerLists">
 import { usePaging } from '@/hooks/usePaging'
 import { getRoutePath } from '@/router'
 import { getUserList } from '@/api/consumer'
@@ -86,6 +86,9 @@ const { pager, getLists, resetPage, resetParams } = usePaging({
     fetchFun: getUserList,
     params: queryParams
 })
+onActivated(() => {
+    getLists()
+})
 
 getLists()
 </script>

admin/src/views/decoration/component/add-nav.vue

@@ -1,37 +1,36 @@
 <template>
     <div>
         <div>
-            <del-wrap
-                class="max-w-[400px]"
-                v-for="(item, index) in modelValue"
-                :key="index"
-                @close="handleDelete(index)"
-            >
-                <div class="bg-fill-light flex items-center w-full p-4 mb-4">
-                    <material-picker
-                        v-model="item.image"
-                        upload-class="bg-body"
-                        size="60px"
-                        exclude-domain
-                    >
-                        <template #upload>
-                            <div class="upload-btn w-[60px] h-[60px]">
-                                <icon name="el-icon-Plus" :size="20" />
+            <draggable class="draggable" v-model="navLists" animation="300">
+                <template v-slot:item="{ element: item, index }">
+                    <del-wrap class="max-w-[400px]" :key="index" @close="handleDelete(index)">
+                        <div class="bg-fill-light flex items-center w-full p-4 mb-4 cursor-move">
+                            <material-picker
+                                v-model="item.image"
+                                upload-class="bg-body"
+                                size="60px"
+                                exclude-domain
+                            >
+                                <template #upload>
+                                    <div class="upload-btn w-[60px] h-[60px]">
+                                        <icon name="el-icon-Plus" :size="20" />
+                                    </div>
+                                </template>
+                            </material-picker>
+                            <div class="ml-3 flex-1">
+                                <div class="flex">
+                                    <span class="text-tx-regular flex-none mr-3">名称</span>
+                                    <el-input v-model="item.name" placeholder="请输入名称" />
+                                </div>
+                                <div class="flex mt-[18px]">
+                                    <span class="text-tx-regular flex-none mr-3">链接</span>
+                                    <link-picker v-model="item.link" />
+                                </div>
                             </div>
-                        </template>
-                    </material-picker>
-                    <div class="ml-3 flex-1">
-                        <div class="flex">
-                            <span class="text-tx-regular flex-none mr-3">名称</span>
-                            <el-input v-model="item.name" placeholder="请输入名称" />
                         </div>
-                        <div class="flex mt-[18px]">
-                            <span class="text-tx-regular flex-none mr-3">链接</span>
-                            <link-picker v-model="item.link" />
-                        </div>
-                    </div>
-                </div>
-            </del-wrap>
+                    </del-wrap>
+                </template>
+            </draggable>
         </div>
         <div>
             <el-button type="primary" @click="handleAdd">添加</el-button>
@@ -41,7 +40,7 @@
 <script lang="ts" setup>
 import feedback from '@/utils/feedback'
 import type { PropType } from 'vue'
-
+import Draggable from 'vuedraggable'
 const props = defineProps({
     modelValue: {
         type: Array as PropType<any[]>,
@@ -57,9 +56,19 @@ const props = defineProps({
     }
 })
 
+const emit = defineEmits(['update:modelValue'])
+const navLists = computed({
+    get() {
+        return props.modelValue
+    },
+    set(value) {
+        emit('update:modelValue', value)
+    }
+})
+
 const handleAdd = () => {
     if (props.modelValue?.length < props.max) {
-        props.modelValue.push({
+        navLists.value.push({
             image: '',
             name: '导航名称',
             link: {}
@@ -72,7 +81,7 @@ const handleDelete = (index: number) => {
     if (props.modelValue?.length <= props.min) {
         return feedback.msgError(`最少保留${props.min}个`)
     }
-    props.modelValue.splice(index, 1)
+    navLists.value.splice(index, 1)
 }
 </script>
 

admin/src/views/decoration/component/pages/attr-setting.vue

@@ -11,6 +11,7 @@
                 :is="widgets[widget?.name]?.attr"
                 :content="widget?.content"
                 :styles="widget?.styles"
+                :type="type"
             />
         </keep-alive>
     </div>
@@ -23,6 +24,10 @@ const props = defineProps({
     widget: {
         type: Object as PropType<Record<string, any>>,
         default: () => ({})
+    },
+    type: {
+        type: String as PropType<'mobile' | 'pc'>,
+        default: 'mobile'
     }
 })
 </script>

admin/src/views/decoration/component/pages/preview-pc.vue

@@ -0,0 +1,67 @@
+<template>
+    <div class="pages-preview">
+        <div
+            v-for="(widget, index) in pageData"
+            :key="widget.id"
+            class="relative"
+            :class="{
+                'cursor-pointer': !widget?.disabled
+            }"
+            @click="handleClick(widget, index)"
+        >
+            <div
+                class="absolute w-full h-full z-[100] border-dashed"
+                :class="{
+                    select: index == modelValue,
+                    'border-[#dcdfe6] border-2': !widget?.disabled
+                }"
+                :style="widget.styles"
+            ></div>
+            <slot>
+                <component
+                    :is="widgets[widget?.name]?.content"
+                    :content="widget.content"
+                    :styles="widget.styles"
+                    :key="widget.id"
+                />
+            </slot>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import widgets from '../widgets'
+import type { PropType } from 'vue'
+
+defineProps({
+    pageData: {
+        type: Array as PropType<any[]>,
+        default: () => []
+    },
+    modelValue: {
+        type: Number,
+        default: 0
+    }
+})
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: number): void
+}>()
+
+const handleClick = (widget: any, index: number) => {
+    if (widget.disabled) return
+    emit('update:modelValue', index)
+}
+</script>
+
+<style lang="scss" scoped>
+.pages-preview {
+    width: 460px;
+    height: 360px;
+    background: url(../../image/pc_index.png);
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    .select {
+        @apply border-primary border-solid;
+    }
+}
+</style>

admin/src/views/decoration/component/widgets/banner/attr.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-form label-width="70px">
-            <el-form-item label="是否启用">
+            <el-form-item label="是否启用" v-if="type == 'mobile'">
                 <el-radio-group v-model="content.enabled">
                     <el-radio :label="1">开启</el-radio>
                     <el-radio :label="0">停用</el-radio>
@@ -10,28 +10,44 @@
             <el-form-item label="图片设置">
                 <div class="flex-1">
                     <div class="form-tips">最多添加5张，建议图片尺寸：750px*340px</div>
-                    <del-wrap
-                        v-for="(item, index) in content.data"
-                        :key="index"
-                        @close="handleDelete(index)"
-                        class="max-w-[400px]"
-                    >
-                        <div class="bg-fill-light flex items-center w-full p-4 mt-4">
-                            <material-picker
-                                v-model="item.image"
-                                upload-class="bg-body"
-                                exclude-domain
-                            />
-                            <div class="ml-3 flex-1">
-                                <el-form-item label="图片名称">
-                                    <el-input v-model="item.name" placeholder="请输入名称" />
-                                </el-form-item>
-                                <el-form-item class="mt-[18px]" label="图片链接">
-                                    <link-picker v-model="item.link" />
-                                </el-form-item>
-                            </div>
-                        </div>
-                    </del-wrap>
+                    <draggable class="draggable" v-model="content.data" animation="300">
+                        <template v-slot:item="{ element: item, index }">
+                            <del-wrap
+                                :key="index"
+                                @close="handleDelete(index)"
+                                class="max-w-[400px]"
+                            >
+                                <div
+                                    class="bg-fill-light flex items-center w-full p-4 mt-4 cursor-move"
+                                >
+                                    <material-picker
+                                        v-model="item.image"
+                                        upload-class="bg-body"
+                                        exclude-domain
+                                    />
+                                    <div class="ml-3 flex-1">
+                                        <el-form-item label="图片名称">
+                                            <el-input
+                                                v-model="item.name"
+                                                placeholder="请输入名称"
+                                            />
+                                        </el-form-item>
+                                        <el-form-item class="mt-[18px]" label="图片链接">
+                                            <link-picker
+                                                v-if="type == 'mobile'"
+                                                v-model="item.link"
+                                            />
+                                            <el-input
+                                                v-if="type == 'pc'"
+                                                placeholder="请输入链接"
+                                                v-model="item.link.path"
+                                            />
+                                        </el-form-item>
+                                    </div>
+                                </div>
+                            </del-wrap>
+                        </template>
+                    </draggable>
                 </div>
             </el-form-item>
             <el-form-item v-if="content.data?.length < limit">
@@ -44,6 +60,7 @@
 import feedback from '@/utils/feedback'
 import type { PropType } from 'vue'
 import type options from './options'
+import Draggable from 'vuedraggable'
 const limit = 5
 type OptionsType = ReturnType<typeof options>
 const props = defineProps({
@@ -54,6 +71,10 @@ const props = defineProps({
     styles: {
         type: Object as PropType<OptionsType['styles']>,
         default: () => ({})
+    },
+    type: {
+        type: String as PropType<'mobile' | 'pc'>,
+        default: 'mobile'
     }
 })
 

admin/src/views/decoration/component/widgets/banner/content.vue

@@ -1,7 +1,12 @@
 <template>
-    <div class="banner">
-        <div class="banner-image">
-            <decoration-img width="100%" height="170px" :src="getImage" fit="contain" />
+    <div class="banner" :style="styles">
+        <div class="banner-image w-full h-full">
+            <decoration-img
+                width="100%"
+                :height="styles.height || height"
+                :src="getImage"
+                fit="contain"
+            />
         </div>
     </div>
 </template>
@@ -18,6 +23,10 @@ const props = defineProps({
     styles: {
         type: Object as PropType<OptionsType['styles']>,
         default: () => ({})
+    },
+    height: {
+        type: String,
+        default: '170px'
     }
 })
 

admin/src/views/decoration/component/widgets/user-banner/attr.vue

@@ -10,28 +10,36 @@
             <el-form-item label="图片设置">
                 <div class="flex-1">
                     <div class="form-tips">最多添加5张，建议图片尺寸：750px*200px</div>
-                    <del-wrap
-                        v-for="(item, index) in content.data"
-                        :key="index"
-                        @close="handleDelete(index)"
-                        class="max-w-[400px]"
-                    >
-                        <div class="bg-fill-light flex items-center w-full p-4 mt-4">
-                            <material-picker
-                                v-model="item.image"
-                                upload-class="bg-body"
-                                exclude-domain
-                            />
-                            <div class="ml-3 flex-1">
-                                <el-form-item label="图片名称">
-                                    <el-input v-model="item.name" placeholder="请输入名称" />
-                                </el-form-item>
-                                <el-form-item class="mt-[18px]" label="图片链接">
-                                    <link-picker v-model="item.link" />
-                                </el-form-item>
-                            </div>
-                        </div>
-                    </del-wrap>
+                    <draggable class="draggable" v-model="content.data" animation="300">
+                        <template v-slot:item="{ element: item, index }">
+                            <del-wrap
+                                :key="index"
+                                @close="handleDelete(index)"
+                                class="max-w-[400px]"
+                            >
+                                <div
+                                    class="bg-fill-light flex items-center w-full p-4 mt-4 cursor-move"
+                                >
+                                    <material-picker
+                                        v-model="item.image"
+                                        upload-class="bg-body"
+                                        exclude-domain
+                                    />
+                                    <div class="ml-3 flex-1">
+                                        <el-form-item label="图片名称">
+                                            <el-input
+                                                v-model="item.name"
+                                                placeholder="请输入名称"
+                                            />
+                                        </el-form-item>
+                                        <el-form-item class="mt-[18px]" label="图片链接">
+                                            <link-picker v-model="item.link" />
+                                        </el-form-item>
+                                    </div>
+                                </div>
+                            </del-wrap>
+                        </template>
+                    </draggable>
                 </div>
             </el-form-item>
             <el-form-item v-if="content.data?.length < limit">
@@ -44,6 +52,7 @@
 import feedback from '@/utils/feedback'
 import type { PropType } from 'vue'
 import type options from './options'
+import Draggable from 'vuedraggable'
 const limit = 5
 type OptionsType = ReturnType<typeof options>
 const props = defineProps({

admin/src/views/decoration/pages/index.vue

@@ -12,7 +12,7 @@
         </footer-btns>
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="decorationPages">
 import Menu from '../component/pages/menu.vue'
 import Preview from '../component/pages/preview.vue'
 import AttrSetting from '../component/pages/attr-setting.vue'
@@ -47,7 +47,7 @@ const menus: Record<
     [pagesTypeEnum.HOME]: {
         id: 1,
         pageType: 1,
-        name: '商城首页',
+        name: '首页装修',
         pageData: generatePageData(['search', 'banner', 'nav', 'news'])
     },
     [pagesTypeEnum.USER]: {

admin/src/views/decoration/pc.vue

@@ -0,0 +1,90 @@
+<template>
+    <div class="decoration-pages min-w-[1100px]">
+        <el-card shadow="never" class="!border-none flex-1 flex" :body-style="{ flex: 1 }">
+            <div class="flex h-full items-start">
+                <Menu v-model="activeMenu" :menus="menus" />
+                <preview-pc class="mx-4" v-model="selectWidgetIndex" :pageData="getPageData" />
+                <attr-setting class="flex-1" :widget="getSelectWidget" type="pc" />
+            </div>
+        </el-card>
+        <footer-btns class="mt-4" :fixed="false" v-perms="['decorate:pages:save']">
+            <el-button type="primary" @click="setData">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+<script lang="ts" setup name="decorationPc">
+import Menu from './component/pages/menu.vue'
+import PreviewPc from './component/pages/preview-pc.vue'
+import AttrSetting from './component/pages/attr-setting.vue'
+import widgets from './component/widgets'
+import { getDecoratePages, setDecoratePages } from '@/api/decoration'
+import { getNonDuplicateID } from '@/utils/util'
+enum pagesTypeEnum {
+    HOME = '4'
+}
+
+const generatePageData = (widgetNames: string[]) => {
+    return widgetNames.map((widgetName) => {
+        const options = {
+            id: getNonDuplicateID(),
+            ...(widgets[widgetName]?.options() || {})
+        }
+        return options
+    })
+}
+
+const menus: Record<
+    string,
+    {
+        id: number
+        name: string
+        pageData: any[]
+    }
+> = reactive({
+    [pagesTypeEnum.HOME]: {
+        id: 4,
+        pageType: 4,
+        name: 'pc首页装修',
+        pageData: []
+    }
+})
+
+const activeMenu = ref('4')
+const selectWidgetIndex = ref(0)
+const getPageData = computed(() => {
+    return menus[activeMenu.value]?.pageData ?? []
+})
+const getSelectWidget = computed(() => {
+    return menus[activeMenu.value]?.pageData[selectWidgetIndex.value] ?? ''
+})
+
+const getData = async () => {
+    const data = await getDecoratePages({ id: activeMenu.value })
+    menus[String(data.id)].pageData = JSON.parse(data.pageData)
+    selectWidgetIndex.value = getPageData.value.findIndex((item) => !item.disabled)
+}
+
+const setData = async () => {
+    await setDecoratePages({
+        ...menus[activeMenu.value],
+        pageData: JSON.stringify(menus[activeMenu.value].pageData)
+    })
+    getData()
+}
+watch(
+    activeMenu,
+    () => {
+        selectWidgetIndex.value = getPageData.value.findIndex((item) => !item.disabled)
+        getData()
+    },
+    {
+        immediate: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+.decoration-pages {
+    min-height: calc(100vh - var(--navbar-height) - 80px);
+    @apply flex flex-col;
+}
+</style>

admin/src/views/decoration/tabbar.vue

@@ -132,7 +132,7 @@
         </footer-btns>
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="decorationTabbar">
 import { getDecorateTabbar, setDecorateTabbar } from '@/api/decoration'
 import feedback from '@/utils/feedback'
 import Draggable from 'vuedraggable'
@@ -188,7 +188,7 @@ const onMove = (e: any) => {
 
 const getData = async () => {
     const data = await getDecorateTabbar()
-    tabbar.list = data.list.map((item: any) => ({ ...item, link: JSON.parse(item.link) }))
+    tabbar.list = data.list
     tabbar.style = data.style
 }
 const setData = async () => {

admin/src/views/dev_tools/code/edit.vue

@@ -8,7 +8,7 @@
                 ref="formRef"
                 class="ls-form"
                 :model="formData"
-                label-width="100px"
+                label-width="130px"
                 :rules="rules"
             >
                 <el-tabs v-model="activeName">
@@ -18,6 +18,7 @@
                                 <el-input
                                     v-model="formData.base.tableName"
                                     placeholder="请输入表名称"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -26,6 +27,7 @@
                                 <el-input
                                     v-model="formData.base.tableComment"
                                     placeholder="请输入表描述"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -34,6 +36,7 @@
                                 <el-input
                                     v-model="formData.base.entityName"
                                     placeholder="请输入实体类名称"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -43,6 +46,7 @@
                                 <el-input
                                     v-model="formData.base.authorName"
                                     placeholder="请输入作者"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -50,9 +54,12 @@
                             <div class="w-80">
                                 <el-input
                                     v-model="formData.base.remarks"
-                                    class="el-input"
+                                    class="w-full"
                                     type="textarea"
-                                    :rows="4"
+                                    :autosize="{ minRows: 4, maxRows: 4 }"
+                                    maxlength="200"
+                                    show-word-limit
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -90,7 +97,7 @@
                                         v-model="row.isRequired"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="插入" width="80">
@@ -99,7 +106,7 @@
                                         v-model="row.isInsert"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="编辑" width="80">
@@ -108,7 +115,7 @@
                                         v-model="row.isEdit"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="列表" width="80">
@@ -117,7 +124,7 @@
                                         v-model="row.isList"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="查询" width="80">
@@ -126,7 +133,7 @@
                                         v-model="row.isQuery"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="查询方式">
@@ -196,6 +203,7 @@
                                 <el-input
                                     v-model="formData.gen.moduleName"
                                     placeholder="请输入模块名"
+                                    clearable
                                 />
                                 <div class="form-tips">生成文件所在模块名</div>
                             </div>
@@ -205,15 +213,55 @@
                                 <el-input
                                     v-model="formData.gen.functionName"
                                     placeholder="请输入功能名称"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
                         <el-form-item label="生成方式" prop="gen.genType">
-                            <el-radio-group v-model="formData.gen.genType">
-                                <el-radio :label="GenType.ZIP">压缩包下载</el-radio>
-                                <el-radio :label="GenType.CUSTOM_PATH">自定义路径</el-radio>
-                            </el-radio-group>
+                            <div>
+                                <el-radio-group v-model="formData.gen.genType">
+                                    <el-radio :label="GenType.ZIP">压缩包下载</el-radio>
+                                    <el-radio :label="GenType.CUSTOM_PATH">自定义路径</el-radio>
+                                </el-radio-group>
+                                <div class="form-tips">压縮包下载方式暂不支持自动构建菜单权限</div>
+                            </div>
                         </el-form-item>
+                        <el-form-item label="菜单构建" prop="gen.menuStatus" required>
+                            <div>
+                                <el-radio-group v-model="formData.gen.menuStatus">
+                                    <el-radio :label="1">自动构建</el-radio>
+                                    <el-radio :label="0">手动添加</el-radio>
+                                </el-radio-group>
+                                <div class="form-tips">
+                                    自动构建：自动执行生成菜单sql。 手动添加：自行添加菜单
+                                </div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="父级菜单" prop="gen.menuPid">
+                            <el-tree-select
+                                class="w-80"
+                                v-model="formData.gen.menuPid"
+                                :data="optionsData.menu"
+                                clearable
+                                node-key="id"
+                                :props="{
+                                    label: 'menuName'
+                                }"
+                                default-expand-all
+                                placeholder="请选择父级菜单"
+                                check-strictly
+                            />
+                        </el-form-item>
+                        <el-form-item label="菜单名称" prop="gen.menuName">
+                            <div class="w-80">
+                                <el-input
+                                    v-model="formData.gen.menuName"
+                                    placeholder="请输入菜单名称"
+                                    clearable
+                                />
+                            </div>
+                        </el-form-item>
+
                         <el-form-item
                             v-if="formData.gen.genType == GenType.CUSTOM_PATH"
                             label="自定义路径"
@@ -223,6 +271,7 @@
                                 <el-input
                                     v-model="formData.gen.genPath"
                                     placeholder="请输入自定义路径"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -263,6 +312,48 @@
                             </el-form-item>
                         </template>
                     </el-tab-pane>
+                    <el-tab-pane label="关联配置" name="relation">
+                        <el-form-item label="关联子表的表名" prop="gen.subTableName">
+                            <el-select
+                                class="w-80"
+                                v-model="formData.gen.subTableName"
+                                clearable
+                                @change="handleTableChange"
+                            >
+                                <el-option
+                                    v-for="item in optionsData.dataTable"
+                                    :key="item.tableName"
+                                    :value="item.tableName"
+                                    :label="`${item.tableName}：${item.tableComment}`"
+                                />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="子表关联的外键名 " prop="gen.subTableFk">
+                            <el-select
+                                class="w-80"
+                                v-model="formData.gen.subTableFk"
+                                clearable
+                                :loading="columnLoading"
+                            >
+                                <el-option
+                                    v-for="item in tableColumn"
+                                    :key="item.id"
+                                    :value="item.columnName"
+                                    :label="`${item.columnName}：${item.columnComment}`"
+                                />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="关联表主键 " prop="gen.subTableFr">
+                            <el-select class="w-80" v-model="formData.gen.subTableFr" clearable>
+                                <el-option
+                                    v-for="item in formData.column"
+                                    :key="item.id"
+                                    :value="item.columnName"
+                                    :label="`${item.columnName}：${item.columnComment}`"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-tab-pane>
                 </el-tabs>
             </el-form>
         </el-card>
@@ -272,14 +363,14 @@
     </div>
 </template>
 
-<script lang="ts" setup>
-import { generateEdit, tableDetail } from '@/api/tools/code'
+<script lang="ts" setup name="tableEdit">
+import { dataTableAll, generateEdit, tableDetail, dataTableToColumn } from '@/api/tools/code'
 import { dictTypeAll } from '@/api/setting/dict'
 import type { FormInstance } from 'element-plus'
 import feedback from '@/utils/feedback'
 import { menuLists } from '@/api/perms/menu'
 import { useDictOptions } from '@/hooks/useDictOptions'
-
+import useMultipleTabs from '@/hooks/useMultipleTabs'
 enum GenTpl {
     CRUD = 'crud',
     TREE = 'tree'
@@ -292,6 +383,7 @@ enum GenType {
 
 const route = useRoute()
 const router = useRouter()
+const { removeTab } = useMultipleTabs()
 const activeName = ref('column')
 const formData = reactive({
     base: {
@@ -311,9 +403,13 @@ const formData = reactive({
         moduleName: '',
         subTableFk: '',
         subTableName: '',
+        subTableFr: '',
         treeParent: '',
         treePrimary: '',
-        treeName: ''
+        treeName: '',
+        menuName: '',
+        menuStatus: 0,
+        menuPid: 0
     }
 })
 
@@ -334,15 +430,18 @@ const getDetails = async () => {
     const data = await tableDetail({
         id: route.query.id
     })
+
     Object.keys(formData).forEach((key) => {
         //@ts-ignore
         formData[key] = data[key]
     })
+    getTableColumn()
 }
 
 const { optionsData } = useDictOptions<{
     dictType: any[]
     menu: any[]
+    dataTable: any[]
 }>({
     dictType: {
         api: dictTypeAll
@@ -350,19 +449,36 @@ const { optionsData } = useDictOptions<{
     menu: {
         api: menuLists,
         transformData(data: any) {
-            const menu = { id: 0, name: '顶级', children: [] }
+            const menu = { id: 0, menuName: '顶级', children: [] }
             menu.children = data
-            return menu
+            return [menu]
         }
+    },
+    dataTable: {
+        api: dataTableAll
     }
 })
 
+const columnLoading = ref(false)
+const tableColumn = ref<any[]>([])
+const getTableColumn = async () => {
+    columnLoading.value = true
+    const res = await dataTableToColumn({ tableName: formData.gen.subTableName })
+    columnLoading.value = false
+    tableColumn.value = res
+}
+
+const handleTableChange = () => {
+    formData.gen.subTableFk = ''
+    getTableColumn()
+}
 const handleSave = async () => {
     try {
         await formRef.value?.validate()
         const { base, column, gen } = formData
         await generateEdit({ ...base, ...gen, column })
         feedback.msgSuccess('操作成功')
+        removeTab()
         router.back()
     } catch (error: any) {
         for (const err in error) {

admin/src/views/dev_tools/code/index.vue

@@ -3,10 +3,20 @@
         <el-card class="!border-none" shadow="never">
             <el-form class="mb-[-16px]" :model="formData" inline>
                 <el-form-item label="表名称">
-                    <el-input class="w-56" v-model="formData.tableName" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="formData.tableName"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
                 </el-form-item>
                 <el-form-item label="表描述">
-                    <el-input class="w-56" v-model="formData.tableComment" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="formData.tableComment"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -138,7 +148,7 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="codeGenerate">
 import {
     generateTable,
     syncColumn,
@@ -228,5 +238,9 @@ const handleCommand = (command: any, row: any) => {
     }
 }
 
+onActivated(() => {
+    getLists()
+})
+
 getLists()
 </script>

admin/src/views/dev_tools/components/data-table.vue

@@ -13,10 +13,20 @@
             </template>
             <el-form class="ls-form" :model="formData" inline>
                 <el-form-item label="表名称">
-                    <el-input class="w-56" v-model="formData.tableName" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="formData.tableName"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
                 </el-form-item>
                 <el-form-item label="表描述">
-                    <el-input class="w-56" v-model="formData.tableComment" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="formData.tableComment"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>

admin/src/views/error/403.vue

@@ -1,10 +1,12 @@
 <template>
     <div class="error404">
-        <error
-            code="403"
-            title="您的账号权限不足，请联系管理员添加权限！"
-            :show-btn="false"
-        ></error>
+        <error code="403" title="您的账号权限不足，请联系管理员添加权限！" :show-btn="false">
+            <template #content>
+                <div class="flex justify-center">
+                    <img class="w-[150px] h-[150px]" src="@/assets/images/no_perms.png" alt="" />
+                </div>
+            </template>
+        </error>
     </div>
 </template>
 

admin/src/views/error/components/error.vue

@@ -1,8 +1,10 @@
 <template>
     <div class="error">
         <div>
-            <div class="error-code">{{ code }}</div>
-            <div class="lg lighter mt-7 mb-7">{{ title }}</div>
+            <slot name="content">
+                <div class="error-code">{{ code }}</div>
+            </slot>
+            <div class="text-lg text-tx-secondary mt-7 mb-7">{{ title }}</div>
             <el-button v-if="showBtn" type="primary" @click="router.go(-1)">
                 {{ second }} 秒后返回上一页
             </el-button>

admin/src/views/finance/balance_details.vue

@@ -0,0 +1,101 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-alert
+                type="warning"
+                title="温馨提示：用户账户变动记录"
+                :closable="false"
+                show-icon
+            ></el-alert>
+            <el-form ref="formRef" class="mb-[-16px] mt-[16px]" :model="queryParams" :inline="true">
+                <el-form-item label="用户信息">
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.keyword"
+                        placeholder="请输入用户编号/昵称/手机号"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
+                </el-form-item>
+                <el-form-item label="变动类型">
+                    <el-select class="w-[280px]" v-model="queryParams.type">
+                        <el-option label="全部" value />
+                        <el-option
+                            v-for="(value, key) in changeType"
+                            :key="key"
+                            :label="value"
+                            :value="key"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="记录时间">
+                    <daterange-picker
+                        v-model:startTime="queryParams.startTime"
+                        v-model:endTime="queryParams.endTime"
+                    />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none mt-4" shadow="never">
+            <el-table size="large" v-loading="pager.loading" :data="pager.lists">
+                <el-table-column label="用户编号" prop="userSn" min-width="100" />
+                <el-table-column label="用户昵称" min-width="160">
+                    <template #default="{ row }">
+                        <div class="flex items-center">
+                            <image-contain
+                                class="flex-none mr-2"
+                                :src="row.avatar"
+                                :width="40"
+                                :height="40"
+                                preview-teleported
+                                fit="contain"
+                            />
+                            {{ row.nickname }}
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="变动金额" prop="changeAmount" min-width="100">
+                    <template #default="{ row }">
+                        <span :class="{ 'text-error': row.action == 2 }">
+                            {{ row.changeAmount }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="剩余金额" prop="leftAmount" min-width="100" />
+                <el-table-column label="变动类型" prop="changeType" min-width="120" />
+
+                <el-table-column label="来源单号" prop="sourceSn" min-width="100" />
+                <el-table-column label="记录时间" prop="createTime" min-width="120" />
+            </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+<script lang="ts" setup name="articleLists">
+import { accountLog } from '@/api/finance'
+import { usePaging } from '@/hooks/usePaging'
+const queryParams = reactive({
+    keyword: '',
+    type: '',
+    startTime: '',
+    endTime: ''
+})
+
+const changeType = ref<any[]>([])
+
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: accountLog,
+    params: queryParams,
+    afterRequest(res) {
+        changeType.value = res.extend?.changeType
+    }
+})
+
+getLists()
+</script>

admin/src/views/finance/component/refund-log.vue

@@ -0,0 +1,68 @@
+<template>
+    <div class="code-preview">
+        <el-dialog v-model="show" width="760px" title="退款日志">
+            <el-table size="large" v-loading="loading" :data="logLists" height="500">
+                <el-table-column label="流水单号" prop="sn" min-width="190" />
+                <el-table-column label="退款金额" min-width="110">
+                    <template #default="{ row }"> ¥{{ row.refundAmount }} </template>
+                </el-table-column>
+                <el-table-column label="退款状态" prop="" min-width="100">
+                    <template #default="{ row }">
+                        <el-tag type="warning" v-if="row.refundStatus == 0">
+                            {{ row.refundStatusMsg }}
+                        </el-tag>
+                        <el-tag v-if="row.refundStatus == 1">
+                            {{ row.refundStatusMsg }}
+                        </el-tag>
+                        <el-tag type="danger" v-if="row.refundStatus == 2">
+                            {{ row.refundStatusMsg }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="记录时间" prop="createTime" min-width="180" />
+                <el-table-column label="操作人" prop="handler" min-width="120" />
+            </el-table>
+        </el-dialog>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { refundLog } from '@/api/finance'
+const loading = ref(false)
+const logLists = ref([])
+const props = defineProps<{
+    modelValue: boolean
+    refundId: number
+}>()
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: boolean): void
+}>()
+
+const show = computed<boolean>({
+    get() {
+        return props.modelValue
+    },
+    set(value) {
+        emit('update:modelValue', value)
+    }
+})
+
+const getRefundLog = async () => {
+    loading.value = true
+    logLists.value = []
+    try {
+        const res = await refundLog({
+            id: props.refundId
+        })
+        logLists.value = res
+    } catch (error) {}
+    loading.value = false
+}
+
+watch(show, (value) => {
+    if (value) {
+        getRefundLog()
+    }
+})
+</script>

admin/src/views/finance/recharge_record.vue

@@ -0,0 +1,144 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-alert
+                type="warning"
+                title="温馨提示：用户充值记录"
+                :closable="false"
+                show-icon
+            ></el-alert>
+            <el-form ref="formRef" class="mb-[-16px] mt-[16px]" :model="queryParams" :inline="true">
+                <el-form-item label="充值单号">
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.sn"
+                        placeholder="请输入充值单号"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
+                </el-form-item>
+                <el-form-item label="用户信息">
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.keyword"
+                        placeholder="请输入用户编号/昵称/手机号"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
+                </el-form-item>
+                <el-form-item label="支付方式">
+                    <el-select class="w-[280px]" v-model="queryParams.payWay">
+                        <el-option label="全部" value />
+                        <el-option label="微信支付" :value="2" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="支付状态">
+                    <el-select class="w-[280px]" v-model="queryParams.payStatus">
+                        <el-option label="全部" value />
+                        <el-option label="未支付" :value="0" />
+                        <el-option label="已支付" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="下单时间">
+                    <daterange-picker
+                        v-model:startTime="queryParams.startTime"
+                        v-model:endTime="queryParams.endTime"
+                    />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                    <export-data
+                        class="ml-2.5"
+                        :fetch-fun="rechargeLists"
+                        :params="queryParams"
+                        :page-size="pager.size"
+                    />
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none mt-4" shadow="never">
+            <el-table size="large" v-loading="pager.loading" :data="pager.lists">
+                <el-table-column label="用户信息" min-width="160">
+                    <template #default="{ row }">
+                        <div class="flex items-center">
+                            <image-contain
+                                class="flex-none mr-2"
+                                :src="row.avatar"
+                                :width="40"
+                                :height="40"
+                                preview-teleported
+                                fit="contain"
+                            />
+                            {{ row.nickname }}
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="充值单号" prop="orderSn" min-width="190" />
+                <el-table-column label="充值金额" prop="orderAmount" min-width="100">
+                </el-table-column>
+                <el-table-column label="支付方式" prop="payWay" min-width="100" />
+                <el-table-column label="支付状态" prop="" min-width="100">
+                    <template #default="{ row }">
+                        <span
+                            :class="{
+                                'text-error': row.payStatus == 0
+                            }"
+                        >
+                            {{ row.payStatus == 0 ? '未支付' : '已支付' }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="提交时间" prop="createTime" min-width="180" />
+                <el-table-column label="支付时间" prop="payTime" min-width="180" />
+                <el-table-column label="操作" width="120" fixed="right">
+                    <template #default="{ row }">
+                        <el-button
+                            v-if="row.payStatus == 1 && row.isRefund == 0"
+                            v-perms="['finance:recharger:refund']"
+                            type="primary"
+                            link
+                            @click="handleRefund(row.id)"
+                        >
+                            退款
+                        </el-button>
+                        <el-button v-if="row.payStatus == 1 && row.isRefund == 1" link>
+                            {{ row.refundStatusMsg }}
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+<script lang="ts" setup name="articleLists">
+import { rechargeLists, refund } from '@/api/finance'
+import { usePaging } from '@/hooks/usePaging'
+import feedback from '@/utils/feedback'
+const queryParams = reactive({
+    sn: '',
+    keyword: '',
+    payStatus: '',
+    payWay: '',
+    startTime: '',
+    endTime: ''
+})
+
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: rechargeLists,
+    params: queryParams
+})
+const handleRefund = async (id: number) => {
+    await feedback.confirm('确认退款？')
+    await refund({
+        id
+    })
+    feedback.msgSuccess('操作成功')
+    getLists()
+}
+
+getLists()
+</script>

admin/src/views/finance/refund_record.vue

@@ -0,0 +1,226 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <div class="flex flex-wrap">
+                <div class="w-1/2 md:w-1/4">
+                    <div class="leading-10">累计退款金额 (元)</div>
+                    <div class="text-6xl">{{ refundData.totalRefundAmount }}</div>
+                </div>
+                <div class="w-1/2 md:w-1/4">
+                    <div class="leading-10">退款中金额 (元)</div>
+                    <div class="text-6xl">{{ refundData.ingRefundAmount }}</div>
+                </div>
+                <div class="w-1/2 md:w-1/4">
+                    <div class="leading-10">退款成功金额 (元)</div>
+                    <div class="text-6xl">{{ refundData.successRefundAmount }}</div>
+                </div>
+                <div class="w-1/2 md:w-1/4">
+                    <div class="leading-10">退款失败金额 (元)</div>
+                    <div class="text-6xl">{{ refundData.errorRefundAmount }}</div>
+                </div>
+            </div>
+        </el-card>
+        <el-card class="!border-none" shadow="never">
+            <el-form ref="formRef" class="mb-[-16px] mt-[16px]" :model="queryParams" :inline="true">
+                <el-form-item label="退款单号">
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.sn"
+                        placeholder="请输入退款单号"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
+                </el-form-item>
+                <el-form-item label="来源单号">
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.orderSn"
+                        placeholder="请输入来源单号"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
+                </el-form-item>
+                <el-form-item label="用户信息">
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.keyword"
+                        placeholder="请输入用户信息"
+                        clearable
+                        @keyup.enter="resetPage"
+                    />
+                </el-form-item>
+                <el-form-item label="退款类型">
+                    <el-select class="w-[280px]" v-model="queryParams.refundType">
+                        <el-option label="全部" value />
+                        <el-option label="后台退款" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="记录时间">
+                    <daterange-picker
+                        v-model:startTime="queryParams.startTime"
+                        v-model:endTime="queryParams.endTime"
+                    />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                    <!-- <export-data
+                        class="ml-2.5"
+                        :fetch-fun="refundRecord"
+                        :params="queryParams"
+                        :page-size="pager.size"
+                    /> -->
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none mt-4" shadow="never">
+            <el-tabs v-model="activeTab" @tab-change="handleTabChange">
+                <el-tab-pane
+                    v-for="(item, index) in tabLists"
+                    :label="`${item.name}(${pager.extend[item.numKey] ?? 0})`"
+                    :name="index"
+                    :key="index"
+                >
+                    <el-table size="large" v-loading="pager.loading" :data="pager.lists">
+                        <el-table-column label="退款单号" prop="sn" min-width="190" />
+                        <el-table-column label="用户信息" min-width="160">
+                            <template #default="{ row }">
+                                <div class="flex items-center">
+                                    <image-contain
+                                        class="flex-none mr-2"
+                                        :src="row.avatar"
+                                        :width="40"
+                                        :height="40"
+                                        preview-teleported
+                                        fit="contain"
+                                    />
+                                    {{ row.nickname }}
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="来源单号" prop="orderSn" min-width="190" />
+                        <el-table-column label="退款金额" min-width="100">
+                            <template #default="{ row }"> ¥ {{ row.refundAmount }} </template>
+                        </el-table-column>
+
+                        <el-table-column label="退款类型" prop="refundTypeMsg" min-width="100" />
+                        <el-table-column label="退款状态" prop="" min-width="100">
+                            <template #default="{ row }">
+                                <el-tag type="warning" v-if="row.refundStatus == 0">
+                                    {{ row.refundStatusMsg }}
+                                </el-tag>
+                                <el-tag v-if="row.refundStatus == 1">
+                                    {{ row.refundStatusMsg }}
+                                </el-tag>
+                                <el-tag type="danger" v-if="row.refundStatus == 2">
+                                    {{ row.refundStatusMsg }}
+                                </el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="记录时间" prop="createTime" min-width="180" />
+                        <el-table-column label="操作" width="180" fixed="right">
+                            <template #default="{ row }">
+                                <el-button
+                                    v-perms="['finance:refund:log']"
+                                    type="primary"
+                                    link
+                                    @click="handleShowRefundLog(row.id)"
+                                >
+                                    退款日志
+                                </el-button>
+                                <el-button
+                                    v-if="row.refundStatus == 2"
+                                    v-perms="['finance:recharger:refundAgain']"
+                                    type="primary"
+                                    link
+                                    @click="handleRefund(row.id)"
+                                >
+                                    重新退款
+                                </el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-tab-pane>
+            </el-tabs>
+
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <refund-log v-model="showRefundLog" :refund-id="selectRefundId" />
+    </div>
+</template>
+<script lang="ts" setup name="articleLists">
+import { refundRecord, refundAgain } from '@/api/finance'
+import { usePaging } from '@/hooks/usePaging'
+import feedback from '@/utils/feedback'
+import RefundLog from './component/refund-log.vue'
+const queryParams = reactive({
+    sn: '',
+    orderSn: '',
+    keyword: '',
+    refundType: '',
+    startTime: '',
+    endTime: '',
+    type: ''
+})
+const refundData = reactive({
+    errorRefundAmount: 0,
+    ingRefundAmount: 0,
+    successRefundAmount: 0,
+    totalRefundAmount: 0
+})
+const showRefundLog = ref(false)
+const selectRefundId = ref(0)
+const activeTab = ref(0)
+const tabLists = ref([
+    {
+        name: '全部',
+        type: '',
+        numKey: 'total'
+    },
+    {
+        name: '退款中',
+        type: 0,
+        numKey: 'ing'
+    },
+    {
+        name: '退款成功',
+        type: 1,
+        numKey: 'success'
+    },
+    {
+        name: '退款失败',
+        type: 2,
+        numKey: 'error'
+    }
+])
+
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: refundRecord,
+    params: queryParams,
+    afterRequest(res) {
+        Object.assign(refundData, res.extend.stat)
+    }
+})
+
+const handleRefund = async (id: number) => {
+    await feedback.confirm('确认重新退款？')
+    await refundAgain({
+        id
+    })
+    feedback.msgSuccess('操作成功')
+    getLists()
+}
+
+const handleShowRefundLog = async (id: number) => {
+    showRefundLog.value = true
+    selectRefundId.value = id
+}
+const handleTabChange = (index: any) => {
+    queryParams.type = tabLists.value[index].type as string
+    resetPage()
+}
+
+getLists()
+</script>

admin/src/views/material/index.vue

@@ -23,7 +23,7 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="materialCenter">
 const tabsMap = [
     {
         type: 'image',

admin/src/views/message/notice/edit.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-card class="!border-none" shadow="never">
-            <el-page-header content="编辑通知设置" @back="$router.back()" />
+            <el-page-header :content="$route.meta.title" @back="$router.back()" />
         </el-card>
         <el-form
             ref="formRef"
@@ -37,16 +37,14 @@
                         <div class="w-full max-w-[320px]">
                             <el-input
                                 type="textarea"
-                                :rows="6"
+                                :autosize="{ minRows: 6, maxRows: 6 }"
                                 v-model="formData.smsNotice.content"
                             />
                         </div>
                         <div class="form-tips">
-                            可选变量 用户昵称:nickname 订单编号:order_sn 支付时间:pay_time
-                            <br />
-                            示例：亲爱的${nickname}，您的订单${order_sn}已支付成功，商家正在快马加鞭为您安排发货。
-                            <br />
-                            生效条件：1、管理后台完成短信设置。2、第三方短信平台申请模板。
+                            <div v-for="(item, index) in formData.smsNotice.tips" :key="index">
+                                {{ item }}
+                            </div>
                         </div>
                     </div>
                 </el-form-item>
@@ -58,10 +56,11 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="noticeEdit">
 import type { FormInstance } from 'element-plus'
 import feedback from '@/utils/feedback'
 import { noticeDetail, setNoticeConfig } from '@/api/message'
+import useMultipleTabs from '@/hooks/useMultipleTabs'
 
 const route = useRoute()
 const router = useRouter()
@@ -75,7 +74,8 @@ const formData = reactive({
     smsNotice: {
         status: 0,
         templateId: '',
-        content: ''
+        content: '',
+        tips: []
     }
 })
 
@@ -95,7 +95,7 @@ const rules = {
         }
     ]
 }
-
+const { removeTab } = useMultipleTabs()
 const formRef = shallowRef<FormInstance>()
 
 const getDetails = async () => {
@@ -114,6 +114,7 @@ const handleSave = async () => {
     await formRef.value?.validate()
     await setNoticeConfig(formData)
     feedback.msgSuccess('操作成功')
+    removeTab()
     router.back()
 }
 

admin/src/views/message/notice/index.vue

@@ -47,7 +47,7 @@
         </el-card>
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="notice">
 import { noticeLists } from '@/api/message'
 import { getRoutePath } from '@/router'
 
@@ -87,5 +87,9 @@ const getLists = async () => {
     }
 }
 
+onActivated(() => {
+    getLists()
+})
+
 getLists()
 </script>

admin/src/views/message/short_letter/index.vue

@@ -26,7 +26,7 @@
         <edit-popup ref="editRef" @success="getLists" />
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="shortLetter">
 import { smsLists } from '@/api/message'
 import EditPopup from './edit.vue'
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()

admin/src/views/organization/department/edit.vue

@@ -26,17 +26,27 @@
                     />
                 </el-form-item>
                 <el-form-item label="部门名称" prop="name">
-                    <el-input v-model="formData.name" placeholder="请输入部门名称" clearable />
+                    <el-input
+                        v-model="formData.name"
+                        placeholder="请输入部门名称"
+                        clearable
+                        :maxlength="100"
+                    />
                 </el-form-item>
                 <el-form-item label="负责人" prop="duty">
-                    <el-input v-model="formData.duty" placeholder="请输入负责人姓名" clearable />
+                    <el-input
+                        v-model="formData.duty"
+                        placeholder="请输入负责人姓名"
+                        clearable
+                        :maxlength="30"
+                    />
                 </el-form-item>
                 <el-form-item label="联系电话" prop="mobile">
                     <el-input v-model="formData.mobile" placeholder="请输入联系电话" clearable />
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" :min="0" />
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                         <div class="form-tips">默认为0， 数值越大越排前</div>
                     </div>
                 </el-form-item>
@@ -71,7 +81,7 @@ const formData = reactive({
 })
 const checkMobile = (rule: any, value: any, callback: any) => {
     if (!value) {
-        return callback(new Error('手机号不能为空'))
+        return callback()
     } else {
         const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
         console.log(reg.test(value))

admin/src/views/organization/department/index.vue

@@ -4,14 +4,14 @@
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
                 <el-form-item label="部门名称" prop="name">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.name"
                         clearable
                         @keyup.enter="getLists"
                     />
                 </el-form-item>
                 <el-form-item label="部门状态" prop="isStop">
-                    <el-select class="w-56" v-model="queryParams.isStop">
+                    <el-select class="w-[280px]" v-model="queryParams.isStop">
                         <el-option label="全部" value />
                         <el-option label="正常" value="0" />
                         <el-option label="停用" value="1" />
@@ -91,7 +91,7 @@
         <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="department">
 import type { ElTable, FormInstance } from 'element-plus'
 import EditPopup from './edit.vue'
 import { deptDelete, deptLists } from '@/api/org/department'

admin/src/views/organization/post/edit.vue

@@ -10,14 +10,19 @@
         >
             <el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
                 <el-form-item label="岗位名称" prop="name">
-                    <el-input v-model="formData.name" placeholder="请输入岗位名称" clearable />
+                    <el-input
+                        v-model="formData.name"
+                        placeholder="请输入岗位名称"
+                        clearable
+                        :maxlength="100"
+                    />
                 </el-form-item>
                 <el-form-item label="岗位编码" prop="code">
                     <el-input v-model="formData.code" placeholder="请输入岗位编码" clearable />
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" :min="0" />
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                         <div class="form-tips">默认为0， 数值越大越排前</div>
                     </div>
                 </el-form-item>
@@ -27,6 +32,8 @@
                         placeholder="请输入备注"
                         type="textarea"
                         :autosize="{ minRows: 4, maxRows: 6 }"
+                        maxlength="200"
+                        show-word-limit
                     />
                 </el-form-item>
                 <el-form-item label="岗位状态" prop="isStop">

admin/src/views/organization/post/index.vue

@@ -4,7 +4,7 @@
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
                 <el-form-item label="岗位编码">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.code"
                         clearable
                         @keyup.enter="resetPage"
@@ -12,14 +12,14 @@
                 </el-form-item>
                 <el-form-item label="岗位名称">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.name"
                         clearable
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
                 <el-form-item label="岗位状态">
-                    <el-select class="w-56" v-model="queryParams.isStop">
+                    <el-select class="w-[280px]" v-model="queryParams.isStop">
                         <el-option label="全部" value />
                         <el-option label="正常" :value="0" />
                         <el-option label="停用" :value="1" />
@@ -51,7 +51,7 @@
                     show-overflow-tooltip
                 />
                 <el-table-column label="添加时间" prop="createTime" min-width="180" />
-                <el-table-column label="部门状态" prop="isStop" min-width="100">
+                <el-table-column label="岗位状态" prop="isStop" min-width="100">
                     <template #default="{ row }">
                         <el-tag class="ml-2" :type="row.isStop ? 'danger' : ''">
                             {{ row.isStop ? '停用' : '正常' }}
@@ -86,7 +86,7 @@
         <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="post">
 import { postDelete, postLists } from '@/api/org/post'
 import { usePaging } from '@/hooks/usePaging'
 import feedback from '@/utils/feedback'

admin/src/views/permission/admin/edit.vue

@@ -28,18 +28,19 @@
                 <el-form-item label="名称" prop="nickname">
                     <el-input v-model="formData.nickname" placeholder="请输入名称" clearable />
                 </el-form-item>
-                <el-form-item label="归属部门" prop="deptId">
+                <el-form-item label="归属部门" prop="deptIds">
                     <el-tree-select
                         class="flex-1"
-                        v-model="formData.deptId"
+                        v-model="formData.deptIds"
                         :data="optionsData.dept"
                         clearable
                         node-key="id"
+                        multiple
                         :props="{
                             value: 'id',
                             label: 'name',
                             disabled(data: any) {
-                                return data.isStop
+                                return !!data.isStop
                             }
                         }"
                         check-strictly
@@ -47,11 +48,12 @@
                         placeholder="请选择上级部门"
                     />
                 </el-form-item>
-                <el-form-item label="岗位" prop="deptId">
+                <el-form-item label="岗位" prop="postIds">
                     <el-select
                         class="flex-1"
                         clearable
-                        v-model="formData.postId"
+                        multiple
+                        v-model="formData.postIds"
                         placeholder="请选择岗位"
                     >
                         <el-option
@@ -63,10 +65,11 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="角色" prop="role">
+                <el-form-item label="角色" prop="roleIds">
                     <el-select
-                        v-model="formData.role"
+                        v-model="formData.roleIds"
                         :disabled="isRoot"
+                        multiple
                         class="flex-1"
                         clearable
                         placeholder="请选择角色"
@@ -76,7 +79,7 @@
                             v-for="(item, index) in optionsData.role"
                             :key="index"
                             :label="item.name"
-                            :value="String(item.id)"
+                            :value="item.id"
                         />
                     </el-select>
                 </el-form-item>
@@ -135,12 +138,12 @@ const popupTitle = computed(() => {
 })
 
 const formData = reactive({
-    id: '',
+    id: 0,
     username: '',
     nickname: '',
-    deptId: '',
-    postId: '',
-    role: '',
+    deptIds: [],
+    postIds: [],
+    roleIds: [],
     avatar: '',
     password: '',
     passwordConfirm: '',
@@ -149,7 +152,7 @@ const formData = reactive({
 })
 
 const isRoot = computed(() => {
-    return formData.role == '0'
+    return formData.id == 1
 })
 
 const passwordConfirmValidator = (rule: object, value: string, callback: any) => {
@@ -174,8 +177,9 @@ const formRules = reactive({
             trigger: ['blur']
         }
     ],
-    role: [
+    roleIds: [
         {
+            type: 'array',
             required: true,
             message: '请选择角色',
             trigger: ['blur']
@@ -231,6 +235,13 @@ const open = (type = 'add') => {
 }
 
 const setFormData = async (row: any) => {
+    formRules.password = []
+    formRules.passwordConfirm = [
+        {
+            validator: passwordConfirmValidator,
+            trigger: 'blur'
+        }
+    ]
     const data = await adminDetail({
         id: row.id
     })
@@ -239,16 +250,7 @@ const setFormData = async (row: any) => {
             //@ts-ignore
             formData[key] = data[key]
         }
-        Number(formData.deptId) == 0 && (formData.deptId = '')
-        Number(formData.postId) == 0 && (formData.postId = '')
     }
-    formRules.password = []
-    formRules.passwordConfirm = [
-        {
-            validator: passwordConfirmValidator,
-            trigger: 'blur'
-        }
-    ]
 }
 
 const handleClose = () => {

admin/src/views/permission/admin/index.vue

@@ -5,7 +5,7 @@
                 <el-form-item label="管理员账号">
                     <el-input
                         v-model="formData.username"
-                        class="w-56"
+                        class="w-[280px]"
                         clearable
                         @keyup.enter="resetPage"
                     />
@@ -13,13 +13,13 @@
                 <el-form-item label="管理员名称">
                     <el-input
                         v-model="formData.nickname"
-                        class="w-56"
+                        class="w-[280px]"
                         clearable
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
                 <el-form-item label="管理员角色">
-                    <el-select class="w-56" v-model="formData.role">
+                    <el-select class="w-[280px]" v-model="formData.role">
                         <el-option label="全部" value="" />
                         <el-option
                             v-for="(item, index) in optionsData.role"
@@ -52,8 +52,18 @@
                     </el-table-column>
                     <el-table-column label="账号" prop="username" min-width="100" />
                     <el-table-column label="名称" prop="nickname" min-width="100" />
-                    <el-table-column label="角色" prop="role" min-width="100" />
-                    <el-table-column label="部门" prop="dept" min-width="100" />
+                    <el-table-column
+                        label="角色"
+                        prop="role"
+                        show-tooltip-when-overflow
+                        min-width="100"
+                    />
+                    <el-table-column
+                        label="部门"
+                        prop="dept"
+                        show-tooltip-when-overflow
+                        min-width="100"
+                    />
                     <el-table-column label="创建时间" prop="createTime" min-width="180" />
                     <el-table-column label="最近登录时间" prop="lastLoginTime" min-width="180" />
                     <el-table-column label="最近登录IP" prop="lastLoginIp" min-width="120" />
@@ -100,7 +110,7 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="admin">
 import { adminLists, adminDelete, adminStatus } from '@/api/perms/admin'
 import { roleAll } from '@/api/perms/role'
 import { useDictOptions } from '@/hooks/useDictOptions'