From c335bf1957820a746953508cc66ec49b9396cdda Mon Sep 17 00:00:00 2001
From: bobi <bobi1234@foxmail.com>
Date: Fri, 30 Aug 2019 09:17:41 +0800
Subject: [PATCH] impr:user.html article.html

---
 data/navs.json                             | 14 +++++++-------
 pages/member/user.html                     |  7 +++++--
 pages/{article => often}/article-add.html  |  0
 pages/{article => often}/article-edit.html |  0
 pages/{article => often}/article.html      |  8 ++++----
 5 files changed, 16 insertions(+), 13 deletions(-)
 rename pages/{article => often}/article-add.html (100%)
 rename pages/{article => often}/article-edit.html (100%)
 rename pages/{article => often}/article.html (96%)

diff --git a/data/navs.json b/data/navs.json
index f8ab9a0..1f05b49 100644
--- a/data/navs.json
+++ b/data/navs.json
@@ -121,43 +121,43 @@
         "children": [
             {
                 "title": "文章列表",
-                "href": "pages/article/article.html",
+                "href": "pages/often/article.html",
                 "icon": "&#xe62e;",
                 "spread": false
             },
 			{
 			    "title": "留言列表",
-			    "href": "pages/article/article.html",
+			    "href": "pages/often/article.html",
 			    "icon": "&#xe62e;",
 			    "spread": false
 			},
 			{
 			    "title": "产品列表",
-			    "href": "pages/article/article.html",
+			    "href": "pages/often/article.html",
 			    "icon": "&#xe62e;",
 			    "spread": false
 			},
 			{
 			    "title": "下载列表",
-			    "href": "pages/article/article.html",
+			    "href": "pages/often/article.html",
 			    "icon": "&#xe62e;",
 			    "spread": false
 			},
 			{
 			    "title": "链接列表",
-			    "href": "pages/article/article.html",
+			    "href": "pages/often/article.html",
 			    "icon": "&#xe62e;",
 			    "spread": false
 			},
 			{
 			    "title": "任务列表",
-			    "href": "pages/article/article.html",
+			    "href": "pages/often/article.html",
 			    "icon": "&#xe62e;",
 			    "spread": false
 			},
 			{
 			    "title": "图片列表",
-			    "href": "pages/article/article.html",
+			    "href": "pages/often/article.html",
 			    "icon": "&#xe62e;",
 			    "spread": false
 			}
diff --git a/pages/member/user.html b/pages/member/user.html
index 1f33bf7..ae9afdd 100644
--- a/pages/member/user.html
+++ b/pages/member/user.html
@@ -58,7 +58,7 @@
             size: "sm",
             cols: [[
                 {type: "checkbox", fixed: "left"},
-                {field: "id", title: "ID", width: 160, sort: true},
+                {field: "guid", title: "GUID", width: 280, sort: true},
                 {field: "username", title: "账号", width: 100},
                 {field: "password", title: "密码", width: 100},
                 {field: "reallyName", title: "姓名", width: 100},
@@ -66,9 +66,12 @@
                 {field: "role", title: "角色", width: 100, templet: "#roleTpl"},
                 {field: "status", title: "状态", width: 100, templet: "#statusTpl"},
                 {field: "email", title: "邮箱", width: 200},
+				{field: "province", title: "省份", width: 120},
+				{field: "city", title: "城市", width: 100},
+				{field: "county", title: "区县", width: 120},
                 {field: "createTime", title: "创建时间", width: 150},
                 {field: "logins", title: "登陆次数", width: 100},
-                {title: "操作", width: 100, templet: "#operationTpl", align: "center", fixed: "right"}
+                {title: "操作", width: 100, align: "center", fixed: "right", templet: "#operationTpl"}
             ]],
             done: function (res, curr, count) {
                 console.info(res, curr, count);
diff --git a/pages/article/article-add.html b/pages/often/article-add.html
similarity index 100%
rename from pages/article/article-add.html
rename to pages/often/article-add.html
diff --git a/pages/article/article-edit.html b/pages/often/article-edit.html
similarity index 100%
rename from pages/article/article-edit.html
rename to pages/often/article-edit.html
diff --git a/pages/article/article.html b/pages/often/article.html
similarity index 96%
rename from pages/article/article.html
rename to pages/often/article.html
index 71c3376..f071028 100644
--- a/pages/article/article.html
+++ b/pages/often/article.html
@@ -59,15 +59,15 @@
             toolbar: "#toolbarTpl",
             size: "sm",
             cols: [[
-                {type: "checkbox"},
-                {field: "id", title: "ID", width: 80, sort: true},
+                {type: "checkbox", fixed: "left"},
+                {field: "guid", title: "GUID", width: 280, sort: true},
                 {field: "title", title: "标题", width: 350},
                 {field: "url", title: "链接", width: 250, templet: "#urlTpl"},
-                {field: "readSize", title: "阅读量", width: 80},
                 {field: "publisher", title: "发布者", width: 100},
+				{field: "readSize", title: "阅读量", width: 80},
                 {field: "isTop", title: "是否置顶", width: 100, align: "center", templet: "#topTpl"},
                 {field: "status", title: "发布状态", width: 110, align: "center", templet: "#statusTpl"},
-                {title: "操作", width: 200, align: "center", templet: "#operationTpl"}
+                {title: "操作", width: 100, align: "center", fixed: "right", templet: "#operationTpl"}
             ]],
             done: function (res, curr, count) {
                 console.log(res, curr, count)