From 50b52877039db60e5a83d1e9aa45a77065a29051 Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Sun, 20 Nov 2016 16:05:13 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E4=BF=AE=E6=94=B9=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=AE=8C=E6=88=90=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/install/view/index/step2.html | 135 ++++++++++++----------
 1 file changed, 74 insertions(+), 61 deletions(-)

diff --git a/application/install/view/index/step2.html b/application/install/view/index/step2.html
index 85c2fc1..d716ad4 100644
--- a/application/install/view/index/step2.html
+++ b/application/install/view/index/step2.html
@@ -2,73 +2,86 @@
 {block name="title"}系统安装Step2{/block}
 {block name="nav"}
 <li><a href="javascript:;">安装协议</a></li>
-<li class="active"><a href="javascript:;">环境检测</a></li>
-<li><a href="javascript:;">参数设置</a></li>
+<li class="active"><a href="javascript:;">参数设置</a></li>
+<li><a href="javascript:;">环境检测</a></li>
 <li><a href="javascript:;">开始安装</a></li>
 <li><a href="javascript:;">安装完成</a></li>
 {/block}
 {block name="main"}
 <div class="panel panel-default">
-    <div class="panel-heading">{:config('PRODUCT_NAME')} 环境检测</div>
+    <div class="panel-heading">{:config('PRODUCT_NAME')} 参数设置</div>
     <div class="panel-body" style="font-size: 14px">
-        <table class="table table-hover">
-            <caption><h4>运行环境检查</h4></caption>
-            <thead>
-            <tr>
-                <th>项目</th>
-                <th>所需配置</th>
-                <th>当前配置</th>
-            </tr>
-            </thead>
-            <tbody>
-            {volist name="checkEnv" id="item"}
-                <tr>
-                    <td>{$item['title']}</td>
-                    <td>{$item['limit']}</td>
-                    <td><i class="{$item['icon']}"></i> {$item['current']}</td>
-                </tr>
-            {/volist}
-            </tbody>
-        </table>
-        <table class="table table-hover">
-            <caption><h4>目录、文件权限检查</h4></caption>
-            <thead>
-            <tr>
-                <th>目录/文件</th>
-                <th>所需状态</th>
-                <th>当前状态</th>
-            </tr>
-            </thead>
-            <tbody>
-            {volist name="checkDirFile" id="item"}
-                <tr>
-                    <td>{$item['path']}</td>
-                    <td>可写</td>
-                    <td><i class="{$item['icon']}"></i> {$item['title']}</td>
-                </tr>
-            {/volist}
-            </tbody>
-        </table>
-        <table class="table table-hover">
-            <caption><h4>函数及扩展依赖性检查</h4></caption>
-            <thead>
-            <tr>
-                <th>名称</th>
-                <th>检查结果</th>
-            </tr>
-            </thead>
-            <tbody>
-            {volist name="checkFuncAndExt" id="item"}
-                <tr>
-                    <td>{$item['name']}</td>
-                    <td><i class="{$item['icon']}"></i> {$item['title']}</td>
-                </tr>
-            {/volist}
-            </tbody>
-        </table>
-        <form action="{:url('step2')}" id="form-setup">
-        <a type="button" target-form="form-setup" class="ajax-post redirect btn btn-primary btn-block">下一步</a>
-        <a type="button" href="{:url('index')}" class="btn btn-default btn-block">上一步</a>
+        <form role="form" id="form-setup" action="{:url('step2')}" method="post" >
+            <h3 style="margin-top: 5px"><span class="label label-info">系统数据库配置</span></h3>
+            <div class="form-group">
+                <label>数据库连接类型</label>
+                <select name="db[DB_TYPE]" class="form-control">
+                    <option value="0">MySQL/MariaDB</option>
+                    <option value="1" disabled>MongoDB[预留]</option>
+                </select>
+            </div>
+            <div class="form-group">
+                <label>数据库服务器，数据库服务器IP，一般为127.0.0.1</label>
+                <input class="form-control" type="text" name="db[DB_HOST]" value="" placeholder="127.0.0.1">
+            </div>
+            <div class="form-group">
+                <label>数据库名</label>
+                <input class="form-control" type="text" name="db[DB_NAME]" value="apiAdmin">
+            </div>
+            <div class="form-group">
+                <label>是否覆盖同名数据库【暂不支持不覆盖安装】</label>
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="cover" value="0" disabled> 不覆盖
+                    </label>
+                    <label>
+                        <input type="radio" name="cover" value="1" checked> 覆盖
+                    </label>
+                </div>
+                </div>
+            <div class="form-group">
+                <label>数据库用户名</label>
+                <input class="form-control" type="text" name="db[DB_USER]" value="" placeholder="请输入数据库用户名">
+            </div>
+            <div class="form-group">
+                <label>数据库密码</label>
+                <input class="form-control" type="text" name="db[DB_PWD]" value="" placeholder="请输入数据库密码">
+            </div>
+            <div class="form-group">
+                <label>数据库端口</label>
+                <input class="form-control" type="text" name="db[DB_PORT]" value="" placeholder="3306/27017">
+            </div>
+            <div class="form-group">
+                <label>数据表前缀，同一个数据库运行多个系统时请修改为不同的前缀</label>
+                <input class="form-control" type="text" name="db[DB_PREFIX]" value="" placeholder="请输入数据表前缀">
+            </div>
+            <h3><span class="label label-info">系统缓存配置</span></h3>
+            <div class="form-group">
+                <label>系统缓存类型：</label>
+                <select class="form-control"  name="cache[type]">
+                    <option value="0">File</option>
+                    <option value="1" disabled>Redis[预留]</option>
+                </select>
+            </div>
+            <div class="form-group">
+                <label>系统缓存IP：</label>
+                <input class="form-control" type="text" name="cache[ip]" value="" placeholder="127.0.0.1">
+            </div>
+            <div class="am-form-group">
+                <label>系统缓存端口：</label>
+                <input class="form-control" type="text" name="cache[port]" value="" placeholder="6379">
+            </div>
+            <h3><span class="label label-info">管理员账号配置</span></h3>
+            <div class="form-group">
+                <label>管理员账号：</label>
+                <input class="form-control" type="text" name="admin[name]" value="">
+            </div>
+            <div class="form-group">
+                <label>管理员密码：</label>
+                <input class="form-control" type="text" name="admin[pass]" value="" placeholder="这里的密码明文显示，请注意！">
+            </div>
+            <a type="button" target-form="form-setup" class="ajax-post redirect btn btn-primary btn-block">下一步</a>
+            <a type="button" href="{:url('index')}" class="btn btn-default btn-block">上一步</a>
         </form>
     </div>
 </div>