diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php
index 032ce626c..5f60030dc 100755
--- a/application/index/controller/Common.php
+++ b/application/index/controller/Common.php
@@ -169,6 +169,9 @@ class Common extends Controller
// 用户登录页面顶部钩子
$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_login_inside_bottom_data', Hook::listen('plugins_view_user_login_inside_bottom', ['hook_name'=>'plugins_view_user_login_inside_bottom', 'is_backend'=>false, 'user'=>$this->user]));
+
// 用户登录内容页面底部钩子
$this->assign('plugins_view_user_login_content_bottom_data', Hook::listen('plugins_view_user_login_content_bottom', ['hook_name'=>'plugins_view_user_login_content_bottom', 'is_backend'=>false, 'user'=>$this->user]));
@@ -178,6 +181,9 @@ class Common extends Controller
// 用户注册页面顶部钩子
$this->assign('plugins_view_user_reg_info_top_data', Hook::listen('plugins_view_user_reg_info_top', ['hook_name'=>'plugins_view_user_reg_info_top', 'is_backend'=>false, 'user'=>$this->user]));
+ // 用户注册页面内底部钩子
+ $this->assign('plugins_view_user_reg_info_inside_bottom_data', Hook::listen('plugins_view_user_reg_info_inside_bottom', ['hook_name'=>'plugins_view_user_reg_info_inside_bottom', 'is_backend'=>false, 'user'=>$this->user]));
+
// 用户注册页面底部钩子
$this->assign('plugins_view_user_reg_info_bottom_data', Hook::listen('plugins_view_user_reg_info_bottom', ['hook_name'=>'plugins_view_user_reg_info_bottom', 'is_backend'=>false, 'user'=>$this->user]));
diff --git a/application/index/view/default/user/login_content.html b/application/index/view/default/user/login_content.html
index 3c49d8056..34cbfef23 100644
--- a/application/index/view/default/user/login_content.html
+++ b/application/index/view/default/user/login_content.html
@@ -107,9 +107,25 @@
{{/if}}
-
-
免费注册
-
忘记密码?
+
+
+ {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+
+ plugins_view_user_login_inside_bottom
+
+ {{/if}}
+ {{if !empty($plugins_view_user_login_inside_bottom_data) and is_array($plugins_view_user_login_inside_bottom_data)}}
+ {{foreach $plugins_view_user_login_inside_bottom_data as $hook}}
+ {{if is_string($hook) or is_int($hook)}}
+ {{$hook|raw}}
+ {{/if}}
+ {{/foreach}}
+ {{/if}}
+
+
diff --git a/application/index/view/default/user/reg_info.html b/application/index/view/default/user/reg_info.html
index 494937e6a..e7762ab9b 100755
--- a/application/index/view/default/user/reg_info.html
+++ b/application/index/view/default/user/reg_info.html
@@ -154,6 +154,8 @@
阅读并同意
《服务协议》
+ 与
+ 《隐私政策》
{{/if}}
@@ -200,6 +202,8 @@
阅读并同意
《服务协议》
+ 与
+ 《隐私政策》
{{/if}}
@@ -211,6 +215,20 @@
{{/if}}
+
+
+ {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+
+ plugins_view_user_reg_info_inside_bottom
+
+ {{/if}}
+ {{if !empty($plugins_view_user_reg_info_inside_bottom_data) and is_array($plugins_view_user_reg_info_inside_bottom_data)}}
+ {{foreach $plugins_view_user_reg_info_inside_bottom_data as $hook}}
+ {{if is_string($hook) or is_int($hook)}}
+ {{$hook|raw}}
+ {{/if}}
+ {{/foreach}}
+ {{/if}}
{{else /}}
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index c660d9f5d..3ad5cd42c 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -448,9 +448,9 @@ ul.am-dropdown-content > .am-active > a:focus,
@media only screen and (min-width: 641px) {
.common-login-modal {
max-width: 400px;
- height: 408px;
+ height: 430px;
left: calc(50% - 200px);
- top: calc(50% - 204px);
+ top: calc(50% - 215px);
margin-left: 0;
margin-top: 0;
}
diff --git a/public/static/index/default/css/user.css b/public/static/index/default/css/user.css
index e77665adb..1f391f26b 100755
--- a/public/static/index/default/css/user.css
+++ b/public/static/index/default/css/user.css
@@ -54,7 +54,7 @@
.my-content form.am-form {
background: #fff;
overflow: hidden;
- padding-top: 10px;
+ padding: 10px 10px 15px 10px;
}
.my-content form.am-form .am-form-group {
padding: 5px 10px !important;