From e063f9c4f8899bbfeb069538801b28f8d793dff2 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Fri, 21 May 2021 00:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/Common.php       |  6 +++++
 .../view/default/user/login_content.html      | 22 ++++++++++++++++---
 .../index/view/default/user/reg_info.html     | 18 +++++++++++++++
 public/static/index/default/css/common.css    |  4 ++--
 public/static/index/default/css/user.css      |  2 +-
 5 files changed, 46 insertions(+), 6 deletions(-)

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 @@
             </div>
         {{/if}}
 
-        <div class="am-padding-sm am-nbfc">
-            <a href="{{:MyUrl('index/user/reginfo')}}" target="_blank" class="am-fl">免费注册</a>
-            <a href="{{:MyUrl('index/user/forgetpwdinfo')}}" target="_blank" class="am-fr">忘记密码？</a>
+        <div class="am-padding-horizontal-xs am-padding-vertical-xs am-margin-bottom-sm am-nbfc">
+            <!-- 用户登录内底部钩子 -->
+            {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+                <div class="plugins-tag">
+                    <span>plugins_view_user_login_inside_bottom</span>
+                </div>
+            {{/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}}
+            <!-- 右侧快捷入口 -->
+            <div class="am-fr">
+                <a href="{{:MyUrl('index/user/reginfo')}}" target="_blank" class="am-text-danger am-margin-right-sm">免费注册</a>
+                <a href="{{:MyUrl('index/user/forgetpwdinfo')}}" target="_blank">忘记密码</a>
+            </div>
         </div>
     </div>
 </div>
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 @@
                                                     <input type="checkbox" value="1" name="is_agree_agreement" data-validation-message="请同意协议" data-am-ucheck required /> 阅读并同意
                                                 </label>
                                                 <a href="{{:MyUrl('index/agreement/index', ['document'=>'userregister'])}}" target="_blank">《服务协议》</a>
+                                                <span>与</span>
+                                                <a href="{{:MyUrl('index/agreement/index', ['document'=>'userprivacy'])}}" target="_blank">《隐私政策》</a>
                                             </div>
                                         {{/if}}
 
@@ -200,6 +202,8 @@
                                                     <input type="checkbox" value="1" name="is_agree_agreement" data-validation-message="请同意协议" data-am-ucheck required /> 阅读并同意
                                                 </label>
                                                 <a href="{{:MyUrl('index/agreement/index', ['document'=>'userregister'])}}" target="_blank">《服务协议》</a>
+                                                <span>与</span>
+                                                <a href="{{:MyUrl('index/agreement/index', ['document'=>'userprivacy'])}}" target="_blank">《隐私政策》</a>
                                             </div>
                                         {{/if}}
 
@@ -211,6 +215,20 @@
                                     <!-- form end -->
                                 </div>
                             {{/if}}
+
+                            <!-- 用户注册页面内底部钩子 -->
+                            {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+                                <div class="plugins-tag">
+                                    <span>plugins_view_user_reg_info_inside_bottom</span>
+                                </div>
+                            {{/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}}
                         </div>
                     </div>
                 {{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;