From 49bd3a60589267e4548a8ef00068f0e5db6189ab Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 3 May 2022 17:52:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=88=97=E8=A1=A8=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96=E3=80=81=E6=96=B0=E5=A2=9E=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E5=9F=9F=E5=90=8D=E7=BB=91=E5=AE=9A=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/default/public/module/form.html      |  2 +-
 .../public/module/form_operate_top.html       | 28 +++++++++----------
 .../view/default/public/module/form.html      |  2 +-
 .../public/module/form_operate_top.html       | 28 +++++++++----------
 config/.gitignore                             |  3 +-
 public/core.php                               | 18 +++++++++++-
 6 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/app/admin/view/default/public/module/form.html b/app/admin/view/default/public/module/form.html
index f62f7a936..f1f1e6e52 100644
--- a/app/admin/view/default/public/module/form.html
+++ b/app/admin/view/default/public/module/form.html
@@ -97,7 +97,7 @@
         {{block name="form_extend"}}{{/block}}
         <!-- extend end -->
 
-        <!-- content inside top hook -->
+        <!-- content inside bottom hook -->
         {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
             <div class="plugins-tag">
                 <span>{{$hook_name_content_inside_bottom}}</span>
diff --git a/app/admin/view/default/public/module/form_operate_top.html b/app/admin/view/default/public/module/form_operate_top.html
index 5167405a2..ef38c56c9 100644
--- a/app/admin/view/default/public/module/form_operate_top.html
+++ b/app/admin/view/default/public/module/form_operate_top.html
@@ -1,18 +1,4 @@
 <!-- 公共操作 -->
-<!-- 是否开启删除操作 -->
-{{if isset($form_table['base']['is_delete']) and $form_table['base']['is_delete'] eq 1}}
-    <button
-        type="button"
-        class="am-btn am-btn-danger am-radius am-btn-xs am-icon-trash-o form-table-operate-top-delete-submit"
-        data-url="{{if isset($form_table['base']['delete_url'])}}{{$form_table.base.delete_url}}{{/if}}"
-        data-form="{{if isset($form_table['base']['delete_form'])}}{{$form_table.base.delete_form}}{{/if}}"
-        data-key="{{if isset($form_table['base']['delete_key'])}}{{$form_table.base.delete_key}}{{/if}}"
-        data-confirm-title="{{if isset($form_table['base']['confirm_title'])}}{{$form_table.base.confirm_title}}{{/if}}"
-        data-confirm-msg="{{if isset($form_table['base']['confirm_msg'])}}{{$form_table.base.confirm_msg}}{{/if}}"
-        data-timeout="{{if isset($form_table['base']['timeout'])}}{{$form_table.base.timeout}}{{/if}}"
-    > 删除</button>
-{{/if}}
-
 <!-- 钩子 -->
 {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
     <div class="plugins-tag">
@@ -33,6 +19,20 @@
     }
 {{/php}}
 
+<!-- 是否开启删除操作 -->
+{{if isset($form_table['base']['is_delete']) and $form_table['base']['is_delete'] eq 1}}
+    <button
+        type="button"
+        class="am-btn am-btn-danger am-radius am-btn-xs am-icon-trash-o form-table-operate-top-delete-submit"
+        data-url="{{if isset($form_table['base']['delete_url'])}}{{$form_table.base.delete_url}}{{/if}}"
+        data-form="{{if isset($form_table['base']['delete_form'])}}{{$form_table.base.delete_form}}{{/if}}"
+        data-key="{{if isset($form_table['base']['delete_key'])}}{{$form_table.base.delete_key}}{{/if}}"
+        data-confirm-title="{{if isset($form_table['base']['confirm_title'])}}{{$form_table.base.confirm_title}}{{/if}}"
+        data-confirm-msg="{{if isset($form_table['base']['confirm_msg'])}}{{$form_table.base.confirm_msg}}{{/if}}"
+        data-timeout="{{if isset($form_table['base']['timeout'])}}{{$form_table.base.timeout}}{{/if}}"
+    > 删除</button>
+{{/if}}
+
 <!-- 是否开启搜索操作 公共搜索操作放在最后面 -->
 {{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1}}
     <a href="{{if isset($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}" class="am-btn am-btn-warning am-radius am-btn-sm am-icon-filter"> 重置</a>
diff --git a/app/index/view/default/public/module/form.html b/app/index/view/default/public/module/form.html
index c262c90ec..4df3d91b6 100644
--- a/app/index/view/default/public/module/form.html
+++ b/app/index/view/default/public/module/form.html
@@ -110,7 +110,7 @@
         {{block name="form_extend"}}{{/block}}
         <!-- extend end -->
 
-        <!-- content inside top hook -->
+        <!-- content inside bottom hook -->
         {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
             <div class="plugins-tag">
                 <span>{{$hook_name_content_inside_bottom}}</span>
diff --git a/app/index/view/default/public/module/form_operate_top.html b/app/index/view/default/public/module/form_operate_top.html
index 5579b6894..67a2e1fbd 100644
--- a/app/index/view/default/public/module/form_operate_top.html
+++ b/app/index/view/default/public/module/form_operate_top.html
@@ -1,18 +1,4 @@
 <!-- 公共操作 -->
-<!-- 是否开启删除操作 -->
-{{if isset($form_table['base']['is_delete']) and $form_table['base']['is_delete'] eq 1}}
-    <button
-        type="button"
-        class="am-btn am-btn-danger am-radius am-btn-xs am-icon-trash-o form-table-operate-top-delete-submit"
-        data-url="{{if isset($form_table['base']['delete_url'])}}{{$form_table.base.delete_url}}{{/if}}"
-        data-form="{{if isset($form_table['base']['delete_form'])}}{{$form_table.base.delete_form}}{{/if}}"
-        data-key="{{if isset($form_table['base']['delete_key'])}}{{$form_table.base.delete_key}}{{/if}}"
-        data-confirm-title="{{if isset($form_table['base']['confirm_title'])}}{{$form_table.base.confirm_title}}{{/if}}"
-        data-confirm-msg="{{if isset($form_table['base']['confirm_msg'])}}{{$form_table.base.confirm_msg}}{{/if}}"
-        data-timeout="{{if isset($form_table['base']['timeout'])}}{{$form_table.base.timeout}}{{/if}}"
-    > 删除</button>
-{{/if}}
-
 <!-- 钩子 -->
 {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
     <div class="plugins-tag">
@@ -33,6 +19,20 @@
     }
 {{/php}}
 
+<!-- 是否开启删除操作 -->
+{{if isset($form_table['base']['is_delete']) and $form_table['base']['is_delete'] eq 1}}
+    <button
+        type="button"
+        class="am-btn am-btn-danger am-radius am-btn-xs am-icon-trash-o form-table-operate-top-delete-submit"
+        data-url="{{if isset($form_table['base']['delete_url'])}}{{$form_table.base.delete_url}}{{/if}}"
+        data-form="{{if isset($form_table['base']['delete_form'])}}{{$form_table.base.delete_form}}{{/if}}"
+        data-key="{{if isset($form_table['base']['delete_key'])}}{{$form_table.base.delete_key}}{{/if}}"
+        data-confirm-title="{{if isset($form_table['base']['confirm_title'])}}{{$form_table.base.confirm_title}}{{/if}}"
+        data-confirm-msg="{{if isset($form_table['base']['confirm_msg'])}}{{$form_table.base.confirm_msg}}{{/if}}"
+        data-timeout="{{if isset($form_table['base']['timeout'])}}{{$form_table.base.timeout}}{{/if}}"
+    > 删除</button>
+{{/if}}
+
 <!-- 是否开启搜索操作 公共搜索操作放在最后面 -->
 {{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1}}
     <a href="{{if isset($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}" class="am-btn am-btn-warning am-radius am-btn-sm am-icon-filter"> 重置</a>
diff --git a/config/.gitignore b/config/.gitignore
index 6b502227c..3c5e2a814 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -1 +1,2 @@
-database.php
\ No newline at end of file
+database.php
+domain.php
\ No newline at end of file
diff --git a/public/core.php b/public/core.php
index 4eef0e038..e502f28e1 100755
--- a/public/core.php
+++ b/public/core.php
@@ -102,4 +102,20 @@ define('IS_POST', isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'
 
 // 是否ajax
 define('IS_AJAX', ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && 'xmlhttprequest' == strtolower($_SERVER['HTTP_X_REQUESTED_WITH'])) || isset($_REQUEST['ajax']) && $_REQUEST['ajax'] == 'ajax'));
-?>
+
+// 二级域名页面绑定
+if(substr_count(__MY_HOST__, '.') > 1 && !is_numeric(str_replace('.', '', __MY_HOST__)))
+{
+    $domain_file = ROOT.'config'.DS.'domain.php';
+    $second_domain = substr(__MY_HOST__, 0, strpos(__MY_HOST__, '.'));
+    if(file_exists($domain_file) && $second_domain != 'www')
+    {
+        $data = include($domain_file);
+        if(!empty($data) && (!empty($data[$second_domain]) || !empty($data['s'])))
+        {
+            define('SECOND_DOMAIN', $second_domain);
+            $_GET['s'] = empty($data[$second_domain]) ? $data['s'] : $data[$second_domain];
+        }
+    }
+}
+?>
\ No newline at end of file