From 2a6901190e74a3cf8b57cc5d1b1753141bc2d976 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 16 Mar 2019 00:22:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E8=B4=AD=E4=B9=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Pluginsadmin.php | 8 +- application/index/controller/Common.php | 14 +- application/index/controller/Order.php | 2 +- .../index/view/default/order/index.html | 8 +- .../view/default/public/header_top_nav.html | 6 +- .../view/default/user/email_reg_info.html | 17 +- .../index/view/default/user/login_info.html | 16 +- .../view/default/user/modal_login_info.html | 16 +- .../index/view/default/user/reg_info.html | 14 + .../index/view/default/user/sms_reg_info.html | 17 +- application/plugins/shopoauth/Hook.php | 2 +- application/plugins/shopoauth/config.json | 2 +- application/plugins/touristbuy/Admin.php | 85 +++++ application/plugins/touristbuy/Hook.php | 171 ++++++++++ application/plugins/touristbuy/Index.php | 127 ++++++++ application/plugins/touristbuy/Service.php | 81 +++++ application/plugins/touristbuy/config.json | 39 +++ .../plugins/view/touristbuy/admin/index.html | 54 ++++ .../view/touristbuy/admin/saveinfo.html | 49 +++ .../plugins/view/touristbuy/index/detail.html | 299 ++++++++++++++++++ .../plugins/view/touristbuy/index/index.html | 55 ++++ application/tags.php | 20 +- .../static/plugins/css/touristbuy/admin.css | 11 + .../static/plugins/css/touristbuy/index.css | 7 + .../plugins/css/touristbuy/index.detail.css | 219 +++++++++++++ .../2019/03/15/1552656656517586.jpg | Bin 0 -> 2838 bytes 26 files changed, 1315 insertions(+), 24 deletions(-) create mode 100644 application/plugins/touristbuy/Admin.php create mode 100644 application/plugins/touristbuy/Hook.php create mode 100644 application/plugins/touristbuy/Index.php create mode 100644 application/plugins/touristbuy/Service.php create mode 100644 application/plugins/touristbuy/config.json create mode 100755 application/plugins/view/touristbuy/admin/index.html create mode 100755 application/plugins/view/touristbuy/admin/saveinfo.html create mode 100644 application/plugins/view/touristbuy/index/detail.html create mode 100644 application/plugins/view/touristbuy/index/index.html create mode 100755 public/static/plugins/css/touristbuy/admin.css create mode 100644 public/static/plugins/css/touristbuy/index.css create mode 100644 public/static/plugins/css/touristbuy/index.detail.css create mode 100644 public/static/upload/images/plugins_touristbuy/2019/03/15/1552656656517586.jpg diff --git a/application/admin/controller/Pluginsadmin.php b/application/admin/controller/Pluginsadmin.php index 44540479c..79eaa5d56 100755 --- a/application/admin/controller/Pluginsadmin.php +++ b/application/admin/controller/Pluginsadmin.php @@ -112,6 +112,7 @@ class Pluginsadmin extends Common $this->assign('params', $params); // 获取数据 + $data = []; if(!empty($params['id'])) { // 获取数据 @@ -120,10 +121,11 @@ class Pluginsadmin extends Common 'n' => 1, 'where' => ['id' => intval($params['id'])], ); - $data = PluginsAdminService::PluginsList($data_params); - $this->assign('data', $data['data'][0]); - $params['plugins'] = $data['data'][0]['plugins']; + $ret = PluginsAdminService::PluginsList($data_params); + $data = $ret['data'][0]; + $params['plugins'] = $ret['data'][0]['plugins']; } + $this->assign('data', $data); // 标记为空或等于view 并且 编辑数据为空则走第一步 if((empty($params['plugins']) || $params['plugins'] == 'view') && empty($data['data'][0])) diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index d3806cca0..79d5195ac 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -100,7 +100,19 @@ class Common extends Controller $this->assign('plugins_view_common_bottom_data', Hook::listen('plugins_view_common_bottom', ['hook_name'=>'plugins_view_common_bottom', 'is_backend'=>false, 'user'=>$this->user])); // 公共顶部小导航钩子-左侧 - $this->assign('plugins_service_header_navigation_top_left_data', Hook::listen('plugins_service_header_navigation_top_left', ['hook_name'=>'plugins_service_header_navigation_top_left', 'is_backend'=>false, 'user'=>$this->user])); + $this->assign('plugins_view_header_navigation_top_left_data', Hook::listen('plugins_view_header_navigation_top_left', ['hook_name'=>'plugins_view_header_navigation_top_left', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户登录页面顶部钩子 + $this->assign('plugins_view_user_login_info_top_data', Hook::listen('plugins_view_user_login_info_top', ['hook_name'=>'plugins_view_user_login_info_top', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户注册页面钩子 + $this->assign('plugins_view_user_reg_info_data', Hook::listen('plugins_view_user_reg_info', ['hook_name'=>'plugins_view_user_reg_info', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户注册短信页面钩子 + $this->assign('plugins_view_user_sms_reg_info_data', Hook::listen('plugins_view_user_sms_reg_info', ['hook_name'=>'plugins_view_user_sms_reg_info', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户注册邮箱页面钩子 + $this->assign('plugins_view_user_email_reg_info_data', Hook::listen('plugins_view_user_email_reg_info', ['hook_name'=>'plugins_view_user_email_reg_info', 'is_backend'=>false, 'user'=>$this->user])); } /** diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php index d403f79d7..b0f1ff923 100755 --- a/application/index/controller/Order.php +++ b/application/index/controller/Order.php @@ -137,7 +137,7 @@ class Order extends Common } else { $this->assign('msg', '没有相关数据'); return $this->fetch('public/tips_error'); - } + } } /** diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html index d971298d5..5482557b4 100755 --- a/application/index/view/default/order/index.html +++ b/application/index/view/default/order/index.html @@ -41,21 +41,21 @@ 时间： - + ~ - + 价格： - + ~ - + diff --git a/application/index/view/default/public/header_top_nav.html b/application/index/view/default/public/header_top_nav.html index 45cf5b816..acbd603cc 100755 --- a/application/index/view/default/public/header_top_nav.html +++ b/application/index/view/default/public/header_top_nav.html @@ -20,11 +20,11 @@ {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
- plugins_service_header_navigation_top_left + plugins_view_header_navigation_top_left
{{/if}} - {{if !empty($plugins_service_header_navigation_top_left_data) and is_array($plugins_service_header_navigation_top_left_data) and (!isset($is_footer) or $is_footer eq 1)}} - {{foreach $plugins_service_header_navigation_top_left_data as $hook}} + {{if !empty($plugins_view_header_navigation_top_left_data) and is_array($plugins_view_header_navigation_top_left_data) and (!isset($is_footer) or $is_footer eq 1)}} + {{foreach $plugins_view_header_navigation_top_left_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} {{/if}} diff --git a/application/index/view/default/user/email_reg_info.html b/application/index/view/default/user/email_reg_info.html index 48a84b4aa..59fec28e4 100755 --- a/application/index/view/default/user/email_reg_info.html +++ b/application/index/view/default/user/email_reg_info.html @@ -23,8 +23,23 @@ -
{{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_user_email_reg_info +
+ {{/if}} + {{if !empty($plugins_view_user_email_reg_info_data) and is_array($plugins_view_user_email_reg_info_data)}} + {{foreach $plugins_view_user_email_reg_info_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} +
+
diff --git a/application/index/view/default/user/sms_reg_info.html b/application/index/view/default/user/sms_reg_info.html index 15ba6c3c3..6f59b3b34 100755 --- a/application/index/view/default/user/sms_reg_info.html +++ b/application/index/view/default/user/sms_reg_info.html @@ -23,8 +23,23 @@ -
{{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_user_sms_reg_info +
+ {{/if}} + {{if !empty($plugins_view_user_sms_reg_info_data) and is_array($plugins_view_user_sms_reg_info_data)}} + {{foreach $plugins_view_user_sms_reg_info_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} +
+