From b4a61169b49b6f796b279b3cb0c350b370fe7205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com>
Date: Fri, 30 Jul 2021 17:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=83=20fix=20use=20role=20power=20enabl?=
 =?UTF-8?q?e=20column?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/data/power.json          |  3 +++
 admin/data/role.json           | 43 +++++++++++++++++++++++++++++++++-
 admin/data/user.json           |  2 +-
 component/pear/module/admin.js |  1 -
 view/system/power.html         |  2 +-
 view/system/role.html          |  2 +-
 view/system/user.html          |  2 +-
 7 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/admin/data/power.json b/admin/data/power.json
index ed51af0..db7ace1 100644
--- a/admin/data/power.json
+++ b/admin/data/power.json
@@ -12,6 +12,7 @@
 		"parentId": "0",
 		"icon": "layui-icon-set-fill",
 		"sort": 1,
+		"enable": 1,
 		"checkArr": "0"
 	}, {
 		"powerId": "2",
@@ -23,6 +24,7 @@
 		"parentId": "1",
 		"icon": "layui-icon-username",
 		"sort": null,
+		"enable": 1,
 		"checkArr": "0"
 	}, {
 		"powerId": "3",
@@ -34,6 +36,7 @@
 		"parentId": "1",
 		"icon": "layui-icon-user",
 		"sort": null,
+		"enable": 1,
 		"checkArr": "0"
 	}, {
 		"powerId": "4",
diff --git a/admin/data/role.json b/admin/data/role.json
index d31933c..42bd064 100644
--- a/admin/data/role.json
+++ b/admin/data/role.json
@@ -1 +1,42 @@
-{"createTime":null,"createBy":null,"updateTime":null,"updateBy":null,"remark":null,"code":0,"msg":"...","count":3,"data":[{"createTime":null,"createBy":null,"updateTime":null,"updateBy":null,"remark":null,"roleId":"1","roleName":"超级管理员","roleCode":"admin","enable":"1","details":"超级管理员","checked":false},{"createTime":null,"createBy":null,"updateTime":null,"updateBy":null,"remark":null,"roleId":"2","roleName":"普通管理员","roleCode":"manager","enable":"0","details":"普通管理员","checked":false},{"createTime":null,"createBy":null,"updateTime":null,"updateBy":null,"remark":null,"roleId":"3","roleName":"普通用户","roleCode":"pearson","enable":"0","details":"普通用户","checked":false}]}
\ No newline at end of file
+{
+	"code": 0,
+	"msg": "...",
+	"count": 3,
+	"data": [{
+		"createTime": null,
+		"createBy": null,
+		"updateTime": null,
+		"updateBy": null,
+		"remark": null,
+		"roleId": "1",
+		"roleName": "超级管理员",
+		"roleCode": "admin",
+		"enable": "1",
+		"details": "超级管理员",
+		"checked": false
+	}, {
+		"createTime": null,
+		"createBy": null,
+		"updateTime": null,
+		"updateBy": null,
+		"remark": null,
+		"roleId": "2",
+		"roleName": "普通管理员",
+		"roleCode": "manager",
+		"enable": "0",
+		"details": "普通管理员",
+		"checked": false
+	}, {
+		"createTime": null,
+		"createBy": null,
+		"updateTime": null,
+		"updateBy": null,
+		"remark": null,
+		"roleId": "3",
+		"roleName": "普通用户",
+		"roleCode": "pearson",
+		"enable": "0",
+		"details": "普通用户",
+		"checked": false
+	}]
+}
diff --git a/admin/data/user.json b/admin/data/user.json
index 4b0b814..a58652b 100644
--- a/admin/data/user.json
+++ b/admin/data/user.json
@@ -27,7 +27,7 @@
 		"avatar": null,
 		"sex": "1",
 		"phone": "1555324324234",
-		"enable": "1",
+		"enable": "0",
 		"login": "1",
 		"roleIds": null
 	}, {
diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js
index 4efb9aa..572f88c 100644
--- a/component/pear/module/admin.js
+++ b/component/pear/module/admin.js
@@ -24,7 +24,6 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 
 		var pearAdmin = new function() {
 
-			// 默认配置
 			var configType = 'yml';
 			var configPath = 'pear.config.yml';
 
diff --git a/view/system/power.html b/view/system/power.html
index c76b313..cb0a594 100644
--- a/view/system/power.html
+++ b/view/system/power.html
@@ -83,7 +83,7 @@
 </script>
 
 <script type="text/html" id="power-enable">
-    <input type="checkbox" name="enable" value="{{d.id}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="user-enable" checked = "{{ d.id == 10003 ? 'true' : 'false' }}">
+    <input type="checkbox" name="enable" value="{{d.id}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="user-enable"  {{ d.enable== true ? 'checked' : '' }} />
 </script>
 
 <script type="text/html" id="icon">
diff --git a/view/system/role.html b/view/system/role.html
index e4975a5..7c93e19 100644
--- a/view/system/role.html
+++ b/view/system/role.html
@@ -66,7 +66,7 @@
 		</script>
 		
 		<script type="text/html" id="role-enable">
-			<input type="checkbox" name="enable" value="{{d.id}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="role-enable" checked = "{{ d.id == 10003 ? 'true' : 'false' }}">
+			<input type="checkbox" name="enable" value="{{d.id}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="role-enable"  {{ d.enable== true ? 'checked' : '' }} />
 		</script>
 
 		<script src="../../component/layui/layui.js"></script>
diff --git a/view/system/user.html b/view/system/user.html
index def3343..7db350d 100644
--- a/view/system/user.html
+++ b/view/system/user.html
@@ -65,7 +65,7 @@
 		</script>
 
 		<script type="text/html" id="user-enable">
-			<input type="checkbox" name="enable" value="{{d.id}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="user-enable" checked = "{{ d.enable == 0 ? 'true' : 'false' }}">
+			<input type="checkbox" name="enable" value="{{d.id}}" lay-skin="switch" lay-text="启用|禁用" lay-filter="user-enable" {{ d.enable== true ? 'checked' : '' }} />
 		</script>
 
 		<script type="text/html" id="user-sex">