From 1af85b7a96c11928e97f4b667c86aec62fe5527d Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Tue, 16 Jun 2020 23:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=8F=8B=E6=83=85=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=88=AA=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Article.php      | 122 ++--
 application/admin/controller/Customview.php   | 115 ++--
 application/admin/controller/Link.php         |  10 +-
 application/admin/controller/Navigation.php   |  15 +-
 application/admin/form/Article.php            | 184 ++++++
 application/admin/form/CustomView.php         | 174 ++++++
 application/admin/form/Goodscomments.php      |   2 +-
 application/admin/form/Link.php               | 154 +++++
 application/admin/form/Navigation.php         | 150 +++++
 application/admin/form/Orderaftersale.php     |   2 +-
 application/admin/form/Role.php               |   2 -
 application/admin/form/User.php               |   5 -
 .../admin/view/default/article/detail.html    |  72 +++
 .../admin/view/default/article/index.html     | 277 +--------
 .../view/default/article/module/info.html     |   4 +
 .../view/default/article/module/operate.html  |  13 +
 .../admin/view/default/customview/detail.html |  51 ++
 .../admin/view/default/customview/index.html  | 218 +------
 .../view/default/customview/module/info.html  |   4 +
 .../default/customview/module/operate.html    |  13 +
 .../view/default/customview/save_info.html    |   2 +-
 .../admin/view/default/goods/detail.html      |  10 +-
 .../default/goodscomments/module/images.html  |  15 +-
 .../admin/view/default/link/detail.html       |   2 +
 .../admin/view/default/link/index.html        | 144 ++---
 .../admin/view/default/link/module/info.html  |   9 +
 .../view/default/link/module/operate.html     |   9 +
 .../admin/view/default/link/module/url.html   |   4 +
 .../admin/view/default/navigation/index.html  | 557 ++++++++----------
 .../view/default/navigation/module/info.html  |   9 +
 .../default/navigation/module/operate.html    |   9 +
 .../orderaftersale/module/voucher.html        |  15 +-
 .../view/default/public/module/form.html      |   8 +-
 application/index/controller/Article.php      |  49 +-
 .../index/view/default/article/index.html     |   2 +-
 application/lang/zh-cn.php                    |  16 +-
 application/service/AdminRoleService.php      |  28 +-
 application/service/ArticleService.php        | 123 +---
 application/service/CustomViewService.php     | 132 +----
 application/service/GoodsCommentsService.php  |  76 ---
 application/service/LinkService.php           |  41 +-
 application/service/NavigationService.php     | 194 +++---
 application/service/ResourcesService.php      |  21 +
 config/shopxo.sql                             |  55 +-
 .../admin/default/css/goodscomments.css       |   5 -
 .../admin/default/css/orderaftersale.css      |  10 +-
 46 files changed, 1644 insertions(+), 1488 deletions(-)
 create mode 100644 application/admin/form/Article.php
 create mode 100644 application/admin/form/CustomView.php
 create mode 100644 application/admin/form/Link.php
 create mode 100644 application/admin/form/Navigation.php
 create mode 100644 application/admin/view/default/article/detail.html
 create mode 100644 application/admin/view/default/article/module/info.html
 create mode 100644 application/admin/view/default/article/module/operate.html
 create mode 100644 application/admin/view/default/customview/detail.html
 create mode 100644 application/admin/view/default/customview/module/info.html
 create mode 100644 application/admin/view/default/customview/module/operate.html
 create mode 100644 application/admin/view/default/link/detail.html
 create mode 100644 application/admin/view/default/link/module/info.html
 create mode 100644 application/admin/view/default/link/module/operate.html
 create mode 100644 application/admin/view/default/link/module/url.html
 create mode 100644 application/admin/view/default/navigation/module/info.html
 create mode 100644 application/admin/view/default/navigation/module/operate.html

diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php
index 21c5f440b..6464e75be 100755
--- a/application/admin/controller/Article.php
+++ b/application/admin/controller/Article.php
@@ -50,54 +50,64 @@ class Article extends Common
      */
 	public function Index()
 	{
-		// 参数
-        $params = input();
+		// 总数
+        $total = ArticleService::ArticleTotal($this->form_where);
 
         // 分页
-        $number = MyC('admin_page_number', 10, true);
-
-        // 条件
-        $where = ArticleService::ArticleListWhere($params);
-
-        // 获取总数
-        $total = ArticleService::ArticleTotal($where);
-
-        // 分页
-        $page_params = array(
-                'number'    =>  $number,
-                'total'     =>  $total,
-                'where'     =>  $params,
-                'page'      =>  isset($params['page']) ? intval($params['page']) : 1,
-                'url'       =>  MyUrl('admin/article/index'),
-            );
+        $page_params = [
+            'number'    =>  $this->page_size,
+            'total'     =>  $total,
+            'where'     =>  $this->data_request,
+            'page'      =>  $this->page,
+            'url'       =>  MyUrl('admin/article/index'),
+        ];
         $page = new \base\Page($page_params);
-        $this->assign('page_html', $page->GetPageHtml());
 
         // 获取列表
-        $data_params = array(
-            'm'     => $page->GetPageStarNumber(),
-            'n'     => $number,
-            'where' => $where,
-            'field' => 'a.*',
-        );
-        $data = ArticleService::ArticleList($data_params);
-        $this->assign('data_list', $data['data']);
+        $data_params = [
+            'where'         => $this->form_where,
+            'm'             => $page->GetPageStarNumber(),
+            'n'             => $this->page_size,
+        ];
+        $ret = ArticleService::ArticleList($data_params);
 
-        // 是否启用
-		$this->assign('common_is_enable_list', lang('common_is_enable_list'));
-
-		// 是否
-        $this->assign('common_is_text_list', lang('common_is_text_list'));
-
-        // 文章分类
-        $article_category = ArticleService::ArticleCategoryList(['field'=>'id,name']);
-        $this->assign('article_category_list', $article_category['data']);
-
-        // 参数
-        $this->assign('params', $params);
+        // 基础参数赋值
+        $this->assign('params', $this->data_request);
+        $this->assign('page_html', $page->GetPageHtml());
+        $this->assign('data_list', $ret['data']);
         return $this->fetch();
 	}
 
+    /**
+     * 详情
+     * @author   Devil
+     * @blog     http://gong.gg/
+     * @version  1.0.0
+     * @datetime 2019-08-05T08:21:54+0800
+     */
+    public function Detail()
+    {
+        if(!empty($this->data_request['id']))
+        {
+            // 条件
+            $where = [
+                ['id', '=', intval($this->data_request['id'])],
+            ];
+
+            // 获取列表
+            $data_params = [
+                'm'             => 0,
+                'n'             => 1,
+                'where'         => $where,
+                'is_category'   => 1,
+            ];
+            $ret = ArticleService::ArticleList($data_params);
+            $data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0];
+            $this->assign('data', $data);
+        }
+        return $this->fetch();
+    }
+
 	/**
 	 * [SaveInfo 文章添加/编辑页面]
 	 * @author   Devil
@@ -108,7 +118,7 @@ class Article extends Common
 	public function SaveInfo()
 	{
 		// 参数
-        $params = input();
+        $params = $this->data_request;
 
         // 数据
         $data = [];
@@ -118,8 +128,7 @@ class Article extends Common
             $data_params = array(
                 'm'     => 0,
                 'n'     => 1,
-                'where' => ['a.id'=>intval($params['id'])],
-                'field' => 'a.*',
+                'where' => ['id'=>intval($params['id'])],
             );
             $ret = ArticleService::ArticleList($data_params);
             $data = empty($ret['data'][0]) ? [] : $ret['data'][0];
@@ -168,7 +177,7 @@ class Article extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         return ArticleService::ArticleSave($params);
 	}
 
@@ -188,7 +197,7 @@ class Article extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         $params['admin'] = $this->admin;
         return ArticleService::ArticleDelete($params);
 	}
@@ -209,31 +218,8 @@ class Article extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         $params['admin'] = $this->admin;
-        $params['field'] = 'is_enable';
-        return ArticleService::ArticleStatusUpdate($params);
-	}
-
-	/**
-	 * [StatusHomeRecommended 是否首页推荐状态更新]
-	 * @author   Devil
-	 * @blog     http://gong.gg/
-	 * @version  0.0.1
-	 * @datetime 2017-01-12T22:23:06+0800
-	 */
-	public function StatusHomeRecommended()
-	{
-		// 是否ajax请求
-        if(!IS_AJAX)
-        {
-            return $this->error('非法访问');
-        }
-
-        // 开始处理
-        $params = input();
-        $params['admin'] = $this->admin;
-        $params['field'] = 'is_home_recommended';
         return ArticleService::ArticleStatusUpdate($params);
 	}
 }
diff --git a/application/admin/controller/Customview.php b/application/admin/controller/Customview.php
index 532783a25..de81bf574 100755
--- a/application/admin/controller/Customview.php
+++ b/application/admin/controller/Customview.php
@@ -41,7 +41,7 @@ class CustomView extends Common
 	}
 
 	/**
-     * [Index 文章列表]
+     * [Index 列表]
      * @author   Devil
      * @blog     http://gong.gg/
      * @version  0.0.1
@@ -49,56 +49,63 @@ class CustomView extends Common
      */
 	public function Index()
 	{
-		// 参数
-        $params = input();
+        // 总数
+        $total = CustomViewService::CustomViewTotal($this->form_where);
 
         // 分页
-        $number = MyC('admin_page_number', 10, true);
-
-        // 条件
-        $where = CustomViewService::CustomViewListWhere($params);
-
-        // 获取总数
-        $total = CustomViewService::CustomViewTotal($where);
-
-        // 分页
-        $page_params = array(
-                'number'    =>  $number,
-                'total'     =>  $total,
-                'where'     =>  $params,
-                'page'      =>  isset($params['page']) ? intval($params['page']) : 1,
-                'url'       =>  MyUrl('admin/customview/index'),
-            );
+        $page_params = [
+            'number'    =>  $this->page_size,
+            'total'     =>  $total,
+            'where'     =>  $this->data_request,
+            'page'      =>  $this->page,
+            'url'       =>  MyUrl('admin/customview/index'),
+        ];
         $page = new \base\Page($page_params);
+
+        // 获取数据列表
+        $data_params = [
+            'where'         => $this->form_where,
+            'm'             => $page->GetPageStarNumber(),
+            'n'             => $this->page_size,
+        ];
+        $ret = CustomViewService::CustomViewList($data_params);
+
+		// 基础参数赋值
+        $this->assign('params', $this->data_request);
         $this->assign('page_html', $page->GetPageHtml());
-
-        // 获取列表
-        $data_params = array(
-            'm'         => $page->GetPageStarNumber(),
-            'n'         => $number,
-            'where'     => $where,
-            'field'     => '*',
-        );
-        $data = CustomViewService::CustomViewList($data_params);
-        $this->assign('data_list', $data['data']);
-
-		// 是否启用
-		$this->assign('common_is_enable_list', lang('common_is_enable_list'));
-
-		// 是否包含头部
-		$this->assign('common_is_header_list', lang('common_is_header_list'));
-
-		// 是否包含尾部
-		$this->assign('common_is_footer_list', lang('common_is_footer_list'));
-
-		// 是否满屏
-		$this->assign('common_is_full_screen_list', lang('common_is_full_screen_list'));
-
-		// 参数
-        $this->assign('params', $params);
+        $this->assign('data_list', $ret['data']);
         return $this->fetch();
 	}
 
