- {{include file="plugins/nav" /}}
+ {{include file="pluginsadmin/nav" /}}
diff --git a/application/admin/view/default/public/error.html b/application/admin/view/default/public/error.html
new file mode 100644
index 000000000..3afaab6b3
--- /dev/null
+++ b/application/admin/view/default/public/error.html
@@ -0,0 +1,19 @@
+{{include file="public/header" /}}
+
+
+
+
+
+ {{if isset($msg)}}
+ {{$msg}}
+ {{else /}}
+ 异常错误
+ {{/if}}
+
+
+
+
+
+
+{{include file="public/footer" /}}
+
\ No newline at end of file
diff --git a/application/common.php b/application/common.php
index d18f402a0..45aac7eed 100755
--- a/application/common.php
+++ b/application/common.php
@@ -104,9 +104,8 @@ function DataReturn($msg = '', $code = 0, $data = '')
* @version 1.0.0
* @date 2018-06-12
* @desc description
- * @param string $c [控制器名称]
- * @param string $a [方法名称]
- * @param array $params [参数]
+ * @param string $path [路径地址]
+ * @param array $params [参数]
*/
function MyUrl($path, $params=[])
{
@@ -121,6 +120,62 @@ function MyUrl($path, $params=[])
return $url;
}
+/**
+ * 生成url地址 - 应用前端
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2018-06-12
+ * @desc description
+ * @param string $plugins_name [应用名称]
+ * @param string $plugins_control [应用控制器]
+ * @param string $plugins_action [应用方法]
+ * @param array $params [参数]
+ */
+function PluginsHomeUrl($plugins_name, $plugins_control, $plugins_action, $params=[])
+{
+ $params['pluginsname'] = $plugins_name;
+ $params['pluginscontrol'] = $plugins_control;
+ $params['pluginsaction'] = $plugins_action;
+ $url = url('index/plugins/index', $params, true, true);
+
+ // 是否根目录访问项目
+ if(defined('IS_ROOT_ACCESS'))
+ {
+ $url = str_replace('public/', '', $url);
+ }
+
+ return $url;
+}
+
+/**
+ * 生成url地址 - 应用后端
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2018-06-12
+ * @desc description
+ * @param string $plugins_name [应用名称]
+ * @param string $plugins_control [应用控制器]
+ * @param string $plugins_action [应用方法]
+ * @param array $params [参数]
+ */
+function PluginsAdminUrl($plugins_name, $plugins_control, $plugins_action, $params=[])
+{
+ $params['pluginsname'] = $plugins_name;
+ $params['pluginscontrol'] = $plugins_control;
+ $params['pluginsaction'] = $plugins_action;
+ $url = url('admin/plugins/index', $params, true, true);
+
+ // 是否根目录访问项目
+ if(defined('IS_ROOT_ACCESS'))
+ {
+ $url = str_replace('public/', '', $url);
+ }
+
+ return $url;
+}
+
/**
* [PriceBeautify 金额美化]
* @author Devil
diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php
index 05a5a6aa7..609995ce0 100755
--- a/application/index/controller/Common.php
+++ b/application/index/controller/Common.php
@@ -82,7 +82,6 @@ class Common extends Controller
{
// 公共顶部钩子
$this->assign('plugins_common_top_data', Hook::listen('plugins_common_top'));
- //$this->assign('plugins_common_nav_top_data', Hook::listen('plugins_common_nav_top'));
}
/**
@@ -223,9 +222,6 @@ class Common extends Controller
}
$this->assign('home_search_keywords', $home_search_keywords);
- // 商城公告
- $this->assign('common_shop_notice', MyC('common_shop_notice'));
-
// 友情链接
$link = LinkService::LinkList(['where'=>['is_enable'=>1]]);
$this->assign('link_list', $link['data']);
diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php
index 7b292d2f3..c42a6b171 100755
--- a/application/index/controller/Index.php
+++ b/application/index/controller/Index.php
@@ -10,7 +10,6 @@
// +----------------------------------------------------------------------
namespace app\index\controller;
-use app\index\controller\Common;
use app\service\BannerService;
use app\service\GoodsService;
use app\service\ArticleService;
diff --git a/application/plugins/controller/Index.php b/application/index/controller/Plugins.php
similarity index 69%
rename from application/plugins/controller/Index.php
rename to application/index/controller/Plugins.php
index 5f36088fa..2946764f4 100644
--- a/application/plugins/controller/Index.php
+++ b/application/index/controller/Plugins.php
@@ -8,31 +8,39 @@
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
-namespace app\plugins\controller;
-
-use think\Controller;
+namespace app\index\controller;
/**
- * 应用入口控制器
+ * 应用调用入口
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Index extends Controller
+class Plugins extends Common
{
/**
- * 入口
+ * 构造方法
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2018-11-30
+ * @desc description
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ }
+
+ /**
+ * [Index 首页]
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
+ * @datetime 2017-02-22T16:50:32+0800
*/
public function Index()
{
- // 登录校验
- $this->IsLogin();
-
// 参数
$params = input();
@@ -59,7 +67,7 @@ class Index extends Controller
{
if(IS_AJAX)
{
- exit(json_encode(DataReturn($ret, -5000)));
+ return DataReturn($ret, -5000);
} else {
$this->assign('msg', $ret);
return $this->fetch('public/error');
@@ -71,53 +79,39 @@ class Index extends Controller
$pluginscontrol = strtolower($params['pluginscontrol']);
$pluginsaction = strtolower($params['pluginsaction']);
+ // 视图初始化
+ $this->PluginsViewInit($pluginsname, $pluginscontrol, $pluginsaction);
+
// 编辑器文件存放地址定义
$this->assign('editor_path_type', 'plugins_'.$pluginsname);
- // 系统初始化
- $this->SystemInit();
-
- // 视图初始化
- $this->ViewInit($pluginsname, $pluginscontrol, $pluginsaction);
-
- // 调用应用
- return controller(ucfirst($pluginscontrol), $pluginsname)->$pluginsaction($params);
- }
-
- /**
- * 登录校验
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:42:35+0800
- */
- protected function IsLogin()
- {
- if(session('admin') === null)
+ // 调用应用控制器
+ $plugins = '\app\plugins\\'.$pluginsname.'\\'.ucfirst($pluginscontrol);
+ $ret = (new $plugins())->ucfirst($pluginsaction)($params);
+
+ // 是否ajax
+ if(IS_AJAX)
{
- if(IS_AJAX)
+ return $ret;
+ } else {
+ // 调用应用模板
+ if(isset($ret['code']))
{
- exit(json_encode(DataReturn('登录失效，请重新登录', -400)));
+ if($ret['code'] == 0)
+ {
+ $this->assign($ret['data']);
+ return $this->fetch('../../../plugins/view/'.$pluginsname.'/'.$pluginscontrol.'/'.$pluginsaction);
+ } else {
+ $this->assign('msg', $ret['msg']);
+ return $this->fetch('public/error');
+ }
} else {
- die('');
+ $this->assign('msg', '应用返回数据格式有误');
+ return $this->fetch('public/error');
}
}
}
- /**
- * 系统初始化
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2018-12-07
- * @desc description
- */
- private function SystemInit()
- {
- // url模式,后端采用兼容模式
- \think\facade\Url::root(__MY_ROOT_PUBLIC__.'index.php?s=');
- }
-
/**
* 视图初始化
* @author Devil
@@ -128,14 +122,13 @@ class Index extends Controller
* @param [string] $plugins_control [控制器名称]
* @param [string] $plugins_action [方法]
*/
- public function ViewInit($plugins_name, $plugins_control, $plugins_action)
+ public function PluginsViewInit($plugins_name, $plugins_control, $plugins_action)
{
// 当前操作名称
- $module_name = strtolower(request()->module());
+ $module_name = 'plugins';
// 当前操作名称
$this->assign('plugins_name', $plugins_name);
- $this->assign('module_name', $module_name);
$this->assign('controller_name', $plugins_control);
$this->assign('action_name', $plugins_action);
@@ -147,9 +140,6 @@ class Index extends Controller
$module_js = $module_name.DS.'js'.DS.$plugins_name.DS.$plugins_control;
$module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$plugins_action.'.js') ? '.'.$plugins_action.'.js' : '.js';
$this->assign('module_js', file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : '');
-
- // 图片host地址
- $this->assign('attachment_host', config('shopxo.attachment_host'));
}
}
?>
\ No newline at end of file
diff --git a/application/index/controller/User.php b/application/index/controller/User.php
index fe50ced4c..3e402cb3d 100755
--- a/application/index/controller/User.php
+++ b/application/index/controller/User.php
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
namespace app\index\controller;
+use think\facade\Hook;
use app\service\OrderService;
use app\service\GoodsService;
use app\service\UserService;
@@ -135,8 +136,8 @@ class User extends Common
$data = GoodsService::GoodsBrowseList($browse_params);
$this->assign('goods_browse_list', $data['data']);
- // 用户中心公告
- $this->assign('common_user_center_notice', MyC('common_user_center_notice'));
+ // 公共顶部钩子
+ $this->assign('plugins_user_center_top_data', Hook::listen('plugins_user_center_top'));
return $this->fetch();
}
diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html
index 279c04681..3b896d804 100755
--- a/application/index/view/default/public/header.html
+++ b/application/index/view/default/public/header.html
@@ -40,38 +40,15 @@
-{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_header) or $is_header eq 1)}}
plugins_common_top
{{/if}}
-{{if !empty($plugins_common_top_data) and is_array($plugins_common_top_data)}}
+{{if !empty($plugins_common_top_data) and is_array($plugins_common_top_data) and (!isset($is_header) or $is_header eq 1)}}
{{foreach $plugins_common_top_data as $hook}}
{{if is_string($hook) or is_int($hook)}}
{{$hook|raw}}
{{/if}}
{{/foreach}}
-{{/if}}
-
-
-{{if MyC('home_site_state') == 1 and (!isset($is_header) or $is_header eq 1)}}
- {{if !empty($common_shop_notice)}}
-
-
{{$common_shop_notice}}
-
- {{/if}}
-{{/if}}
-
-
-{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
-
- plugins_common_nav_top
-
-{{/if}}
-{{if !empty($plugins_common_nav_top_data) and is_array($plugins_common_nav_top_data)}}
- {{foreach $plugins_common_nav_top_data as $hook}}
- {{if is_string($hook) or is_int($hook)}}
- {{$hook|raw}}
- {{/if}}
- {{/foreach}}
{{/if}}
\ No newline at end of file
diff --git a/application/index/view/default/user/index.html b/application/index/view/default/user/index.html
index 9a16c7cd2..365d1bcd9 100755
--- a/application/index/view/default/user/index.html
+++ b/application/index/view/default/user/index.html
@@ -26,13 +26,19 @@
-
- {{if !empty($common_user_center_notice)}}
-
-
-
{{$common_user_center_notice}}
+
+ {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+
+ plugins_user_center_top
{{/if}}
+ {{if !empty($plugins_user_center_top_data) and is_array($plugins_user_center_top_data)}}
+ {{foreach $plugins_user_center_top_data as $hook}}
+ {{if is_string($hook) or is_int($hook)}}
+ {{$hook|raw}}
+ {{/if}}
+ {{/foreach}}
+ {{/if}}
diff --git a/application/plugins/commontopmaxpicture/Admin.php b/application/plugins/commontopmaxpicture/Admin.php
new file mode 100644
index 000000000..787ddcceb
--- /dev/null
+++ b/application/plugins/commontopmaxpicture/Admin.php
@@ -0,0 +1,91 @@
+ $ret['data'],
+ ];
+ return DataReturn('处理成功', 0, $data);
+ } else {
+ return $ret;
+ }
+ }
+
+ /**
+ * 编辑页面
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @datetime 2019-02-07T08:21:54+0800
+ * @param [array] $params [输入参数]
+ */
+ public function saveinfo($params = [])
+ {
+ $ret = PluginsService::PluginsData('commontopmaxpicture', ['images']);
+ if($ret['code'] == 0)
+ {
+ // 是否
+ $is_whether_list = [
+ 0 => array('id' => 0, 'name' => '否', 'checked' => true),
+ 1 => array('id' => 1, 'name' => '是'),
+ ];
+
+ // 数组组装
+ $data = [
+ 'is_whether_list' => $is_whether_list,
+ 'data' => $ret['data'],
+ ];
+ return DataReturn('处理成功', 0, $data);
+ } else {
+ return $ret;
+ }
+ }
+
+ /**
+ * 数据保存
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @datetime 2019-02-07T08:21:54+0800
+ * @param [array] $params [输入参数]
+ */
+ public function save($params = [])
+ {
+ unset($params['max_file_size']);
+ return PluginsService::PluginsDataSave(['plugins'=>'commontopmaxpicture', 'data'=>$params]);
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/plugins/commontopmaxpicture/Index.php b/application/plugins/commontopmaxpicture/Hook.php
similarity index 63%
rename from application/plugins/commontopmaxpicture/Index.php
rename to application/plugins/commontopmaxpicture/Hook.php
index f70dc7953..e711e86c3 100644
--- a/application/plugins/commontopmaxpicture/Index.php
+++ b/application/plugins/commontopmaxpicture/Hook.php
@@ -10,17 +10,16 @@
// +----------------------------------------------------------------------
namespace app\plugins\commontopmaxpicture;
-use think\Controller;
use app\service\PluginsService;
/**
- * 顶部大图广告插件
+ * 顶部大图广告插件 - 钩子入口
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Index extends Controller
+class Hook
{
/**
* 应用响应入口
@@ -59,7 +58,7 @@ class Index extends Controller
$action_name = strtolower(request()->action());
// 获取应用数据
- $ret = PluginsService::PluginsData('commontopmaxpicture');
+ $ret = PluginsService::PluginsData('commontopmaxpicture', ['images']);
// html拼接
$html = '
$ret['data'],
+ ];
+ return DataReturn('处理成功', 0, $data);
+ } else {
+ return $ret;
+ }
+ }
+
+ /**
+ * 编辑页面
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @datetime 2019-02-07T08:21:54+0800
+ * @param [array] $params [输入参数]
+ */
+ public function saveinfo($params = [])
+ {
+ $ret = PluginsService::PluginsData('commontopnotice');
+ if($ret['code'] == 0)
+ {
+ // 是否
+ $is_whether_list = [
+ 0 => array('id' => 0, 'name' => '否', 'checked' => true),
+ 1 => array('id' => 1, 'name' => '是'),
+ ];
+
+ // 数组组装
+ $data = [
+ 'is_whether_list' => $is_whether_list,
+ 'data' => $ret['data'],
+ ];
+ return DataReturn('处理成功', 0, $data);
+ } else {
+ return $ret;
+ }
+ }
+
+ /**
+ * 数据保存
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @datetime 2019-02-07T08:21:54+0800
+ * @param [array] $params [输入参数]
+ */
+ public function save($params = [])
+ {
+ return PluginsService::PluginsDataSave(['plugins'=>'commontopnotice', 'data'=>$params]);
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/plugins/commontopnotice/Hook.php b/application/plugins/commontopnotice/Hook.php
new file mode 100644
index 000000000..af2a64f51
--- /dev/null
+++ b/application/plugins/commontopnotice/Hook.php
@@ -0,0 +1,112 @@
+html($params);
+ }
+ }
+
+ /**
+ * 视图
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @datetime 2019-02-06T16:16:34+0800
+ * @param [array] $params [输入参数]
+ */
+ public function html($params = [])
+ {
+ // 当前模块/控制器/方法
+ $module_name = strtolower(request()->module());
+ $controller_name = strtolower(request()->controller());
+ $action_name = strtolower(request()->action());
+
+ // 获取应用数据
+ $ret = PluginsService::PluginsData('commontopnotice');
+
+ // html拼接
+ $html = '
';
+ $content = '';
+ if($ret['code'] == 0)
+ {
+ // 内容是否为空
+ if(empty($ret['data']['content']))
+ {
+ return '';
+ }
+
+ // 有效时间
+ if(!empty($ret['data']['time_start']))
+ {
+ // 是否已开始
+ if(strtotime($ret['data']['time_start']) > time())
+ {
+ return '';
+ }
+ }
+ if(!empty($ret['data']['time_end']))
+ {
+ // 是否已结束
+ if(strtotime($ret['data']['time_end']) < time())
+ {
+ return '';
+ }
+ }
+
+ // 非全局
+ if($ret['data']['is_overall'] != 1)
+ {
+ // 非首页则空
+ if($module_name.$controller_name.$action_name != 'indexindexindex')
+ {
+ return '';
+ }
+ }
+
+ $content .= '
'.$ret['data']['content'].'
';
+ } else {
+ $content = $ret['msg'];
+ }
+ $html .= $content;
+ $html .= '
';
+
+ return $html;
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/plugins/commontopnotice/config.json b/application/plugins/commontopnotice/config.json
new file mode 100644
index 000000000..deca8d70f
--- /dev/null
+++ b/application/plugins/commontopnotice/config.json
@@ -0,0 +1,17 @@
+{
+ "base": {
+ "name": "顶部公告",
+ "logo": "/static/upload/images/plugins_commontopnotice/2019/02/12/1549671733987652.png",
+ "author": "Devil",
+ "author_url": "https://shopxo.net/",
+ "version": "1.0.0",
+ "desc": "顶部公告，通知",
+ "apply_terminal": ["pc"],
+ "apply_version": ["1.3.0"],
+ "is_home": false,
+ "sales_amount": 0
+ },
+ "hook": {
+ "plugins_common_top": ["app\\plugins\\commontopnotice\\Hook"]
+ }
+}
\ No newline at end of file
diff --git a/application/plugins/config/template.php b/application/plugins/config/template.php
deleted file mode 100644
index 239eca79d..000000000
--- a/application/plugins/config/template.php
+++ /dev/null
@@ -1,36 +0,0 @@
- 'Think',
- // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
- 'auto_rule' => 1,
- // 模板路径
- 'view_path' => APP_PATH.'plugins'.DS.'view'.DS,
- // 模板后缀
- 'view_suffix' => 'html',
- // 模板文件名分隔符
- 'view_depr' => DIRECTORY_SEPARATOR,
- // 模板引擎普通标签开始标记
- 'tpl_begin' => '{{',
- // 模板引擎普通标签结束标记
- 'tpl_end' => '}}',
- // 标签库标签开始标记
- 'taglib_begin' => '{{',
- // 标签库标签结束标记
- 'taglib_end' => '}}',
-];
-?>
\ No newline at end of file
diff --git a/application/plugins/usercentertopnotice/Admin.php b/application/plugins/usercentertopnotice/Admin.php
new file mode 100644
index 000000000..5d0560436
--- /dev/null
+++ b/application/plugins/usercentertopnotice/Admin.php
@@ -0,0 +1,83 @@
+ $ret['data'],
+ ];
+ return DataReturn('处理成功', 0, $data);
+ } else {
+ return $ret;
+ }
+ }
+
+ /**
+ * 编辑页面
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @datetime 2019-02-07T08:21:54+0800
+ * @param [array] $params [输入参数]
+ */
+ public function saveinfo($params = [])
+ {
+ $ret = PluginsService::PluginsData('usercentertopnotice');
+ if($ret['code'] == 0)
+ {
+ // 数组组装
+ $data = [
+ 'data' => $ret['data'],
+ ];
+ return DataReturn('处理成功', 0, $data);
+ } else {
+ return $ret;
+ }
+ }
+
+ /**
+ * 数据保存
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @datetime 2019-02-07T08:21:54+0800
+ * @param [array] $params [输入参数]
+ */
+ public function save($params = [])
+ {
+ return PluginsService::PluginsDataSave(['plugins'=>'usercentertopnotice', 'data'=>$params]);
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/plugins/usercentertopnotice/Hook.php b/application/plugins/usercentertopnotice/Hook.php
new file mode 100644
index 000000000..e188a2e5b
--- /dev/null
+++ b/application/plugins/usercentertopnotice/Hook.php
@@ -0,0 +1,102 @@
+html($params);
+ }
+ }
+
+ /**
+ * 视图
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @datetime 2019-02-06T16:16:34+0800
+ * @param [array] $params [输入参数]
+ */
+ public function html($params = [])
+ {
+ // 当前模块/控制器/方法
+ $module_name = strtolower(request()->module());
+ $controller_name = strtolower(request()->controller());
+ $action_name = strtolower(request()->action());
+
+ // 获取应用数据
+ $ret = PluginsService::PluginsData('usercentertopnotice');
+
+ // html拼接
+ $html = '
';
+ $content = '';
+ if($ret['code'] == 0)
+ {
+ // 内容是否为空
+ if(empty($ret['data']['content']))
+ {
+ return '';
+ }
+
+ // 有效时间
+ if(!empty($ret['data']['time_start']))
+ {
+ // 是否已开始
+ if(strtotime($ret['data']['time_start']) > time())
+ {
+ return '';
+ }
+ }
+ if(!empty($ret['data']['time_end']))
+ {
+ // 是否已结束
+ if(strtotime($ret['data']['time_end']) < time())
+ {
+ return '';
+ }
+ }
+
+ $content .= '
'.$ret['data']['content'].'
';
+ } else {
+ $content = $ret['msg'];
+ }
+ $html .= $content;
+ $html .= '
';
+
+ return $html;
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/plugins/usercentertopnotice/config.json b/application/plugins/usercentertopnotice/config.json
new file mode 100644
index 000000000..cd471e54a
--- /dev/null
+++ b/application/plugins/usercentertopnotice/config.json
@@ -0,0 +1,17 @@
+{
+ "base": {
+ "name": "用户中心顶部公告",
+ "logo": "/static/upload/images/plugins_usercentertopnotice/2019/02/12/1549671733967341.png",
+ "author": "Devil",
+ "author_url": "https://shopxo.net/",
+ "version": "1.0.0",
+ "desc": "用户中心顶部公告，通知",
+ "apply_terminal": ["pc"],
+ "apply_version": ["1.3.0"],
+ "is_home": false,
+ "sales_amount": 0
+ },
+ "hook": {
+ "plugins_common_top": ["app\\plugins\\usercentertopnotice\\Hook"]
+ }
+}
\ No newline at end of file
diff --git a/application/plugins/view/commontopmaxpicture/index.html b/application/plugins/view/commontopmaxpicture/admin/index.html
similarity index 86%
rename from application/plugins/view/commontopmaxpicture/index.html
rename to application/plugins/view/commontopmaxpicture/admin/index.html
index 5107db15f..42d34f94c 100644
--- a/application/plugins/view/commontopmaxpicture/index.html
+++ b/application/plugins/view/commontopmaxpicture/admin/index.html
@@ -5,14 +5,14 @@
-
}}{{$data.images_old}}{{else /}}{{$attachment_host}}/static/plugins/images/default-images.png{{/if}})
+
}}{{$data.images_old}}{{else /}}{{$attachment_host}}/static/plugins/images/commontopmaxpicture/default-images.png{{/if}})
@@ -63,7 +63,7 @@
{{/if}}
-
编辑
+
编辑
diff --git a/application/plugins/view/commontopmaxpicture/saveinfo.html b/application/plugins/view/commontopmaxpicture/admin/saveinfo.html
similarity index 89%
rename from application/plugins/view/commontopmaxpicture/saveinfo.html
rename to application/plugins/view/commontopmaxpicture/admin/saveinfo.html
index 4175e6241..88e4e2540 100644
--- a/application/plugins/view/commontopmaxpicture/saveinfo.html
+++ b/application/plugins/view/commontopmaxpicture/admin/saveinfo.html
@@ -4,11 +4,11 @@