From 6767f2b54b0ca1274769774c81716e297c4134a9 Mon Sep 17 00:00:00 2001 From: esp Date: Tue, 25 Aug 2015 10:09:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E4=BF=AE=E5=A4=8DuserList.?= =?UTF-8?q?js=E4=B8=AD=E5=85=B3=E4=BA=8E=E7=BF=BB=E9=A1=B5=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=8A=B6=E6=80=81=E6=8E=A7=E5=88=B6=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E9=94=99=E8=AF=AF.=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=9A=E5=88=9A=E6=8F=90=E4=BA=A4=E7=9A=84bug[CI=20?= =?UTF-8?q?SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/admin/user/userList.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static/src/js/app/admin/user/userList.js b/static/src/js/app/admin/user/userList.js index 3a525b8..3f80c89 100644 --- a/static/src/js/app/admin/user/userList.js +++ b/static/src/js/app/admin/user/userList.js @@ -7,10 +7,10 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, if (avalon.vmodels.userList) { var vm = avalon.vmodels.userList; // initialize avalon object - userList= [], previousPage= 0, nextPage= 0, page= 1, - editingUserId= 0, totalPage: 1, keyword: "", showAdminOnly: false, + userList = []; previousPage= 0; nextPage= 0; page = 1; + editingUserId= 0; totalPage = 1; keyword= ""; showAdminOnly= false; //user editor fields - username: "", realName: "", email: "", adminType: 0, id: 0, + username= ""; realName= ""; email= ""; adminType= 0; id= 0; } else { var vm = avalon.define({ @@ -42,7 +42,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, getPageData(vm.page - 1); }, getBtnClass: function (btn) { //上一页/下一页按钮启用禁用逻辑 - if (btn) { + if (btn == "next") { return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled"; } else {