From 9ef65ced5cf33feb70401b131dbd53e7f7353c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E7=94=A8lww?= <“529520975@qq.com>
Date: Fri, 8 Nov 2019 11:58:44 +0800
Subject: [PATCH] Merge branch 'feature/promote' of D:\workspace\git\platform
 with conflicts.

---
 Application/Media/View/default/Index/index.html | 2 +-
 Public/Media/css/base1.css                      | 2 +-
 index.php                                       | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Application/Media/View/default/Index/index.html b/Application/Media/View/default/Index/index.html
index fa6f20eb0..3f70d1676 100644
--- a/Application/Media/View/default/Index/index.html
+++ b/Application/Media/View/default/Index/index.html
@@ -13,7 +13,7 @@
 </div>
 <div class="home_text">
     <div class="home_pad">
-        <div class="title" style="margin-bottom: 15px">公司介绍</div>
+        <div class="title">公司介绍</div>
         <div class="del">COMPANY PROFILE</div>
         <div class="content">
             <p>万盟天下励志为玩家提供国内最精品的移动游戏，公司集休闲、娱乐、游戏、玩家互动为一体，以公司服务和玩家互动娱乐为核心， 并于游戏厂商共建良好的沟通反馈机制，力图为大家打造一个最优秀最专业的绿色健康游戏服务平台。</p>
diff --git a/Public/Media/css/base1.css b/Public/Media/css/base1.css
index 13aba14cc..da8ecab95 100644
--- a/Public/Media/css/base1.css
+++ b/Public/Media/css/base1.css
@@ -1,6 +1,6 @@
 @charset "utf-8";
 html{font-family:"Microsoft YaHei","Helvetica Neue",Helvetica,sans-serif,Arial,"tahoma";}
-/* body{background:#fff; font:12px/22px "Microsoft YaHei"; min-width:1200px;} */
+body{ }
 body,div,ul,ol,li,dl,dt,dd,h1,h2,h3,h4,h5,h6,p,img,select,input{padding:0; margin:0; list-style:none; vertical-align:middle;}
 input,textarea:focus{outline:none;}
 input::-webkit-input-placeholder,input:-ms-input-placeholder,input::-moz-placeholder{color:#999;}
diff --git a/index.php b/index.php
index 24e284545..44b309d90 100644
--- a/index.php
+++ b/index.php
@@ -14,6 +14,11 @@ if(version_compare(PHP_VERSION,'5.3.0','<'))  die('require PHP > 5.3.0 !');
  */
 define('APP_DEBUG', true );
 define('ROOTTT',dirname(__FILE__).'/');
+if (APP_DEBUG) {
+    ini_set("display_errors", "On");
+    error_reporting(E_ALL | E_STRICT);
+}
+
 /**
  * 应用目录设置
  * 安全期间，建议安装调试完成后移动到非WEB目录
@@ -24,6 +29,7 @@ if(!is_file(APP_PATH . 'User/Conf/config.php')){
 	header('Location: ./install.php');
 	exit;
 }
+
 /**
  * 缓存目录设置
  * 此目录必须可写，建议移动到非WEB目录