Merge branch 'master' of https://gitee.com/virus010101/linfeng-community

src/main/java/io/linfeng/modules/sys/controller/SysConfigController.java

@@ -1,4 +1,3 @@
-
 package io.linfeng.modules.sys.controller;
 
 

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<SysMenuEntity> menuList = sysMenuService.queryListParentId(menuId);

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';
 						}
 					});
-			},
+			}
 		}
 	}
 </script>
@@ -246,4 +245,4 @@
 			margin: 30rpx 0;
 		}
 	}
-</style>
+</style>