+    /**
+     * 详情
+     * @author   Devil
+     * @blog     http://gong.gg/
+     * @version  1.0.0
+     * @datetime 2019-08-05T08:21:54+0800
+     */
+    public function Detail()
+    {
+        if(!empty($this->data_request['id']))
+        {
+            // 条件
+            $where = [
+                ['id', '=', intval($this->data_request['id'])],
+            ];
+
+            // 获取列表
+            $data_params = [
+                'm'             => 0,
+                'n'             => 1,
+                'where'         => $where,
+            ];
+            $ret = CustomViewService::CustomViewList($data_params);
+            $data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0];
+            $this->assign('data', $data);
+        }
+        return $this->fetch();
+    }
+
 	/**
 	 * [SaveInfo 添加/编辑页面]
 	 * @author   Devil
@@ -109,34 +116,28 @@ class CustomView extends Common
 	public function SaveInfo()
 	{
 		// 参数
-		$params = input();
+		$params = $this->data_request;
 
 		// 数据
         $data = [];
 		if(!empty($params['id']))
 		{
 			// 获取列表
-	        $data_params = array(
+	        $data_params = [
 	            'm'        => 0,
 	            'n'        => 1,
 	            'where'    => ['id'=>intval($params['id'])],
 	            'field'    => '*',
-	        );
+	        ];
 	        $ret = CustomViewService::CustomViewList($data_params);
 	        $data = empty($ret['data'][0]) ? [] : $ret['data'][0];
 		}
         $this->assign('data', $data);
 
-		// 是否启用
+		// 静态资源
 		$this->assign('common_is_enable_list', lang('common_is_enable_list'));
-
-		// 是否包含头部
 		$this->assign('common_is_header_list', lang('common_is_header_list'));
-
-		// 是否包含尾部
 		$this->assign('common_is_footer_list', lang('common_is_footer_list'));
-
-		// 是否满屏
 		$this->assign('common_is_full_screen_list', lang('common_is_full_screen_list'));
 
 		return $this->fetch();
@@ -158,7 +159,7 @@ class CustomView extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         return CustomViewService::CustomViewSave($params);
 	}
 
@@ -178,7 +179,7 @@ class CustomView extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         $params['user_type'] = 'admin';
         return CustomViewService::CustomViewDelete($params);
 	}
@@ -199,7 +200,7 @@ class CustomView extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         return CustomViewService::CustomViewStatusUpdate($params);
 	}
 }
diff --git a/application/admin/controller/Link.php b/application/admin/controller/Link.php
index 83a469b20..2c4228168 100755
--- a/application/admin/controller/Link.php
+++ b/application/admin/controller/Link.php
@@ -50,8 +50,8 @@ class Link extends Common
 	public function Index()
 	{
 		// 获取导航列表
-		$data = LinkService::LinkList();
-		$this->assign('data_list', $data['data']);
+		$ret = LinkService::LinkList(['where'=>$this->form_where]);
+		$this->assign('data_list', $ret['data']);
 
 		// 是否新窗口打开
 		$this->assign('common_is_new_window_open_list', lang('common_is_new_window_open_list'));
@@ -78,7 +78,7 @@ class Link extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         return LinkService::LinkSave($params);
 	}
 
@@ -98,7 +98,7 @@ class Link extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         $params['user_type'] = 'admin';
         return LinkService::LinkDelete($params);
 	}
@@ -119,7 +119,7 @@ class Link extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         return LinkService::LinkStatusUpdate($params);
 	}
 }
diff --git a/application/admin/controller/Navigation.php b/application/admin/controller/Navigation.php
index 424f7beb1..263a078d0 100755
--- a/application/admin/controller/Navigation.php
+++ b/application/admin/controller/Navigation.php
@@ -44,7 +44,7 @@ class Navigation extends Common
 		$this->IsPower();
 
 		// 导航类型
-		$this->nav_type = input('nav_type', 'header');
+		$this->nav_type = empty($this->data_request['nav_type']) ? 'header' : $this->data_request['nav_type'];
 	}
 
 	/**
@@ -57,7 +57,10 @@ class Navigation extends Common
 	public function Index()
 	{
 		// 获取导航列表
-		$this->assign('data_list', NavigationService::NavList(['nav_type'=>$this->nav_type]));
+        $where = $this->form_where;
+        $where[] = ['nav_type', '=', $this->nav_type];
+        $ret = NavigationService::NavList(['where'=>$where]);
+		$this->assign('data_list', $ret['data']);
 
 		// 一级分类
 		$this->assign('nav_header_pid_list', NavigationService::LevelOneNav(['nav_type'=>$this->nav_type]));
@@ -98,13 +101,11 @@ class Navigation extends Common
         }
 
         // 开始处理
-        $params = input();
+        $params = $this->data_request;
         $params['nav_type'] = $this->nav_type;
         return NavigationService::NavSave($params);
 	}
 
-	
-
 	/**
 	 * [Delete 删除]
 	 * @author   Devil
@@ -121,7 +122,7 @@ class Navigation extends Common
 		}
 
 		// 开始处理
-        $params = input();
+        $params = $this->data_request;
         return NavigationService::NavDelete($params);
 	}
 
@@ -141,7 +142,7 @@ class Navigation extends Common
 		}
 
 		// 开始处理
-        $params = input();
+        $params = $this->data_request;
         return NavigationService::NavStatusUpdate($params);
 	}
 }
diff --git a/application/admin/form/Article.php b/application/admin/form/Article.php
new file mode 100644
index 000000000..5ce833bd3
--- /dev/null
+++ b/application/admin/form/Article.php
@@ -0,0 +1,184 @@
+<?php
+// +----------------------------------------------------------------------
+// | ShopXO 国内领先企业级B2C免费开源电商系统
+// +----------------------------------------------------------------------
+// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Devil
+// +----------------------------------------------------------------------
+namespace app\admin\form;
+
+use app\service\ArticleService;
+
+/**
+ * 文章动态表格
+ * @author  Devil
+ * @blog    http://gong.gg/
+ * @version 1.0.0
+ * @date    2020-06-16
+ * @desc    description
+ */
+class Article
+{
+    // 基础条件
+    public $condition_base = [];
+
+    /**
+     * 入口
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-06-16
+     * @desc    description
+     * @param   [array]           $params [输入参数]
+     */
+    public function Run($params = [])
+    {
+        return [
+            // 基础配置
+            'base' => [
+                'key_field'     => 'id',
+                'status_field'  => 'is_enable',
+                'is_search'     => 1,
+                'search_url'    => MyUrl('admin/article/index'),
+                'is_delete'     => 1,
+                'delete_url'    => MyUrl('admin/article/delete'),
+                'delete_key'    => 'ids',
+                'detail_title'  => '基础信息',
+            ],
+            // 表单配置
+            'form' => [
+                [
+                    'view_type'         => 'checkbox',
+                    'is_checked'        => 0,
+                    'checked_text'      => '反选',
+                    'not_checked_text'  => '全选',
+                    'align'             => 'center',
+                    'width'             => 80,
+                ],
+                [
+                    'label'         => '标题',
+                    'view_type'     => 'module',
+                    'view_key'      => 'article/module/info',
+                    'grid_size'     => 'sm',
+                    'search_config' => [
+                        'form_type'         => 'input',
+                        'form_name'         => 'title',
+                        'where_type'        => 'like',
+                    ],
+                ],
+                [
+                    'label'         => '跳转url地址',
+                    'view_type'     => 'field',
+                    'view_key'      => 'jump_url',
+                    'grid_size'     => 'sm',
+                    'search_config' => [
+                        'form_type'         => 'input',
+                        'where_type'        => 'like',
+                    ],
+                ],
+                [
+                    'label'         => '分类',
+                    'view_type'     => 'field',
+                    'view_key'      => 'article_category_name',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'form_name'         => 'article_category_id',
+                        'where_type'        => 'in',
+                        'data'              => $this->ArticleCategoryList(),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '是否启用',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_enable',
+                    'post_url'      => MyUrl('admin/article/statusupdate'),
+                    'is_form_su'    => 1,
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_enable_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '首页推荐',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_home_recommended',
+                    'post_url'      => MyUrl('admin/article/statusupdate'),
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_text_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '图片数量',
+                    'view_type'     => 'field',
+                    'view_key'      => 'images_count',
+                    'search_config' => [
+                        'form_type'         => 'section',
+                    ],
+                ],
+                [
+                    'label'         => '访问次数',
+                    'view_type'     => 'field',
+                    'view_key'      => 'access_count',
+                    'search_config' => [
+                        'form_type'         => 'section',
+                    ],
+                ],
+                [
+                    'label'         => '创建时间',
+                    'view_type'     => 'field',
+                    'view_key'      => 'add_time',
+                    'search_config' => [
+                        'form_type'         => 'datetime',
+                    ],
+                ],
+                [
+                    'label'         => '更新时间',
+                    'view_type'     => 'field',
+                    'view_key'      => 'upd_time',
+                    'search_config' => [
+                        'form_type'         => 'datetime',
+                    ],
+                ],
+                [
+                    'label'         => '操作',
+                    'view_type'     => 'operate',
+                    'view_key'      => 'article/module/operate',
+                    'align'         => 'center',
+                    'fixed'         => 'right',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * 获取文章分类列表
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-06-11
+     * @desc    description
+     */
+    public function ArticleCategoryList()
+    {
+        $res = ArticleService::ArticleCategoryList(['field'=>'id,name']);
+        return $res['data'];
+    }
+}
+?>
\ No newline at end of file
diff --git a/application/admin/form/CustomView.php b/application/admin/form/CustomView.php
new file mode 100644
index 000000000..a00c5e2b7
--- /dev/null
+++ b/application/admin/form/CustomView.php
@@ -0,0 +1,174 @@
+<?php
+// +----------------------------------------------------------------------
+// | ShopXO 国内领先企业级B2C免费开源电商系统
+// +----------------------------------------------------------------------
+// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Devil
+// +----------------------------------------------------------------------
+namespace app\admin\form;
+
+/**
+ * 自定义页面动态表格
+ * @author  Devil
+ * @blog    http://gong.gg/
+ * @version 1.0.0
+ * @date    2020-06-16
+ * @desc    description
+ */
+class CustomView
+{
+    // 基础条件
+    public $condition_base = [];
+
+    /**
+     * 入口
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-06-16
+     * @desc    description
+     * @param   [array]           $params [输入参数]
+     */
+    public function Run($params = [])
+    {
+        return [
+            // 基础配置
+            'base' => [
+                'key_field'     => 'id',
+                'status_field'  => 'is_enable',
+                'is_search'     => 1,
+                'search_url'    => MyUrl('admin/customview/index'),
+                'is_delete'     => 1,
+                'delete_url'    => MyUrl('admin/customview/delete'),
+                'delete_key'    => 'ids',
+                'detail_title'  => '基础信息',
+            ],
+            // 表单配置
+            'form' => [
+                [
+                    'view_type'         => 'checkbox',
+                    'is_checked'        => 0,
+                    'checked_text'      => '反选',
+                    'not_checked_text'  => '全选',
+                    'align'             => 'center',
+                    'width'             => 80,
+                ],
+                [
+                    'label'         => '标题',
+                    'view_type'     => 'module',
+                    'view_key'      => 'customview/module/info',
+                    'grid_size'     => 'lg',
+                    'search_config' => [
+                        'form_type'         => 'input',
+                        'form_name'         => 'title',
+                        'where_type'        => 'like',
+                    ],
+                ],
+                [
+                    'label'         => '是否启用',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_enable',
+                    'post_url'      => MyUrl('admin/customview/statusupdate'),
+                    'is_form_su'    => 1,
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_enable_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '是否头部',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_header',
+                    'post_url'      => MyUrl('admin/customview/statusupdate'),
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_header_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '是否尾部',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_footer',
+                    'post_url'      => MyUrl('admin/customview/statusupdate'),
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_footer_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '是否满屏',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_full_screen',
+                    'post_url'      => MyUrl('admin/customview/statusupdate'),
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_full_screen_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '图片数量',
+                    'view_type'     => 'field',
+                    'view_key'      => 'images_count',
+                    'search_config' => [
+                        'form_type'         => 'section',
+                    ],
+                ],
+                [
+                    'label'         => '访问次数',
+                    'view_type'     => 'field',
+                    'view_key'      => 'access_count',
+                    'search_config' => [
+                        'form_type'         => 'section',
+                    ],
+                ],
+                [
+                    'label'         => '创建时间',
+                    'view_type'     => 'field',
+                    'view_key'      => 'add_time',
+                    'search_config' => [
+                        'form_type'         => 'datetime',
+                    ],
+                ],
+                [
+                    'label'         => '更新时间',
+                    'view_type'     => 'field',
+                    'view_key'      => 'upd_time',
+                    'search_config' => [
+                        'form_type'         => 'datetime',
+                    ],
+                ],
+                [
+                    'label'         => '操作',
+                    'view_type'     => 'operate',
+                    'view_key'      => 'customview/module/operate',
+                    'align'         => 'center',
+                    'fixed'         => 'right',
+                ],
+            ],
+        ];
+    }
+}
+?>
\ No newline at end of file
diff --git a/application/admin/form/Goodscomments.php b/application/admin/form/Goodscomments.php
index 67f890bc8..e934385f7 100644
--- a/application/admin/form/Goodscomments.php
+++ b/application/admin/form/Goodscomments.php
@@ -115,7 +115,7 @@ class Goodscomments
                     'label'         => '评论图片',
                     'view_type'     => 'module',
                     'view_key'      => 'goodscomments/module/images',
-                    'width'         => 140,
+                    'is_list'       => 0,
                 ],
                 [
                     'label'         => '评分',
diff --git a/application/admin/form/Link.php b/application/admin/form/Link.php
new file mode 100644
index 000000000..ed6ead086
--- /dev/null
+++ b/application/admin/form/Link.php
@@ -0,0 +1,154 @@
+<?php
+// +----------------------------------------------------------------------
+// | ShopXO 国内领先企业级B2C免费开源电商系统
+// +----------------------------------------------------------------------
+// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Devil
+// +----------------------------------------------------------------------
+namespace app\admin\form;
+
+use app\service\LinkService;
+
+/**
+ * 友情链接动态表格
+ * @author  Devil
+ * @blog    http://gong.gg/
+ * @version 1.0.0
+ * @date    2020-06-16
+ * @desc    description
+ */
+class Link
+{
+    // 基础条件
+    public $condition_base = [];
+
+    /**
+     * 入口
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-06-16
+     * @desc    description
+     * @param   [array]           $params [输入参数]
+     */
+    public function Run($params = [])
+    {
+        return [
+            // 基础配置
+            'base' => [
+                'key_field'     => 'id',
+                'status_field'  => 'is_enable',
+                'is_search'     => 1,
+                'search_url'    => MyUrl('admin/link/index'),
+                'is_delete'     => 1,
+                'delete_url'    => MyUrl('admin/link/delete'),
+                'delete_key'    => 'ids',
+            ],
+            // 表单配置
+            'form' => [
+                [
+                    'view_type'         => 'checkbox',
+                    'is_checked'        => 0,
+                    'checked_text'      => '反选',
+                    'not_checked_text'  => '全选',
+                    'align'             => 'center',
+                    'width'             => 80,
+                ],
+                [
+                    'label'         => '名称',
+                    'view_type'     => 'module',
+                    'view_key'      => 'link/module/info',
+                    'grid_size'     => 'sm',
+                    'search_config' => [
+                        'form_type'         => 'input',
+                        'form_name'         => 'name',
+                        'where_type'        => 'like',
+                    ],
+                ],
+                [
+                    'label'         => 'url地址',
+                    'view_type'     => 'module',
+                    'view_key'      => 'link/module/url',
+                    'grid_size'     => 'lg',
+                    'search_config' => [
+                        'form_type'         => 'input',
+                        'form_name'         => 'url',
+                        'where_type'        => 'like',
+                    ],
+                ],
+                [
+                    'label'         => '描述',
+                    'view_type'     => 'field',
+                    'view_key'      => 'describe',
+                    'search_config' => [
+                        'form_type'         => 'input',
+                        'where_type'        => 'like',
+                    ],
+                ],
+                [
+                    'label'         => '是否启用',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_enable',
+                    'post_url'      => MyUrl('admin/link/statusupdate'),
+                    'is_form_su'    => 1,
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_enable_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '是否新窗口打开',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_new_window_open',
+                    'post_url'      => MyUrl('admin/link/statusupdate'),
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_new_window_open_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '排序',
+                    'view_type'     => 'field',
+                    'view_key'      => 'sort',
+                ],
+                [
+                    'label'         => '创建时间',
+                    'view_type'     => 'field',
+                    'view_key'      => 'add_time',
+                    'search_config' => [
+                        'form_type'         => 'datetime',
+                    ],
+                ],
+                [
+                    'label'         => '更新时间',
+                    'view_type'     => 'field',
+                    'view_key'      => 'upd_time',
+                    'search_config' => [
+                        'form_type'         => 'datetime',
+                    ],
+                ],
+                [
+                    'label'         => '操作',
+                    'view_type'     => 'operate',
+                    'view_key'      => 'link/module/operate',
+                    'align'         => 'center',
+                    'fixed'         => 'right',
+                ],
+            ],
+        ];
+    }
+}
+?>
\ No newline at end of file
diff --git a/application/admin/form/Navigation.php b/application/admin/form/Navigation.php
new file mode 100644
index 000000000..24d6da77b
--- /dev/null
+++ b/application/admin/form/Navigation.php
@@ -0,0 +1,150 @@
+<?php
+// +----------------------------------------------------------------------
+// | ShopXO 国内领先企业级B2C免费开源电商系统
+// +----------------------------------------------------------------------
+// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Devil
+// +----------------------------------------------------------------------
+namespace app\admin\form;
+
+/**
+ * 导航动态表格
+ * @author  Devil
+ * @blog    http://gong.gg/
+ * @version 1.0.0
+ * @date    2020-06-15
+ * @desc    description
+ */
+class Navigation
+{
+    // 基础条件
+    public $condition_base = [];
+
+    /**
+     * 入口
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-06-15
+     * @desc    description
+     * @param   [array]           $params [输入参数]
+     */
+    public function Run($params = [])
+    {
+        // 导航类型
+        $nav_type = empty($params['nav_type']) ? 'header' : trim($params['nav_type']);
+
+        // 配置信息
+        return [
+            // 基础配置
+            'base' => [
+                'key_field'     => 'id',
+                'status_field'  => 'is_show',
+                'is_search'     => 1,
+                'search_url'    => MyUrl('admin/navigation/index', ['nav_type'=>$nav_type]),
+                'is_delete'     => 1,
+                'delete_url'    => MyUrl('admin/navigation/delete'),
+                'delete_key'    => 'ids',
+            ],
+            // 表单配置
+            'form' => [
+                [
+                    'view_type'         => 'checkbox',
+                    'is_checked'        => 0,
+                    'checked_text'      => '反选',
+                    'not_checked_text'  => '全选',
+                    'align'             => 'center',
+                    'width'             => 80,
+                ],
+                [
+                    'label'         => '导航名称',
+                    'view_type'     => 'module',
+                    'view_key'      => 'navigation/module/info',
+                    'grid_size'     => 'sm',
+                    'search_config' => [
+                        'form_type'         => 'input',
+                        'form_name'         => 'name',
+                        'where_type'        => 'like',
+                    ],
+                ],
+                [
+                    'label'         => '导航数据类型',
+                    'view_type'     => 'field',
+                    'view_key'      => 'data_type_text',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'form_name'         => 'data_type',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_nav_type_list'),
+                        'data_key'          => 'value',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '状态',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_show',
+                    'post_url'      => MyUrl('admin/navigation/statusupdate'),
+                    'is_form_su'    => 1,
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_show_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '新窗口打开',
+                    'view_type'     => 'status',
+                    'view_key'      => 'is_new_window_open',
+                    'post_url'      => MyUrl('admin/navigation/statusupdate'),
+                    'align'         => 'center',
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_is_new_window_open_list'),
+                        'data_key'          => 'id',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
+                [
+                    'label'         => '排序',
+                    'view_type'     => 'field',
+                    'view_key'      => 'sort',
+                ],
+                [
+                    'label'         => '创建时间',
+                    'view_type'     => 'field',
+                    'view_key'      => 'add_time',
+                    'search_config' => [
+                        'form_type'         => 'datetime',
+                    ],
+                ],
+                [
+                    'label'         => '更新时间',
+                    'view_type'     => 'field',
+                    'view_key'      => 'upd_time',
+                    'search_config' => [
+                        'form_type'         => 'datetime',
+                    ],
+                ],
+                [
+                    'label'         => '操作',
+                    'view_type'     => 'operate',
+                    'view_key'      => 'navigation/module/operate',
+                    'align'         => 'center',
+                    'fixed'         => 'right',
+                ],
+            ],
+        ];
+    }
+}
+?>
\ No newline at end of file
diff --git a/application/admin/form/Orderaftersale.php b/application/admin/form/Orderaftersale.php
index e86c4f04b..9e38ed32e 100644
--- a/application/admin/form/Orderaftersale.php
+++ b/application/admin/form/Orderaftersale.php
@@ -167,7 +167,7 @@ class Orderaftersale
                     'label'         => '凭证',
                     'view_type'     => 'module',
                     'view_key'      => 'orderaftersale/module/voucher',
-                    'width'         => 140,
+                    'is_list'        => 0,
                 ],
                 [
                     'label'         => '快递公司',
diff --git a/application/admin/form/Role.php b/application/admin/form/Role.php
index 7bf82a722..6d4ca69e3 100644
--- a/application/admin/form/Role.php
+++ b/application/admin/form/Role.php
@@ -10,8 +10,6 @@
 // +----------------------------------------------------------------------
 namespace app\admin\form;
 
-use app\service\AdminService;
-
 /**
  * 角色管理动态表格
  * @author  Devil
diff --git a/application/admin/form/User.php b/application/admin/form/User.php
index 942bdf9d6..9be8c2058 100644
--- a/application/admin/form/User.php
+++ b/application/admin/form/User.php
@@ -10,11 +10,6 @@
 // +----------------------------------------------------------------------
 namespace app\admin\form;
 
-use think\Db;
-use app\service\GoodsService;
-use app\service\RegionService;
-use app\service\BrandService;
-
 /**
  * 用户动态表格
  * @author  Devil
diff --git a/application/admin/view/default/article/detail.html b/application/admin/view/default/article/detail.html
new file mode 100644
index 000000000..efce29768
--- /dev/null
+++ b/application/admin/view/default/article/detail.html
@@ -0,0 +1,72 @@
+<!-- 继承公共的 form -->
+{{extend name="public/module/detail" /}}
+
+<!-- 重写数据模块 -->
+{{block name="detail_data"}}
+    <!-- 父级内容 -->
+    {__block__}
+    
+    <!-- 详情内容 -->
+    <div class="am-panel am-panel-default">
+        <div class="am-panel-hd">详情内容</div>
+        <div class="am-panel-bd">
+            {{if !empty($data['content'])}}
+                <div class="am-scrollable-vertical am-nowrap-initial">
+                    {{$data.content|raw}}
+                </div>
+            {{else /}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
+        </div>
+    </div>
+
+    <!-- 详情图片 -->
+    <div class="am-panel am-panel-default">
+        <div class="am-panel-hd">详情图片</div>
+        <div class="am-panel-bd">
+            {{if !empty($data['images'])}}
+                <div data-am-widget="slider" class="am-slider am-slider-default" data-am-slider='{"controlNav":false}'>
+                    <ul class="am-slides">
+                        {{foreach $data.images as $ik=>$iv}}
+                            <li>
+                                <a href="{{$iv}}" target="_blank">
+                                    <img src="{{$iv}}" />
+                                </a>
+                                <div class="am-slider-desc">
+                                    <div class="am-slider-counter">
+                                        <strong class="am-text-lg">{{$ik+1}}</strong>
+                                        <span class="am-margin-right-sm">/{{:count($data['images'])}}</span>
+                                        <span>{{$iv}}</span>
+                                    </div>
+                                </div>
+                            </li>
+                        {{/foreach}}
+                    </ul>
+                </div>
+            {{else /}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
+        </div>
+    </div>
+
+    <!-- SEO信息 -->
+    <div class="am-panel am-panel-default">
+        <div class="am-panel-hd">SEO信息</div>
+        <div class="am-panel-bd">
+            {{if !empty($data)}}
+                <dl class="dl-content">
+                    <dt>SEO标题</dt>
+                    <dd>{{$data.seo_title}}</dd>
+
+                    <dt>SEO关键字</dt>
+                    <dd>{{$data.seo_keywords}}</dd>
+
+                    <dt>SEO描述</dt>
+                    <dd>{{$data.seo_desc}}</dd>
+                </dl>
+            {{else /}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
+        </div>
+    </div>
+{{/block}}
\ No newline at end of file
diff --git a/application/admin/view/default/article/index.html b/application/admin/view/default/article/index.html
index 688da15c1..49c2f5ef8 100755
--- a/application/admin/view/default/article/index.html
+++ b/application/admin/view/default/article/index.html
@@ -1,270 +1,9 @@
-{{include file="public/header" /}}
+<!-- 继承公共的 form -->
+{{extend name="public/module/form" /}}
 
-<!-- right content start  -->
-<div class="content-right">
-	<div class="content">
-		<!-- form start -->
-		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/article/index')}}" request-type="form">
-            <div class="thin">
-                <div class="am-input-group am-input-group-sm am-fl so">
-                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="标题关键字" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
-                    <span class="am-input-group-btn">
-                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
-                    </span>
-                </div>
-                <label class="am-fl thin_sub more-submit">
-                    更多筛选条件
-                    {{if isset($params['is_more']) and $params['is_more'] eq 1}}
-                        <input type="checkbox" name="is_more" value="1" id="is_more" checked />
-                        <i class="am-icon-angle-up"></i>
-                    {{else /}}
-                        <input type="checkbox" name="is_more" value="1" id="is_more" />
-                        <i class="am-icon-angle-down"></i>
-                    {{/if}}
-                </label>
-            </div>
-            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
-                <tbody>
-                    <tr>
-                        <td>
-                            <span>启用：</span>
-                            <select name="is_enable" class="chosen-select" data-placeholder="是否启用...">
-                                <option value="-1">是否启用...</option>
-                                {{foreach $common_is_enable_list as $v}}
-                                    <option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                                {{/foreach}}
-                            </select>
-                        </td>
-                        <td>
-                            <span>分类：</span>
-                            <select name="article_category_id" class="chosen-select" data-placeholder="文章分类...">
-								<option value="-1">文章分类...</option>
-								{{foreach $article_category_list as $v}}
-									<option value="{{$v.id}}" {{if isset($params['article_category_id']) and $params['article_category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-								{{/foreach}}
-							</select>
-                        </td>
-                    </tr>
-                    <tr>
-                    	<td>
-                    		<span>推荐：</span>
-                    		<select name="is_home_recommended" class="chosen-select" data-placeholder="首页推荐...">
-								<option value="-1">首页推荐...</option>
-								{{foreach $common_is_text_list as $v}}
-									<option value="{{$v.id}}" {{if isset($params['is_home_recommended']) and $params['is_home_recommended'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-								{{/foreach}}
-							</select>
-                    	</td>
-                        <td class="input">
-                            <span>热度：</span>
-                            <input type="number" name="access_count" class="am-form-field am-input-sm am-radius" placeholder="浏览热度" value="{{if !empty($params.access_count)}}{{$params.access_count}}{{/if}}" data-validation-message="热度有误" />
-                        </td>
-                    </tr>
-                   	<tr>
-                   		<td class="time">
-                            <span>时间：</span>
-                            <span>
-                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
-                            </span>
-                            <em class="text-grey">~</em>
-                            <span>
-                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
-                            </span>
-                        </td>
-                        <td>
-                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
-                            <a href="{{:MyUrl('admin/article/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </form>
-        <!-- form end -->
-
-        <!-- top operation start -->
-        <div class="am-g am-margin-top-sm">
-            <a href="{{:MyUrl('admin/article/saveinfo')}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus"> 新增</a>
-
-            <!-- 顶部操作钩子 -->
-            {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
-                <div class="plugins-tag">
-                    <span>plugins_view_admin_article_top_operate</span>
-                </div>
-            {{/if}}
-            {{php}}
-                $hook_name = 'plugins_view_admin_article_top_operate';
-                $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true]);
-                if(!empty($hook_data) && is_array($hook_data))
-                {
-                    foreach($hook_data as $hook)
-                    {
-                        if(is_string($hook) || is_int($hook))
-                        {
-                            echo htmlspecialchars_decode($hook);
-                        }
-                    }
-                }
-            {{/php}}
-        </div>
-        <!-- top operation end -->
-
-		<!-- list start -->
-		<div class="am-scrollable-horizontal am-table-scrollable-horizontal am-margin-top-sm">
-            <table class="am-table am-table-striped am-table-hover am-table-bordered am-text-nowrap am-table-td-fixed-last">
-    			<thead>
-    				<tr>
-    					<th class="am-grid-lg">标题</th>
-    					<th>文章分类</th>
-    					<th>访问热度</th>
-    					<th class="am-text-center">是否启用</th>
-                        <th class="am-text-center">首页推荐</th>
-    					<th class="am-text-center">更多</th>
-                        <th class="am-text-center">操作</th>
-    				</tr>
-    			</thead>
-    			<tbody>
-    				{{if !empty($data_list)}}
-    					{{foreach $data_list as $v}}
-    						<tr id="data-list-{{$v.id}}" {{if $v['is_enable'] eq 0}}class="am-active"{{/if}} data-height="85">
-    							<td class="am-text-middle">
-    								<a href="{{$v.url}}" target="_blank" title="{{$v.title}}" {{if !empty($v['title_color'])}} style="color:{{$v.title_color}};" {{/if}} class="am-nowrap-initial">{{$v.title}}</a>
-    							</td>
-    							<td class="am-text-middle">{{$v.article_category_name}}</td>
-    							<td class="am-text-middle">{{$v.access_count}}</td>
-    							<td class="am-text-middle am-text-center">
-    								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_enable'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/article/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-is-update-status="1"></a>
-    							</td>
-    							<td class="am-text-middle am-text-center">
-    								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_home_recommended'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/article/statushomerecommended')}}" data-id="{{$v.id}}" data-state="{{$v['is_home_recommended']}}"></a>
-    							</td>
-    							<td class="am-text-middle">
-                                    <p class="am-text-center xo-cursor-pr">
-                                        <i class="am-icon-caret-down"></i>
-                                        <span data-am-modal="{target: '#my-popup{{$v.id}}'}"> 查看更多</span>
-                                    </p>
-    								<div class="am-popup am-radius" id="my-popup{{$v.id}}">
-    									<div class="am-popup-inner">
-    										<div class="am-popup-hd">
-    											<h4 class="am-popup-title">详情内容</h4>
-    											<span data-am-modal-close
-    											class="am-close">&times;</span>
-    										</div>
-    										<div class="am-popup-bd">
-    											<dl class="dl-content">
-    												<dt>标题</dt>
-    												<dd class="am-nowrap-initial">{{$v.title}}</dd>
-
-    												<dt>文章分类</dt>
-    												<dd>{{$v.article_category_name}}</dd>
-
-    												<dt>访问次数</dt>
-    												<dd>{{$v.access_count}}</dd>
-
-    												<dt>是否启用</dt>
-    												<dd>{{$v.is_enable_text}}</dd>
-
-                                                    <dt>内容</dt>
-                                                    <dd>
-                                                        <div class="am-scrollable-vertical am-nowrap-initial">{{$v.content|raw}}</div>
-                                                    </dd>
-
-                                                    <dt>SEO标题</dt>
-                                                    <dd>{{$v.seo_title}}</dd>
-
-                                                    <dt>SEO关键字</dt>
-                                                    <dd>{{$v.seo_keywords}}</dd>
-
-                                                    <dt>SEO描述</dt>
-                                                    <dd>{{$v.seo_desc}}</dd>
-
-    												<dt>创建时间</dt>
-    												<dd>{{$v.add_time_time}}</dd>
-
-    												<dt>更新时间</dt>
-    												<dd>{{$v.upd_time_time}}</dd>
-    											</dl>
-    										</div>
-    									</div>
-    								</div>
-    							</td>
-                                <td class="am-operate-grid">
-                                    <div class="am-scrollable-vertical">
-                                        <a class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block" href="{{:MyUrl('admin/article/saveinfo', array_merge($params, ['id'=>$v['id']]))}}">
-                                            <i class="am-icon-edit"></i>
-                                            <span>编辑</span>
-                                        </a>
-                                        <button class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-delete" data-url="{{:MyUrl('admin/article/delete')}}" data-id="{{$v.id}}">
-                                            <i class="am-icon-trash-o"></i>
-                                            <span>删除</span>
-                                        </button>
-
-                                        <!-- 文章列表操作钩子 -->
-                                        {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
-                                            <div class="plugins-tag">
-                                                <span>plugins_view_admin_article_list_operate</span>
-                                            </div>
-                                        {{/if}}
-                                        {{php}}
-                                            $hook_name = 'plugins_view_admin_article_list_operate';
-                                            $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]);
-                                            if(!empty($hook_data) && is_array($hook_data))
-                                            {
-                                                foreach($hook_data as $hook)
-                                                {
-                                                    if(is_string($hook) || is_int($hook))
-                                                    {
-                                                        echo htmlspecialchars_decode($hook);
-                                                    }
-                                                }
-                                            }
-                                        {{/php}}
-                                    </div>                                    
-    							</td>
-    						</tr>
-    					{{/foreach}}
-    				{{/if}}
-    			</tbody>
-    		</table>
-            {{if empty($data_list)}}
-                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
-            {{/if}}
-        </div>
-		<!-- list end -->
-
-        <!-- bottom operation start -->
-        <div class="am-g am-margin-top-sm">
-            <!-- 底部操作钩子 -->
-            {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
-                <div class="plugins-tag">
-                    <span>plugins_view_admin_article_bottom_operate</span>
-                </div>
-            {{/if}}
-            {{php}}
-                $hook_name = 'plugins_view_admin_article_bottom_operate';
-                $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true]);
-                if(!empty($hook_data) && is_array($hook_data))
-                {
-                    foreach($hook_data as $hook)
-                    {
-                        if(is_string($hook) || is_int($hook))
-                        {
-                            echo htmlspecialchars_decode($hook);
-                        }
-                    }
-                }
-            {{/php}}
-        </div>
-        <!-- bottom operation end -->
-
-		<!-- page start -->
-		{{if !empty($data_list)}}
-			{{$page_html|raw}}
-		{{/if}}
-		<!-- page end -->
-	</div>
-</div>
-<!-- right content end  -->
-		
-<!-- footer start -->
-{{include file="public/footer" /}}
-<!-- footer end -->
\ No newline at end of file
+<!-- 表单顶部操作栏 -->
+{{block name="form_operate_top"}}
+    <a href="{{:MyUrl('admin/article/saveinfo')}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus"> 新增</a>
+    <!-- 父级内容 -->
+    {__block__}
+{{/block}}
\ No newline at end of file
diff --git a/application/admin/view/default/article/module/info.html b/application/admin/view/default/article/module/info.html
new file mode 100644
index 000000000..35bcb7a29
--- /dev/null
+++ b/application/admin/view/default/article/module/info.html
@@ -0,0 +1,4 @@
+<!-- 标题信息 -->
+{{if !empty($module_data)}}
+    <a href="{{:MyUrl('index/article/index', ['id'=>$module_data['id']])}}" target="_blank" title="{{$module_data.title}}" {{if !empty($module_data['title_color'])}}style="color:{{$module_data.title_color}};"{{/if}}>{{$module_data.title}}</a>
+{{/if}}
\ No newline at end of file
diff --git a/application/admin/view/default/article/module/operate.html b/application/admin/view/default/article/module/operate.html
new file mode 100644
index 000000000..5c01502db
--- /dev/null
+++ b/application/admin/view/default/article/module/operate.html
@@ -0,0 +1,13 @@
+<!-- 操作栏 -->
+<button type="button" class="am-btn am-btn-default am-btn-xs am-radius am-btn-block submit-popup" data-url="{{:MyUrl('admin/article/detail', ['id'=>$module_data['id']])}}">
+    <i class="am-icon-eye"></i>
+    <span>详情</span>
+</button>
+<a class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block" href="{{:MyUrl('admin/article/saveinfo', array('id'=>$module_data['id']))}}">
+    <i class="am-icon-edit"></i>
+    <span>编辑</span>
+</a>
+<button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-delete" data-url="{{:MyUrl('admin/article/delete')}}" data-id="{{$module_data.id}}" data-key="ids">
+    <i class="am-icon-trash-o"></i>
+    <span>删除</span>
+</button>
\ No newline at end of file
diff --git a/application/admin/view/default/customview/detail.html b/application/admin/view/default/customview/detail.html
new file mode 100644
index 000000000..73d167799
--- /dev/null
+++ b/application/admin/view/default/customview/detail.html
@@ -0,0 +1,51 @@
+<!-- 继承公共的 form -->
+{{extend name="public/module/detail" /}}
+
+<!-- 重写数据模块 -->
+{{block name="detail_data"}}
+    <!-- 父级内容 -->
+    {__block__}
+    
+    <!-- 详情内容 -->
+    <div class="am-panel am-panel-default">
+        <div class="am-panel-hd">详情内容</div>
+        <div class="am-panel-bd">
+            {{if !empty($data['content'])}}
+                <div class="am-scrollable-vertical am-nowrap-initial">
+                    {{$data.content|raw}}
+                </div>
+            {{else /}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
+        </div>
+    </div>
+
+    <!-- 详情图片 -->
+    <div class="am-panel am-panel-default">
+        <div class="am-panel-hd">详情图片</div>
+        <div class="am-panel-bd">
+            {{if !empty($data['images'])}}
+                <div data-am-widget="slider" class="am-slider am-slider-default" data-am-slider='{"controlNav":false}'>
+                    <ul class="am-slides">
+                        {{foreach $data.images as $ik=>$iv}}
+                            <li>
+                                <a href="{{$iv}}" target="_blank">
+                                    <img src="{{$iv}}" />
+                                </a>
+                                <div class="am-slider-desc">
+                                    <div class="am-slider-counter">
+                                        <strong class="am-text-lg">{{$ik+1}}</strong>
+                                        <span class="am-margin-right-sm">/{{:count($data['images'])}}</span>
+                                        <span>{{$iv}}</span>
+                                    </div>
+                                </div>
+                            </li>
+                        {{/foreach}}
+                    </ul>
+                </div>
+            {{else /}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
+        </div>
+    </div>
+{{/block}}
\ No newline at end of file
diff --git a/application/admin/view/default/customview/index.html b/application/admin/view/default/customview/index.html
index ec04a7d6f..315cc843b 100755
--- a/application/admin/view/default/customview/index.html
+++ b/application/admin/view/default/customview/index.html
@@ -1,211 +1,9 @@
-{{include file="public/header" /}}
+<!-- 继承公共的 form -->
+{{extend name="public/module/form" /}}
 
-<!-- right content start  -->
-<div class="content-right">
-	<div class="content">
-		<!-- form start -->
-		<form class="am-form form-validation form-search" method="post" action="{{:MyUrl('admin/customview/index')}}" request-type="form">
-			<div class="thin">
-                <div class="am-input-group am-input-group-sm am-fl so">
-                    <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="标题/型号" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
-                    <span class="am-input-group-btn">
-                        <button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
-                    </span>
-                </div>
-                <label class="am-fl thin_sub more-submit">
-                    更多筛选条件
-                    {{if isset($params['is_more']) and $params['is_more'] eq 1}}
-                        <input type="checkbox" name="is_more" value="1" id="is_more" checked />
-                        <i class="am-icon-angle-up"></i>
-                    {{else /}}
-                        <input type="checkbox" name="is_more" value="1" id="is_more" />
-                        <i class="am-icon-angle-down"></i>
-                    {{/if}}
-                </label>
-            </div>
-            <table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
-                <tbody>
-                	<tr>
-                		<td>
-                			<span>头部：</span>
-							<select name="is_header" class="chosen-select" data-placeholder="包含头部...">
-								<option value="-1">包含头部...</option>
-								{{foreach $common_is_header_list as $v}}
-									<option value="{{$v.id}}" {{if isset($params['is_header']) and $params['is_header'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-								{{/foreach}}
-							</select>
-                		</td>
-                		<td>
-							<span>尾部：</span>
-							<select name="is_footer" class="chosen-select" data-placeholder="包含尾部...">
-								<option value="-1">包含尾部...</option>
-								{{foreach $common_is_footer_list as $v}}
-									<option value="{{$v.id}}" {{if isset($params['is_footer']) and $params['is_footer'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-								{{/foreach}}
-							</select>
-                		</td>
-                	</tr>
-                	<tr>
-                		<td>
-                			<span>启用：</span>
-                			<select name="is_enable" class="chosen-select" data-placeholder="是否启用...">
-								<option value="-1">是否启用...</option>
-								{{foreach $common_is_enable_list as $v}}
-									<option value="{{$v.id}}" {{if isset($params['is_enable']) and $params['is_enable'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-								{{/foreach}}
-							</select>
-                		</td>
-                		<td>
-                            <span>满屏：</span>
-                            <select name="is_full_screen" class="chosen-select" data-placeholder="是否满屏...">
-                                <option value="-1">是否满屏...</option>
-                                {{foreach $common_is_full_screen_list as $v}}
-                                    <option value="{{$v.id}}" {{if isset($params['is_full_screen']) and $params['is_full_screen'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                                {{/foreach}}
-                            </select>
-                        </td>
-                	</tr>
-                    <tr>
-                        <td class="time">
-                            <span>时间：</span>
-                            <span>
-                                <input type="text" autocomplete="off" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
-                            </span>
-                            <em class="text-grey">~</em>
-                            <span>
-                                <input type="text" autocomplete="off" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
-                            </span>
-                        </td>
-                        <td>
-                            <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
-                            <a href="{{:MyUrl('admin/customview/index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
-                        </td>
-                    </tr>
-                </tbody>
-			</table>
-		</form>
-		<!-- form end -->
-
-		<!-- operation start -->
-		<div class="am-g am-margin-top-sm">
-			<a href="{{:MyUrl('admin/customview/saveinfo')}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus"> 新增</a>
-		</div>
-		<!-- operation end -->
-
-		<!-- list start -->
-		<div class="am-scrollable-horizontal am-table-scrollable-horizontal am-margin-top-sm">
-            <table class="am-table am-table-striped am-table-hover am-table-bordered am-text-nowrap am-table-td-fixed-last">
-    			<thead>
-    				<tr>
-    					<th class="am-grid-lg">标题</th>
-    					<th class="am-text-center">是否启用</th>
-    					<th class="am-text-center">是否含头部</th>
-    					<th class="am-text-center">是否含尾部</th>
-    					<th class="am-text-center">是否满屏</th>
-    					<th>访问次数</th>
-    					<th class="am-text-center">更多</th>
-    					<th class="am-text-center" data-width="170">操作</th>
-    				</tr>
-    			</thead>
-    			<tbody>
-    				{{if !empty($data_list)}}
-    					{{foreach $data_list as $v}}
-    						<tr id="data-list-{{$v.id}}" {{if $v['is_enable'] eq 0}}class="am-active"{{/if}}>
-    							<td class="am-text-middle am-nowrap-initial">
-    								<a href="{{:str_replace('admin.php', 'index.php', MyUrl('index/customview/index', array('id'=>$v['id'])))}}" target="_blank" title="{{$v.title}}">{{$v.title}}</a>
-    							</td>
-    							<td class="am-text-middle am-text-center">
-    								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_enable'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/customview/statusupdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-field="is_enable" data-is-update-status="1"></a>
-    							</td>
-    							<td class="am-text-middle am-text-center">
-    								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_header'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/customview/statusupdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_header']}}" data-field="is_header"></a>
-    							</td>
-    							<td class="am-text-middle am-text-center">
-    								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_footer'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/customview/statusupdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_footer']}}" data-field="is_footer"></a>
-    							</td>
-    							<td class="am-text-middle am-text-center">
-    								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_full_screen'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/customview/statusupdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_full_screen']}}" data-field="is_full_screen"></a>
-    							</td>
-    							<td class="am-text-middle">{{$v.access_count}}</td>
-    							<td class="am-text-middle">
-                                    <p class="am-text-center xo-cursor-pr">
-                                        <i class="am-icon-caret-down"></i>
-                                        <span data-am-modal="{target: '#my-popup{{$v.id}}'}"> 查看更多</span>
-                                    </p>
-    								<div class="am-popup am-radius" id="my-popup{{$v.id}}">
-    									<div class="am-popup-inner">
-    										<div class="am-popup-hd">
-    											<h4 class="am-popup-title">详情内容</h4>
-    											<span data-am-modal-close
-    											class="am-close">&times;</span>
-    										</div>
-    										<div class="am-popup-bd">
-    											<dl class="dl-content">
-    												<dt>标题</dt>
-    												<dd class="am-nowrap-initial">{{$v.title}}</dd>
-
-    												<dt>是否启用</dt>
-    												<dd>{{$v.is_enable_text}}</dd>
-
-    												<dt>是否含头部</dt>
-    												<dd>{{:lang('common_is_header_list')[$v['is_header']]['name']}}</dd>
-
-    												<dt>是否含尾部</dt>
-    												<dd>{{:lang('common_is_footer_list')[$v['is_footer']]['name']}}</dd>
-
-    												<dt>是否满屏</dt>
-    												<dd>{{:lang('common_is_full_screen_list')[$v['is_full_screen']]['name']}}</dd>
-
-    												<dt>访问次数</dt>
-    												<dd>{{$v.access_count}}</dd>
-
-                                                    <dt>内容</dt>
-                                                    <dd>
-                                                        <div class="am-scrollable-vertical am-nowrap-initial">{{$v.content|raw}}</div>
-                                                    </dd>
-
-    												<dt>创建时间</dt>
-    												<dd>{{$v.add_time_time}}</dd>
-
-    												<dt>更新时间</dt>
-    												<dd>{{$v.upd_time_time}}</dd>
-    											</dl>
-    										</div>
-    									</div>
-    								</div>
-    							</td>
-    							<td class="am-operate-grid" data-width="170">
-                                    <div class="am-scrollable-vertical">
-        								<a class="am-btn am-btn-secondary am-btn-xs am-radius" href="{{:MyUrl('admin/customview/saveinfo', array('id'=>$v['id']))}}">
-                                            <i class="am-icon-edit"></i>
-                                            <span>编辑</span>
-                                        </a>
-        								<button class="am-btn am-btn-danger am-btn-xs am-radius submit-delete" data-url="{{:MyUrl('admin/customview/delete')}}" data-id="{{$v.id}}">
-                                            <i class="am-icon-trash-o"></i>
-                                            <span>删除</span>
-                                        </button>
-                                    </div>
-    							</td>
-    						</tr>
-    					{{/foreach}}
-    				{{/if}}
-    			</tbody>
-    		</table>
-            {{if empty($data_list)}}
-                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
-            {{/if}}
-        </div>
-		<!-- list end -->
-
-		<!-- page start -->
-		{{if !empty($data_list)}}
-			{{$page_html|raw}}
-		{{/if}}
-		<!-- page end -->
-	</div>
-</div>
-<!-- right content end  -->
-		
-<!-- footer start -->
-{{include file="public/footer" /}}
-<!-- footer end -->
\ No newline at end of file
+<!-- 表单顶部操作栏 -->
+{{block name="form_operate_top"}}
+    <a href="{{:MyUrl('admin/customview/saveinfo')}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus"> 新增</a>
+    <!-- 父级内容 -->
+    {__block__}
+{{/block}}
\ No newline at end of file
diff --git a/application/admin/view/default/customview/module/info.html b/application/admin/view/default/customview/module/info.html
new file mode 100644
index 000000000..da68aa439
--- /dev/null
+++ b/application/admin/view/default/customview/module/info.html
@@ -0,0 +1,4 @@
+<!-- 标题信息 -->
+{{if !empty($module_data)}}
+    <a href="{{:MyUrl('index/customview/index', ['id'=>$module_data['id']])}}" target="_blank" title="{{$module_data.title}}">{{$module_data.title}}</a>
+{{/if}}
\ No newline at end of file
diff --git a/application/admin/view/default/customview/module/operate.html b/application/admin/view/default/customview/module/operate.html
new file mode 100644
index 000000000..9d0038b09
--- /dev/null
+++ b/application/admin/view/default/customview/module/operate.html
@@ -0,0 +1,13 @@
+<!-- 操作栏 -->
+<button type="button" class="am-btn am-btn-default am-btn-xs am-radius am-btn-block submit-popup" data-url="{{:MyUrl('admin/customview/detail', ['id'=>$module_data['id']])}}">
+    <i class="am-icon-eye"></i>
+    <span>详情</span>
+</button>
+<a class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block" href="{{:MyUrl('admin/customview/saveinfo', array('id'=>$module_data['id']))}}">
+    <i class="am-icon-edit"></i>
+    <span>编辑</span>
+</a>
+<button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-delete" data-url="{{:MyUrl('admin/customview/delete')}}" data-id="{{$module_data.id}}" data-key="ids">
+    <i class="am-icon-trash-o"></i>
+    <span>删除</span>
+</button>
\ No newline at end of file
diff --git a/application/admin/view/default/customview/save_info.html b/application/admin/view/default/customview/save_info.html
index ab9b01f13..99f394d20 100755
--- a/application/admin/view/default/customview/save_info.html
+++ b/application/admin/view/default/customview/save_info.html
@@ -41,7 +41,7 @@
 
 			<div class="am-form-group">
 				<label>内容{{if IsMobile()}}<span class="am-form-group-label-tips">更多编辑功能请使用电脑访问</span>{{/if}}</label>
-				<textarea class="am-radius am-validate" name="content" rows="5" minlength="50" maxlength="105000" {{if !IsMobile()}}id="editor-tag" data-url="{{:MyUrl('admin/ueditor/index', ['path_type'=>'customview'])}}" placeholder="内容长度最少 50~105000 个字符" {{else /}} placeholder="内容长度最少 50~105000 个字符更多编辑功能请使用电脑访问" {{/if}} data-validation-message="内容长度最少 50~105000 个字符" required>{{if !empty($data)}}{{$data.content}}{{/if}}</textarea>
+				<textarea class="am-radius am-validate" name="content" rows="5" minlength="10" maxlength="105000" {{if !IsMobile()}}id="editor-tag" data-url="{{:MyUrl('admin/ueditor/index', ['path_type'=>'customview'])}}" placeholder="内容长度最少 10~105000 个字符" {{else /}} placeholder="内容长度最少 10~105000 个字符更多编辑功能请使用电脑访问" {{/if}} data-validation-message="内容长度最少 10~105000 个字符" required>{{if !empty($data)}}{{$data.content}}{{/if}}</textarea>
 			</div>
 			<div class="am-form-group am-form-group-refreshing">
 				<input type="hidden" name="id" {{if !empty($data)}} value="{{$data.id}}"{{/if}} />
diff --git a/application/admin/view/default/goods/detail.html b/application/admin/view/default/goods/detail.html
index 0ee3171ad..c80aaec7e 100644
--- a/application/admin/view/default/goods/detail.html
+++ b/application/admin/view/default/goods/detail.html
@@ -10,9 +10,13 @@
     <div class="am-panel am-panel-default">
         <div class="am-panel-hd">电脑端详情</div>
         <div class="am-panel-bd">
-            <div class="am-scrollable-vertical am-nowrap-initial">
-                {{$data.content_web|raw}}
-            </div>
+            {{if !empty($data['content_web'])}}
+                <div class="am-scrollable-vertical am-nowrap-initial">
+                    {{$data.content_web|raw}}
+                </div>
+            {{else /}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
         </div>
     </div>
 
diff --git a/application/admin/view/default/goodscomments/module/images.html b/application/admin/view/default/goodscomments/module/images.html
index 2ca6f7ee7..ea284eeaf 100644
--- a/application/admin/view/default/goodscomments/module/images.html
+++ b/application/admin/view/default/goodscomments/module/images.html
@@ -1,12 +1,19 @@
 <!-- 评论图片 -->
 {{if !empty($module_data) and !empty($module_data['images'])}}
-    <div data-am-widget="slider" class="am-slider am-slider-a1" data-am-slider='{&quot;directionNav&quot;:false, slideshow:false}' >
+    <div data-am-widget="slider" class="am-slider am-slider-default" data-am-slider='{"controlNav":false}'>
         <ul class="am-slides">
-            {{foreach $module_data.images as $img}}
+            {{foreach $module_data.images as $ik=>$iv}}
                 <li>
-                    <a href="{{$img}}" target="_blank">
-                        <img src="{{$img}}" />
+                    <a href="{{$iv}}" target="_blank">
+                        <img src="{{$iv}}" />
                     </a>
+                    <div class="am-slider-desc">
+                        <div class="am-slider-counter">
+                            <strong class="am-text-lg">{{$ik+1}}</strong>
+                            <span class="am-margin-right-sm">/{{:count($module_data['images'])}}</span>
+                            <span>{{$iv}}</span>
+                        </div>
+                    </div>
                 </li>
             {{/foreach}}
         </ul>
diff --git a/application/admin/view/default/link/detail.html b/application/admin/view/default/link/detail.html
new file mode 100644
index 000000000..06eeee457
--- /dev/null
+++ b/application/admin/view/default/link/detail.html
@@ -0,0 +1,2 @@
+<!-- 继承公共的 form -->
+{{extend name="public/module/detail" /}}
\ No newline at end of file
diff --git a/application/admin/view/default/link/index.html b/application/admin/view/default/link/index.html
index 5eb5b9552..6ea7312f5 100755
--- a/application/admin/view/default/link/index.html
+++ b/application/admin/view/default/link/index.html
@@ -1,103 +1,51 @@
-{{include file="public/header" /}}
+<!-- 继承公共的 form -->
+{{extend name="public/module/form" /}}
 
-<!-- right content start  -->
-<div class="content-right">
-	<div class="content">
-		<!-- operation start -->
-		<div class="am-g">
-			<button class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus submit-add" data-am-modal="{target: '#data-save-win'}"> 新增</button>
-		</div>
-		<!-- operation end -->
+<!-- 表单顶部操作栏 -->
+{{block name="form_operate_top"}}
+    <button type="button" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus submit-add" data-am-modal="{target: '#data-save-win'}"> 新增</button>
+    <!-- 父级内容 -->
+    {__block__}
+{{/block}}
 
-		<!-- list start -->
-		<div class="am-scrollable-horizontal am-table-scrollable-horizontal am-margin-top-sm am-margin-bottom-sm">
-            <table class="am-table am-table-striped am-table-hover am-table-bordered am-text-nowrap am-table-td-fixed-last">
-				<thead>
-					<tr>
-						<th class="am-grid-sm">名称</th>
-						<th class="am-grid-sm">描述</th>
-						<th class="am-text-center">状态</th>
-						<th class="am-text-center" data-width="170">操作</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{if !empty($data_list)}}
-						{{foreach $data_list as $v}}
-							<tr id="data-list-{{$v.id}}" {{if $v['is_enable'] eq 0}} class="am-active"{{/if}}>
-								<td class="am-text-middle am-nowrap-initial">{{$v.name}}
-									<a href="{{$v.url}}" target="_blank">
-										<i class="am-icon-external-link"></i>
-									</a>
-								</td>
-								<td class="am-text-middle am-nowrap-initial">{{$v.describe}}</td>
-								<td class="am-text-middle am-text-center">
-									<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_enable'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/link/statusupdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-is-update-status="1"></a>
-								</td>
-								<td class="am-operate-grid" data-width="170">
-                                    <div class="am-scrollable-vertical">
-										<button class="am-btn am-btn-secondary am-btn-xs am-radius submit-edit" data-am-modal="{target: '#data-save-win'}" data-json='{{:json_encode($v)}}'>
-											<i class="am-icon-edit"></i>
-											<span>编辑</span>
-										</button>
-										<button class="am-btn am-btn-danger am-btn-xs am-radius submit-delete" data-url="{{:MyUrl('admin/link/delete')}}" data-id="{{$v.id}}">
-											<i class="am-icon-trash-o"></i>
-											<span>删除</span>
-										</button>
-									</div>
-								</td>
-							</tr>
-						{{/foreach}}
-					{{/if}}
-				</tbody>
-			</table>
-			{{if empty($data_list)}}
-                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
-            {{/if}}
-		</div>
-		<!-- list end -->
-
-		<!-- save win start -->
-		<div class="am-popup am-radius" id="data-save-win">
-			<div class="am-popup-inner">
-				<div class="am-popup-hd">
-					<h4 class="am-popup-title" data-add-title="友情链接添加" data-edit-title="友情链接编辑">友情链接添加</h4>
-					<span data-am-modal-close class="am-close">&times;</span>
-				</div>
-				<div class="am-popup-bd">
-					<!-- form start -->
-					<form class="am-form form-validation" action="{{:MyUrl('admin/link/Save')}}" method="POST" request-type="ajax-reload" request-value="">
-						<div class="am-form-group">
-							<label>名称</label>
-							<input type="text" placeholder="名称" name="name" minlength="2" maxlength="16" data-validation-message="名称格式 2~16 个字符" class="am-radius" required />
-						</div>
-						<div class="am-form-group">
-							<label>链接地址<span class="am-form-group-label-tips">带http://或https://</span></label>
-							<input type="url" placeholder="链接地址" name="url"  data-validation-message="链接地址格式有误" class="am-radius" required />
-						</div>
-						<div class="am-form-group">
-							<label>顺序</label>
-							<input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
-						</div>
-						{{include file="lib/is_new_window_open" /}}
-						{{include file="lib/enable" /}}
-						<div class="am-form-group am-form-success">
-							<label>描述</label>
-							<textarea rows="3" maxlength="60" name="describe" class="am-radius" placeholder="描述" data-validation-message="描述不能大于60个字符"></textarea>
-						</div>
-						<div class="am-form-group am-form-group-refreshing">
-							<input type="hidden" name="id" />
-							<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
-						</div>
-					</form>
-					<!-- form end -->
-				</div>
+<!-- 扩展 -->
+{{block name="form_extend"}}
+	<!-- save win start -->
+	<div class="am-popup am-radius" id="data-save-win">
+		<div class="am-popup-inner">
+			<div class="am-popup-hd">
+				<h4 class="am-popup-title" data-add-title="友情链接添加" data-edit-title="友情链接编辑">友情链接添加</h4>
+				<span data-am-modal-close class="am-close">&times;</span>
+			</div>
+			<div class="am-popup-bd">
+				<!-- form start -->
+				<form class="am-form form-validation" action="{{:MyUrl('admin/link/Save')}}" method="POST" request-type="ajax-reload" request-value="">
+					<div class="am-form-group">
+						<label>名称</label>
+						<input type="text" placeholder="名称" name="name" minlength="2" maxlength="16" data-validation-message="名称格式 2~16 个字符" class="am-radius" required />
+					</div>
+					<div class="am-form-group">
+						<label>链接地址<span class="am-form-group-label-tips">带http://或https://</span></label>
+						<input type="url" placeholder="链接地址" name="url"  data-validation-message="链接地址格式有误" class="am-radius" required />
+					</div>
+					<div class="am-form-group">
+						<label>顺序</label>
+						<input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
+					</div>
+					{{include file="lib/is_new_window_open" /}}
+					{{include file="lib/enable" /}}
+					<div class="am-form-group am-form-success">
+						<label>描述</label>
+						<textarea rows="3" maxlength="60" name="describe" class="am-radius" placeholder="描述" data-validation-message="描述不能大于60个字符"></textarea>
+					</div>
+					<div class="am-form-group am-form-group-refreshing">
+						<input type="hidden" name="id" />
+						<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
+					</div>
+				</form>
+				<!-- form end -->
 			</div>
 		</div>
-		<!-- save win end -->
 	</div>
-</div>
-<!-- right content end  -->
-
-<!-- footer start -->
-{{include file="public/footer" /}}
-<!-- footer end -->
\ No newline at end of file
+	<!-- save win end -->
+{{/block}}
\ No newline at end of file
diff --git a/application/admin/view/default/link/module/info.html b/application/admin/view/default/link/module/info.html
new file mode 100644
index 000000000..3bc6f7133
--- /dev/null
+++ b/application/admin/view/default/link/module/info.html
@@ -0,0 +1,9 @@
+<!-- 商品基础信息 -->
+{{if !empty($module_data)}}
+    <div title="{{$module_data.name}}">
+        <span>{{$module_data.name}}</span>
+        <a href="{{$module_data.url}}" target="_blank">
+            <i class="am-icon-external-link"></i>
+        </a>
+    </div>
+{{/if}}
\ No newline at end of file
diff --git a/application/admin/view/default/link/module/operate.html b/application/admin/view/default/link/module/operate.html
new file mode 100644
index 000000000..697514734
--- /dev/null
+++ b/application/admin/view/default/link/module/operate.html
@@ -0,0 +1,9 @@
+<!-- 操作栏 -->
+<button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-edit" data-am-modal="{target: '#data-save-win'}" data-json='{{:json_encode($module_data)}}'>
+    <i class="am-icon-edit"></i>
+    <span>编辑</span>
+</button>
+<button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-delete" data-url="{{:MyUrl('admin/link/delete')}}" data-id="{{$module_data.id}}" data-key="ids">
+    <i class="am-icon-trash-o"></i>
+    <span>删除</span>
+</button>
\ No newline at end of file
diff --git a/application/admin/view/default/link/module/url.html b/application/admin/view/default/link/module/url.html
new file mode 100644
index 000000000..320f56e7c
--- /dev/null
+++ b/application/admin/view/default/link/module/url.html
@@ -0,0 +1,4 @@
+<!-- 商品基础信息 -->
+{{if !empty($module_data['url'])}}
+    <a href="{{$module_data.url}}" target="_blank" title="{{$module_data.name}}">{{$module_data.url}}</a>
+{{/if}}
\ No newline at end of file
diff --git a/application/admin/view/default/navigation/index.html b/application/admin/view/default/navigation/index.html
index 80b39de52..9c0266cc5 100755
--- a/application/admin/view/default/navigation/index.html
+++ b/application/admin/view/default/navigation/index.html
@@ -1,314 +1,251 @@
-{{include file="public/header" /}}
+<!-- table nav start -->
+{{block name="form_navigation"}}
+	{{include file="navigation/nav" /}}
+{{/block}}
+<!-- table nav end -->
 
-<!-- right content start  -->
-<div class="content-right">
-	<div class="content">
-		<!-- table nav start -->
-		{{include file="navigation/nav" /}}
-		<!-- table nav end -->
+<!-- 继承公共的 form -->
+{{extend name="public/module/form" /}}
 
-		<!-- operation start -->
-		<div class="am-g">
-			<button class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus submit-add" data-am-modal="{target: '#nav-custom-save-win'}" data-tag="nav-custom-save-win"> 自定义</button>
-			<button class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus submit-add" data-am-modal="{target: '#nav-article-save-win'}" data-tag="nav-article-save-win"> 文章</button>
-			<button class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus submit-add" data-am-modal="{target: '#nav-customview-save-win'}" data-tag="nav-customview-save-win"> 自定义页面</button>
-			<button class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus submit-add" data-am-modal="{target: '#nav-goods_category-save-win'}" data-tag="nav-goods_category-save-win"> 商品分类</button>
-		</div>
-		<!-- operation end -->
-
-		<!-- list start -->
-		<div class="am-scrollable-horizontal am-table-scrollable-horizontal am-margin-top-sm am-margin-bottom-sm">
-            <table class="am-table am-table-striped am-table-hover am-table-bordered am-text-nowrap am-table-td-fixed-last">
-				<thead>
-					<tr>
-						<th class="am-grid-lg">导航名称</th>
-						<th>导航数据类型</th>
-						<th class="am-text-center">状态</th>
-						<th class="am-text-center" data-width="170">操作</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{if !empty($data_list)}}
-						{{foreach $data_list as $v}}
-							<tr id="data-list-{{$v.id}}" {{if $v['is_show'] eq 0}}class="am-active"{{/if}}>
-								<td class="am-text-middle">{{$v.name}}
-									<a href="{{$v.url}}" target="_blank">
-										<i class="am-icon-external-link"></i>
-									</a>
-								</td>
-								<td class="am-text-middle">{{:lang('common_nav_type_list')[$v['data_type']]}}</td>
-								<td class="am-text-middle am-text-center">
-									<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_show'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/navigation/statusupdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_show']}}" data-is-update-status="1"></a>
-								</td>
-								<td class="am-operate-grid" data-width="170">
-                                    <div class="am-scrollable-vertical">
-										<button class="am-btn am-btn-secondary am-btn-xs am-radius submit-edit" data-am-modal="{target: '#nav-{{$v.data_type}}-save-win'}" data-json='{{:json_encode($v)}}' data-tag="nav-{{$v.data_type}}-save-win">
-											<i class="am-icon-edit"></i>
-											<span>编辑</span>
-										</button>
-										<button class="am-btn am-btn-danger am-btn-xs am-radius submit-delete" data-url="{{:MyUrl('admin/navigation/delete')}}" data-id="{{$v.id}}">
-											<i class="am-icon-trash-o"></i>
-											<span>删除</span>
-										</button>
-									</div>
-								</td>
-							</tr>
-							{{if !empty($v['items'])}}
-								{{foreach $v.items as $vs}}
-									<tr id="data-list-{{$vs.id}}" {{if $vs['is_show'] eq 0}}class="am-active"{{/if}}>
-										<td class="p-l-30">{{$vs.name}}
-											<a href="{{$vs.url}}" target="_blank">
-												<i class="am-icon-external-link"></i>
-											</a>
-										</td>
-										<td class="am-text-middle">{{:lang('common_nav_type_list')[$vs['data_type']]}}</td>
-										<td class="am-text-middle am-text-center">
-											<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $vs['is_show'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/navigation/statusupdate')}}" data-id="{{$vs.id}}" data-state="{{$vs['is_show']}}" data-is-update-status="1"></a>
-										</td>
-										<td class="am-operate-grid" data-width="170">
-                                    		<div class="am-scrollable-vertical">
-												<button class="am-btn am-btn-secondary am-btn-xs am-radius submit-edit" data-am-modal="{target: '#nav-{{$vs.data_type}}-save-win'}" data-json='{{:json_encode($vs)}}' data-tag="nav-{{$vs.data_type}}-save-win">
-													<i class="am-icon-edit"></i>
-													<span>编辑</span>
-												</button>
-												<button class="am-btn am-btn-danger am-btn-xs am-radius submit-delete" data-url="{{:MyUrl('admin/navigation/delete')}}" data-id="{{$vs.id}}">
-													<i class="am-icon-trash-o"></i>
-													<span>删除</span>
-												</button>
-											</div>
-										</td>
-									</tr>
-								{{/foreach}}
-							{{/if}}
-						{{/foreach}}
-					{{/if}}
-				</tbody>
-			</table>
-			{{if empty($data_list)}}
-                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
-            {{/if}}
-		</div>
-		<!-- list end -->
-
-		<!-- custom save win start -->
-		<div class="am-popup am-radius" id="nav-custom-save-win">
-			<div class="am-popup-inner">
-				<div class="am-popup-hd">
-					<h4 class="am-popup-title" data-add-title="自定义导航添加" data-edit-title="自定义导航编辑">自定义导航添加</h4>
-					<span data-am-modal-close class="am-close">&times;</span>
-				</div>
-				<div class="am-popup-bd">
-					<!-- form start -->
-					<form class="am-form form-validation" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
-						<div class="am-form-group">
-							<label>导航级别</label>
-							<select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
-								<option value="">一级栏目...</option>
-								{{foreach $nav_header_pid_list as $v}}
-									<option value="{{$v.id}}">{{$v.name}}</option>
-								{{/foreach}}
-							</select>
-						</div>
-						<div class="am-form-group">
-							<label>导航名称</label>
-							<input type="text" placeholder="导航名称" name="name" minlength="2" maxlength="16" data-validation-message="导航名称格式 2~16 个字符" class="am-radius" required />
-						</div>
-						<div class="am-form-group">
-							<label>url地址<span class="am-form-group-label-tips">带http://或https://</span></label>
-							<input type="url" placeholder="url地址" name="url"  data-validation-message="url格式有误" class="am-radius" required />
-						</div>
-						<div class="am-form-group">
-							<label>顺序</label>
-							<input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
-						</div>
-						{{include file="lib/is_show" /}}
-						{{include file="lib/is_new_window_open" /}}
-						<div class="am-form-group am-form-group-refreshing">
-							<input type="hidden" name="id" />
-							<input type="hidden" name="data_type" value="custom" />
-							<input type="hidden" name="nav_type" value="{{$nav_type}}" />
-							<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
-						</div>
-					</form>
-					<!-- form end -->
-				</div>
-			</div>
-		</div>
-		<!-- custom save win end -->
-
-		<!-- article save win start -->
-		<div class="am-popup am-radius" id="nav-article-save-win">
-			<div class="am-popup-inner">
-				<div class="am-popup-hd">
-					<h4 class="am-popup-title" data-add-title="文章导航添加" data-edit-title="文章导航编辑">文章导航添加</h4>
-					<span data-am-modal-close class="am-close">&times;</span>
-				</div>
-				<div class="am-popup-bd">
-					<!-- form start -->
-					<form class="am-form form-validation-article" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
-						<div class="am-form-group">
-							<label>导航级别</label>
-							<select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
-								<option value="">一级栏目...</option>
-								{{foreach $nav_header_pid_list as $v}}
-									<option value="{{$v.id}}">{{$v.name}}</option>
-								{{/foreach}}
-							</select>
-						</div>
-						<div class="am-form-group">
-							<label>文章</label>
-							<select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="文章选择有误" required>
-								<option value="">请选择...</option>
-								{{foreach $article_list as $v}}
-									<optgroup label="{{$v.name}}">
-										{{if !empty($v['items'])}}
-											{{foreach $v.items as $vs}}
-												<option value="{{$vs.id}}">{{$vs.title}}</option>
-											{{/foreach}}
-										{{/if}}
-									</optgroup>
-								{{/foreach}}
-							</select>
-						</div>
-						<div class="am-form-group">
-							<label>导航名称<span class="am-form-group-label-tips">默认文章名称</span></label>
-							<input type="text" placeholder="导航名称" name="name" maxlength="16" data-validation-message="导航名称格式 2~16 个字符" class="am-radius" />
-						</div>
-						<div class="am-form-group">
-							<label>顺序</label>
-							<input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
-						</div>
-						{{include file="lib/is_show" /}}
-						{{include file="lib/is_new_window_open" /}}
-						<div class="am-form-group am-form-group-refreshing">
-							<input type="hidden" name="id" />
-							<input type="hidden" name="data_type" value="article" />
-							<input type="hidden" name="nav_type" value="{{$nav_type}}" />
-							<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
-						</div>
-					</form>
-					<!-- form end -->
-				</div>
-			</div>
-		</div>
-		<!-- article save win end -->
-
-		<!-- customview save win start -->
-		<div class="am-popup am-radius" id="nav-customview-save-win">
-			<div class="am-popup-inner">
-				<div class="am-popup-hd">
-					<h4 class="am-popup-title" data-add-title="自定义页面导航添加" data-edit-title="自定义页面导航编辑">自定义页面导航添加</h4>
-					<span data-am-modal-close
-					class="am-close">&times;</span>
-					</div>
-				<div class="am-popup-bd">
-					<!-- form start -->
-					<form class="am-form form-validation-customview" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
-						<div class="am-form-group">
-							<label>导航级别</label>
-							<select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
-								<option value="">一级栏目...</option>
-								{{foreach $nav_header_pid_list as $v}}
-									<option value="{{$v.id}}">{{$v.name}}</option>
-								{{/foreach}}
-							</select>
-						</div>
-						<div class="am-form-group">
-							<label>自定义页面</label>
-							<select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="自定义页面选择有误" required>
-								<option value="">请选择...</option>
-								{{foreach $customview_list as $v}}
-									<option value="{{$v.id}}">{{$v.title}}</option>
-								{{/foreach}}
-							</select>
-						</div>
-						<div class="am-form-group">
-							<label>导航名称<span class="am-form-group-label-tips">默认自定义页面名称</span></label>
-							<input type="text" placeholder="导航名称" name="name" maxlength="16" data-validation-message="导航名称格式 2~16 个字符" class="am-radius" />
-						</div>
-						<div class="am-form-group">
-							<label>顺序</label>
-							<input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
-						</div>
-						{{include file="lib/is_show" /}}
-						{{include file="lib/is_new_window_open" /}}
-						<div class="am-form-group am-form-group-refreshing">
-							<input type="hidden" name="id" />
-							<input type="hidden" name="data_type" value="customview" />
-							<input type="hidden" name="nav_type" value="{{$nav_type}}" />
-							<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
-						</div>
-					</form>
-					<!-- form end -->
-				</div>
-			</div>
-		</div>
-		<!-- customview save win end -->
-
-		<!-- goods_category save win start -->
-		<div class="am-popup am-radius" id="nav-goods_category-save-win">
-			<div class="am-popup-inner">
-				<div class="am-popup-hd">
-					<h4 class="am-popup-title" data-add-title="商品分类导航添加" data-edit-title="商品分类导航编辑">商品分类导航添加</h4>
-					<span data-am-modal-close class="am-close">&times;</span>
-				</div>
-				<div class="am-popup-bd">
-					<!-- form start -->
-					<form class="am-form form-validation-goods_category" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
-						<div class="am-form-group">
-							<label>导航级别</label>
-							<select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
-								<option value="">一级栏目...</option>
-								{{foreach $nav_header_pid_list as $v}}
-									<option value="{{$v.id}}">{{$v.name}}</option>
-								{{/foreach}}
-							</select>
-						</div>
-						<div class="am-form-group">
-							<label>商品分类</label>
-							<select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="商品分类选择有误" required>
-								<option value="">请选择...</option>
-								{{foreach $goods_category_list as $v}}
-									<option value="{{$v.id}}" {{if !empty($data['category_ids']) and in_array($v['id'], $data['category_ids'])}}selected{{/if}}>一级 - {{$v.name}}</option>
-									{{if !empty($v['items'])}}
-										{{foreach $v.items as $vs}}
-											<option style="padding-left: 30px;" value="{{$vs.id}}" {{if !empty($data['category_ids']) and in_array($vs['id'], $data['category_ids'])}}selected{{/if}}>二级 - {{$vs.name}}</option>
-											{{if !empty($vs['items'])}}
-												{{foreach $vs.items as $vss}}
-													<option style="padding-left: 60px;" value="{{$vss.id}}" {{if !empty($data['category_ids']) and in_array($vss['id'], $data['category_ids'])}}selected{{/if}}>三级 - {{$vss.name}}</option>
-												{{/foreach}}
-											{{/if}}
-										{{/foreach}}
-									{{/if}}
-								{{/foreach}}
-							</select>
-						</div>
-						<div class="am-form-group">
-							<label>导航名称<span class="am-form-group-label-tips">默认商品分类名称</span></label>
-							<input type="text" placeholder="导航名称" name="name" maxlength="16" data-validation-message="导航名称格式 2~16 个字符" class="am-radius" />
-						</div>
-						<div class="am-form-group">
-							<label>顺序</label>
-							<input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
-						</div>
-						{{include file="lib/is_show" /}}
-						{{include file="lib/is_new_window_open" /}}
-						<div class="am-form-group am-form-group-refreshing">
-							<input type="hidden" name="id" />
-							<input type="hidden" name="data_type" value="goods_category" />
-							<input type="hidden" name="nav_type" value="{{$nav_type}}" />
-							<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
-						</div>
-					</form>
-					<!-- form end -->
-				</div>
-			</div>
-		</div>
-		<!-- goods_category save win end -->
+<!-- 表单顶部操作栏 -->
+{{block name="form_operate_top"}}
+	<div class="am-dropdown am-margin-right-sm" data-am-dropdown>
+		<button class="am-btn am-btn-secondary am-radius am-btn-xs am-dropdown-toggle" data-am-dropdown-toggle>新增 <span class="am-icon-caret-down"></span></button>
+		<ul class="am-dropdown-content">
+			<li>
+				<button type="button" class="am-btn am-btn-link am-btn-xs am-btn-block am-text-left am-padding-horizontal-sm am-icon-plus submit-add" data-am-modal="{target: '#nav-custom-save-win'}" data-tag="nav-custom-save-win"> 自定义</button>
+			</li>
+			<li>
+			    <button type="button" class="am-btn am-btn-link am-btn-xs am-btn-block am-text-left am-padding-horizontal-sm am-icon-plus submit-add" data-am-modal="{target: '#nav-article-save-win'}" data-tag="nav-article-save-win"> 文章</button>
+			   </li>
+			<li>
+			    <button type="button" class="am-btn am-btn-link am-btn-xs am-btn-block am-text-left am-padding-horizontal-sm am-icon-plus submit-add" data-am-modal="{target: '#nav-customview-save-win'}" data-tag="nav-customview-save-win"> 自定义页面</button>
+			   </li>
+			<li>
+			    <button type="button" class="am-btn am-btn-link am-btn-xs am-btn-block am-text-left am-padding-horizontal-sm am-icon-plus submit-add" data-am-modal="{target: '#nav-goods_category-save-win'}" data-tag="nav-goods_category-save-win"> 商品分类</button>
+			</li>
+		</ul>
 	</div>
-</div>
-<!-- right content end  -->
 
-<!-- footer start -->
-{{include file="public/footer" /}}
-<!-- footer end -->
\ No newline at end of file
+    <!-- 父级内容 -->
+    {__block__}
+{{/block}}
+
+<!-- 扩展 -->
+{{block name="form_extend"}}
+    <!-- custom save win start -->
+    <div class="am-popup am-radius" id="nav-custom-save-win">
+        <div class="am-popup-inner">
+            <div class="am-popup-hd">
+                <h4 class="am-popup-title" data-add-title="自定义导航添加" data-edit-title="自定义导航编辑">自定义导航添加</h4>
+                <span data-am-modal-close class="am-close">&times;</span>
+            </div>
+            <div class="am-popup-bd">
+                <!-- form start -->
+                <form class="am-form form-validation" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
+                    <div class="am-form-group">
+                        <label>导航级别</label>
+                        <select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
+                            <option value="">一级栏目...</option>
+                            {{foreach $nav_header_pid_list as $v}}
+                                <option value="{{$v.id}}">{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>导航名称</label>
+                        <input type="text" placeholder="导航名称" name="name" minlength="2" maxlength="16" data-validation-message="导航名称格式 2~16 个字符" class="am-radius" required />
+                    </div>
+                    <div class="am-form-group">
+                        <label>url地址<span class="am-form-group-label-tips">带http://或https://</span></label>
+                        <input type="url" placeholder="url地址" name="url"  data-validation-message="url格式有误" class="am-radius" required />
+                    </div>
+                    <div class="am-form-group">
+                        <label>顺序</label>
+                        <input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
+                    </div>
+                    {{include file="lib/is_show" /}}
+                    {{include file="lib/is_new_window_open" /}}
+                    <div class="am-form-group am-form-group-refreshing">
+                        <input type="hidden" name="id" />
+                        <input type="hidden" name="data_type" value="custom" />
+                        <input type="hidden" name="nav_type" value="{{$nav_type}}" />
+                        <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
+                    </div>
+                </form>
+                <!-- form end -->
+            </div>
+        </div>
+    </div>
+    <!-- custom save win end -->
+
+    <!-- article save win start -->
+    <div class="am-popup am-radius" id="nav-article-save-win">
+        <div class="am-popup-inner">
+            <div class="am-popup-hd">
+                <h4 class="am-popup-title" data-add-title="文章导航添加" data-edit-title="文章导航编辑">文章导航添加</h4>
+                <span data-am-modal-close class="am-close">&times;</span>
+            </div>
+            <div class="am-popup-bd">
+                <!-- form start -->
+                <form class="am-form form-validation-article" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
+                    <div class="am-form-group">
+                        <label>导航级别</label>
+                        <select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
+                            <option value="">一级栏目...</option>
+                            {{foreach $nav_header_pid_list as $v}}
+                                <option value="{{$v.id}}">{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>文章</label>
+                        <select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="文章选择有误" required>
+                            <option value="">请选择...</option>
+                            {{foreach $article_list as $v}}
+                                <optgroup label="{{$v.name}}">
+                                    {{if !empty($v['items'])}}
+                                        {{foreach $v.items as $vs}}
+                                            <option value="{{$vs.id}}">{{$vs.title}}</option>
+                                        {{/foreach}}
+                                    {{/if}}
+                                </optgroup>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>导航名称<span class="am-form-group-label-tips">默认文章名称</span></label>
+                        <input type="text" placeholder="导航名称" name="name" maxlength="16" data-validation-message="导航名称格式 2~16 个字符" class="am-radius" />
+                    </div>
+                    <div class="am-form-group">
+                        <label>顺序</label>
+                        <input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
+                    </div>
+                    {{include file="lib/is_show" /}}
+                    {{include file="lib/is_new_window_open" /}}
+                    <div class="am-form-group am-form-group-refreshing">
+                        <input type="hidden" name="id" />
+                        <input type="hidden" name="data_type" value="article" />
+                        <input type="hidden" name="nav_type" value="{{$nav_type}}" />
+                        <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
+                    </div>
+                </form>
+                <!-- form end -->
+            </div>
+        </div>
+    </div>
+    <!-- article save win end -->
+
+    <!-- customview save win start -->
+    <div class="am-popup am-radius" id="nav-customview-save-win">
+        <div class="am-popup-inner">
+            <div class="am-popup-hd">
+                <h4 class="am-popup-title" data-add-title="自定义页面导航添加" data-edit-title="自定义页面导航编辑">自定义页面导航添加</h4>
+                <span data-am-modal-close
+                class="am-close">&times;</span>
+                </div>
+            <div class="am-popup-bd">
+                <!-- form start -->
+                <form class="am-form form-validation-customview" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
+                    <div class="am-form-group">
+                        <label>导航级别</label>
+                        <select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
+                            <option value="">一级栏目...</option>
+                            {{foreach $nav_header_pid_list as $v}}
+                                <option value="{{$v.id}}">{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>自定义页面</label>
+                        <select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="自定义页面选择有误" required>
+                            <option value="">请选择...</option>
+                            {{foreach $customview_list as $v}}
+                                <option value="{{$v.id}}">{{$v.title}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>导航名称<span class="am-form-group-label-tips">默认自定义页面名称</span></label>
+                        <input type="text" placeholder="导航名称" name="name" maxlength="16" data-validation-message="导航名称格式 2~16 个字符" class="am-radius" />
+                    </div>
+                    <div class="am-form-group">
+                        <label>顺序</label>
+                        <input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
+                    </div>
+                    {{include file="lib/is_show" /}}
+                    {{include file="lib/is_new_window_open" /}}
+                    <div class="am-form-group am-form-group-refreshing">
+                        <input type="hidden" name="id" />
+                        <input type="hidden" name="data_type" value="customview" />
+                        <input type="hidden" name="nav_type" value="{{$nav_type}}" />
+                        <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
+                    </div>
+                </form>
+                <!-- form end -->
+            </div>
+        </div>
+    </div>
+    <!-- customview save win end -->
+
+    <!-- goods_category save win start -->
+    <div class="am-popup am-radius" id="nav-goods_category-save-win">
+        <div class="am-popup-inner">
+            <div class="am-popup-hd">
+                <h4 class="am-popup-title" data-add-title="商品分类导航添加" data-edit-title="商品分类导航编辑">商品分类导航添加</h4>
+                <span data-am-modal-close class="am-close">&times;</span>
+            </div>
+            <div class="am-popup-bd">
+                <!-- form start -->
+                <form class="am-form form-validation-goods_category" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
+                    <div class="am-form-group">
+                        <label>导航级别</label>
+                        <select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
+                            <option value="">一级栏目...</option>
+                            {{foreach $nav_header_pid_list as $v}}
+                                <option value="{{$v.id}}">{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>商品分类</label>
+                        <select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="商品分类选择有误" required>
+                            <option value="">请选择...</option>
+                            {{foreach $goods_category_list as $v}}
+                                <option value="{{$v.id}}" {{if !empty($data['category_ids']) and in_array($v['id'], $data['category_ids'])}}selected{{/if}}>一级 - {{$v.name}}</option>
+                                {{if !empty($v['items'])}}
+                                    {{foreach $v.items as $vs}}
+                                        <option style="padding-left: 30px;" value="{{$vs.id}}" {{if !empty($data['category_ids']) and in_array($vs['id'], $data['category_ids'])}}selected{{/if}}>二级 - {{$vs.name}}</option>
+                                        {{if !empty($vs['items'])}}
+                                            {{foreach $vs.items as $vss}}
+                                                <option style="padding-left: 60px;" value="{{$vss.id}}" {{if !empty($data['category_ids']) and in_array($vss['id'], $data['category_ids'])}}selected{{/if}}>三级 - {{$vss.name}}</option>
+                                            {{/foreach}}
+                                        {{/if}}
+                                    {{/foreach}}
+                                {{/if}}
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>导航名称<span class="am-form-group-label-tips">默认商品分类名称</span></label>
+                        <input type="text" placeholder="导航名称" name="name" maxlength="16" data-validation-message="导航名称格式 2~16 个字符" class="am-radius" />
+                    </div>
+                    <div class="am-form-group">
+                        <label>顺序</label>
+                        <input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
+                    </div>
+                    {{include file="lib/is_show" /}}
+                    {{include file="lib/is_new_window_open" /}}
+                    <div class="am-form-group am-form-group-refreshing">
+                        <input type="hidden" name="id" />
+                        <input type="hidden" name="data_type" value="goods_category" />
+                        <input type="hidden" name="nav_type" value="{{$nav_type}}" />
+                        <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
+                    </div>
+                </form>
+                <!-- form end -->
+            </div>
+        </div>
+    </div>
+    <!-- goods_category save win end -->
+{{/block}}
\ No newline at end of file
diff --git a/application/admin/view/default/navigation/module/info.html b/application/admin/view/default/navigation/module/info.html
new file mode 100644
index 000000000..f706181f7
--- /dev/null
+++ b/application/admin/view/default/navigation/module/info.html
@@ -0,0 +1,9 @@
+<!-- 商品基础信息 -->
+{{if !empty($module_data)}}
+    <div {{if $module_data['pid'] gt 0}}class="am-padding-left-lg am-margin-left-lg"{{/if}} title="{{$module_data.name}}">
+        <span>{{$module_data.name}}</span>
+        <a href="{{$module_data.url}}" target="_blank">
+            <i class="am-icon-external-link"></i>
+        </a>
+    </div>
+{{/if}}
\ No newline at end of file
diff --git a/application/admin/view/default/navigation/module/operate.html b/application/admin/view/default/navigation/module/operate.html
new file mode 100644
index 000000000..4b3718bcd
--- /dev/null
+++ b/application/admin/view/default/navigation/module/operate.html
@@ -0,0 +1,9 @@
+<!-- 操作栏 -->
+<button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-edit" data-am-modal="{target: '#nav-{{$module_data.data_type}}-save-win'}" data-json='{{:json_encode($module_data)}}' data-tag="nav-{{$module_data.data_type}}-save-win">
+    <i class="am-icon-edit"></i>
+    <span>编辑</span>
+</button>
+<button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-delete" data-url="{{:MyUrl('admin/navigation/delete')}}" data-id="{{$module_data.id}}" data-key="ids">
+    <i class="am-icon-trash-o"></i>
+    <span>删除</span>
+</button>
\ No newline at end of file
diff --git a/application/admin/view/default/orderaftersale/module/voucher.html b/application/admin/view/default/orderaftersale/module/voucher.html
index 1c31a2445..96a9ec005 100644
--- a/application/admin/view/default/orderaftersale/module/voucher.html
+++ b/application/admin/view/default/orderaftersale/module/voucher.html
@@ -1,12 +1,19 @@
 <!-- 凭证 -->
 {{if !empty($module_data) and !empty($module_data['images'])}}
-    <div data-am-widget="slider" class="am-slider am-slider-a1" data-am-slider='{&quot;directionNav&quot;:false, slideshow:false}' >
+    <div data-am-widget="slider" class="am-slider am-slider-default" data-am-slider='{"controlNav":false}'>
         <ul class="am-slides">
-            {{foreach $module_data.images as $img}}
+            {{foreach $module_data.images as $ik=>$iv}}
                 <li>
-                    <a href="{{$img}}" target="_blank">
-                        <img src="{{$img}}" />
+                    <a href="{{$iv}}" target="_blank">
+                        <img src="{{$iv}}" />
                     </a>
+                    <div class="am-slider-desc">
+                        <div class="am-slider-counter">
+                            <strong class="am-text-lg">{{$ik+1}}</strong>
+                            <span class="am-margin-right-sm">/{{:count($module_data['images'])}}</span>
+                            <span>{{$iv}}</span>
+                        </div>
+                    </div>
                 </li>
             {{/foreach}}
         </ul>
diff --git a/application/admin/view/default/public/module/form.html b/application/admin/view/default/public/module/form.html
index 9e513ff3b..f3c53f434 100644
--- a/application/admin/view/default/public/module/form.html
+++ b/application/admin/view/default/public/module/form.html
@@ -46,6 +46,12 @@
         <!-- form -->
         {{if !empty($form_table) and !empty($form_table['base']) and !empty($form_table['form']) and is_array($form_table['base']) and is_array($form_table['form'])}}
             <form class="form-validation-search" method="post" action="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}" request-type="jump" request-value="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}">
+                <!-- nav start -->
+                <div class="am-g form-table-navigation">
+                    {{block name="form_navigation"}}{{/block}}
+                </div>
+                <!-- nav end -->
+
                 <!-- top operate start -->
                 <div class="am-g form-table-operate-top">
                     {{block name="form_operate_top"}}
@@ -391,7 +397,7 @@
 
         <!-- page start -->
         {{block name="form_page"}}
-            {{if !empty($data_list)}}
+            {{if !empty($data_list) and isset($page_html)}}
                 {{$page_html|raw}}
             {{/if}}
         {{/block}}
diff --git a/application/index/controller/Article.php b/application/index/controller/Article.php
index 2c94b72a9..b803bb815 100755
--- a/application/index/controller/Article.php
+++ b/application/index/controller/Article.php
@@ -45,47 +45,58 @@ class Article extends Common
 	public function Index()
 	{
 		// 获取文章
-		$id = input('id');
+		if(empty($this->data_request['id']))
+        {
+            $this->assign('msg', '文章ID有误');
+            return $this->fetch('public/tips_error');
+        }
+
+        // 获取数据
+        $id = intval($this->data_request['id']);
 		$params = [
-			'where' => ['a.is_enable'=>1, 'a.id'=>$id],
-			'field' => 'a.id,a.title,a.title_color,a.jump_url,a.content,a.access_count,a.article_category_id,seo_title,seo_keywords,seo_desc,a.add_time',
-			'm' => 0,
-			'n' => 1,
+			'where'  => [
+                'is_enable' => 1,
+                'id'        => $id,
+            ],
+			'field'  => 'id,title,title_color,jump_url,content,access_count,article_category_id,seo_title,seo_keywords,seo_desc,add_time',
+			'm'      => 0,
+			'n'      => 1,
 		];
-		$article = ArticleService::ArticleList($params);
-		if(!empty($article['data'][0]))
+		$ret = ArticleService::ArticleList($params);
+		if(!empty($ret['data'][0]))
 		{
 			// 访问统计
 			ArticleService::ArticleAccessCountInc(['id'=>$id]);
 
 			// 是否外部链接
-			if(!empty($article['data'][0]['jump_url']))
+			if(!empty($ret['data'][0]['jump_url']))
 			{
-				return redirect($article['data'][0]['jump_url']);
+				return redirect($ret['data'][0]['jump_url']);
 			}
 
-			// 获取分类和文字
+			// 获取分类
 			$article_category_content = ArticleService::ArticleCategoryListContent();
             $this->assign('category_list', $article_category_content['data']);
 
             // seo
-            $seo_title = empty($article['data'][0]['seo_title']) ? $article['data'][0]['title'] : $article['data'][0]['seo_title'];
+            $seo_title = empty($ret['data'][0]['seo_title']) ? $ret['data'][0]['title'] : $ret['data'][0]['seo_title'];
             $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($seo_title, 2));
-            if(!empty($article['data'][0]['seo_keywords']))
+            if(!empty($ret['data'][0]['seo_keywords']))
             {
-                $this->assign('home_seo_site_keywords', $article['data'][0]['seo_keywords']);
+                $this->assign('home_seo_site_keywords', $ret['data'][0]['seo_keywords']);
             }
-            if(!empty($article['data'][0]['seo_desc']))
+            if(!empty($ret['data'][0]['seo_desc']))
             {
-                $this->assign('home_seo_site_description', $article['data'][0]['seo_desc']);
+                $this->assign('home_seo_site_description', $ret['data'][0]['seo_desc']);
             }
 
-			$this->assign('article', $article['data'][0]);
+			$this->assign('article', $ret['data'][0]);
 			return $this->fetch();
-		} else {
-			$this->assign('msg', '文章不存在或已删除');
-			return $this->fetch('public/tips_error');
 		}
+
+        // 无数据
+		$this->assign('msg', '文章不存在或已删除');
+		return $this->fetch('public/tips_error');
 	}
 }
 ?>
\ No newline at end of file
diff --git a/application/index/view/default/article/index.html b/application/index/view/default/article/index.html
index 92d87114a..42cb32310 100755
--- a/application/index/view/default/article/index.html
+++ b/application/index/view/default/article/index.html
@@ -19,7 +19,7 @@
 		<div class="am-u-sm-12 article-header">
 			<h1 class="am-article-title">{{$article.title}}</h1>
 			<p class="am-article-meta">
-				<span>发布时间：{{$article.add_time_time}}</span>
+				<span>发布时间：{{$article.add_time}}</span>
 				<span>浏览次数：{{$article.access_count}}</span>
 			</p>
 			<hr class="am-article-divider" />
diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php
index da1236527..33b159dc3 100755
--- a/application/lang/zh-cn.php
+++ b/application/lang/zh-cn.php
@@ -205,14 +205,6 @@ return array(
             1 => array('id' => 1, 'name' => '是'),
         ),
 
-    // 导航数据类型
-    'common_nav_type_list'              =>  array(
-            'custom'            =>  '自定义',
-            'article'           =>  '文章',
-            'customview'        =>  '自定义页面',
-            'goods_category'    =>  '商品分类',
-        ),
-
     // 是否含头部
     'common_is_header_list'         =>  array(
             0 => array('id' => 0, 'name' => '否'),
@@ -239,6 +231,14 @@ return array(
             1 => array('value' => 1, 'name' => '已评价'),
         ),
 
+    // 导航数据类型
+    'common_nav_type_list'              =>  array(
+            'custom' => array('value'=>'custom', 'name'=>'自定义'),
+            'article' => array('value'=>'article', 'name'=>'文章'),
+            'customview' => array('value'=>'customview', 'name'=>'自定义页面'),
+            'goods_category' => array('value'=>'goods_category', 'name'=>'商品分类'),
+        ),
+
     // 搜索框下热门关键字类型
     'common_search_keywords_type_list'      =>  array(
             0 => array('value' => 0, 'name' => '关闭'),
diff --git a/application/service/AdminRoleService.php b/application/service/AdminRoleService.php
index 3ccccef03..de371e134 100644
--- a/application/service/AdminRoleService.php
+++ b/application/service/AdminRoleService.php
@@ -43,15 +43,29 @@ class AdminRoleService
         $data = Db::name('Role')->field($field)->where($where)->order($order_by)->limit($m, $n)->select();
         if(!empty($data))
         {
+            // 获取对应权限数据
+            $powers = [];
+            $ids = array_column($data, 'id');
+            $powers_data = Db::name('Role')->alias('r')->join(['__ROLE_POWER__'=>'rp'], 'rp.role_id = r.id')->join(['__POWER__'=>'p'], 'rp.power_id = p.id')->where(['r.id'=>$ids])->field('rp.role_id, rp.power_id, p.name')->select();
+            if(!empty($powers_data))
+            {
+                foreach($powers_data as $p)
+                {
+                    $powers[$p['role_id']][] = $p['name'];
+                }
+            }
+            // 是否存在超级管理角色组
+            // 超级管理员数据库中并没存储关联关系，所以这里直接读取全部权限菜单
+            if(in_array(1, $ids))
+            {
+                $powers[1] = Db::name('Power')->column('name');
+            }
+            
+            // 循环处理数据
             foreach($data as &$v)
             {
-                // 关联查询权限和角色数据
-                if($v['id'] == 1)
-                {
-                    $v['items'] = Db::name('Power')->column('name');
-                } else {
-                    $v['items'] = Db::name('Role')->alias('r')->join(['__ROLE_POWER__'=>'rp'], 'rp.role_id = r.id')->join(['__POWER__'=>'p'], 'rp.power_id = p.id')->where(array('r.id'=>$v['id']))->column('p.name');
-                }
+                // 对应权限数据
+                $v['items'] = array_key_exists($v['id'], $powers) ? $powers[$v['id']] : [];
 
                 // 时间
                 $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
diff --git a/application/service/ArticleService.php b/application/service/ArticleService.php
index 2af00f6d9..8c5c1b313 100755
--- a/application/service/ArticleService.php
+++ b/application/service/ArticleService.php
@@ -35,13 +35,14 @@ class ArticleService
     public static function ArticleList($params)
     {
         $where = empty($params['where']) ? [] : $params['where'];
-        $field = empty($params['field']) ? 'a.*' : $params['field'];
+        $field = empty($params['field']) ? '*' : $params['field'];
         $m = isset($params['m']) ? intval($params['m']) : 0;
         $n = isset($params['n']) ? intval($params['n']) : 10;
 
-        $data = Db::name('Article')->alias('a')->join(['__ARTICLE_CATEGORY__'=>'ac'], 'a.article_category_id=ac.id')->field($field)->where($where)->order('a.id desc')->limit($m, $n)->select();
+        $data = Db::name('Article')->field($field)->where($where)->order('id desc')->limit($m, $n)->select();
         if(!empty($data))
         {
+            $names = Db::name('ArticleCategory')->where(['id'=>array_column($data, 'article_category_id')])->column('name', 'id');
             $common_is_enable_tips = lang('common_is_enable_tips');
             foreach($data as &$v)
             {
@@ -51,13 +52,7 @@ class ArticleService
                 // 分类名称
                 if(isset($v['article_category_id']))
                 {
-                    $v['article_category_name'] = Db::name('ArticleCategory')->where(['id'=>$v['article_category_id']])->value('name');
-                }
-
-                // 是否启用
-                if(isset($v['is_enable']))
-                {
-                    $v['is_enable_text'] = $common_is_enable_tips[$v['is_enable']]['name'];
+                    $v['article_category_name'] = isset($names[$v['article_category_id']]) ? $names[$v['article_category_id']] : '';
                 }
 
                 // 内容
@@ -80,15 +75,14 @@ class ArticleService
                     }
                 }
 
+                // 时间
                 if(isset($v['add_time']))
                 {
-                    $v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']);
-                    $v['add_time_date'] = date('Y-m-d', $v['add_time']);
+                    $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
                 }
                 if(isset($v['upd_time']))
                 {
-                    $v['upd_time_time'] = date('Y-m-d H:i:s', $v['upd_time']);
-                    $v['upd_time_date'] = date('Y-m-d', $v['upd_time']);
+                    $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']);
                 }
             }
         }
@@ -105,59 +99,7 @@ class ArticleService
      */
     public static function ArticleTotal($where)
     {
-        return (int) Db::name('Article')->alias('a')->join(['__ARTICLE_CATEGORY__'=>'ac'], 'a.article_category_id=ac.id')->where($where)->count();
-    }
-
-    /**
-     * 列表条件
-     * @author   Devil
-     * @blog    http://gong.gg/
-     * @version 1.0.0
-     * @date    2018-09-29
-     * @desc    description
-     * @param   [array]          $params [输入参数]
-     */
-    public static function ArticleListWhere($params = [])
-    {
-        $where = [];
-
-        if(!empty($params['keywords']))
-        {
-            $where[] = ['a.title', 'like', '%'.$params['keywords'].'%'];
-        }
-
-        // 是否更多条件
-        if(isset($params['is_more']) && $params['is_more'] == 1)
-        {
-            // 等值
-            if(isset($params['is_enable']) && $params['is_enable'] > -1)
-            {
-                $where[] = ['a.is_enable', '=', intval($params['is_enable'])];
-            }
-            if(isset($params['article_category_id']) && $params['article_category_id'] > -1)
-            {
-                $where[] = ['a.article_category_id', '=', intval($params['article_category_id'])];
-            }
-            if(isset($params['is_home_recommended']) && $params['is_home_recommended'] > -1)
-            {
-                $where[] = ['a.is_home_recommended', '=', intval($params['is_home_recommended'])];
-            }
-            if(isset($params['access_count']) && $params['access_count'] > -1)
-            {
-                $where[] = ['a.access_count', '>', intval($params['access_count'])];
-            }
-
-            if(!empty($params['time_start']))
-            {
-                $where[] = ['a.add_time', '>', strtotime($params['time_start'])];
-            }
-            if(!empty($params['time_end']))
-            {
-                $where[] = ['a.add_time', '<', strtotime($params['time_end'])];
-            }
-        }
-
-        return $where;
+        return (int) Db::name('Article')->where($where)->count();
     }
 
     /**
@@ -229,7 +171,7 @@ class ArticleService
         $content = isset($params['content']) ? htmlspecialchars_decode($params['content']) : '';
 
         // 数据
-        $images = self::MatchContentImage($content);
+        $images = ResourcesService::RichTextMatchContentImage($content, 'article');
         $data = [
             'title'                 => $params['title'],
             'title_color'           => empty($params['title_color']) ? '' : $params['title_color'],
@@ -277,26 +219,6 @@ class ArticleService
         }
     }
 
-    /**
-     * 正则匹配文章图片
-     * @author   Devil
-     * @blog     http://gong.gg/
-     * @version  0.0.1
-     * @datetime 2017-01-22T18:06:53+0800
-     * @param    [string]         $content [文章内容]
-     * @return   [array]                   [文章图片数组（一维）]
-     */
-    private static function MatchContentImage($content)
-    {
-        if(!empty($content))
-        {
-            $pattern = '/<img.*?src=[\'|\"](\/static\/upload\/article\/image\/.*?[\.gif|\.jpg|\.jpeg|\.png|\.bmp])[\'|\"].*?[\/]?>/';
-            preg_match_all($pattern, $content, $match);
-            return empty($match[1]) ? [] : $match[1];
-        }
-        return array();
-    }
-
     /**
      * 获取分类和所有文章
      * @author   Devil
@@ -376,27 +298,24 @@ class ArticleService
      */
     public static function ArticleDelete($params = [])
     {
-        // 请求参数
-        $p = [
-            [
-                'checked_type'      => 'empty',
-                'key_name'          => 'id',
-                'error_msg'         => '操作id有误',
-            ],
-        ];
-        $ret = ParamsChecked($params, $p);
-        if($ret !== true)
+        // 参数是否有误
+        if(empty($params['ids']))
         {
-            return DataReturn($ret, -1);
+            return DataReturn('商品id有误', -1);
+        }
+        // 是否数组
+        if(!is_array($params['ids']))
+        {
+            $params['ids'] = explode(',', $params['ids']);
         }
 
         // 删除操作
-        if(Db::name('Article')->where(['id'=>$params['id']])->delete())
+        if(Db::name('Article')->where(['id'=>$params['ids']])->delete())
         {
             return DataReturn('删除成功');
         }
 
-        return DataReturn('删除失败或资源不存在', -100);
+        return DataReturn('删除失败', -100);
     }
 
     /**
@@ -435,11 +354,11 @@ class ArticleService
         }
 
         // 数据更新
-        if(Db::name('Article')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state'])]))
+        if(Db::name('Article')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()]))
         {
             return DataReturn('编辑成功');
         }
-        return DataReturn('编辑失败或数据未改变', -100);
+        return DataReturn('编辑失败', -100);
     }
 
     /**
diff --git a/application/service/CustomViewService.php b/application/service/CustomViewService.php
index ee4c92c67..d7da17c17 100755
--- a/application/service/CustomViewService.php
+++ b/application/service/CustomViewService.php
@@ -34,7 +34,7 @@ class CustomViewService
     public static function CustomViewList($params = [])
     {
         $where = empty($params['where']) ? [] : $params['where'];
-        $field = empty($params['field']) ? 'id,title,content,is_header,is_footer,is_full_screen,access_count,is_enable' : $params['field'];
+        $field = empty($params['field']) ? '*' : $params['field'];
         $m = isset($params['m']) ? intval($params['m']) : 0;
         $n = isset($params['n']) ? intval($params['n']) : 10;
 
@@ -57,29 +57,24 @@ class CustomViewService
                 }
 
                 // 图片
-                if(isset($v['images']))
+                if(!empty($v['images']))
                 {
-                    if(!empty($v['images']))
+                    $images = json_decode($v['images'], true);
+                    foreach($images as &$img)
                     {
-                        $images = json_decode($v['images'], true);
-                        foreach($images as &$img)
-                        {
-                            $img = ResourcesService::AttachmentPathViewHandle($img);
-                        }
-                        $v['images'] = $images;
+                        $img = ResourcesService::AttachmentPathViewHandle($img);
                     }
+                    $v['images'] = $images;
                 }
 
                 // 时间
                 if(isset($v['add_time']))
                 {
-                    $v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']);
-                    $v['add_time_date'] = date('Y-m-d', $v['add_time']);
+                    $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
                 }
                 if(isset($v['upd_time']))
                 {
-                    $v['upd_time_time'] = date('Y-m-d H:i:s', $v['upd_time']);
-                    $v['upd_time_date'] = date('Y-m-d', $v['upd_time']);
+                    $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']);
                 }
             }
         }
@@ -100,64 +95,6 @@ class CustomViewService
         return (int) Db::name('CustomView')->where($where)->count();
     }
 
-    /**
-     * 列表条件
-     * @author   Devil
-     * @blog    http://gong.gg/
-     * @version 1.0.0
-     * @date    2018-09-29
-     * @desc    description
-     * @param   [array]          $params [输入参数]
-     */
-    public static function CustomViewListWhere($params = [])
-    {
-        $where = [];
-
-        // id
-        if(!empty($params['id']))
-        {
-            $where[] = ['id', '=', $params['id']];
-        }
-
-        if(!empty($params['keywords']))
-        {
-            $where[] = ['title', 'like', '%'.$params['keywords'].'%'];
-        }
-
-        // 是否更多条件
-        if(isset($params['is_more']) && $params['is_more'] == 1)
-        {
-            // 等值
-            if(isset($params['is_enable']) && $params['is_enable'] > -1)
-            {
-                $where[] = ['is_enable', '=', intval($params['is_enable'])];
-            }
-            if(isset($params['is_full_screen']) && $params['is_full_screen'] > -1)
-            {
-                $where[] = ['is_full_screen', '=', intval($params['is_full_screen'])];
-            }
-            if(isset($params['is_header']) && $params['is_header'] > -1)
-            {
-                $where[] = ['is_header', '=', intval($params['is_header'])];
-            }
-            if(isset($params['is_footer']) && $params['is_footer'] > -1)
-            {
-                $where[] = ['is_footer', '=', intval($params['is_footer'])];
-            }
-
-            if(!empty($params['time_start']))
-            {
-                $where[] = ['add_time', '>', strtotime($params['time_start'])];
-            }
-            if(!empty($params['time_end']))
-            {
-                $where[] = ['add_time', '<', strtotime($params['time_end'])];
-            }
-        }
-
-        return $where;
-    }
-
     /**
      * 自定义页面访问统计加1
      * @author   Devil
@@ -198,8 +135,8 @@ class CustomViewService
             [
                 'checked_type'      => 'length',
                 'key_name'          => 'content',
-                'checked_data'      => '50,105000',
-                'error_msg'         => '内容长度最少 50~105000 个字符',
+                'checked_data'      => '10,105000',
+                'error_msg'         => '内容长度最少 10~105000 个字符',
             ],
         ];
         $ret = ParamsChecked($params, $p);
@@ -212,7 +149,7 @@ class CustomViewService
         $content = isset($params['content']) ? htmlspecialchars_decode($params['content']) : '';
 
         // 数据
-        $images = self::MatchContentImage($content);
+        $images = ResourcesService::RichTextMatchContentImage($content, 'customview');
         $data = [
             'title'         => $params['title'],
             'content'       => ResourcesService::ContentStaticReplace($content, 'add'),
@@ -242,26 +179,6 @@ class CustomViewService
         }
     }
 
-    /**
-     * 正则匹配文章图片
-     * @author   Devil
-     * @blog     http://gong.gg/
-     * @version  0.0.1
-     * @datetime 2017-01-22T18:06:53+0800
-     * @param    [string]         $content [文章内容]
-     * @return   [array]                   [文章图片数组（一维）]
-     */
-    private static function MatchContentImage($content)
-    {
-        if(!empty($content))
-        {
-            $pattern = '/<img.*?src=[\'|\"](\/static\/upload\/customview\/image\/.*?[\.gif|\.jpg|\.jpeg|\.png|\.bmp])[\'|\"].*?[\/]?>/';
-            preg_match_all($pattern, $content, $match);
-            return empty($match[1]) ? [] : $match[1];
-        }
-        return [];
-    }
-
     /**
      * 删除
      * @author   Devil
@@ -273,27 +190,24 @@ class CustomViewService
      */
     public static function CustomViewDelete($params = [])
     {
-        // 请求参数
-        $p = [
-            [
-                'checked_type'      => 'empty',
-                'key_name'          => 'id',
-                'error_msg'         => '操作id有误',
-            ],
-        ];
-        $ret = ParamsChecked($params, $p);
-        if($ret !== true)
+        // 参数是否有误
+        if(empty($params['ids']))
         {
-            return DataReturn($ret, -1);
+            return DataReturn('操作id有误', -1);
+        }
+        // 是否数组
+        if(!is_array($params['ids']))
+        {
+            $params['ids'] = explode(',', $params['ids']);
         }
 
         // 删除操作
-        if(Db::name('CustomView')->where(['id'=>$params['id']])->delete())
+        if(Db::name('CustomView')->where(['id'=>$params['ids']])->delete())
         {
             return DataReturn('删除成功');
         }
 
-        return DataReturn('删除失败或资源不存在', -100);
+        return DataReturn('删除失败', -100);
     }
 
     /**
@@ -332,11 +246,11 @@ class CustomViewService
         }
 
         // 数据更新
-        if(Db::name('CustomView')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state'])]))
+        if(Db::name('CustomView')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()]))
         {
            return DataReturn('编辑成功');
         }
-        return DataReturn('编辑失败或数据未改变', -100);
+        return DataReturn('编辑失败', -100);
     }
 }
 ?>
\ No newline at end of file
diff --git a/application/service/GoodsCommentsService.php b/application/service/GoodsCommentsService.php
index 21524aac7..8dfa578ff 100644
--- a/application/service/GoodsCommentsService.php
+++ b/application/service/GoodsCommentsService.php
@@ -328,82 +328,6 @@ class GoodsCommentsService
         return (int) Db::name('GoodsComments')->where($where)->count();
     }
 
-    /**
-     * 商品评论列表条件
-     * @author   Devil
-     * @blog    http://gong.gg/
-     * @version 1.0.0
-     * @date    2018-09-29
-     * @desc    description
-     * @param   [array]          $params [输入参数]
-     */
-    public static function GoodsCommentsListWhere($params = [])
-    {
-        $where = [];
-
-        // 用户id
-        if(!empty($params['user']))
-        {
-            $where[] = ['user_id', '=', $params['user']['id']];
-        }
-        
-        // 关键字根据用户筛选,商品标题
-        if(!empty($params['keywords']))
-        {
-            if(empty($params['user']))
-            {
-                $user_ids = Db::name('User')->where('username|nickname|mobile|email', '=', $params['keywords'])->column('id');
-                if(!empty($user_ids))
-                {
-                    $where[] = ['user_id', 'in', $user_ids];
-                } else {
-                    // 无数据条件，走商品
-                    $goods_ids = Db::name('Goods')->where('title', 'like', '%'.$params['keywords'].'%')->column('id');
-                    if(!empty($goods_ids))
-                    {
-                        $where[] = ['goods_id', 'in', $goods_ids];
-                    } else {
-                        $where[] = ['id', '=', 0];
-                    }
-                }
-            }
-        }
-
-        // 是否更多条件
-        if(isset($params['is_more']) && $params['is_more'] == 1)
-        {
-            // 等值
-            if(isset($params['is_show']) && $params['is_show'] > -1)
-            {
-                $where[] = ['is_show', '=', intval($params['is_show'])];
-            }
-            if(isset($params['is_anonymous']) && $params['is_anonymous'] > -1)
-            {
-                $where[] = ['is_anonymous', '=', intval($params['is_anonymous'])];
-            }
-            if(isset($params['is_reply']) && $params['is_reply'] > -1)
-            {
-                $where[] = ['is_reply', '=', intval($params['is_reply'])];
-            }
-            if(!empty($params['business_type']))
-            {
-                $where[] = ['business_type', '=', $params['business_type']];
-            }
-
-
-            if(!empty($params['time_start']))
-            {
-                $where[] = ['add_time', '>', strtotime($params['time_start'])];
-            }
-            if(!empty($params['time_end']))
-            {
-                $where[] = ['add_time', '<', strtotime($params['time_end'])];
-            }
-        }
-
-        return $where;
-    }
-
     /**
      * 评论保存
      * @author  Devil
diff --git a/application/service/LinkService.php b/application/service/LinkService.php
index db1aeaf93..2e47bcfd8 100755
--- a/application/service/LinkService.php
+++ b/application/service/LinkService.php
@@ -35,6 +35,15 @@ class LinkService
     {
         $where = empty($params['where']) ? [] : $params['where'];
         $data = Db::name('Link')->where($where)->order('sort asc')->select();
+        if(!empty($data))
+        {
+            foreach($data as &$v)
+            {
+                // 时间
+                $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
+                $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']);
+            }
+        }
         return DataReturn('处理成功', 0, $data);
     }
 
@@ -133,27 +142,24 @@ class LinkService
      */
     public static function LinkDelete($params = [])
     {
-        // 请求参数
-        $p = [
-            [
-                'checked_type'      => 'empty',
-                'key_name'          => 'id',
-                'error_msg'         => '操作id有误',
-            ],
-        ];
-        $ret = ParamsChecked($params, $p);
-        if($ret !== true)
+        // 参数是否有误
+        if(empty($params['ids']))
         {
-            return DataReturn($ret, -1);
+            return DataReturn('操作id有误', -1);
+        }
+        // 是否数组
+        if(!is_array($params['ids']))
+        {
+            $params['ids'] = explode(',', $params['ids']);
         }
 
         // 删除操作
-        if(Db::name('Link')->where(['id'=>$params['id']])->delete())
+        if(Db::name('Link')->where(['id'=>$params['ids']])->delete())
         {
             return DataReturn('删除成功');
         }
 
-        return DataReturn('删除失败或资源不存在', -100);
+        return DataReturn('删除失败', -100);
     }
 
     /**
@@ -173,6 +179,11 @@ class LinkService
                 'key_name'          => 'id',
                 'error_msg'         => '操作id有误',
             ],
+            [
+                'checked_type'      => 'empty',
+                'key_name'          => 'field',
+                'error_msg'         => '未指定操作字段',
+            ],
             [
                 'checked_type'      => 'in',
                 'key_name'          => 'state',
@@ -187,11 +198,11 @@ class LinkService
         }
 
         // 数据更新
-        if(Db::name('Link')->where(['id'=>intval($params['id'])])->update(['is_enable'=>intval($params['state'])]))
+        if(Db::name('Link')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()]))
         {
             return DataReturn('编辑成功');
         }
-        return DataReturn('编辑失败或数据未改变', -100);
+        return DataReturn('编辑失败', -100);
     }
 }
 ?>
\ No newline at end of file
diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php
index 6ac2d94ed..26aa6e8cf 100755
--- a/application/service/NavigationService.php
+++ b/application/service/NavigationService.php
@@ -41,56 +41,18 @@ class NavigationService
         $header = cache(config('shopxo.cache_common_home_nav_header_key'));
         $footer = cache(config('shopxo.cache_common_home_nav_footer_key'));
 
-        // 导航模型
-        $field = array('id', 'pid', 'name', 'url', 'value', 'data_type', 'is_new_window_open');
-
         // 缓存没数据则从数据库重新读取,顶部菜单
         if(empty($header))
         {
             // 获取导航数据
-            $header = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(array('nav_type'=>'header', 'is_show'=>1, 'pid'=>0))->order('sort')->select());
-            if(!empty($header))
-            {
-                foreach($header as &$v)
-                {
-                    $v['items'] = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(array('nav_type'=>'header', 'is_show'=>1, 'pid'=>$v['id']))->order('sort')->select());
-                }
-            }
-
-            // 大导航钩子
-            $hook_name = 'plugins_service_navigation_header_handle';
-            Hook::listen($hook_name, [
-                'hook_name'     => $hook_name,
-                'is_backend'    => true,
-                'params'        => &$params,
-                'header'        => &$header,
-            ]);
- 
-            cache(config('shopxo.cache_common_home_nav_header_key'), $header);
+            $header = self::NavDataAll('header');
         }
 
         // 底部导航
         if(empty($footer))
         {
-            $footer = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(array('nav_type'=>'footer', 'is_show'=>1, 'pid'=>0))->order('sort')->select());
-            if(!empty($footer))
-            {
-                foreach($footer as &$v)
-                {
-                    $v['items'] = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(array('nav_type'=>'footer', 'is_show'=>1, 'pid'=>$v['id']))->order('sort')->select());
-                }
-            }
-
-            // 底部导航钩子
-            $hook_name = 'plugins_service_navigation_footer_handle';
-            Hook::listen($hook_name, [
-                'hook_name'     => $hook_name,
-                'is_backend'    => true,
-                'params'        => &$params,
-                'footer'        => &$footer,
-            ]);
-
-            cache(config('shopxo.cache_common_home_nav_footer_key'), $footer);
+            // 获取导航数据
+            $footer = self::NavDataAll('footer');
         }
 
         // 中间大导航添加首页导航
@@ -140,6 +102,58 @@ class NavigationService
         ];
     }
 
+    /**
+     * 获取导航数据
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-06-15
+     * @desc    description
+     * @param   [string]          $nav_type [导航类型（header, footer）]
+     */
+    public static function NavDataAll($nav_type)
+    {
+        // 指定字段
+        $field = array('id', 'pid', 'name', 'url', 'value', 'data_type', 'is_new_window_open');
+
+        // 获取导航数据
+        $data = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(array('nav_type'=>$nav_type, 'is_show'=>1, 'pid'=>0))->order('sort')->select());
+        if(!empty($data))
+        {
+            // 获取子数据
+            $items = [];
+            $ids = array_column($data, 'id');
+            $items_data = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(array('nav_type'=>$nav_type, 'is_show'=>1, 'pid'=>$ids))->order('sort')->select());
+            if(!empty($items_data))
+            {
+                foreach($items_data as $it)
+                {
+                    $items[$it['pid']][] = $it;
+                }
+            }
+
+            // 数据组合
+            foreach($data as &$v)
+            {
+                $v['items'] = isset($items[$v['id']]) ? $items[$v['id']] : [];
+            }
+        }
+
+        // 大导航钩子
+        $hook_name = 'plugins_service_navigation_'.$nav_type.'_handle';
+        Hook::listen($hook_name, [
+            'hook_name'     => $hook_name,
+            'is_backend'    => true,
+            'params'        => &$params,
+            'data'          => &$data,
+            $nav_type       => &$data,
+        ]);
+
+        // 缓存
+        cache(config('shopxo.cache_common_home_nav_'.$nav_type.'_key'), $data);
+        return $data;
+    }
+
     /**
      * [NavDataDealWith 导航数据处理]
      * @author   Devil
@@ -186,22 +200,67 @@ class NavigationService
      * @version 1.0.0
      * @date    2018-12-18
      * @desc    description
-     * @param   [array]          $params [输入参数]
+     * @param   [array]          $params  [输入参数]
      */
     public static function NavList($params = [])
     {
-        if(empty($params['nav_type']))
-        {
-            return [];
-        }
+        // 导航条件
+        $where = empty($params['where']) ? [] : $params['where'];
+        $where1 = $where;
+        $where1[] = ['pid', '=', 0];
 
-        $field = 'id,pid,name,url,value,data_type,sort,is_show,is_new_window_open';
-        $data = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(['nav_type'=>$params['nav_type'], 'pid'=>0])->order('sort')->select());
+        $field = '*';
+        $data = self::NavigationHandle(self::NavDataDealWith(Db::name('Navigation')->field($field)->where($where1)->order('sort')->select()));
         if(!empty($data))
         {
+            // 子级数据
+            $items = [];
+            $where2 = $where;
+            $where2[] = ['pid', 'in', array_column($data, 'id')];
+            $items_data =  self::NavigationHandle(self::NavDataDealWith(Db::name('Navigation')->field($field)->where($where2)->order('sort')->select()));
+            if(!empty($items_data))
+            {
+                foreach($items_data as $it)
+                {
+                    $items[$it['pid']][] = $it;
+                }
+            }
+
+            // 数据处理
+            foreach($data as $k=>$v)
+            {
+                // 数据类型
+                if(isset($items[$v['id']]))
+                {
+                    array_splice($data, $k+1, 0, $items[$v['id']]);
+                }
+            }
+        }
+        return DataReturn('处理成功', 0, $data);
+    }
+
+    /**
+     * 数据处理
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-06-15
+     * @desc    description
+     * @param   [array]          $data [导航数据]
+     */
+    public static function NavigationHandle($data)
+    {
+        if(!empty($data) && is_array($data))
+        {
+            $nav_type_list = lang('common_nav_type_list');
             foreach($data as &$v)
             {
-                $v['items'] = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(['nav_type'=>$params['nav_type'], 'pid'=>$v['id']])->order('sort')->select());
+                // 数据类型
+                $v['data_type_text'] = isset($nav_type_list[$v['data_type']]) ? $nav_type_list[$v['data_type']]['name'] : '';
+
+                // 时间
+                $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
+                $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']);
             }
         }
         return $data;
@@ -232,7 +291,7 @@ class NavigationService
      * @blog     http://gong.gg/
      * @version  0.0.1
      * @datetime 2016-12-07T21:58:19+0800
-     * @param   [array]          $params [输入参数]
+     * @param    [array]          $params [输入参数]
      */
     public static function NavSave($params = [])
     {
@@ -364,7 +423,7 @@ class NavigationService
      * @blog     http://gong.gg/
      * @version  0.0.1
      * @datetime 2017-02-05T20:12:30+0800
-     * @param   [array]          $params [输入参数]
+     * @param    [array]          $params [输入参数]
      */
     public static function NacDataSave($params = [])
     {
@@ -446,25 +505,22 @@ class NavigationService
      */
     public static function NavDelete($params = [])
     {
-        // 请求参数
-        $p = [
-            [
-                'checked_type'      => 'empty',
-                'key_name'          => 'id',
-                'error_msg'         => '操作id有误',
-            ],
-        ];
-        $ret = ParamsChecked($params, $p);
-        if($ret !== true)
+        // 参数是否有误
+        if(empty($params['ids']))
         {
-            return DataReturn($ret, -1);
+            return DataReturn('操作id有误', -1);
+        }
+        // 是否数组
+        if(!is_array($params['ids']))
+        {
+            $params['ids'] = explode(',', $params['ids']);
         }
 
         // 启动事务
         Db::startTrans();
 
         // 删除操作
-        if(Db::name('Navigation')->where(['id'=>$params['id']])->delete() !== false && Db::name('Navigation')->where(['pid'=>$params['id']])->delete() !== false)
+        if(Db::name('Navigation')->where(['id'=>$params['ids']])->delete() !== false && Db::name('Navigation')->where(['pid'=>$params['ids']])->delete() !== false)
         {
             // 提交事务
             Db::commit();
@@ -478,8 +534,7 @@ class NavigationService
 
         // 回滚事务
         Db::rollback();
-
-        return DataReturn('删除失败或资源不存在', -100);
+        return DataReturn('删除失败', -100);
     }
 
     /**
@@ -499,6 +554,11 @@ class NavigationService
                 'key_name'          => 'id',
                 'error_msg'         => '操作id有误',
             ],
+            [
+                'checked_type'      => 'empty',
+                'key_name'          => 'field',
+                'error_msg'         => '未指定操作字段',
+            ],
             [
                 'checked_type'      => 'in',
                 'key_name'          => 'state',
@@ -513,7 +573,7 @@ class NavigationService
         }
 
         // 数据更新
-        if(Db::name('Navigation')->where(['id'=>intval($params['id'])])->update(['is_show'=>intval($params['state'])]))
+        if(Db::name('Navigation')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()]))
         {
             // 清除缓存
             cache(config('shopxo.cache_common_home_nav_header_key'), null);
@@ -521,7 +581,7 @@ class NavigationService
 
             return DataReturn('编辑成功');
         }
-        return DataReturn('编辑失败或数据未改变', -100);
+        return DataReturn('编辑失败', -100);
     }
 
     /**
diff --git a/application/service/ResourcesService.php b/application/service/ResourcesService.php
index f208e0ca7..ba24fb5ee 100755
--- a/application/service/ResourcesService.php
+++ b/application/service/ResourcesService.php
@@ -538,5 +538,26 @@ class ResourcesService
         ];
         return str_replace($search, $replace, $content);
     }
+
+    /**
+     * 正则匹配富文本图片
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-06-16
+     * @desc    description
+     * @param   [string]          $content [内容]
+     * @param   [string]          $type    [模块名称]
+     */
+    public static function RichTextMatchContentImage($content, $type)
+    {
+        if(!empty($content))
+        {
+            $pattern = '/<img.*?src=[\'|\"](\/static\/upload\/images\/'.$type.'\/image\/.*?[\.gif|\.jpg|\.jpeg|\.png|\.bmp])[\'|\"].*?[\/]?>/';
+            preg_match_all($pattern, self::AttachmentPathHandle($content), $match);
+            return empty($match[1]) ? [] : $match[1];
+        }
+        return [];
+    }
 }
 ?>
\ No newline at end of file
diff --git a/config/shopxo.sql b/config/shopxo.sql
index 78b720935..c9797b0b6 100644
--- a/config/shopxo.sql
+++ b/config/shopxo.sql
@@ -11,7 +11,7 @@
  Target Server Version : 50729
  File Encoding         : utf-8
 
- Date: 06/14/2020 23:18:20 PM
+ Date: 06/16/2020 23:26:40 PM
 */
 
 SET NAMES utf8mb4;
@@ -161,13 +161,13 @@ CREATE TABLE `s_article` (
   KEY `access_count` (`access_count`),
   KEY `image_count` (`images_count`),
   KEY `article_category_id` (`article_category_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='文章';
+) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='文章';
 
 -- ----------------------------
 --  Records of `s_article`
 -- ----------------------------
 BEGIN;
-INSERT INTO `s_article` VALUES ('1', '如何注册成为会员', '7', '', '', '1', '<p>如何注册成为会员</p><p>如何注册成为会员</p><p>如何注册成为会员</p><p>如何注册成为会员</p>', '[]', '0', '211', '1', '', '', '', '1484965691', '1534228456'), ('3', '积分细则', '7', '#FF0000', '', '1', '<p>积分细则</p><p>积分细则</p><p>积分细则</p><p>积分细则</p><p>积分细则</p><p>积分细则</p><p>积分细则</p>', '[]', '0', '44', '1', '', '', '', '1484985139', '1534228496'), ('4', '积分兑换说明', '17', '', '', '1', '<p>积分兑换说明</p><p>积分兑换说明</p><p>积分兑换说明</p><p>积分兑换说明</p><p>积分兑换说明</p><p>积分兑换说明</p>', '[]', '0', '44', '1', '', '', '', '1484989903', '1534228520'), ('5', '如何搜索', '7', '', '', '1', '<p>如何搜索</p><p>如何搜索</p><p>如何搜索</p><p>如何搜索</p><p>如何搜索</p><p>如何搜索</p><p>如何搜索</p>', '[]', '0', '36', '1', '', '', '', '1485064767', '1534228544'), ('6', '忘记密码', '17', '', '', '1', '<p>忘记密码</p><p>忘记密码</p><p>忘记密码</p><p>忘记密码</p><p>忘记密码</p>', '[]', '0', '23', '1', '', '', '', '1485073500', '1534228567'), ('7', '如何管理店铺', '10', '', '', '1', '<p>如何管理店铺</p><p>如何管理店铺</p><p>如何管理店铺</p><p>如何管理店铺</p><p>如何管理店铺</p><p>如何管理店铺</p>', '[]', '0', '57', '1', '', '', '', '1487819252', '1534228589'), ('8', '查看售出商品', '10', '', '', '1', '<p>查看售出商品</p><p>查看售出商品</p><p>查看售出商品</p><p>查看售出商品</p><p>查看售出商品</p>', '[]', '0', '54', '1', '', '', '', '1487819408', '1534228614'), ('9', '如何发货', '10', '#CC0066', '', '1', '<p>如何发货</p><p>如何发货</p><p>如何发货</p><p>如何发货</p><p>如何发货</p>', '', '0', '40', '1', '', '', '', '1487920130', '1545500851'), ('10', '商城商品推荐', '10', '', '', '1', '<p>商城商品推荐</p><p>商城商品推荐</p><p>商城商品推荐</p><p>商城商品推荐</p><p>商城商品推荐</p>', '[]', '0', '9', '1', '', '', '', '1534228650', '1534228650'), ('11', '如何申请开店', '10', '', '', '1', '<p>如何申请开店</p><p>如何申请开店</p><p>如何申请开店</p><p>如何申请开店</p>', '[]', '0', '6', '1', '', '', '', '1534228676', '1534228676'), ('12', '分期付款', '16', '', '', '1', '<p>分期付款</p><p>分期付款</p><p>分期付款</p><p>分期付款</p><p>分期付款</p>', '[]', '0', '33', '1', '', '', '', '1534228694', '1534228694'), ('13', '邮局汇款', '16', '', '', '1', '<p>邮局汇款</p><p>邮局汇款</p><p>邮局汇款</p><p>邮局汇款</p><p>邮局汇款</p>', '[]', '0', '31', '1', '', '', '', '1534228710', '1534228710'), ('14', '公司转账', '16', '', '', '1', '<p>公司转账</p><p>公司转账</p><p>公司转账</p><p>公司转账</p><p>公司转账</p>', '[]', '0', '39', '1', '', '', '', '1534228732', '1534228732'), ('15', '如何注册支付宝', '16', '', '', '1', '<p>如何注册支付宝</p><p>如何注册支付宝</p><p>如何注册支付宝</p><p>如何注册支付宝</p><p>如何注册支付宝</p>', '[]', '0', '28', '1', '', '', '', '1534228748', '1534228748'), ('16', '在线支付', '16', '', '', '1', '<p>在线支付</p><p>在线支付</p><p>在线支付</p><p>在线支付</p><p>在线支付</p>', '[]', '0', '36', '1', '', '', '', '1534228764', '1534228764'), ('17', '联系卖家', '17', '', '', '1', '<p>联系卖家</p><p>联系卖家</p><p>联系卖家</p><p>联系卖家</p><p>联系卖家</p><p>联系卖家</p>', '[]', '0', '10', '1', '', '', '', '1534228781', '1534228781'), ('18', '退换货政策', '17', '', '', '1', '<p>退换货政策</p><p>退换货政策</p><p>退换货政策</p><p>退换货政策</p><p>退换货政策</p>', '[]', '0', '5', '1', '', '', '', '1534228802', '1534228802'), ('19', '退换货流程', '17', '', '', '1', '<p>退换货流程</p><p>退换货流程</p><p>退换货流程</p><p>退换货流程</p><p>退换货流程</p>', '[]', '0', '0', '1', '', '', '', '1534228850', '1534228850'), ('20', '返修/退换货', '17', '', '', '1', '<p>返修/退换货</p><p>返修/退换货</p><p>返修/退换货</p><p>返修/退换货</p><p>返修/退换货</p>', '[]', '0', '4', '1', '', '', '', '1534228867', '1534228867'), ('21', '退款申请', '17', '', '', '1', '<p>退款申请</p><p>退款申请</p><p>退款申请</p><p>退款申请</p><p>退款申请</p>', '[]', '0', '56', '1', '', '', '', '1534228885', '1534228885'), ('22', '会员修改密码', '18', '', '', '1', '<p>会员修改密码</p><p>会员修改密码</p><p>会员修改密码</p><p>会员修改密码</p>', '[]', '0', '67', '1', '', '', '', '1534228900', '1534228900'), ('23', '会员修改个人资料', '18', '', '', '1', '<p>会员修改个人资料</p><p>会员修改个人资料</p><p>会员修改个人资料</p><p>会员修改个人资料</p><p>会员修改个人资料</p>', '[]', '0', '60', '1', '', '', '', '1534228916', '1534228916'), ('24', '商品发布', '18', '', '', '1', '<p>商品发布</p><p>商品发布</p><p>商品发布</p><p>商品发布</p><p>商品发布</p>', '[]', '0', '58', '1', '', '', '', '1534228931', '1534228931'), ('25', '修改收货地址', '18', '', '', '1', '<p>修改收货地址</p><p>修改收货地址</p><p>修改收货地址</p><p>修改收货地址</p><p>修改收货地址</p>', '[]', '0', '53', '1', '', '', '', '1534228948', '1534228948'), ('26', '合作及洽谈', '24', '', '', '1', '<p>合作及洽谈</p><p>合作及洽谈</p><p>合作及洽谈</p><p>合作及洽谈</p><p>合作及洽谈</p>', '[]', '0', '46', '1', '', '', '', '1534228968', '1534228968'), ('27', '招聘英才', '24', '', '', '1', '<h2>PHP工程师</h2><p>岗位描述：</p><p>1.负责项目后端系统的研发和维护工作。</p><p>2.负责跟进平台的运营监控和数据分析工作。</p><p>3.按时保质保量完成项目开发,研究新兴技术，持续优化系统架构，完善基础服务。<br/></p><p>4.思维敏捷,责任心强,能承受工作压力。</p><p><br/></p><p>任职资格：</p><p>1、本科及以上学历，计算机相关专业，3年以上相关开发工作经验。</p><p>2、精通基于LNMP的Web开发技术, 熟悉yii, yaf, ThinkPHP, zend等框架的是用及实现原理。</p><p>3、熟悉mysql、redis等应用开发，精通SQL调优和数据结构设计。</p><p>4、熟悉使用Javascript、Ajax，Html，Div+CSS，Vue等技术。</p><p>5、有大型项目开发经验，系统调优经验者优先。</p><p>6、对LNMP/LAMP架构的部署、搭建、优化、排错等方面有经验者优先。</p><p>7、事业心强，勤奋好学，有团队精神。</p><p><br/></p><h2>前端工程师</h2><p>岗位描述：</p><p>1.配合项目经理和设计师快速实现一流的前端界面，优化代码并保持良好的兼容性，改善用户体验。</p><p>2.根据业务和项目需求，进行技术创新，分析并给出最优的前台技术实现方案。</p><p>3.对前端开发的新技术有敏锐嗅觉，推进前端技术演进。</p><p>4.进行新技术调研，持续对产品前端进行维护和升级。</p><p><br/></p><p>任职资格：</p><p>1、了解Web 标准，熟悉 HTML、CSS、JavaScript 各种前端技术。</p><p>2、熟悉 HTTP 协议。</p><p>3、认真负责，积极主动，有良好的团队合作意识。</p><p>4、了解 Angularjs，前端工程化或者 Node.js 等技术有研究。</p><p>5、有Vue开发经验者优先。</p><p>6、事业心强，勤奋好学，有团队精神。</p><p><br/></p>', '[]', '0', '37', '1', '', '', '', '1534228987', '1534229359'), ('28', '联系我们', '24', '', '', '1', '<p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\">欢迎您对我们的站点、工作、产品和服务提出自己宝贵的意见或建议。我们将给予您及时答复。同时也欢迎您到我们公司来洽商业务。</p><p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\"><br/><strong style=\"font-size: 1em;\">公司名称</strong>： ShopXO</p><p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\"><strong style=\"font-size: 1em;\">通信地址</strong>： 上海市浦东新区上海市浦东新区盛夏路</p><p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\"><strong style=\"font-size: 1em;\">商务洽谈</strong>： 176-8888-8888</p><table class=\"am-table am-table-bordered\"><tbody><tr class=\"firstRow\"><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><strong>标题</strong></td><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><strong>价格(元)</strong></td><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><strong>状态</strong></td></tr><tr><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\">商品名称</td><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><span style=\"color: rgb(227, 108, 9);\">￥100.00</span></td><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><span style=\"color: rgb(0, 176, 80);\">有效</span></td></tr></tbody></table><p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\"><br/></p>', '', '0', '147', '1', '联系我们文章详情ShopXO', '联系我们,ShopXO开源商城', '国内领先企业级B2C开源电商系统！', '1534229110', '1559482593'), ('29', '关于ShopXO', '24', '#FF0000', 'https://shopxo.net/', '1', '<p>ShopXO位于上海市浦东新区，是专业从事生产管理信息化领域技术咨询和软件开发的高新技术企业。公司拥有多名技术人才和资深的行业解决方案专家。</p><p><br/></p><p>公司拥有一支勇于开拓、具有战略眼光和敏锐市场判断力的市场营销队伍，一批求实敬业，追求卓越的行政管理人才，一个能征善战，技术优秀，经验丰富的开发团队。公司坚持按现代企业制度和市场规律办事，在扩大经营规模的同时，注重企业经济运行质量，在自主产品研发及承接软件项目方面获得了很强的竞争力。 我公司也积极参与国内传统企业的信息化改造，引进国际化产品开发的标准，规范软件开发流程，通过提升各层面的软件开发人才的技术素质，打造国产软件精品，目前已经开发出具有自主知识产权的网络商城软件，还在积极开发基于电子商务平台高效能、高效益的管理系统。为今后进一步开拓国内市场打下坚实的基础。公司致力于构造一个开放、发展的人才平台，积极营造追求卓越、积极奉献的工作氛围，把“以人为本”的理念落实到每一项具体工作中，为那些锋芒内敛，激情无限的业界精英提供充分的发展空间，优雅自信、从容自得的工作环境，事业雄心与生活情趣两相兼顾的生活方式。并通过每个员工不断提升自我，以自己的独特价值观对工作与生活作最准确的判断，使我们每一个员工彰显出他们出色的自我品位，独有的工作个性和卓越的创新风格，让他们时刻保持振奋、不断鼓舞内心深处的梦想，永远走在时代潮流前端。公司发展趋势 励精图治，展望未来。公司把发展产业策略与发掘人才策略紧密结合，广纳社会精英，挖掘创新潜能，以人为本，凝聚人气，努力营造和谐宽松的工作氛围，为优秀人才的脱颖而出提供机遇。公司将在深入发展软件产业的同时，通过不懈的努力，来塑造大型软件公司的辉煌形象。</p>', '', '0', '40', '1', '', '', '', '1534229221', '1580807467');
+INSERT INTO `s_article` VALUES ('1', '如何注册成为会员', '7', '', '', '1', '<p>如何注册成为会员</p><p>如何注册成为会员</p><p>如何注册成为会员</p><p>如何注册成为会员</p>', '[]', '0', '213', '1', '', '', '', '1484965691', '1534228456'), ('3', '积分细则', '7', '#FF0000', '', '1', '<p>积分细则</p><p>积分细则</p><p>积分细则</p><p>积分细则</p><p>积分细则</p><p>积分细则</p><p>积分细则</p>', '[]', '0', '45', '1', '', '', '', '1484985139', '1534228496'), ('4', '积分兑换说明', '17', '', '', '1', '<p>积分兑换说明</p><p>积分兑换说明</p><p>积分兑换说明</p><p>积分兑换说明</p><p>积分兑换说明</p><p>积分兑换说明</p>', '[]', '0', '44', '1', '', '', '', '1484989903', '1534228520'), ('5', '如何搜索', '7', '', '', '1', '<p>如何搜索</p><p>如何搜索</p><p>如何搜索</p><p>如何搜索</p><p>如何搜索</p><p>如何搜索</p><p>如何搜索</p>', '[]', '0', '37', '1', '', '', '', '1485064767', '1534228544'), ('6', '忘记密码', '17', '', '', '1', '<p>忘记密码</p><p>忘记密码</p><p>忘记密码</p><p>忘记密码</p><p>忘记密码</p>', '[]', '0', '24', '1', '', '', '', '1485073500', '1534228567'), ('7', '如何管理店铺', '10', '', '', '1', '<p>如何管理店铺</p><p>如何管理店铺</p><p>如何管理店铺</p><p>如何管理店铺</p><p>如何管理店铺</p><p>如何管理店铺</p>', '[]', '0', '57', '1', '', '', '', '1487819252', '1534228589'), ('8', '查看售出商品', '10', '', '', '1', '<p>查看售出商品</p><p>查看售出商品</p><p>查看售出商品</p><p>查看售出商品</p><p>查看售出商品</p>', '[]', '0', '54', '1', '', '', '', '1487819408', '1534228614'), ('9', '如何发货', '10', '#CC0066', '', '1', '<p>如何发货</p><p>如何发货</p><p>如何发货</p><p>如何发货</p><p>如何发货</p>', '', '0', '40', '1', '', '', '', '1487920130', '1545500851'), ('10', '商城商品推荐', '10', '', '', '1', '<p>商城商品推荐</p><p>商城商品推荐</p><p>商城商品推荐</p><p>商城商品推荐</p><p>商城商品推荐</p>', '[]', '0', '9', '1', '', '', '', '1534228650', '1534228650'), ('11', '如何申请开店', '10', '', '', '1', '<p>如何申请开店</p><p>如何申请开店</p><p>如何申请开店</p><p>如何申请开店</p>', '[]', '0', '6', '1', '', '', '', '1534228676', '1534228676'), ('12', '分期付款', '16', '', '', '1', '<p>分期付款</p><p>分期付款</p><p>分期付款</p><p>分期付款</p><p>分期付款</p>', '[]', '0', '34', '1', '', '', '', '1534228694', '1534228694'), ('13', '邮局汇款', '16', '', '', '1', '<p>邮局汇款</p><p>邮局汇款</p><p>邮局汇款</p><p>邮局汇款</p><p>邮局汇款</p>', '[]', '0', '31', '1', '', '', '', '1534228710', '1534228710'), ('14', '公司转账', '16', '', '', '1', '<p>公司转账</p><p>公司转账</p><p>公司转账</p><p>公司转账</p><p>公司转账</p>', '[]', '0', '39', '1', '', '', '', '1534228732', '1534228732'), ('15', '如何注册支付宝', '16', '', '', '1', '<p>如何注册支付宝</p><p>如何注册支付宝</p><p>如何注册支付宝</p><p>如何注册支付宝</p><p>如何注册支付宝</p>', '[]', '0', '28', '1', '', '', '', '1534228748', '1534228748'), ('16', '在线支付', '16', '', '', '1', '<p>在线支付</p><p>在线支付</p><p>在线支付</p><p>在线支付</p><p>在线支付</p>', '[]', '0', '36', '1', '', '', '', '1534228764', '1534228764'), ('17', '联系卖家', '17', '', '', '1', '<p>联系卖家</p><p>联系卖家</p><p>联系卖家</p><p>联系卖家</p><p>联系卖家</p><p>联系卖家</p>', '[]', '0', '10', '1', '', '', '', '1534228781', '1534228781'), ('18', '退换货政策', '17', '', '', '1', '<p>退换货政策</p><p>退换货政策</p><p>退换货政策</p><p>退换货政策</p><p>退换货政策</p>', '[]', '0', '5', '1', '', '', '', '1534228802', '1534228802'), ('19', '退换货流程', '17', '', '', '1', '<p>退换货流程</p><p>退换货流程</p><p>退换货流程</p><p>退换货流程</p><p>退换货流程</p>', '[]', '0', '0', '1', '', '', '', '1534228850', '1534228850'), ('20', '返修/退换货', '17', '', '', '1', '<p>返修/退换货</p><p>返修/退换货</p><p>返修/退换货</p><p>返修/退换货</p><p>返修/退换货</p>', '[]', '0', '4', '1', '', '', '', '1534228867', '1534228867'), ('21', '退款申请', '17', '', '', '1', '<p>退款申请</p><p>退款申请</p><p>退款申请</p><p>退款申请</p><p>退款申请</p>', '[]', '0', '56', '1', '', '', '', '1534228885', '1534228885'), ('22', '会员修改密码', '18', '', '', '1', '<p>会员修改密码</p><p>会员修改密码</p><p>会员修改密码</p><p>会员修改密码</p>', '[]', '0', '67', '1', '', '', '', '1534228900', '1534228900'), ('23', '会员修改个人资料', '18', '', '', '1', '<p>会员修改个人资料</p><p>会员修改个人资料</p><p>会员修改个人资料</p><p>会员修改个人资料</p><p>会员修改个人资料</p>', '[]', '0', '60', '1', '', '', '', '1534228916', '1534228916'), ('24', '商品发布', '18', '', '', '1', '<p>商品发布</p><p>商品发布</p><p>商品发布</p><p>商品发布</p><p>商品发布</p>', '[]', '0', '58', '1', '', '', '', '1534228931', '1534228931'), ('25', '修改收货地址', '18', '', '', '1', '<p>修改收货地址</p><p>修改收货地址</p><p>修改收货地址</p><p>修改收货地址</p><p>修改收货地址</p>', '[]', '0', '53', '1', '', '', '', '1534228948', '1534228948'), ('26', '合作及洽谈', '24', '', '', '1', '<p>合作及洽谈</p><p>合作及洽谈</p><p>合作及洽谈</p><p>合作及洽谈</p><p>合作及洽谈</p>', '[]', '0', '46', '1', '', '', '', '1534228968', '1534228968'), ('27', '招聘英才', '24', '', '', '1', '<h2>PHP工程师</h2><p>岗位描述：</p><p>1.负责项目后端系统的研发和维护工作。</p><p>2.负责跟进平台的运营监控和数据分析工作。</p><p>3.按时保质保量完成项目开发,研究新兴技术，持续优化系统架构，完善基础服务。<br/></p><p>4.思维敏捷,责任心强,能承受工作压力。</p><p><br/></p><p>任职资格：</p><p>1、本科及以上学历，计算机相关专业，3年以上相关开发工作经验。</p><p>2、精通基于LNMP的Web开发技术, 熟悉yii, yaf, ThinkPHP, zend等框架的是用及实现原理。</p><p>3、熟悉mysql、redis等应用开发，精通SQL调优和数据结构设计。</p><p>4、熟悉使用Javascript、Ajax，Html，Div+CSS，Vue等技术。</p><p>5、有大型项目开发经验，系统调优经验者优先。</p><p>6、对LNMP/LAMP架构的部署、搭建、优化、排错等方面有经验者优先。</p><p>7、事业心强，勤奋好学，有团队精神。</p><p><br/></p><h2>前端工程师</h2><p>岗位描述：</p><p>1.配合项目经理和设计师快速实现一流的前端界面，优化代码并保持良好的兼容性，改善用户体验。</p><p>2.根据业务和项目需求，进行技术创新，分析并给出最优的前台技术实现方案。</p><p>3.对前端开发的新技术有敏锐嗅觉，推进前端技术演进。</p><p>4.进行新技术调研，持续对产品前端进行维护和升级。</p><p><br/></p><p>任职资格：</p><p>1、了解Web 标准，熟悉 HTML、CSS、JavaScript 各种前端技术。</p><p>2、熟悉 HTTP 协议。</p><p>3、认真负责，积极主动，有良好的团队合作意识。</p><p>4、了解 Angularjs，前端工程化或者 Node.js 等技术有研究。</p><p>5、有Vue开发经验者优先。</p><p>6、事业心强，勤奋好学，有团队精神。</p><p><br/></p>', '[]', '0', '37', '1', '', '', '', '1534228987', '1534229359'), ('28', '联系我们', '24', '', '', '1', '<p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\">欢迎您对我们的站点、工作、产品和服务提出自己宝贵的意见或建议。我们将给予您及时答复。同时也欢迎您到我们公司来洽商业务。</p><p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\"><br/><strong style=\"font-size: 1em;\">公司名称</strong>： ShopXO</p><p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\"><strong style=\"font-size: 1em;\">通信地址</strong>： 上海市浦东新区上海市浦东新区盛夏路</p><p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\"><strong style=\"font-size: 1em;\">商务洽谈</strong>： 176-8888-8888</p><table class=\"am-table am-table-bordered\"><tbody><tr class=\"firstRow\"><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><strong>标题</strong></td><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><strong>价格(元)</strong></td><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><strong>状态</strong></td></tr><tr><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\">商品名称</td><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><span style=\"color: rgb(227, 108, 9);\">￥100.00</span></td><td width=\"301\" valign=\"top\" style=\"word-break: break-all;\"><span style=\"color: rgb(0, 176, 80);\">有效</span></td></tr></tbody></table><p style=\"padding: 5px; margin-top: 0px; margin-bottom: 0px; clear: both; color: rgb(102, 102, 102); font-family: &quot;Hiragino Sans GB&quot;, &quot;Microsoft Yahei&quot;, arial, 宋体, &quot;Helvetica Neue&quot;, Helvetica, STHeiTi, sans-serif; font-size: 12px; white-space: normal; background-color: rgb(255, 255, 255);\"><br/></p>', '', '0', '161', '1', '联系我们文章详情ShopXO', '联系我们,ShopXO开源商城', '国内领先企业级B2C开源电商系统！', '1534229110', '1559482593'), ('29', '关于ShopXO', '24', '#FF0000', 'https://shopxo.net/', '1', '<p>ShopXO位于上海市浦东新区，是专业从事生产管理信息化领域技术咨询和软件开发的高新技术企业。公司拥有多名技术人才和资深的行业解决方案专家。</p><p><br/></p><p>公司拥有一支勇于开拓、具有战略眼光和敏锐市场判断力的市场营销队伍，一批求实敬业，追求卓越的行政管理人才，一个能征善战，技术优秀，经验丰富的开发团队。公司坚持按现代企业制度和市场规律办事，在扩大经营规模的同时，注重企业经济运行质量，在自主产品研发及承接软件项目方面获得了很强的竞争力。 我公司也积极参与国内传统企业的信息化改造，引进国际化产品开发的标准，规范软件开发流程，通过提升各层面的软件开发人才的技术素质，打造国产软件精品，目前已经开发出具有自主知识产权的网络商城软件，还在积极开发基于电子商务平台高效能、高效益的管理系统。为今后进一步开拓国内市场打下坚实的基础。公司致力于构造一个开放、发展的人才平台，积极营造追求卓越、积极奉献的工作氛围，把“以人为本”的理念落实到每一项具体工作中，为那些锋芒内敛，激情无限的业界精英提供充分的发展空间，优雅自信、从容自得的工作环境，事业雄心与生活情趣两相兼顾的生活方式。并通过每个员工不断提升自我，以自己的独特价值观对工作与生活作最准确的判断，使我们每一个员工彰显出他们出色的自我品位，独有的工作个性和卓越的创新风格，让他们时刻保持振奋、不断鼓舞内心深处的梦想，永远走在时代潮流前端。公司发展趋势 励精图治，展望未来。公司把发展产业策略与发掘人才策略紧密结合，广纳社会精英，挖掘创新潜能，以人为本，凝聚人气，努力营造和谐宽松的工作氛围，为优秀人才的脱颖而出提供机遇。公司将在深入发展软件产业的同时，通过不懈的努力，来塑造大型软件公司的辉煌形象。</p>', '', '0', '41', '1', '', '', '', '1534229221', '1592318738');
 COMMIT;
 
 -- ----------------------------
@@ -328,7 +328,7 @@ DROP TABLE IF EXISTS `s_custom_view`;
 CREATE TABLE `s_custom_view` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
   `title` char(60) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '标题',
-  `content` text CHARACTER SET utf8 COMMENT '内容',
+  `content` longtext COMMENT '内容',
   `is_enable` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '是否启用（0否，1是）',
   `is_header` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '是否包含头部（0否, 1是）',
   `is_footer` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '是否包含尾部（0否, 1是）',
@@ -343,13 +343,13 @@ CREATE TABLE `s_custom_view` (
   KEY `is_enable` (`is_enable`),
   KEY `access_count` (`access_count`),
   KEY `image_count` (`images_count`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义页面';
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义页面';
 
 -- ----------------------------
 --  Records of `s_custom_view`
 -- ----------------------------
 BEGIN;
-INSERT INTO `s_custom_view` VALUES ('1', '测试自定义页面22沙发上冬瓜豆腐东方红甘肃光合谷 vV 币 vv 小白菜 v 吧俄国人搞活动个人风格 VC 不超过吧都是', '<p><img src=\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\" title=\"1533779966550231.jpeg\" alt=\"1.jpeg\"/></p><p><span style=\"color: rgb(255, 0, 0);\">ShopXO</span></p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \">秀，身材苗条！</span></p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \"><br/></p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><br/></p>', '1', '1', '1', '0', '', '0', '918', '1484965691', '1583067575');
+INSERT INTO `s_custom_view` VALUES ('1', '测试自定义页面22沙发上冬瓜豆腐东方红甘肃光合谷 vV 币 vv 小白菜 v 吧俄国人搞活动个人风格 VC 不超过吧都是', '<p><img src=\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\" title=\"1533779966550231.jpeg\" alt=\"1.jpeg\"/></p><p><span style=\"color: rgb(255, 0, 0);\">ShopXO</span></p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \">秀，身材苗条！</span></p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \"><br/></p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><span style=\"color: rgb(38, 38, 38); font-family: 微软雅黑, \"><br/></span></p><p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。</p><p style=\"box-sizing: border-box; margin-top: 1.6rem; margin-bottom: 1.6rem; color: rgb(51, 51, 51); font-family: \">因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。</p><p><br/></p>', '1', '1', '1', '0', '[\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\",\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\",\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\"]', '1', '922', '1484965691', '1592300274');
 COMMIT;
 
 -- ----------------------------
@@ -538,7 +538,7 @@ CREATE TABLE `s_goods_comments` (
 --  Records of `s_goods_comments`
 -- ----------------------------
 BEGIN;
-INSERT INTO `s_goods_comments` VALUES ('1', '1', '65', '10', 'order', 'asdf 水电费水电费第三方水电费水电费第三方\n东方大厦佛挡杀佛多少东山风动石\n官方复古复古', '', '', '4', '1', '1', '0', '0', '1583121523', '1591614421'), ('2', '1', '65', '2', 'order', '发水电费水电费水电费似懂非懂顺丰速递手动滑稽发给大家发过的食发鬼收到大姐夫广东省房改办飞行背囊防腐木公司地方很近说过发烧几个地方\n十大歌手发给地方很近公司附近是分开过食发鬼\n师傅鬼斧神工东方公司告诉付个首付食发鬼\n发水电费水电费水电费似懂非懂顺丰速递手动滑稽发给大家发过的食发鬼收到大姐夫广东省房改办飞行背囊防腐木公司地方很近说过发烧几个地方 十大歌手发给地方很近公司附近是分开过食发鬼 师傅鬼斧神工东方公司告诉付个首付食发鬼\n发水电费水电费水电费似懂非懂顺丰', '', '粉身碎骨刮大风换个地方干活地方古典风格\n复古复大哥大哥\n发水电费水电费水电费似懂非懂顺丰速递手动滑稽发给大家发过的食发鬼收到大姐夫广东省房改办飞行背囊防腐木公司地方很近说过发烧几个地方 十大歌手发给地方很近公司附近是分开过食发鬼 师傅鬼斧神工东方公司告诉付个首付食发鬼\n发水电费水电费水电费似懂非懂顺丰速递手动滑稽发给大家发过的食发鬼收到大姐夫广东省房改办飞行背囊防腐木公司地方很近说过发烧几个地方 十大歌手发给地方很近公司附近是分开过食发鬼 师傅鬼斧神工东方', '5', '1', '0', '1', '1583123618', '1583121523', '1592121237');
+INSERT INTO `s_goods_comments` VALUES ('1', '1', '65', '10', 'order', 'asdf 水电费水电费第三方水电费水电费第三方\n东方大厦佛挡杀佛多少东山风动石\n官方复古复古', '[\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\",\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\",\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\"]', '', '4', '1', '1', '0', '0', '1583121523', '1591614421'), ('2', '1', '65', '2', 'order', '发水电费水电费水电费似懂非懂顺丰速递手动滑稽发给大家发过的食发鬼收到大姐夫广东省房改办飞行背囊防腐木公司地方很近说过发烧几个地方\n十大歌手发给地方很近公司附近是分开过食发鬼\n师傅鬼斧神工东方公司告诉付个首付食发鬼\n发水电费水电费水电费似懂非懂顺丰速递手动滑稽发给大家发过的食发鬼收到大姐夫广东省房改办飞行背囊防腐木公司地方很近说过发烧几个地方 十大歌手发给地方很近公司附近是分开过食发鬼 师傅鬼斧神工东方公司告诉付个首付食发鬼\n发水电费水电费水电费似懂非懂顺丰', '', '粉身碎骨刮大风换个地方干活地方古典风格\n复古复大哥大哥\n发水电费水电费水电费似懂非懂顺丰速递手动滑稽发给大家发过的食发鬼收到大姐夫广东省房改办飞行背囊防腐木公司地方很近说过发烧几个地方 十大歌手发给地方很近公司附近是分开过食发鬼 师傅鬼斧神工东方公司告诉付个首付食发鬼\n发水电费水电费水电费似懂非懂顺丰速递手动滑稽发给大家发过的食发鬼收到大姐夫广东省房改办飞行背囊防腐木公司地方很近说过发烧几个地方 十大歌手发给地方很近公司附近是分开过食发鬼 师傅鬼斧神工东方', '5', '1', '0', '1', '1583123618', '1583121523', '1592121237');
 COMMIT;
 
 -- ----------------------------
@@ -686,13 +686,13 @@ CREATE TABLE `s_link` (
   PRIMARY KEY (`id`),
   KEY `sort` (`sort`),
   KEY `is_enable` (`is_enable`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='友情链接';
+) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='友情链接';
 
 -- ----------------------------
 --  Records of `s_link`
 -- ----------------------------
 BEGIN;
-INSERT INTO `s_link` VALUES ('1', 'SchoolCMS', 'http://schoolcms.org/', 'SchoolCMS学校教务管理系统', '1', '1', '1', '1486292373', '0'), ('12', 'AmazeUI', 'http://amazeui.shopxo.net/', 'AmazeUI国内首个HTML5框架', '4', '1', '1', '1486353476', '1563088005'), ('13', '龚哥哥的博客', 'http://gong.gg/', '龚哥哥的博客', '2', '1', '1', '1486353528', '0'), ('14', 'ThinkPHP', 'http://www.thinkphp.cn/', 'ThinkPHP', '3', '1', '1', '1487919160', '0'), ('15', 'ShopXO', 'http://shopxo.net', 'ShopXO企业级B2C免费开源电商系统', '0', '1', '1', '1533711881', '1547450275'), ('16', '码云', 'https://gitee.com/gongfuxiang/shopxo', '代码托管平台', '0', '1', '1', '1547450105', '1563088051'), ('17', 'GitHub', 'https://github.com/gongfuxiang/shopxo', '代码托管平台', '0', '1', '1', '1547450145', '1563088069'), ('18', 'ShopXO应用商店', 'http://store.shopxo.net/', 'ShopXO应用商店', '0', '1', '1', '1563088117', '1563088129'), ('19', '码付宝个人免签支付', 'http://pay.shopxo.net/', '码付宝个人免签支付', '0', '1', '1', '1563089718', '1563089753'), ('20', '宝塔面板', 'https://www.bt.cn/?invite_code=MV9kZHh6b2Y=', '宝塔服务器控制面板', '5', '1', '1', '1566531114', '0'), ('21', '西部数码', 'https://www.west.cn/active/freetc/?ReferenceID=934057', '西部数码国内知名服务器提供商', '6', '1', '1', '1566531132', '0');
+INSERT INTO `s_link` VALUES ('1', 'SchoolCMS', 'http://schoolcms.org/', 'SchoolCMS学校教务管理系统', '1', '1', '1', '1486292373', '0'), ('12', 'AmazeUI', 'http://amazeui.shopxo.net/', 'AmazeUI国内首个HTML5框架', '4', '1', '1', '1486353476', '1563088005'), ('13', '龚哥哥的博客', 'http://gong.gg/', '龚哥哥的博客', '2', '1', '1', '1486353528', '1592320862'), ('14', 'ThinkPHP', 'http://www.thinkphp.cn/', 'ThinkPHP', '3', '1', '1', '1487919160', '0'), ('15', 'ShopXO', 'http://shopxo.net', 'ShopXO企业级B2C免费开源电商系统', '0', '1', '1', '1533711881', '1592320866'), ('16', '码云', 'https://gitee.com/gongfuxiang/shopxo', '代码托管平台', '0', '1', '1', '1547450105', '1563088051'), ('17', 'GitHub', 'https://github.com/gongfuxiang/shopxo', '代码托管平台', '0', '1', '1', '1547450145', '1563088069'), ('18', 'ShopXO应用商店', 'http://store.shopxo.net/', 'ShopXO应用商店', '0', '1', '1', '1563088117', '1563088129'), ('19', '码付宝个人免签支付', 'http://pay.shopxo.net/', '码付宝个人免签支付', '0', '1', '1', '1563089718', '1563089753'), ('20', '宝塔面板', 'https://www.bt.cn/?invite_code=MV9kZHh6b2Y=', '宝塔服务器控制面板', '5', '1', '1', '1566531114', '0'), ('21', '西部数码', 'https://www.west.cn/active/freetc/?ReferenceID=934057', '西部数码国内知名服务器提供商', '6', '1', '1', '1566531132', '0');
 COMMIT;
 
 -- ----------------------------
@@ -729,11 +729,11 @@ DROP TABLE IF EXISTS `s_navigation`;
 CREATE TABLE `s_navigation` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
   `pid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '父id',
-  `name` char(30) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '导航名称',
-  `url` char(255) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT 'url地址',
-  `value` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '分类id',
-  `data_type` char(30) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '数据类型（custom:自定义导航, article_class:文章分类, customview:自定义页面）',
-  `nav_type` char(30) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '导航类型（header:顶部导航, footer:底部导航）',
+  `name` char(30) NOT NULL DEFAULT '' COMMENT '导航名称',
+  `url` char(255) NOT NULL DEFAULT '' COMMENT '自定义url地址',
+  `value` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '数据 id',
+  `data_type` char(30) NOT NULL DEFAULT '' COMMENT '数据类型（custom:自定义导航, article_class:文章分类, customview:自定义页面）',
+  `nav_type` char(30) NOT NULL DEFAULT '' COMMENT '导航类型（header:顶部导航, footer:底部导航）',
   `sort` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '排序',
   `is_show` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '是否显示（0否，1是）',
   `is_new_window_open` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否新窗口打开（0否，1是）',
@@ -744,13 +744,13 @@ CREATE TABLE `s_navigation` (
   KEY `sort` (`sort`),
   KEY `nav_type` (`nav_type`),
   KEY `pid` (`pid`)
-) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='导航';
+) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='导航';
 
 -- ----------------------------
 --  Records of `s_navigation`
 -- ----------------------------
 BEGIN;
-INSERT INTO `s_navigation` VALUES ('8', '0', '自定义页面test', '', '1', 'customview', 'header', '0', '1', '0', '1486352254', '1545116379'), ('17', '0', 'ShopXO', 'http://shopxo.net/', '0', 'custom', 'header', '10', '1', '1', '1487923617', '1533873171'), ('24', '54', '服饰鞋包', '', '2', 'goods_category', 'header', '0', '1', '0', '1539150026', '1556016126'), ('34', '0', '信息咨询', 'http://shopxo.net/', '0', 'custom', 'footer', '0', '1', '0', '1554795563', '0'), ('35', '0', '客户服务', 'http://shopxo.net/', '0', 'custom', 'footer', '0', '1', '0', '1554795788', '0'), ('36', '0', '支付方式', 'http://shopxo.net/', '0', 'custom', 'footer', '0', '1', '0', '1554796068', '0'), ('37', '0', '会员中心', 'http://shopxo.net/', '0', 'custom', 'footer', '0', '1', '0', '1554796082', '0'), ('38', '34', '关于ShopXO', '', '29', 'article', 'footer', '0', '1', '0', '1554796171', '0'), ('39', '34', '联系我们', '', '28', 'article', 'footer', '0', '1', '0', '1554796188', '0'), ('40', '34', '招聘英才', '', '27', 'article', 'footer', '0', '1', '0', '1554796202', '0'), ('41', '34', '合作及洽谈', '', '26', 'article', 'footer', '0', '1', '0', '1554796211', '0'), ('42', '35', '如何注册成为会员', '', '1', 'article', 'footer', '0', '1', '0', '1554796239', '0'), ('43', '35', '积分细则', '', '3', 'article', 'footer', '0', '1', '0', '1554796245', '0'), ('44', '35', '如何搜索', '', '5', 'article', 'footer', '0', '1', '0', '1554796253', '0'), ('45', '36', '分期付款', '', '12', 'article', 'footer', '0', '1', '0', '1554796281', '0'), ('46', '36', '邮局汇款', '', '13', 'article', 'footer', '0', '1', '0', '1554796296', '0'), ('47', '36', '在线支付', '', '16', 'article', 'footer', '0', '1', '0', '1554796312', '0'), ('48', '36', '公司转账', '', '14', 'article', 'footer', '0', '1', '0', '1554796327', '0'), ('49', '36', '如何注册支付宝', '', '15', 'article', 'footer', '0', '1', '0', '1554796339', '0'), ('50', '37', '会员修改密码', '', '22', 'article', 'footer', '0', '1', '0', '1554796367', '0'), ('51', '37', '会员修改个人资料', '', '23', 'article', 'footer', '0', '1', '0', '1554796375', '0'), ('52', '37', '修改收货地址', '', '25', 'article', 'footer', '0', '1', '0', '1554796386', '0'), ('53', '37', '如何管理店铺', '', '7', 'article', 'footer', '0', '1', '0', '1554796399', '0'), ('54', '0', '商品分类', 'http://shopxo.net/', '0', 'custom', 'header', '0', '1', '0', '1556015784', '0'), ('55', '54', '手机', '', '58', 'goods_category', 'header', '0', '1', '0', '1556015825', '0');
+INSERT INTO `s_navigation` VALUES ('8', '0', '自定义页面test', '', '1', 'customview', 'header', '0', '0', '0', '1486352254', '1545116379'), ('17', '0', 'ShopXO', 'http://shopxo.net/', '0', 'custom', 'header', '10', '1', '1', '1487923617', '1533873171'), ('24', '54', '服饰鞋包', '', '2', 'goods_category', 'header', '0', '1', '0', '1539150026', '1592230670'), ('34', '0', '信息咨询', 'http://shopxo.net/', '0', 'custom', 'footer', '0', '1', '1', '1554795563', '1592232213'), ('35', '0', '客户服务', 'http://shopxo.net/', '0', 'custom', 'footer', '0', '1', '0', '1554795788', '0'), ('36', '0', '支付方式', 'http://shopxo.net/', '0', 'custom', 'footer', '0', '1', '0', '1554796068', '0'), ('37', '0', '会员中心', 'http://shopxo.net/', '0', 'custom', 'footer', '0', '1', '0', '1554796082', '0'), ('38', '34', '关于ShopXO', '', '29', 'article', 'footer', '0', '1', '0', '1554796171', '0'), ('39', '34', '联系我们', '', '28', 'article', 'footer', '0', '1', '0', '1554796188', '0'), ('40', '34', '招聘英才', '', '27', 'article', 'footer', '0', '1', '0', '1554796202', '0'), ('41', '34', '合作及洽谈', '', '26', 'article', 'footer', '0', '1', '0', '1554796211', '0'), ('42', '35', '如何注册成为会员', '', '1', 'article', 'footer', '0', '1', '0', '1554796239', '0'), ('43', '35', '积分细则', '', '3', 'article', 'footer', '0', '1', '0', '1554796245', '0'), ('44', '35', '如何搜索', '', '5', 'article', 'footer', '0', '1', '0', '1554796253', '0'), ('45', '36', '分期付款', '', '12', 'article', 'footer', '0', '1', '0', '1554796281', '0'), ('46', '36', '邮局汇款', '', '13', 'article', 'footer', '0', '1', '0', '1554796296', '0'), ('47', '36', '在线支付', '', '16', 'article', 'footer', '0', '1', '0', '1554796312', '0'), ('48', '36', '公司转账', '', '14', 'article', 'footer', '0', '1', '0', '1554796327', '0'), ('49', '36', '如何注册支付宝', '', '15', 'article', 'footer', '0', '1', '0', '1554796339', '0'), ('50', '37', '会员修改密码', '', '22', 'article', 'footer', '0', '1', '0', '1554796367', '0'), ('51', '37', '会员修改个人资料', '', '23', 'article', 'footer', '0', '1', '0', '1554796375', '0'), ('52', '37', '修改收货地址', '', '25', 'article', 'footer', '0', '1', '0', '1554796386', '0'), ('53', '37', '如何管理店铺', '', '7', 'article', 'footer', '0', '1', '0', '1554796399', '0'), ('54', '0', '商品分类', 'http://shopxo.net/', '0', 'custom', 'header', '0', '1', '0', '1556015784', '0');
 COMMIT;
 
 -- ----------------------------
@@ -881,7 +881,7 @@ CREATE TABLE `s_order_aftersale` (
 --  Records of `s_order_aftersale`
 -- ----------------------------
 BEGIN;
-INSERT INTO `s_order_aftersale` VALUES ('1', '20200515134249780466', '2', '2', '7', '1', '3', '0', '2', '未按约定时间发货', '1', '168.00', 'sdfdsfdsf', '[]', '', '', '', '1589521628', '0', '0', '1589521641', '0', '1589521628', '1589521641'), ('2', '20200509220012016832', '1', '1', '7', '1', '2', '0', '0', '未按约定时间发货', '0', '168.00', '热热热东方大厦发', '[]', '', '', '', '1589528635', '0', '0', '0', '0', '1589528635', '0'), ('3', '20200608001726706827', '4', '3', '2', '1', '2', '0', '0', '配送超时', '0', '5500.00', '东方大厦发水电费', '[]', '', '', '', '1591599601', '0', '0', '0', '0', '1591599601', '0'), ('4', '20200608001726706827', '5', '3', '12', '1', '2', '0', '0', '物流显示签收但实际未收到货', '0', '0.03', '\n更舒服跟师傅过三个故事发给谁\n发个发送给撒苟富贵帅哥哥葛根粉蛋糕\n食发鬼食发鬼食发鬼', '[\"\\/static\\/upload\\/images\\/order_aftersale\\/1\\/3\\/5\\/2020\\/06\\/08\\/1591605307539422.png\",\"\\/static\\/upload\\/images\\/order_aftersale\\/1\\/3\\/5\\/2020\\/06\\/08\\/1591605307962868.png\",\"\\/static\\/upload\\/images\\/order_aftersale\\/1\\/3\\/5\\/2020\\/06\\/08\\/1591605307490461.jpg\"]', '', '', '', '1591605323', '0', '0', '0', '0', '1591605323', '0');
+INSERT INTO `s_order_aftersale` VALUES ('1', '20200515134249780466', '2', '2', '7', '1', '3', '0', '2', '未按约定时间发货', '1', '168.00', 'sdfdsfdsf', '[]', '', '', '', '1589521628', '0', '0', '1589521641', '0', '1589521628', '1589521641'), ('2', '20200509220012016832', '1', '1', '7', '1', '2', '0', '0', '未按约定时间发货', '0', '168.00', '热热热东方大厦发', '[]', '', '', '', '1589528635', '0', '0', '0', '0', '1589528635', '0'), ('3', '20200608001726706827', '4', '3', '2', '1', '2', '0', '0', '配送超时', '0', '5500.00', '东方大厦发水电费', '[]', '', '', '', '1591599601', '0', '0', '0', '0', '1591599601', '0'), ('4', '20200608001726706827', '5', '3', '12', '1', '2', '0', '0', '物流显示签收但实际未收到货', '0', '0.03', '\n更舒服跟师傅过三个故事发给谁\n发个发送给撒苟富贵帅哥哥葛根粉蛋糕\n食发鬼食发鬼食发鬼', '[\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\",\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\",\"/static/upload/images/customview/image/2018/08/09/1533779966550231.jpeg\"]', '', '', '', '1591605323', '0', '0', '0', '0', '1591605323', '0');
 COMMIT;
 
 -- ----------------------------
@@ -1342,13 +1342,13 @@ CREATE TABLE `s_power` (
   `icon` char(60) NOT NULL DEFAULT '' COMMENT '图标class',
   `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=407 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='权限';
+) ENGINE=InnoDB AUTO_INCREMENT=408 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='权限';
 
 -- ----------------------------
 --  Records of `s_power`
 -- ----------------------------
 BEGIN;
-INSERT INTO `s_power` VALUES ('1', '0', '权限控制', 'Power', 'Index', '3', '1', 'icon-quanxian', '1481612301'), ('4', '1', '角色管理', 'Role', 'Index', '20', '1', '', '1481639037'), ('13', '1', '权限分配', 'Power', 'Index', '30', '1', '', '1482156143'), ('15', '1', '权限添加/编辑', 'Power', 'Save', '31', '0', '', '1482243750'), ('16', '1', '权限删除', 'Power', 'Delete', '32', '0', '', '1482243797'), ('17', '1', '角色组添加/编辑页面', 'Role', 'SaveInfo', '21', '0', '', '1482243855'), ('18', '1', '角色组添加/编辑', 'Role', 'Save', '22', '0', '', '1482243888'), ('19', '1', '管理员添加/编辑页面', 'Admin', 'SaveInfo', '2', '0', '', '1482244637'), ('20', '1', '管理员添加/编辑', 'Admin', 'Save', '3', '0', '', '1482244666'), ('21', '1', '管理员删除', 'Admin', 'Delete', '4', '0', '', '1482244688'), ('22', '1', '管理员列表', 'Admin', 'Index', '1', '1', '', '1482568868'), ('23', '1', '角色删除', 'Role', 'Delete', '23', '0', '', '1482569155'), ('38', '0', '商品管理', 'Goods', 'Index', '5', '1', 'icon-shangpin', '1483283430'), ('39', '38', '商品管理', 'Goods', 'Index', '1', '1', '', '1483283546'), ('41', '0', '系统设置', 'Config', 'Index', '1', '1', 'icon-peizhi', '1483362358'), ('42', '41', '配置保存', 'Config', 'Save', '10', '0', '', '1483432335'), ('57', '38', '商品添加/编辑页面', 'Goods', 'SaveInfo', '2', '0', '', '1483616439'), ('58', '38', '商品添加/编辑', 'Goods', 'Save', '3', '0', '', '1483616492'), ('59', '38', '商品删除', 'Goods', 'Delete', '4', '0', '', '1483616569'), ('81', '0', '站点配置', 'Site', 'Index', '2', '1', 'icon-zhandianpeizhi', '1486182943'), ('103', '81', '站点设置', 'Site', 'Index', '0', '1', '', '1486561470'), ('104', '81', '短信设置', 'Sms', 'Index', '10', '1', '', '1486561615'), ('105', '81', '站点设置编辑', 'Site', 'Save', '1', '0', '', '1486561780'), ('107', '81', '短信设置编辑', 'Sms', 'Save', '11', '0', '', '1486562011'), ('118', '0', '工具', 'Tool', 'Index', '50', '1', 'icon-tools', '1488108044'), ('119', '118', '缓存管理', 'Cache', 'Index', '1', '1', '', '1488108107'), ('120', '118', '站点缓存更新', 'Cache', 'StatusUpdate', '2', '0', '', '1488108235'), ('121', '118', '模板缓存更新', 'Cache', 'TemplateUpdate', '2', '0', '', '1488108390'), ('122', '118', '模块缓存更新', 'Cache', 'ModuleUpdate', '3', '0', '', '1488108436'), ('126', '0', '用户管理', 'User', 'Index', '4', '1', 'icon-yonghuguanli', '1490794162'), ('127', '126', '用户列表', 'User', 'Index', '0', '1', '', '1490794316'), ('128', '126', '用户编辑/添加页面', 'User', 'SaveInfo', '1', '0', '', '1490794458'), ('129', '126', '用户添加/编辑', 'User', 'Save', '2', '0', '', '1490794510'), ('130', '126', '用户删除', 'User', 'Delete', '3', '0', '', '1490794585'), ('146', '126', 'Excel导出', 'User', 'ExcelExport', '6', '0', '', '1522223773'), ('153', '222', '地区管理', 'Region', 'Index', '60', '1', '', '1526304473'), ('154', '222', '地区添加/编辑', 'Region', 'Save', '61', '0', '', '1526304503'), ('155', '222', '地区删除', 'Region', 'Delete', '62', '0', '', '1526304531'), ('156', '222', '快递管理', 'Express', 'Index', '70', '1', '', '1526304473'), ('157', '222', '快递添加/编辑', 'Express', 'Save', '71', '0', '', '1526304473'), ('158', '222', '快递删除', 'Express', 'Delete', '72', '0', '', '1526304473'), ('172', '222', '首页轮播', 'Slide', 'Index', '40', '1', '', '1527149117'), ('173', '222', '轮播添加/编辑页面', 'Slide', 'SaveInfo', '41', '0', '', '1527149152'), ('174', '222', '轮播添加/编辑', 'Slide', 'Save', '42', '0', '', '1527149186'), ('175', '222', '轮播状态更新', 'Slide', 'StatusUpdate', '43', '0', '', '1527156980'), ('176', '222', '轮播删除', 'Slide', 'Delete', '44', '0', '', '1527157260'), ('177', '0', '订单管理', 'Order', 'Index', '6', '1', 'icon-dingdan', '1522229870'), ('178', '177', '订单管理', 'Order', 'Index', '1', '1', '', '1522317898'), ('179', '177', '订单删除', 'Order', 'Delete', '2', '0', '', '1522317917'), ('180', '177', '订单取消', 'Order', 'Cancel', '3', '0', '', '1527497803'), ('181', '38', '商品状态更新', 'Goods', 'StatusUpdate', '5', '0', '', '1528080200'), ('182', '0', '数据管理', 'Data', 'Index', '22', '1', 'icon-shuju', '1528096661'), ('183', '182', '消息管理', 'Message', 'Index', '0', '1', '', '1528080200'), ('184', '182', '消息删除', 'Message', 'Delete', '1', '0', '', '1528080200'), ('185', '182', '支付日志', 'PayLog', 'Index', '10', '1', '', '1528080200'), ('186', '182', '积分日志', 'IntegralLog', 'Index', '30', '1', '', '1528103067'), ('193', '222', '筛选价格', 'ScreeningPrice', 'Index', '50', '1', '', '1528708578'), ('194', '222', '筛选价格添加/编辑', 'ScreeningPrice', 'Save', '51', '0', '', '1528708609'), ('199', '81', 'SEO设置', 'Seo', 'Index', '30', '1', '', '1528771081'), ('200', '81', 'SEO设置编辑', 'Seo', 'Save', '31', '0', '', '1528771105'), ('201', '38', '商品分类', 'GoodsCategory', 'Index', '10', '1', '', '1529041901'), ('202', '38', '商品分类添加/编辑', 'GoodsCategory', 'Save', '11', '0', '', '1529041928'), ('203', '38', '商品分类删除', 'GoodsCategory', 'Delete', '12', '0', '', '1529041949'), ('204', '0', '文章管理', 'Article', 'Index', '20', '1', 'icon-wenzhang', '1530360560'), ('205', '204', '文章管理', 'Article', 'Index', '0', '1', '', '1530360593'), ('206', '204', '文章添加/编辑页面', 'Article', 'SaveInfo', '1', '0', '', '1530360625'), ('207', '204', '文章添加/编辑', 'Article', 'Save', '2', '0', '', '1530360663'), ('208', '204', '文章删除', 'Article', 'Delete', '3', '0', '', '1530360692'), ('209', '204', '文章状态更新', 'Article', 'StatusUpdate', '4', '0', '', '1530360730'), ('210', '204', '文章分类', 'ArticleCategory', 'Index', '10', '1', '', '1530361071'), ('211', '204', '文章分类编辑/添加', 'ArticleCategory', 'Save', '11', '0', '', '1530361101'), ('212', '204', '文章分类删除', 'ArticleCategory', 'Delete', '12', '0', '', '1530361126'), ('213', '0', '问答留言', 'Answer', 'Index', '21', '1', 'icon-wenda', '1533112421'), ('214', '213', '问答留言', 'Answer', 'Index', '0', '1', '', '1533112443'), ('215', '213', '问答留言回复', 'Answer', 'Reply', '1', '0', '', '1533119660'), ('216', '213', '问答留言删除', 'Answer', 'Delete', '2', '0', '', '1533119680'), ('217', '213', '问答留言状态更新', 'Answer', 'StatusUpdate', '3', '0', '', '1533119704'), ('219', '81', '邮箱设置', 'Email', 'Index', '20', '1', '', '1533636067'), ('220', '81', '邮箱设置/编辑', 'Email', 'Save', '21', '0', '', '1533636109'), ('221', '81', '邮件发送测试', 'Email', 'EmailTest', '22', '0', '', '1533636157'), ('222', '0', '网站管理', 'Navigation', 'Index', '7', '1', 'icon-wangzhanguanli', '1533692051'), ('223', '222', '导航管理', 'Navigation', 'Index', '0', '1', '', '1486183114'), ('226', '222', '导航添加/编辑', 'Navigation', 'Save', '2', '0', '', '1486183367'), ('227', '222', '导航删除', 'Navigation', 'Delete', '3', '0', '', '1486183410'), ('228', '222', '导航状态更新', 'Navigation', 'StatusUpdate', '4', '0', '', '1486183462'), ('234', '222', '自定义页面', 'CustomView', 'Index', '11', '1', '', '1486193400'), ('235', '222', '自定义页面添加/编辑页面', 'CustomView', 'SaveInfo', '12', '0', '', '1486193449'), ('236', '222', '自定义页面添加/编辑', 'CustomView', 'Save', '13', '0', '', '1486193473'), ('237', '222', '自定义页面删除', 'CustomView', 'Delete', '14', '0', '', '1486193516'), ('238', '222', '自定义页面状态更新', 'CustomView', 'StatusUpdate', '15', '0', '', '1486193582'), ('239', '222', '友情链接', 'Link', 'Index', '21', '1', '', '1486194358'), ('240', '222', '友情链接添加/编辑页面', 'Link', 'SaveInfo', '22', '0', '', '1486194392'), ('241', '222', '友情链接添加/编辑', 'Link', 'Save', '23', '0', '', '1486194413'), ('242', '222', '友情链接删除', 'Link', 'Delete', '24', '0', '', '1486194435'), ('243', '222', '友情链接状态更新', 'Link', 'StatusUpdate', '25', '0', '', '1486194479'), ('244', '222', '主题管理', 'Theme', 'Index', '30', '1', '', '1494381693'), ('245', '222', '主题管理添加/编辑', 'Theme', 'Save', '31', '0', '', '1494398194'), ('246', '222', '主题上传安装', 'Theme', 'Upload', '32', '0', '', '1494405096'), ('247', '222', '主题删除', 'Theme', 'Delete', '33', '0', '', '1494410655'), ('248', '204', '商品首页推荐', 'Article', 'StatusHomeRecommended', '5', '0', '', '1534156400'), ('249', '252', '品牌管理', 'Brand', 'Index', '0', '1', '', '1535683271'), ('250', '252', '品牌添加/编辑', 'Brand', 'Save', '2', '0', '', '1535683310'), ('251', '252', '品牌删除', 'Brand', 'Delete', '4', '0', '', '1535683351'), ('252', '0', '品牌管理', 'Brand', 'Index', '8', '1', 'icon-ico-pinpaiguanli', '1535684308'), ('253', '252', '品牌分类', 'BrandCategory', 'Index', '10', '1', '', '1535684401'), ('254', '252', '品牌分类添加/编辑', 'BrandCategory', 'Save', '11', '0', '', '1535684424'), ('255', '252', '品牌分类删除', 'BrandCategory', 'Delete', '12', '0', '', '1535684444'), ('256', '252', '品牌添加/编辑页面', 'Brand', 'SaveInfo', '1', '0', '', '1535694837'), ('257', '252', '品牌状态更新', 'Brand', 'StatusUpdate', '3', '0', '', '1535694880'), ('258', '222', '筛选价格删除', 'ScreeningPrice', 'Delete', '52', '0', '', '1536227071'), ('259', '222', '支付方式', 'Payment', 'Index', '80', '1', '', '1537156351'), ('260', '222', '支付方式安装/编辑页面', 'Payment', 'SaveInfo', '81', '0', '', '1537156423'), ('261', '222', '支付方式安装/编辑', 'Payment', 'Save', '82', '0', '', '1537156463'), ('262', '222', '支付方式删除', 'Payment', 'Delete', '83', '0', '', '1537156502'), ('263', '222', '支付方式安装', 'Payment', 'Install', '84', '0', '', '1537166090'), ('264', '222', '支付方式状态更新', 'Payment', 'StatusUpdate', '85', '0', '', '1537166149'), ('265', '222', '支付方式卸载', 'Payment', 'Uninstall', '86', '0', '', '1537167814'), ('266', '222', '支付方式上传', 'Payment', 'Upload', '87', '0', '', '1537173653'), ('267', '177', '订单发货', 'Order', 'Delivery', '4', '0', '', '1538413499'), ('268', '177', '订单收货', 'Order', 'Collect', '5', '0', '', '1538414034'), ('269', '177', '订单支付', 'Order', 'Pay', '6', '0', '', '1538757043'), ('310', '177', '订单确认', 'Order', 'Confirm', '7', '0', '', '1542011799'), ('311', '1', '角色状态更新', 'Role', 'StatusUpdate', '24', '0', '', '1542102071'), ('312', '0', '支付宝小程序', 'AppMiniAlipay', 'Index', '10', '1', 'icon-xiaochengxu-alipay', '1542558274'), ('313', '312', '基础配置', 'AppMiniAlipayConfig', 'Index', '0', '1', '', '1542558297'), ('314', '319', '首页导航', 'AppHomeNav', 'Index', '10', '1', '', '1542558318'), ('315', '319', '首页导航添加/编辑页面', 'AppHomeNav', 'SaveInfo', '11', '0', '', '1542558686'), ('316', '319', '首页导航添加/编辑', 'AppHomeNav', 'Save', '12', '0', '', '1542558706'), ('317', '319', '首页导航状态更新', 'AppHomeNav', 'StatusUpdate', '13', '0', '', '1542558747'), ('318', '319', '首页导航删除', 'AppHomeNav', 'Delete', '14', '0', '', '1542558767'), ('319', '0', '手机端管理', 'App', 'Index', '9', '1', 'icon-shouji', '0'), ('325', '312', '基础配置保存', 'AppMiniAlipayConfig', 'Save', '1', '0', '', '1542596647'), ('326', '319', '基础配置', 'AppConfig', 'Index', '0', '1', '', '1543206359'), ('327', '319', '基础配置保存', 'AppConfig', 'Save', '1', '0', '', '1543206402'), ('328', '312', '小程序', 'AppMiniAlipayList', 'Index', '10', '1', '', '1543304094'), ('329', '312', '小程序生成', 'AppMiniAlipayList', 'Created', '11', '0', '', '1543305528'), ('330', '312', '小程序删除', 'AppMiniAlipayList', 'Delete', '12', '0', '', '1543305609'), ('331', '118', '日志删除', 'Cache', 'LogDelete', '4', '0', '', '1545642163'), ('332', '0', '微信小程序', 'AppMiniWeixin', 'Index', '11', '1', 'icon-xiaochengxu-wechat', '1546935020'), ('333', '332', '基础配置', 'AppMiniWeixinConfig', 'Index', '0', '1', '', '1546935090'), ('334', '332', '基础配置保存', 'AppMiniWeixinConfig', 'Save', '1', '0', '', '1546935118'), ('335', '332', '小程序', 'AppMiniWeixinList', 'Index', '10', '1', '', '1546935153'), ('336', '332', '小程序生成', 'AppMiniWeixinList', 'Created', '11', '0', '', '1546935187'), ('337', '332', '小程序删除', 'AppMiniWeixinList', 'Delete', '12', '0', '', '1546935212'), ('339', '41', '后台配置', 'Config', 'Index', '0', '1', '', '1549419752'), ('340', '0', '应用中心', 'Store', 'Index', '30', '1', 'icon-application', '1549496703'), ('341', '340', '应用管理', 'Pluginsadmin', 'Index', '1', '1', '', '1549497306'), ('342', '340', '应用状态更新', 'Pluginsadmin', 'StatusUpdate', '3', '0', '', '1549694138'), ('343', '340', '应用调用管理', 'Plugins', 'Index', '0', '0', '', '1549958187'), ('345', '340', '应用添加/编辑页面', 'Pluginsadmin', 'SaveInfo', '1', '0', '', '1549977925'), ('346', '340', '应用添加/编辑', 'Pluginsadmin', 'Save', '2', '0', '', '1549977958'), ('347', '340', '应用删除', 'Pluginsadmin', 'Delete', '4', '0', '', '1549977993'), ('348', '340', '应用上传', 'Pluginsadmin', 'Upload', '5', '0', '', '1550110821'), ('349', '118', 'SQL控制台', 'Sqlconsole', 'Index', '10', '1', '', '1550476002'), ('350', '118', 'SQL执行', 'Sqlconsole', 'Implement', '11', '0', '', '1550476023'), ('351', '340', '应用打包', 'Pluginsadmin', 'Download', '6', '0', '', '1553248727'), ('352', '213', '问答添加/编辑页面', 'Answer', 'SaveInfo', '4', '0', '', '1553964318'), ('353', '213', '问答添加/编辑', 'Answer', 'Save', '5', '0', '', '1553964354'), ('354', '41', '商店信息', 'Config', 'Store', '0', '1', '', '1554803430'), ('356', '38', '商品评论', 'Goodscomments', 'Index', '20', '1', '', '1533112443'), ('357', '38', '商品评论回复', 'Goodscomments', 'Reply', '21', '0', '', '1533119660'), ('358', '38', '商品评论删除', 'Goodscomments', 'Delete', '22', '0', '', '1533119680'), ('359', '38', '商品评论状态更新', 'Goodscomments', 'StatusUpdate', '23', '0', '', '1533119704'), ('360', '38', '商品评论添加/编辑页面', 'Goodscomments', 'SaveInfo', '24', '0', '', '1553964318'), ('361', '38', '商品评论添加/编辑', 'Goodscomments', 'Save', '25', '0', '', '1553964354'), ('362', '81', '协议管理', 'Agreement', 'Index', '40', '1', '', '1486561615'), ('363', '81', '协议设置编辑', 'Agreement', 'Save', '41', '0', '', '1486562011'), ('364', '177', '订单售后', 'Orderaftersale', 'Index', '10', '1', '', '1522317898'), ('365', '177', '订单售后删除', 'Orderaftersale', 'Delete', '11', '0', '', '1522317917'), ('366', '177', '订单售后取消', 'Orderaftersale', 'Cancel', '12', '0', '', '1527497803'), ('367', '177', '订单售后审核', 'Orderaftersale', 'Audit', '13', '0', '', '1538413499'), ('368', '177', '订单售后确认', 'Orderaftersale', 'Confirm', '14', '0', '', '1538414034'), ('369', '177', '订单售后拒绝', 'Orderaftersale', 'Refuse', '15', '0', '', '1538757043'), ('372', '182', '退款日志', 'RefundLog', 'Index', '20', '1', '', '1528080200'), ('373', '340', '应用商店', 'Store', 'Index', '10', '1', '', '1553248727'), ('374', '340', '应用安装', 'Pluginsadmin', 'Install', '6', '0', '', '1561369950'), ('375', '340', '应用卸载', 'Pluginsadmin', 'Uninstall', '7', '0', '', '1561370063'), ('376', '319', '用户中心导航', 'AppCenterNav', 'Index', '20', '1', '', '1542558318'), ('377', '319', '用户中心导航添加/编辑页面', 'AppCenterNav', 'SaveInfo', '21', '0', '', '1542558686'), ('378', '319', '用户中心导航添加/编辑', 'AppCenterNav', 'Save', '22', '0', '', '1542558706'), ('379', '319', '用户中心导航状态更新', 'AppCenterNav', 'StatusUpdate', '23', '0', '', '1542558747'), ('380', '319', '用户中心导航删除', 'AppCenterNav', 'Delete', '24', '0', '', '1542558767'), ('381', '0', '百度小程序', 'AppMiniBaidu', 'Index', '12', '1', 'icon-xiaochengxu-baidu', '1546935020'), ('382', '381', '基础配置', 'AppMiniBaiduConfig', 'Index', '0', '1', '', '1546935090'), ('383', '381', '基础配置保存', 'AppMiniBaiduConfig', 'Save', '1', '0', '', '1546935118'), ('384', '381', '小程序', 'AppMiniBaiduList', 'Index', '10', '1', '', '1546935153'), ('385', '381', '小程序生成', 'AppMiniBaiduList', 'Created', '11', '0', '', '1546935187'), ('386', '381', '小程序删除', 'AppMiniBaiduList', 'Delete', '12', '0', '', '1546935212'), ('387', '222', '主题下载', 'Theme', 'Download', '34', '0', '', '1494410699'), ('388', '0', '头条小程序', 'AppMiniToutiao', 'Index', '13', '1', 'icon-xiaochengxu-toutiao', '1546935020'), ('389', '388', '基础配置', 'AppMiniToutiaoConfig', 'Index', '0', '1', '', '1546935090'), ('390', '388', '基础配置保存', 'AppMiniToutiaoConfig', 'Save', '1', '0', '', '1546935118'), ('391', '388', '小程序', 'AppMiniToutiaoList', 'Index', '10', '1', '', '1546935153'), ('392', '388', '小程序生成', 'AppMiniToutiaoList', 'Created', '11', '0', '', '1546935187'), ('393', '388', '小程序删除', 'AppMiniToutiaoList', 'Delete', '12', '0', '', '1546935212'), ('394', '0', 'QQ小程序', 'AppMiniQQ', 'Index', '14', '1', 'icon-xiaochengxu-qq', '1546935020'), ('395', '394', '基础配置', 'AppMiniQQConfig', 'Index', '0', '1', '', '1546935090'), ('396', '394', '基础配置保存', 'AppMiniQQConfig', 'Save', '1', '0', '', '1546935118'), ('397', '394', '小程序', 'AppMiniQQList', 'Index', '10', '1', '', '1546935153'), ('398', '394', '小程序生成', 'AppMiniQQList', 'Created', '11', '0', '', '1546935187'), ('399', '394', '小程序删除', 'AppMiniQQList', 'Delete', '12', '0', '', '1546935212'), ('400', '177', '订单详情', 'Order', 'Detail', '8', '0', '', '1589534580'), ('401', '177', '订单售后详情', 'Orderaftersale', 'Detail', '16', '0', '', '1589538361'), ('402', '38', '商品详情', 'Goods', 'Detail', '6', '0', '', '1589539780'), ('403', '38', '商品评论详情', 'Goodscomments', 'Detail', '26', '0', '', '1591609904'), ('404', '126', '用户详情', 'User', 'Detail', '7', '0', '', '1591621569'), ('405', '1', '管理员详情', 'Admin', 'Detail', '5', '0', '', '1591951422'), ('406', '1', '角色详情', 'Role', 'Detail', '25', '0', '', '1542102071');
+INSERT INTO `s_power` VALUES ('1', '0', '权限控制', 'Power', 'Index', '3', '1', 'icon-quanxian', '1481612301'), ('4', '1', '角色管理', 'Role', 'Index', '20', '1', '', '1481639037'), ('13', '1', '权限分配', 'Power', 'Index', '30', '1', '', '1482156143'), ('15', '1', '权限添加/编辑', 'Power', 'Save', '31', '0', '', '1482243750'), ('16', '1', '权限删除', 'Power', 'Delete', '32', '0', '', '1482243797'), ('17', '1', '角色组添加/编辑页面', 'Role', 'SaveInfo', '21', '0', '', '1482243855'), ('18', '1', '角色组添加/编辑', 'Role', 'Save', '22', '0', '', '1482243888'), ('19', '1', '管理员添加/编辑页面', 'Admin', 'SaveInfo', '2', '0', '', '1482244637'), ('20', '1', '管理员添加/编辑', 'Admin', 'Save', '3', '0', '', '1482244666'), ('21', '1', '管理员删除', 'Admin', 'Delete', '4', '0', '', '1482244688'), ('22', '1', '管理员列表', 'Admin', 'Index', '1', '1', '', '1482568868'), ('23', '1', '角色删除', 'Role', 'Delete', '23', '0', '', '1482569155'), ('38', '0', '商品管理', 'Goods', 'Index', '5', '1', 'icon-shangpin', '1483283430'), ('39', '38', '商品管理', 'Goods', 'Index', '1', '1', '', '1483283546'), ('41', '0', '系统设置', 'Config', 'Index', '1', '1', 'icon-peizhi', '1483362358'), ('42', '41', '配置保存', 'Config', 'Save', '10', '0', '', '1483432335'), ('57', '38', '商品添加/编辑页面', 'Goods', 'SaveInfo', '2', '0', '', '1483616439'), ('58', '38', '商品添加/编辑', 'Goods', 'Save', '3', '0', '', '1483616492'), ('59', '38', '商品删除', 'Goods', 'Delete', '4', '0', '', '1483616569'), ('81', '0', '站点配置', 'Site', 'Index', '2', '1', 'icon-zhandianpeizhi', '1486182943'), ('103', '81', '站点设置', 'Site', 'Index', '0', '1', '', '1486561470'), ('104', '81', '短信设置', 'Sms', 'Index', '10', '1', '', '1486561615'), ('105', '81', '站点设置编辑', 'Site', 'Save', '1', '0', '', '1486561780'), ('107', '81', '短信设置编辑', 'Sms', 'Save', '11', '0', '', '1486562011'), ('118', '0', '工具', 'Tool', 'Index', '50', '1', 'icon-tools', '1488108044'), ('119', '118', '缓存管理', 'Cache', 'Index', '1', '1', '', '1488108107'), ('120', '118', '站点缓存更新', 'Cache', 'StatusUpdate', '2', '0', '', '1488108235'), ('121', '118', '模板缓存更新', 'Cache', 'TemplateUpdate', '2', '0', '', '1488108390'), ('122', '118', '模块缓存更新', 'Cache', 'ModuleUpdate', '3', '0', '', '1488108436'), ('126', '0', '用户管理', 'User', 'Index', '4', '1', 'icon-yonghuguanli', '1490794162'), ('127', '126', '用户列表', 'User', 'Index', '0', '1', '', '1490794316'), ('128', '126', '用户编辑/添加页面', 'User', 'SaveInfo', '1', '0', '', '1490794458'), ('129', '126', '用户添加/编辑', 'User', 'Save', '2', '0', '', '1490794510'), ('130', '126', '用户删除', 'User', 'Delete', '3', '0', '', '1490794585'), ('146', '126', 'Excel导出', 'User', 'ExcelExport', '6', '0', '', '1522223773'), ('153', '222', '地区管理', 'Region', 'Index', '60', '1', '', '1526304473'), ('154', '222', '地区添加/编辑', 'Region', 'Save', '61', '0', '', '1526304503'), ('155', '222', '地区删除', 'Region', 'Delete', '62', '0', '', '1526304531'), ('156', '222', '快递管理', 'Express', 'Index', '70', '1', '', '1526304473'), ('157', '222', '快递添加/编辑', 'Express', 'Save', '71', '0', '', '1526304473'), ('158', '222', '快递删除', 'Express', 'Delete', '72', '0', '', '1526304473'), ('172', '222', '首页轮播', 'Slide', 'Index', '40', '1', '', '1527149117'), ('173', '222', '轮播添加/编辑页面', 'Slide', 'SaveInfo', '41', '0', '', '1527149152'), ('174', '222', '轮播添加/编辑', 'Slide', 'Save', '42', '0', '', '1527149186'), ('175', '222', '轮播状态更新', 'Slide', 'StatusUpdate', '43', '0', '', '1527156980'), ('176', '222', '轮播删除', 'Slide', 'Delete', '44', '0', '', '1527157260'), ('177', '0', '订单管理', 'Order', 'Index', '6', '1', 'icon-dingdan', '1522229870'), ('178', '177', '订单管理', 'Order', 'Index', '1', '1', '', '1522317898'), ('179', '177', '订单删除', 'Order', 'Delete', '2', '0', '', '1522317917'), ('180', '177', '订单取消', 'Order', 'Cancel', '3', '0', '', '1527497803'), ('181', '38', '商品状态更新', 'Goods', 'StatusUpdate', '5', '0', '', '1528080200'), ('182', '0', '数据管理', 'Data', 'Index', '22', '1', 'icon-shuju', '1528096661'), ('183', '182', '消息管理', 'Message', 'Index', '0', '1', '', '1528080200'), ('184', '182', '消息删除', 'Message', 'Delete', '1', '0', '', '1528080200'), ('185', '182', '支付日志', 'PayLog', 'Index', '10', '1', '', '1528080200'), ('186', '182', '积分日志', 'IntegralLog', 'Index', '30', '1', '', '1528103067'), ('193', '222', '筛选价格', 'ScreeningPrice', 'Index', '50', '1', '', '1528708578'), ('194', '222', '筛选价格添加/编辑', 'ScreeningPrice', 'Save', '51', '0', '', '1528708609'), ('199', '81', 'SEO设置', 'Seo', 'Index', '30', '1', '', '1528771081'), ('200', '81', 'SEO设置编辑', 'Seo', 'Save', '31', '0', '', '1528771105'), ('201', '38', '商品分类', 'GoodsCategory', 'Index', '10', '1', '', '1529041901'), ('202', '38', '商品分类添加/编辑', 'GoodsCategory', 'Save', '11', '0', '', '1529041928'), ('203', '38', '商品分类删除', 'GoodsCategory', 'Delete', '12', '0', '', '1529041949'), ('204', '0', '文章管理', 'Article', 'Index', '20', '1', 'icon-wenzhang', '1530360560'), ('205', '204', '文章管理', 'Article', 'Index', '0', '1', '', '1530360593'), ('206', '204', '文章添加/编辑页面', 'Article', 'SaveInfo', '1', '0', '', '1530360625'), ('207', '204', '文章添加/编辑', 'Article', 'Save', '2', '0', '', '1530360663'), ('208', '204', '文章删除', 'Article', 'Delete', '3', '0', '', '1530360692'), ('209', '204', '文章状态更新', 'Article', 'StatusUpdate', '4', '0', '', '1530360730'), ('210', '204', '文章分类', 'ArticleCategory', 'Index', '10', '1', '', '1530361071'), ('211', '204', '文章分类编辑/添加', 'ArticleCategory', 'Save', '11', '0', '', '1530361101'), ('212', '204', '文章分类删除', 'ArticleCategory', 'Delete', '12', '0', '', '1530361126'), ('213', '0', '问答留言', 'Answer', 'Index', '21', '1', 'icon-wenda', '1533112421'), ('214', '213', '问答留言', 'Answer', 'Index', '0', '1', '', '1533112443'), ('215', '213', '问答留言回复', 'Answer', 'Reply', '1', '0', '', '1533119660'), ('216', '213', '问答留言删除', 'Answer', 'Delete', '2', '0', '', '1533119680'), ('217', '213', '问答留言状态更新', 'Answer', 'StatusUpdate', '3', '0', '', '1533119704'), ('219', '81', '邮箱设置', 'Email', 'Index', '20', '1', '', '1533636067'), ('220', '81', '邮箱设置/编辑', 'Email', 'Save', '21', '0', '', '1533636109'), ('221', '81', '邮件发送测试', 'Email', 'EmailTest', '22', '0', '', '1533636157'), ('222', '0', '网站管理', 'Navigation', 'Index', '7', '1', 'icon-wangzhanguanli', '1533692051'), ('223', '222', '导航管理', 'Navigation', 'Index', '0', '1', '', '1486183114'), ('226', '222', '导航添加/编辑', 'Navigation', 'Save', '2', '0', '', '1486183367'), ('227', '222', '导航删除', 'Navigation', 'Delete', '3', '0', '', '1486183410'), ('228', '222', '导航状态更新', 'Navigation', 'StatusUpdate', '4', '0', '', '1486183462'), ('234', '222', '自定义页面', 'CustomView', 'Index', '11', '1', '', '1486193400'), ('235', '222', '自定义页面添加/编辑页面', 'CustomView', 'SaveInfo', '12', '0', '', '1486193449'), ('236', '222', '自定义页面添加/编辑', 'CustomView', 'Save', '13', '0', '', '1486193473'), ('237', '222', '自定义页面删除', 'CustomView', 'Delete', '14', '0', '', '1486193516'), ('238', '222', '自定义页面状态更新', 'CustomView', 'StatusUpdate', '15', '0', '', '1486193582'), ('239', '222', '友情链接', 'Link', 'Index', '21', '1', '', '1486194358'), ('240', '222', '友情链接添加/编辑页面', 'Link', 'SaveInfo', '22', '0', '', '1486194392'), ('241', '222', '友情链接添加/编辑', 'Link', 'Save', '23', '0', '', '1486194413'), ('242', '222', '友情链接删除', 'Link', 'Delete', '24', '0', '', '1486194435'), ('243', '222', '友情链接状态更新', 'Link', 'StatusUpdate', '25', '0', '', '1486194479'), ('244', '222', '主题管理', 'Theme', 'Index', '30', '1', '', '1494381693'), ('245', '222', '主题管理添加/编辑', 'Theme', 'Save', '31', '0', '', '1494398194'), ('246', '222', '主题上传安装', 'Theme', 'Upload', '32', '0', '', '1494405096'), ('247', '222', '主题删除', 'Theme', 'Delete', '33', '0', '', '1494410655'), ('248', '204', '文章详情', 'Article', 'Detail', '5', '0', '', '1534156400'), ('249', '252', '品牌管理', 'Brand', 'Index', '0', '1', '', '1535683271'), ('250', '252', '品牌添加/编辑', 'Brand', 'Save', '2', '0', '', '1535683310'), ('251', '252', '品牌删除', 'Brand', 'Delete', '4', '0', '', '1535683351'), ('252', '0', '品牌管理', 'Brand', 'Index', '8', '1', 'icon-ico-pinpaiguanli', '1535684308'), ('253', '252', '品牌分类', 'BrandCategory', 'Index', '10', '1', '', '1535684401'), ('254', '252', '品牌分类添加/编辑', 'BrandCategory', 'Save', '11', '0', '', '1535684424'), ('255', '252', '品牌分类删除', 'BrandCategory', 'Delete', '12', '0', '', '1535684444'), ('256', '252', '品牌添加/编辑页面', 'Brand', 'SaveInfo', '1', '0', '', '1535694837'), ('257', '252', '品牌状态更新', 'Brand', 'StatusUpdate', '3', '0', '', '1535694880'), ('258', '222', '筛选价格删除', 'ScreeningPrice', 'Delete', '52', '0', '', '1536227071'), ('259', '222', '支付方式', 'Payment', 'Index', '80', '1', '', '1537156351'), ('260', '222', '支付方式安装/编辑页面', 'Payment', 'SaveInfo', '81', '0', '', '1537156423'), ('261', '222', '支付方式安装/编辑', 'Payment', 'Save', '82', '0', '', '1537156463'), ('262', '222', '支付方式删除', 'Payment', 'Delete', '83', '0', '', '1537156502'), ('263', '222', '支付方式安装', 'Payment', 'Install', '84', '0', '', '1537166090'), ('264', '222', '支付方式状态更新', 'Payment', 'StatusUpdate', '85', '0', '', '1537166149'), ('265', '222', '支付方式卸载', 'Payment', 'Uninstall', '86', '0', '', '1537167814'), ('266', '222', '支付方式上传', 'Payment', 'Upload', '87', '0', '', '1537173653'), ('267', '177', '订单发货', 'Order', 'Delivery', '4', '0', '', '1538413499'), ('268', '177', '订单收货', 'Order', 'Collect', '5', '0', '', '1538414034'), ('269', '177', '订单支付', 'Order', 'Pay', '6', '0', '', '1538757043'), ('310', '177', '订单确认', 'Order', 'Confirm', '7', '0', '', '1542011799'), ('311', '1', '角色状态更新', 'Role', 'StatusUpdate', '24', '0', '', '1542102071'), ('312', '0', '支付宝小程序', 'AppMiniAlipay', 'Index', '10', '1', 'icon-xiaochengxu-alipay', '1542558274'), ('313', '312', '基础配置', 'AppMiniAlipayConfig', 'Index', '0', '1', '', '1542558297'), ('314', '319', '首页导航', 'AppHomeNav', 'Index', '10', '1', '', '1542558318'), ('315', '319', '首页导航添加/编辑页面', 'AppHomeNav', 'SaveInfo', '11', '0', '', '1542558686'), ('316', '319', '首页导航添加/编辑', 'AppHomeNav', 'Save', '12', '0', '', '1542558706'), ('317', '319', '首页导航状态更新', 'AppHomeNav', 'StatusUpdate', '13', '0', '', '1542558747'), ('318', '319', '首页导航删除', 'AppHomeNav', 'Delete', '14', '0', '', '1542558767'), ('319', '0', '手机端管理', 'App', 'Index', '9', '1', 'icon-shouji', '0'), ('325', '312', '基础配置保存', 'AppMiniAlipayConfig', 'Save', '1', '0', '', '1542596647'), ('326', '319', '基础配置', 'AppConfig', 'Index', '0', '1', '', '1543206359'), ('327', '319', '基础配置保存', 'AppConfig', 'Save', '1', '0', '', '1543206402'), ('328', '312', '小程序', 'AppMiniAlipayList', 'Index', '10', '1', '', '1543304094'), ('329', '312', '小程序生成', 'AppMiniAlipayList', 'Created', '11', '0', '', '1543305528'), ('330', '312', '小程序删除', 'AppMiniAlipayList', 'Delete', '12', '0', '', '1543305609'), ('331', '118', '日志删除', 'Cache', 'LogDelete', '4', '0', '', '1545642163'), ('332', '0', '微信小程序', 'AppMiniWeixin', 'Index', '11', '1', 'icon-xiaochengxu-wechat', '1546935020'), ('333', '332', '基础配置', 'AppMiniWeixinConfig', 'Index', '0', '1', '', '1546935090'), ('334', '332', '基础配置保存', 'AppMiniWeixinConfig', 'Save', '1', '0', '', '1546935118'), ('335', '332', '小程序', 'AppMiniWeixinList', 'Index', '10', '1', '', '1546935153'), ('336', '332', '小程序生成', 'AppMiniWeixinList', 'Created', '11', '0', '', '1546935187'), ('337', '332', '小程序删除', 'AppMiniWeixinList', 'Delete', '12', '0', '', '1546935212'), ('339', '41', '后台配置', 'Config', 'Index', '0', '1', '', '1549419752'), ('340', '0', '应用中心', 'Store', 'Index', '30', '1', 'icon-application', '1549496703'), ('341', '340', '应用管理', 'Pluginsadmin', 'Index', '1', '1', '', '1549497306'), ('342', '340', '应用状态更新', 'Pluginsadmin', 'StatusUpdate', '3', '0', '', '1549694138'), ('343', '340', '应用调用管理', 'Plugins', 'Index', '0', '0', '', '1549958187'), ('345', '340', '应用添加/编辑页面', 'Pluginsadmin', 'SaveInfo', '1', '0', '', '1549977925'), ('346', '340', '应用添加/编辑', 'Pluginsadmin', 'Save', '2', '0', '', '1549977958'), ('347', '340', '应用删除', 'Pluginsadmin', 'Delete', '4', '0', '', '1549977993'), ('348', '340', '应用上传', 'Pluginsadmin', 'Upload', '5', '0', '', '1550110821'), ('349', '118', 'SQL控制台', 'Sqlconsole', 'Index', '10', '1', '', '1550476002'), ('350', '118', 'SQL执行', 'Sqlconsole', 'Implement', '11', '0', '', '1550476023'), ('351', '340', '应用打包', 'Pluginsadmin', 'Download', '6', '0', '', '1553248727'), ('352', '213', '问答添加/编辑页面', 'Answer', 'SaveInfo', '4', '0', '', '1553964318'), ('353', '213', '问答添加/编辑', 'Answer', 'Save', '5', '0', '', '1553964354'), ('354', '41', '商店信息', 'Config', 'Store', '0', '1', '', '1554803430'), ('356', '38', '商品评论', 'Goodscomments', 'Index', '20', '1', '', '1533112443'), ('357', '38', '商品评论回复', 'Goodscomments', 'Reply', '21', '0', '', '1533119660'), ('358', '38', '商品评论删除', 'Goodscomments', 'Delete', '22', '0', '', '1533119680'), ('359', '38', '商品评论状态更新', 'Goodscomments', 'StatusUpdate', '23', '0', '', '1533119704'), ('360', '38', '商品评论添加/编辑页面', 'Goodscomments', 'SaveInfo', '24', '0', '', '1553964318'), ('361', '38', '商品评论添加/编辑', 'Goodscomments', 'Save', '25', '0', '', '1553964354'), ('362', '81', '协议管理', 'Agreement', 'Index', '40', '1', '', '1486561615'), ('363', '81', '协议设置编辑', 'Agreement', 'Save', '41', '0', '', '1486562011'), ('364', '177', '订单售后', 'Orderaftersale', 'Index', '10', '1', '', '1522317898'), ('365', '177', '订单售后删除', 'Orderaftersale', 'Delete', '11', '0', '', '1522317917'), ('366', '177', '订单售后取消', 'Orderaftersale', 'Cancel', '12', '0', '', '1527497803'), ('367', '177', '订单售后审核', 'Orderaftersale', 'Audit', '13', '0', '', '1538413499'), ('368', '177', '订单售后确认', 'Orderaftersale', 'Confirm', '14', '0', '', '1538414034'), ('369', '177', '订单售后拒绝', 'Orderaftersale', 'Refuse', '15', '0', '', '1538757043'), ('372', '182', '退款日志', 'RefundLog', 'Index', '20', '1', '', '1528080200'), ('373', '340', '应用商店', 'Store', 'Index', '10', '1', '', '1553248727'), ('374', '340', '应用安装', 'Pluginsadmin', 'Install', '6', '0', '', '1561369950'), ('375', '340', '应用卸载', 'Pluginsadmin', 'Uninstall', '7', '0', '', '1561370063'), ('376', '319', '用户中心导航', 'AppCenterNav', 'Index', '20', '1', '', '1542558318'), ('377', '319', '用户中心导航添加/编辑页面', 'AppCenterNav', 'SaveInfo', '21', '0', '', '1542558686'), ('378', '319', '用户中心导航添加/编辑', 'AppCenterNav', 'Save', '22', '0', '', '1542558706'), ('379', '319', '用户中心导航状态更新', 'AppCenterNav', 'StatusUpdate', '23', '0', '', '1542558747'), ('380', '319', '用户中心导航删除', 'AppCenterNav', 'Delete', '24', '0', '', '1542558767'), ('381', '0', '百度小程序', 'AppMiniBaidu', 'Index', '12', '1', 'icon-xiaochengxu-baidu', '1546935020'), ('382', '381', '基础配置', 'AppMiniBaiduConfig', 'Index', '0', '1', '', '1546935090'), ('383', '381', '基础配置保存', 'AppMiniBaiduConfig', 'Save', '1', '0', '', '1546935118'), ('384', '381', '小程序', 'AppMiniBaiduList', 'Index', '10', '1', '', '1546935153'), ('385', '381', '小程序生成', 'AppMiniBaiduList', 'Created', '11', '0', '', '1546935187'), ('386', '381', '小程序删除', 'AppMiniBaiduList', 'Delete', '12', '0', '', '1546935212'), ('387', '222', '主题下载', 'Theme', 'Download', '34', '0', '', '1494410699'), ('388', '0', '头条小程序', 'AppMiniToutiao', 'Index', '13', '1', 'icon-xiaochengxu-toutiao', '1546935020'), ('389', '388', '基础配置', 'AppMiniToutiaoConfig', 'Index', '0', '1', '', '1546935090'), ('390', '388', '基础配置保存', 'AppMiniToutiaoConfig', 'Save', '1', '0', '', '1546935118'), ('391', '388', '小程序', 'AppMiniToutiaoList', 'Index', '10', '1', '', '1546935153'), ('392', '388', '小程序生成', 'AppMiniToutiaoList', 'Created', '11', '0', '', '1546935187'), ('393', '388', '小程序删除', 'AppMiniToutiaoList', 'Delete', '12', '0', '', '1546935212'), ('394', '0', 'QQ小程序', 'AppMiniQQ', 'Index', '14', '1', 'icon-xiaochengxu-qq', '1546935020'), ('395', '394', '基础配置', 'AppMiniQQConfig', 'Index', '0', '1', '', '1546935090'), ('396', '394', '基础配置保存', 'AppMiniQQConfig', 'Save', '1', '0', '', '1546935118'), ('397', '394', '小程序', 'AppMiniQQList', 'Index', '10', '1', '', '1546935153'), ('398', '394', '小程序生成', 'AppMiniQQList', 'Created', '11', '0', '', '1546935187'), ('399', '394', '小程序删除', 'AppMiniQQList', 'Delete', '12', '0', '', '1546935212'), ('400', '177', '订单详情', 'Order', 'Detail', '8', '0', '', '1589534580'), ('401', '177', '订单售后详情', 'Orderaftersale', 'Detail', '16', '0', '', '1589538361'), ('402', '38', '商品详情', 'Goods', 'Detail', '6', '0', '', '1589539780'), ('403', '38', '商品评论详情', 'Goodscomments', 'Detail', '26', '0', '', '1591609904'), ('404', '126', '用户详情', 'User', 'Detail', '7', '0', '', '1591621569'), ('405', '1', '管理员详情', 'Admin', 'Detail', '5', '0', '', '1591951422'), ('406', '1', '角色详情', 'Role', 'Detail', '25', '0', '', '1542102071'), ('407', '222', '自定义页面详情', 'CustomView', 'Detail', '16', '0', '', '1592287822');
 COMMIT;
 
 -- ----------------------------
@@ -1457,13 +1457,13 @@ CREATE TABLE `s_role` (
   `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间',
   `upd_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='角色组';
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='角色组';
 
 -- ----------------------------
 --  Records of `s_role`
 -- ----------------------------
 BEGIN;
-INSERT INTO `s_role` VALUES ('1', '超级管理员', '1', '1481350313', '0'), ('13', '管理员', '1', '1484402362', '1592145302');
+INSERT INTO `s_role` VALUES ('1', '超级管理员', '1', '1481350313', '0'), ('13', '管理员', '1', '1484402362', '1592145302'), ('17', 'fdsf', '1', '1592185183', '1592185183');
 COMMIT;
 
 -- ----------------------------
@@ -1478,13 +1478,13 @@ CREATE TABLE `s_role_power` (
   PRIMARY KEY (`id`),
   KEY `role_id` (`role_id`),
   KEY `power_id` (`power_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3220 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='角色与权限管理';
+) ENGINE=InnoDB AUTO_INCREMENT=3226 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='角色与权限管理';
 
 -- ----------------------------
 --  Records of `s_role_power`
 -- ----------------------------
 BEGIN;
-INSERT INTO `s_role_power` VALUES ('3118', '13', '41', '1592145302'), ('3119', '13', '339', '1592145302'), ('3120', '13', '354', '1592145302'), ('3121', '13', '81', '1592145302'), ('3122', '13', '103', '1592145302'), ('3123', '13', '104', '1592145302'), ('3124', '13', '219', '1592145302'), ('3125', '13', '199', '1592145302'), ('3126', '13', '362', '1592145302'), ('3127', '13', '126', '1592145302'), ('3128', '13', '127', '1592145302'), ('3129', '13', '38', '1592145302'), ('3130', '13', '39', '1592145302'), ('3131', '13', '201', '1592145302'), ('3132', '13', '356', '1592145302'), ('3133', '13', '177', '1592145302'), ('3134', '13', '178', '1592145302'), ('3135', '13', '180', '1592145302'), ('3136', '13', '267', '1592145302'), ('3137', '13', '268', '1592145302'), ('3138', '13', '269', '1592145302'), ('3139', '13', '310', '1592145302'), ('3140', '13', '364', '1592145302'), ('3141', '13', '213', '1592145302'), ('3142', '13', '214', '1592145302'), ('3143', '13', '222', '1592145302'), ('3144', '13', '223', '1592145302'), ('3145', '13', '234', '1592145302'), ('3146', '13', '236', '1592145302'), ('3147', '13', '238', '1592145302'), ('3148', '13', '239', '1592145302'), ('3149', '13', '241', '1592145302'), ('3150', '13', '244', '1592145302'), ('3151', '13', '172', '1592145302'), ('3152', '13', '175', '1592145302'), ('3153', '13', '193', '1592145302'), ('3154', '13', '153', '1592145302'), ('3155', '13', '156', '1592145302'), ('3156', '13', '259', '1592145302'), ('3157', '13', '261', '1592145302'), ('3158', '13', '252', '1592145302'), ('3159', '13', '249', '1592145302'), ('3160', '13', '253', '1592145302'), ('3161', '13', '319', '1592145302'), ('3162', '13', '326', '1592145302'), ('3163', '13', '314', '1592145302'), ('3164', '13', '376', '1592145302'), ('3165', '13', '312', '1592145302'), ('3166', '13', '313', '1592145302'), ('3167', '13', '328', '1592145302'), ('3168', '13', '329', '1592145302'), ('3169', '13', '332', '1592145302'), ('3170', '13', '333', '1592145302'), ('3171', '13', '335', '1592145302'), ('3172', '13', '336', '1592145302'), ('3173', '13', '381', '1592145302'), ('3174', '13', '382', '1592145302'), ('3175', '13', '384', '1592145302'), ('3176', '13', '388', '1592145302'), ('3177', '13', '389', '1592145302'), ('3178', '13', '391', '1592145302'), ('3179', '13', '394', '1592145302'), ('3180', '13', '395', '1592145302'), ('3181', '13', '397', '1592145302'), ('3182', '13', '1', '1592145302'), ('3183', '13', '22', '1592145302'), ('3184', '13', '13', '1592145302'), ('3185', '13', '4', '1592145302'), ('3186', '13', '406', '1592145302'), ('3187', '13', '204', '1592145302'), ('3188', '13', '205', '1592145302'), ('3189', '13', '210', '1592145302'), ('3190', '13', '182', '1592145302'), ('3191', '13', '183', '1592145302'), ('3192', '13', '185', '1592145302'), ('3193', '13', '372', '1592145302'), ('3194', '13', '186', '1592145302'), ('3195', '13', '340', '1592145302'), ('3196', '13', '343', '1592145302'), ('3197', '13', '341', '1592145302'), ('3198', '13', '118', '1592145302'), ('3199', '13', '119', '1592145302'), ('3200', '13', '120', '1592145302'), ('3201', '13', '121', '1592145302'), ('3202', '13', '122', '1592145302'), ('3203', '13', '331', '1592145302');
+INSERT INTO `s_role_power` VALUES ('3118', '13', '41', '1592145302'), ('3119', '13', '339', '1592145302'), ('3120', '13', '354', '1592145302'), ('3121', '13', '81', '1592145302'), ('3122', '13', '103', '1592145302'), ('3123', '13', '104', '1592145302'), ('3124', '13', '219', '1592145302'), ('3125', '13', '199', '1592145302'), ('3126', '13', '362', '1592145302'), ('3127', '13', '126', '1592145302'), ('3128', '13', '127', '1592145302'), ('3129', '13', '38', '1592145302'), ('3130', '13', '39', '1592145302'), ('3131', '13', '201', '1592145302'), ('3132', '13', '356', '1592145302'), ('3133', '13', '177', '1592145302'), ('3134', '13', '178', '1592145302'), ('3135', '13', '180', '1592145302'), ('3136', '13', '267', '1592145302'), ('3137', '13', '268', '1592145302'), ('3138', '13', '269', '1592145302'), ('3139', '13', '310', '1592145302'), ('3140', '13', '364', '1592145302'), ('3141', '13', '213', '1592145302'), ('3142', '13', '214', '1592145302'), ('3143', '13', '222', '1592145302'), ('3144', '13', '223', '1592145302'), ('3145', '13', '234', '1592145302'), ('3146', '13', '236', '1592145302'), ('3147', '13', '238', '1592145302'), ('3148', '13', '239', '1592145302'), ('3149', '13', '241', '1592145302'), ('3150', '13', '244', '1592145302'), ('3151', '13', '172', '1592145302'), ('3152', '13', '175', '1592145302'), ('3153', '13', '193', '1592145302'), ('3154', '13', '153', '1592145302'), ('3155', '13', '156', '1592145302'), ('3156', '13', '259', '1592145302'), ('3157', '13', '261', '1592145302'), ('3158', '13', '252', '1592145302'), ('3159', '13', '249', '1592145302'), ('3160', '13', '253', '1592145302'), ('3161', '13', '319', '1592145302'), ('3162', '13', '326', '1592145302'), ('3163', '13', '314', '1592145302'), ('3164', '13', '376', '1592145302'), ('3165', '13', '312', '1592145302'), ('3166', '13', '313', '1592145302'), ('3167', '13', '328', '1592145302'), ('3168', '13', '329', '1592145302'), ('3169', '13', '332', '1592145302'), ('3170', '13', '333', '1592145302'), ('3171', '13', '335', '1592145302'), ('3172', '13', '336', '1592145302'), ('3173', '13', '381', '1592145302'), ('3174', '13', '382', '1592145302'), ('3175', '13', '384', '1592145302'), ('3176', '13', '388', '1592145302'), ('3177', '13', '389', '1592145302'), ('3178', '13', '391', '1592145302'), ('3179', '13', '394', '1592145302'), ('3180', '13', '395', '1592145302'), ('3181', '13', '397', '1592145302'), ('3182', '13', '1', '1592145302'), ('3183', '13', '22', '1592145302'), ('3184', '13', '13', '1592145302'), ('3185', '13', '4', '1592145302'), ('3186', '13', '406', '1592145302'), ('3187', '13', '204', '1592145302'), ('3188', '13', '205', '1592145302'), ('3189', '13', '210', '1592145302'), ('3190', '13', '182', '1592145302'), ('3191', '13', '183', '1592145302'), ('3192', '13', '185', '1592145302'), ('3193', '13', '372', '1592145302'), ('3194', '13', '186', '1592145302'), ('3195', '13', '340', '1592145302'), ('3196', '13', '343', '1592145302'), ('3197', '13', '341', '1592145302'), ('3198', '13', '118', '1592145302'), ('3199', '13', '119', '1592145302'), ('3200', '13', '120', '1592145302'), ('3201', '13', '121', '1592145302'), ('3202', '13', '122', '1592145302'), ('3203', '13', '331', '1592145302'), ('3220', '17', '41', '1592185183'), ('3221', '17', '339', '1592185183'), ('3222', '17', '354', '1592185183'), ('3223', '17', '42', '1592185183'), ('3224', '17', '81', '1592185183'), ('3225', '17', '103', '1592185183');
 COMMIT;
 
 -- ----------------------------
@@ -1529,7 +1529,14 @@ CREATE TABLE `s_search_history` (
   `ymd` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '日期 ymd',
   `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志';
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志';
+
+-- ----------------------------
+--  Records of `s_search_history`
+-- ----------------------------
+BEGIN;
+INSERT INTO `s_search_history` VALUES ('1', '0', '0', '58', '', '0-0', 'default', 'asc', '20200615', '1592230678'), ('2', '0', '0', '2', '', '0-0', 'default', 'asc', '20200615', '1592230681');
+COMMIT;
 
 -- ----------------------------
 --  Table structure for `s_slide`
diff --git a/public/static/admin/default/css/goodscomments.css b/public/static/admin/default/css/goodscomments.css
index beccfd624..670aa2a05 100644
--- a/public/static/admin/default/css/goodscomments.css
+++ b/public/static/admin/default/css/goodscomments.css
@@ -1,11 +1,6 @@
 /**
  * 列表
  */
-.content-right table.am-table .am-slider {
-    overflow: hidden;
-    box-shadow: none;
-    -webkit-box-shadow: none;
-}
 .content-right table.am-table .reply-content {
     max-height: 80px;
 }
diff --git a/public/static/admin/default/css/orderaftersale.css b/public/static/admin/default/css/orderaftersale.css
index 046d2e3ec..d1392c844 100644
--- a/public/static/admin/default/css/orderaftersale.css
+++ b/public/static/admin/default/css/orderaftersale.css
@@ -2,12 +2,4 @@
  * 商品列表
  */
 .goods-spec li { color: #888; line-height: 16px; }
-.original-price { color: #9c9c9c; text-decoration: line-through; }
-
-/**
- * 列表
- */
-table.am-table .am-slider {
-    box-shadow: none;
-    -webkit-box-shadow: none;
-}
+.original-price { color: #9c9c9c; text-decoration: line-through; }
\ No newline at end of file