From 2786b410bda03fe821db2d5e435f331392db5393 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sat, 13 Jun 2020 00:09:05 +0800 Subject: [PATCH 001/117] =?UTF-8?q?feat[litemall-admin]:=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0vue-element-admin=E5=88=B04.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-admin/package.json | 8 +-- .../src/components/Notice/index.vue | 2 +- .../src/components/ScrollPane/index.vue | 4 +- litemall-admin/src/permission.js | 2 +- litemall-admin/src/router/index.js | 28 +++++--- litemall-admin/src/store/getters.js | 7 +- .../src/store/modules/permission.js | 26 +++---- litemall-admin/src/store/modules/user.js | 71 +++++++------------ litemall-admin/src/styles/element-ui.scss | 2 +- .../src/styles/element-variables.scss | 6 +- litemall-admin/src/styles/sidebar.scss | 19 +++++ litemall-admin/src/vendor/Export2Excel.js | 18 ++++- litemall-admin/src/views/goods/comment.vue | 20 +++--- .../src/views/layout/components/Navbar.vue | 4 +- .../views/layout/components/Sidebar/Item.vue | 14 +++- .../views/layout/components/Sidebar/Link.vue | 33 +++++---- .../views/layout/components/Sidebar/index.vue | 4 +- .../components/{ => TagsView}/ScrollPane.vue | 18 ++--- .../{TagsView.vue => TagsView/index.vue} | 18 ++--- .../src/views/layout/components/index.js | 4 +- litemall-admin/vue.config.js | 20 +++--- 21 files changed, 182 insertions(+), 146 deletions(-) rename litemall-admin/src/views/layout/components/{ => TagsView}/ScrollPane.vue (90%) rename litemall-admin/src/views/layout/components/{TagsView.vue => TagsView/index.vue} (94%) diff --git a/litemall-admin/package.json b/litemall-admin/package.json index ba0a1f84..870fa83f 100644 --- a/litemall-admin/package.json +++ b/litemall-admin/package.json @@ -1,7 +1,7 @@ { "name": "litemall-admin", "version": "1.0.0", - "description": "litemall-admin basing on vue-element-admin 4.2.1", + "description": "litemall-admin basing on vue-element-admin 4.3.0", "author": "linlinjava ", "license": "MIT", "scripts": { @@ -50,13 +50,14 @@ "clipboard": "2.0.4", "connect": "3.6.6", "echarts": "4.2.1", - "element-ui": "2.12.0", + "element-ui": "2.13.2", "file-saver": "1.3.8", "js-cookie": "2.2.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", "screenfull": "4.2.0", + "script-loader": "0.7.2", "vue": "2.6.10", "vue-count-to": "1.0.13", "vue-router": "3.0.2", @@ -83,11 +84,10 @@ "html-webpack-plugin": "3.2.0", "husky": "1.3.1", "lint-staged": "8.1.5", - "node-sass": "^4.9.0", + "sass": "^1.26.2", "runjs": "^4.3.2", "sass-loader": "^7.1.0", "script-ext-html-webpack-plugin": "2.1.3", - "script-loader": "0.7.2", "serve-static": "^1.13.2", "svg-sprite-loader": "4.1.3", "svgo": "1.2.0", diff --git a/litemall-admin/src/components/Notice/index.vue b/litemall-admin/src/components/Notice/index.vue index 1b7499be..c131013c 100644 --- a/litemall-admin/src/components/Notice/index.vue +++ b/litemall-admin/src/components/Notice/index.vue @@ -42,7 +42,7 @@ export default { diff --git a/litemall-admin/src/views/layout/components/Sidebar/Link.vue b/litemall-admin/src/views/layout/components/Sidebar/Link.vue index 5d366f24..b66755da 100644 --- a/litemall-admin/src/views/layout/components/Sidebar/Link.vue +++ b/litemall-admin/src/views/layout/components/Sidebar/Link.vue @@ -1,14 +1,11 @@ - -- Gitee From 7ff311b60485367d7926d66bbd23995cbd697162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=91=E7=A8=BD=E5=88=98?= <1073236926@qq.com> Date: Sat, 27 Jun 2020 15:17:51 +0800 Subject: [PATCH 011/117] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-admin/src/views/mall/aftersale.vue | 5 ++- litemall-admin/src/views/mall/order.vue | 35 ++++++++++++++------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/litemall-admin/src/views/mall/aftersale.vue b/litemall-admin/src/views/mall/aftersale.vue index e711508b..f4266c91 100644 --- a/litemall-admin/src/views/mall/aftersale.vue +++ b/litemall-admin/src/views/mall/aftersale.vue @@ -67,7 +67,10 @@ {{ aftersaleDetail.amount }} - {{ aftersaleDetail.status }} + 已申请,待审核 + 审核通过,待退款 + 退款成功 + 审核不通过,已拒绝 {{ aftersaleDetail.userId }} diff --git a/litemall-admin/src/views/mall/order.vue b/litemall-admin/src/views/mall/order.vue index 51f412ad..9ad57210 100644 --- a/litemall-admin/src/views/mall/order.vue +++ b/litemall-admin/src/views/mall/order.vue @@ -4,6 +4,7 @@
+ @@ -190,7 +191,8 @@ export default { timeArray: [], orderStatusArray: [], sort: 'add_time', - order: 'desc' + order: 'desc', + orderId:undefined }, pickerOptions: { shortcuts: [{ @@ -256,16 +258,27 @@ export default { this.listQuery.start = null this.listQuery.end = null } - - listOrder(this.listQuery).then(response => { - this.list = response.data.data.list - this.total = response.data.data.total - this.listLoading = false - }).catch(() => { - this.list = [] - this.total = 0 - this.listLoading = false - }) + if(this.listQuery.orderId){ + detailOrder(this.listQuery.orderId).then(response => { + this.list = []; + this.list.push(response.data.data.order) + this.listLoading = false + }).catch(() => { + this.list = [] + this.total = 0 + this.listLoading = false + }) + }else{ + listOrder(this.listQuery).then(response => { + this.list = response.data.data.list + this.total = response.data.data.total + this.listLoading = false + }).catch(() => { + this.list = [] + this.total = 0 + this.listLoading = false + }) + } }, getChannel() { listChannel().then(response => { -- Gitee From 9d2c07a11f260ce8f109c5cf273c32084ff52f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=91=E7=A8=BD=E5=88=98?= <1073236926@qq.com> Date: Sat, 27 Jun 2020 15:23:15 +0800 Subject: [PATCH 012/117] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=A0=B9=E6=8D=AEid?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-admin/src/views/mall/order.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/litemall-admin/src/views/mall/order.vue b/litemall-admin/src/views/mall/order.vue index 9ad57210..b6974d7a 100644 --- a/litemall-admin/src/views/mall/order.vue +++ b/litemall-admin/src/views/mall/order.vue @@ -261,8 +261,11 @@ export default { if(this.listQuery.orderId){ detailOrder(this.listQuery.orderId).then(response => { this.list = []; - this.list.push(response.data.data.order) - this.listLoading = false + if(response.data.data.order){ + this.list.push(response.data.data.order); + this.total = 1; + this.listLoading = false + } }).catch(() => { this.list = [] this.total = 0 -- Gitee From 04c716de0578cb123201376ed6243e65a02c77e0 Mon Sep 17 00:00:00 2001 From: Batur <9591690+Batur24@users.noreply.github.com> Date: Mon, 29 Jun 2020 15:39:55 +0800 Subject: [PATCH 013/117] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=88=AA=E6=A0=8F?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=20(#409)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-vue/src/views/user/module-address/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/litemall-vue/src/views/user/module-address/index.vue b/litemall-vue/src/views/user/module-address/index.vue index 33635c68..19e454cf 100755 --- a/litemall-vue/src/views/user/module-address/index.vue +++ b/litemall-vue/src/views/user/module-address/index.vue @@ -1,6 +1,5 @@ -- Gitee From 27e6d275d1aa136b4a161554bc1faf6379826c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=91=E7=A8=BD=E5=88=98?= <1073236926@qq.com> Date: Thu, 2 Jul 2020 21:08:49 +0800 Subject: [PATCH 014/117] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=BC=80=E5=9B=A2=E5=9B=A2=E8=B4=AD=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8A=A0=E5=85=A5=E5=88=A4=E7=A9=BA=EF=BC=8C=E5=90=A6?= =?UTF-8?q?=E5=88=99=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E6=83=A8=E5=9B=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linlinjava/litemall/wx/service/WxOrderService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java index 739a0d04..d83b51b8 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java @@ -290,8 +290,13 @@ public class WxOrderService { } // (2)不允许参加自己开团的团购 LitemallGroupon groupon = grouponService.queryById(userId, grouponLinkId); - if(groupon.getCreatorUserId().equals(userId)){ - return ResponseUtil.fail(GROUPON_JOIN, "团购活动已经参加!"); + // if(groupon.getCreatorUserId().equals(userId)){ + // return ResponseUtil.fail(GROUPON_JOIN, "团购活动已经参加!"); + // } + if(groupon!=null) { + if(groupon.getCreatorUserId().equals(userId)){ + return ResponseUtil.fail(GROUPON_JOIN, "团购活动已经参加!"); + } } } } -- Gitee From 25518ade9fa2b4d312fe25d1fa5c7f05cdb2b504 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jul 2020 10:43:00 +0800 Subject: [PATCH 015/117] build(deps): bump mysql-connector-java in /litemall-db (#411) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.46 to 8.0.16. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.46...8.0.16) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- litemall-db/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litemall-db/pom.xml b/litemall-db/pom.xml index eaf34e76..2b6326a8 100644 --- a/litemall-db/pom.xml +++ b/litemall-db/pom.xml @@ -57,7 +57,7 @@ mysql mysql-connector-java - 5.1.46 + 8.0.16 com.itfsw -- Gitee From fa189cdcf4c66c5ad60b6432804533dc9d5a307a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jul 2020 10:43:20 +0800 Subject: [PATCH 016/117] build(deps): bump mysql-connector-java from 5.1.46 to 8.0.16 (#410) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.46 to 8.0.16. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.46...8.0.16) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f01efc4..c1ca1d4e 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ mysql mysql-connector-java - 5.1.46 + 8.0.16 -- Gitee From 8dd7c4bb2c18c7669ad6e0c298eab9eacbb47c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=91=E7=A8=BD=E5=88=98?= <1073236926@qq.com> Date: Sun, 5 Jul 2020 11:25:23 +0800 Subject: [PATCH 017/117] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86,=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7id?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/web/AdminUserController.java | 17 +++ litemall-admin/src/api/user.js | 17 ++- litemall-admin/src/views/user/user.vue | 103 +++++++++++++++--- 3 files changed, 123 insertions(+), 14 deletions(-) diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java index 2052d616..ac544adb 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java @@ -12,12 +12,16 @@ import org.linlinjava.litemall.db.service.LitemallUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import javax.validation.constraints.NotNull; + @RestController @RequestMapping("/admin/user") @Validated @@ -38,4 +42,17 @@ public class AdminUserController { List userList = userService.querySelective(username, mobile, page, limit, sort, order); return ResponseUtil.okList(userList); } + @RequiresPermissions("admin:user:list") + @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "查询") + @GetMapping("/detail") + public Object userDetail(@NotNull Integer id) { + LitemallUser user=userService.findById(id); + return ResponseUtil.ok(user); + } + @RequiresPermissions("admin:user:list") + @RequiresPermissionsDesc(menu = {"用户管理", "会员管理"}, button = "查询") + @PostMapping("/update") + public Object userUpdate(@RequestBody LitemallUser user) { + return ResponseUtil.ok(userService.updateById(user)); + } } diff --git a/litemall-admin/src/api/user.js b/litemall-admin/src/api/user.js index a7b8b42e..33dc2f51 100644 --- a/litemall-admin/src/api/user.js +++ b/litemall-admin/src/api/user.js @@ -8,6 +8,22 @@ export function fetchList(query) { }) } +export function userDetail(id) { + return request({ + url: '/user/detail', + method: 'get', + params: {id} + }) +} + +export function updateUser(data) { + return request({ + url: '/user/update', + method: 'post', + data + }) +} + export function listAddress(query) { return request({ url: '/address/list', @@ -47,4 +63,3 @@ export function listHistory(query) { params: query }) } - diff --git a/litemall-admin/src/views/user/user.vue b/litemall-admin/src/views/user/user.vue index e8164ba7..713b1eb3 100644 --- a/litemall-admin/src/views/user/user.vue +++ b/litemall-admin/src/views/user/user.vue @@ -4,6 +4,7 @@
+ 查找 导出 @@ -36,16 +37,49 @@ {{ statusDic[scope.row.status] }} - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + +