From 68a2360e622c4732520d6c06eb1c78bf8e5f4976 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 28 Dec 2018 16:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=90=91=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../install/view/public/footer_nav.html       |  2 +-
 .../install/view/public/header_nav.html       |  2 +-
 public/core.php                               | 20 +++++++++----------
 public/static/install/css/index.css           |  9 ++++++---
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/application/install/view/public/footer_nav.html b/application/install/view/public/footer_nav.html
index dd1eefff6..9bf35f462 100755
--- a/application/install/view/public/footer_nav.html
+++ b/application/install/view/public/footer_nav.html
@@ -8,7 +8,7 @@
     </div>
     <div class="am-footer-miscs">
         <p>由 <a href="http://shopxo.net/" title="ShopXO" target="_blank" class="">ShopXO</a> 提供技术支持</p>
-        <p>CopyRight©{{:date('Y')}} ShopXO Inc.</p>
+        <p>CopyRight©{{:date('Y')}} ShopXO {{$Think.APPLICATION_VERSION}} Inc.</p>
         <p>黔ICP备15003530号-5</p>
     </div>
 </footer>
\ No newline at end of file
diff --git a/application/install/view/public/header_nav.html b/application/install/view/public/header_nav.html
index ad127c089..c64257008 100755
--- a/application/install/view/public/header_nav.html
+++ b/application/install/view/public/header_nav.html
@@ -1,6 +1,6 @@
 <div class="header-nav">
     <div class="inside">
-        <p class="logo-name">ShopXO<span>安装向导</span></p>
+        <p class="logo-name">ShopXO<span>安装向导 {{$Think.APPLICATION_VERSION}}</span></p>
         <ul class="schedule {{if isset($action) && $action == 'index'}}active{{/if}}">
             <li class="number">1</li>
             <li class="word">使用协议</li>
diff --git a/public/core.php b/public/core.php
index 47f5664f3..c8c8e927c 100755
--- a/public/core.php
+++ b/public/core.php
@@ -36,13 +36,6 @@ define('__MY_PUBLIC_URL__',  empty($_SERVER['HTTP_HOST']) ? '' : __MY_HTTP__.':/
 $request_url = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
 define('__MY_VIEW_URL__', substr(__MY_URL__, 0, -1).$request_url);
 
-// 检测是否是新安装
-// if(is_dir("./install") && !file_exists("./install/install.lock"))
-// {
-//     $url = __MY_URL__.'install/index.php';
-//     exit(header('location:'.$url));
-// }
-
 // 系统版本
 define('APPLICATION_VERSION', 'v1.2.0');
 
@@ -52,9 +45,6 @@ define('APP_DEBUG', true);
 // 应用Trace 建议开发阶段开启 部署阶段注释或者设为false
 define('APP_TRACE', true);
 
-// 分之模式,master,develop,test,debug
-define('APP_STATUS', 'develop');
-
 // 定义系统目录分隔符
 define('DS', '/');
 
@@ -79,4 +69,14 @@ define('APPLICATION_CLIENT_TYPE', empty($_REQUEST['application_client_type']) ?
 // 是否ajax
 define('IS_AJAX', ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && 'xmlhttprequest' == strtolower($_SERVER['HTTP_X_REQUESTED_WITH'])) || isset($_REQUEST['ajax']) && $_REQUEST['ajax'] == 'ajax'));
 
+// 检测是否是新安装
+if(is_dir(ROOT.'public/install') && !file_exists(ROOT.'public/install/install.lock'))
+{
+    if(empty($_GET['s']) || stripos($_GET['s'], 'install') === false)
+    {
+        $url = __MY_URL__.'index.php?s=/install/index/index';
+        exit(header('location:'.$url));
+    }
+}
+
 ?>
\ No newline at end of file
diff --git a/public/static/install/css/index.css b/public/static/install/css/index.css
index 65d5d2395..9df4040a7 100644
--- a/public/static/install/css/index.css
+++ b/public/static/install/css/index.css
@@ -15,6 +15,9 @@ li {
 h2 {
     margin: 0 0 5px 0;
 }
+p {
+    margin: 0;
+}
 .inside {
     margin: 0 auto;
     padding: 10px;
@@ -50,11 +53,11 @@ h2 {
     padding: 0;
 }
 .header-nav .inside .logo-name {
-    width: 160px;
+    width: 180px;
     height: 40px;
+    line-height: 40px;
     font-size: 20px;
     float: left;
-    margin-top: 7px;
 }
 .header-nav .inside .logo-name span {
     font-size: 12px;
@@ -62,7 +65,7 @@ h2 {
 }
 .header-nav .inside .schedule {
     margin-left: 5px;
-    width: 17%;
+    width: calc(25% - 50px);
     height: 30px;
     float: left;
     margin-top: 8px;
-- 
GitLab