Merge remote-tracking branch 'origin/v2.0' into v2.0

data/navs.json

@@ -241,6 +241,26 @@
             }
         ]
     },
+    {
+        "title": "数据表格",
+        "href": "",
+        "icon": "",
+        "spread": false,
+        "children": [
+            {
+                "title": "Datatables",
+                "href": "http://www.datatables.club",
+                "icon": "",
+                "spread": false
+            },
+            {
+                "title": "jQuery.bsgrid",
+                "href": "http://thebestofyouth.com/bsgrid",
+                "icon": "",
+                "spread": false
+            }
+        ]
+    },
     {
         "title": "多级导航",
         "fontFamily": "ok-icon",

lib/layui/lay/okmodules/okMock.js

@@ -26,6 +26,9 @@ layui.define([], function(exprots) {
             article: {
                 list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/article/list"
             },
+            product: {
+                list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/product/list"
+            },
             log: {
                 list: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/log/list"
             },

pages/often/article.html

@@ -183,10 +183,10 @@
 <!-- 头工具栏模板 -->
 <script type="text/html" id="toolbarTpl">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled"><i class="iconfont icon-shangsheng"></i>批量上架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled"><i class="iconfont icon-web-icon-"></i>批量下架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
-        <button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe61f;</i>添加文章</button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled">批量上架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled">批量下架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel">批量删除</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加文章</button>
     </div>
 </script>
 <!-- 链接模板 -->

pages/often/download.html

@@ -183,10 +183,10 @@
 <!-- 头工具栏模板 -->
 <script type="text/html" id="toolbarTpl">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled"><i class="iconfont icon-shangsheng"></i>批量上架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled"><i class="iconfont icon-web-icon-"></i>批量下架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
-        <button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe61f;</i>添加文章</button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled">批量上架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled">批量下架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel">批量删除</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加文章</button>
     </div>
 </script>
 <!-- 链接模板 -->

pages/often/image.html

@@ -183,10 +183,10 @@
 <!-- 头工具栏模板 -->
 <script type="text/html" id="toolbarTpl">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled"><i class="iconfont icon-shangsheng"></i>批量上架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled"><i class="iconfont icon-web-icon-"></i>批量下架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
-        <button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe61f;</i>添加文章</button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled">批量上架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled">批量下架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel">批量删除</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加文章</button>
     </div>
 </script>
 <!-- 链接模板 -->

pages/often/link.html

@@ -183,10 +183,10 @@
 <!-- 头工具栏模板 -->
 <script type="text/html" id="toolbarTpl">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled"><i class="iconfont icon-shangsheng"></i>批量上架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled"><i class="iconfont icon-web-icon-"></i>批量下架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
-        <button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe61f;</i>添加文章</button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled">批量上架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled">批量下架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel">批量删除</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加文章</button>
     </div>
 </script>
 <!-- 链接模板 -->

pages/often/message.html

@@ -183,10 +183,10 @@
 <!-- 头工具栏模板 -->
 <script type="text/html" id="toolbarTpl">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled"><i class="iconfont icon-shangsheng"></i>批量上架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled"><i class="iconfont icon-web-icon-"></i>批量下架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
-        <button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe61f;</i>添加文章</button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled">批量上架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled">批量下架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel">批量删除</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加文章</button>
     </div>
 </script>
 <!-- 链接模板 -->

pages/often/product.html

@@ -52,21 +52,20 @@
 
         var articleTable = table.render({
             elem: "#tableId",
-            url: okMock.api.article.list,
+            url: okMock.api.product.list,
             limit: 20,
             page: true,
             even: true,
             toolbar: "#toolbarTpl",
-            size: "sm",
+            size: "lg",
             cols: [[
                 {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: "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"},
+                {field: "guid", title: "GUID", width: 320, sort: true},
+                {field: "name", title: "产品名称", width: 100},
+                {field: "logo", title: "产品LOGO", width: 150, templet: "#logoTpl"},
+                {field: "url", title: "产品官网", width: 200, templet: "#urlTpl"},
+                {field: "description", title: "产品描述", width: 100},
+                {field: "createTime", title: "创建时间", width: 180},
                 {title: "操作", width: 100, align: "center", fixed: "right", templet: "#operationTpl"}
             ]],
             done: function (res, curr, count) {
@@ -183,40 +182,24 @@
 <!-- 头工具栏模板 -->
 <script type="text/html" id="toolbarTpl">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled"><i class="iconfont icon-shangsheng"></i>批量上架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled"><i class="iconfont icon-web-icon-"></i>批量下架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
-        <button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe61f;</i>添加文章</button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled">批量上架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled">批量下架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel">批量删除</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加文章</button>
     </div>
 </script>
-<!-- 链接模板 -->
-<script type="text/html" id="urlTpl">
-    <a href="{{d.url}}" target="_blank">{{d.url}}</a>
-</script>
-<!-- 是否指顶模板
-    <input type="checkbox" name="isTop" value="{{d.isTop}}" lay-skin="switch" lay-text="是|否" {{ d.isTop== true ? 'checked' : ''}}>
--->
-<script type="text/html" id="topTpl">
-    {{#  if(d.isTop == true){ }}
-        <span class="layui-btn layui-btn-normal layui-btn-xs">已置顶</span>
-    {{#  } else if(d.isTop == false) { }}
-        <span class="layui-btn layui-btn-warm layui-btn-xs">未置顶</span>
-    {{#  } }}
-</script>
-<!-- 发布状态模板
-    <input type="checkbox" name="top" value="{{d.status}}" lay-skin="switch" lay-text="已发布|未发布" {{ d.status== true ? 'checked' : ''}}>
--->
-<script type="text/html" id="statusTpl">
-    {{#  if(d.status == true){ }}
-        <span class="layui-btn layui-btn-normal layui-btn-xs">已发布</span>
-    {{#  } else if(d.status == false) { }}
-        <span class="layui-btn layui-btn-warm layui-btn-xs">未发布</span>
-    {{#  } }}
-</script>
 <!-- 行工具栏模板 -->
 <script type="text/html" id="operationTpl">
     <a href="javascript:" title="编辑" lay-event="edit"><i class="layui-icon">&#xe642;</i></a>
     <a href="javascript:" title="删除" lay-event="del"><i class="layui-icon">&#xe640;</i></a>
 </script>
+
+<script type="text/html" id="logoTpl">
+    <image src="{{d.logo}}"/>
+</script>
+
+<script type="text/html" id="urlTpl">
+    <a href="{{d.url}}" target="_blank">{{d.url}}</a>
+</script>
 </body>
 </html>

pages/often/task.html

@@ -183,10 +183,10 @@
 <!-- 头工具栏模板 -->
 <script type="text/html" id="toolbarTpl">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled"><i class="iconfont icon-shangsheng"></i>批量上架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled"><i class="iconfont icon-web-icon-"></i>批量下架</button>
-        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
-        <button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe61f;</i>添加文章</button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled">批量上架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled">批量下架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel">批量删除</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加文章</button>
     </div>
 </script>
 <!-- 链接模板 -->