From a494c126f3311005750869b217b01a5de133d79c Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Wed, 10 Jun 2020 10:55:08 +0800
Subject: [PATCH] =?UTF-8?q?fecmall=20=E7=95=8C=E9=9D=A2=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/Database/controllers/ConfigController.php           | 2 +-
 app/appinstall/modules/Database/views/config/complete.php       | 2 +-
 app/appinstall/modules/Database/views/config/initadminuser.php  | 2 +-
 app/appinstall/modules/Database/views/config/initdomain.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/appinstall/modules/Database/controllers/ConfigController.php b/app/appinstall/modules/Database/controllers/ConfigController.php
index 42fa6f893..7c02cc71a 100644
--- a/app/appinstall/modules/Database/controllers/ConfigController.php
+++ b/app/appinstall/modules/Database/controllers/ConfigController.php
@@ -106,7 +106,7 @@ public function actionMigrate()
                 return $this->render('migratesuccess', [
                     'successInfo' => $successInfo,
                     'nextUrl' => Yii::$app->homeUrl . '/database/config/addtestdata',
-                    'skipUrl' => Yii::$app->homeUrl . '/database/config/complete',
+                    'skipUrl' => Yii::$app->homeUrl . '/database/config/initdomain',
                 ]);
             } else {
                 $errors = 'migrate 失败，你可以在logs文件中查看具体原因（@appfront/config/main.php中log组件，对应的logFile配置，查看该log文件，如果没有可以手动创建该log文件，清空数据库，重新执行该操作）';
diff --git a/app/appinstall/modules/Database/views/config/complete.php b/app/appinstall/modules/Database/views/config/complete.php
index a2ac2dc3c..00103f785 100644
--- a/app/appinstall/modules/Database/views/config/complete.php
+++ b/app/appinstall/modules/Database/views/config/complete.php
@@ -13,7 +13,7 @@
 <?php echo CRequest::getCsrfInputHtml();  ?>
 <p style="font-size:16px;line-height:25px;"><b>您还需要进行如下的步骤：</b></p>
 
-<p style="font-size:16px;line-height:25px;">设置安全权限(window不需要执行）,Fecmall安装根目录执行命令行：<code>chmod 644 common/config/main-local.php</code></p>
+<p style="font-size:16px;line-height:25px;">设置安全权限(window不需要执行）,Fecmall安装<code>根目录下</code>执行命令行：<code>chmod 644 common/config/main-local.php</code></p>
 
 
 <p style="font-size:16px;line-height:25px;">对于本地环境无所谓，但是线上环境为了安全，请必须设置数据库配置文件644</p>
diff --git a/app/appinstall/modules/Database/views/config/initadminuser.php b/app/appinstall/modules/Database/views/config/initadminuser.php
index 10e64bf86..21051b8c7 100644
--- a/app/appinstall/modules/Database/views/config/initadminuser.php
+++ b/app/appinstall/modules/Database/views/config/initadminuser.php
@@ -23,5 +23,5 @@
         <input type="password" class="form-control" required value="<?= $editForm['password'] ?>"
                name="editForm[password]" placeholder="超级账户密码">
     </div>
-    <button type="submit" class="btn btn-default">提交</button>
+    <button type="submit" class="btn btn-default">下一步</button>
 </form>
diff --git a/app/appinstall/modules/Database/views/config/initdomain.php b/app/appinstall/modules/Database/views/config/initdomain.php
index f8230b59d..8abfcd5cd 100644
--- a/app/appinstall/modules/Database/views/config/initdomain.php
+++ b/app/appinstall/modules/Database/views/config/initdomain.php
@@ -66,5 +66,5 @@
     </div>
     -->
     
-    <button type="submit" class="btn btn-default">提交</button>
+    <button type="submit" class="btn btn-default">下一步</button>
 </form>