动态列表细节优化、新增二级域名绑定模块

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>

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>

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>

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>

config/.gitignore

@@ -1 +1,2 @@
-database.php
+database.php
+domain.php

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];
+        }
+    }
+}
+?>