diff --git a/src/main/java/io/linfeng/modules/sys/controller/SysConfigController.java b/src/main/java/io/linfeng/modules/sys/controller/SysConfigController.java index e74f948..b7a406c 100644 --- a/src/main/java/io/linfeng/modules/sys/controller/SysConfigController.java +++ b/src/main/java/io/linfeng/modules/sys/controller/SysConfigController.java @@ -1,4 +1,3 @@ - package io.linfeng.modules.sys.controller; diff --git a/src/main/java/io/linfeng/modules/sys/controller/SysMenuController.java b/src/main/java/io/linfeng/modules/sys/controller/SysMenuController.java index 3c9a866..c2bd4cc 100644 --- a/src/main/java/io/linfeng/modules/sys/controller/SysMenuController.java +++ b/src/main/java/io/linfeng/modules/sys/controller/SysMenuController.java @@ -63,8 +63,6 @@ public class SysMenuController extends AbstractController { } } - - return menuList; } @@ -140,9 +138,6 @@ public class SysMenuController extends AbstractController { @PostMapping("/delete/{menuId}") @RequiresPermissions("sys:menu:delete") public R delete(@PathVariable("menuId") long menuId){ -// if(menuId <= 31){ -// return R.error("系统菜单,不能删除"); -// } //判断是否有子菜单或按钮 List menuList = sysMenuService.queryListParentId(menuId); diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue index 1f607f1..e8707db 100644 --- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue +++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue @@ -89,8 +89,7 @@ if (this.pageCurrent == 0) { this.page++; this.getPostList() - } - if (this.pageCurrent == 1) { + } else if (this.pageCurrent == 1) { this.userList = []; this.getUserRanking(); } @@ -162,7 +161,7 @@ this.loadPostStatus = 'loadmore'; } }); - }, + } } } @@ -246,4 +245,4 @@ margin: 30rpx 0; } } - + \ No newline at end of file