细节优化

app/admin/view/default/public/loading.html

-<div class="am-margin-top-lg am-text-center">
+<div class="am-margin-top-lg am-text-center am-text-grey">
     <p>处理中...</p>
 </div>
\ No newline at end of file

app/index/view/default/category/index.html

@@ -105,7 +105,7 @@
                         <div class="table-no">
                             <i class="am-icon-warning"></i>
                             <span>没有子分类数据</span>
-                            <p class="am-margin-top-lg am-text-center">
+                            <p class="am-margin-top-lg am-text-center am-text-grey">
                                 <a href="{{:MyUrl('index/search/index', ['cid'=>$v['id']])}}" class="am-text-secondary" title="查看分类下商品">查看分类下商品 >></a>
                             </p>
                         </div>

app/index/view/default/config.json

 {
 	"name":"默认主题",
-	"ver":"2.3.0",
+	"ver":"2.3.1",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file

app/index/view/default/public/loading.html

-<div class="am-margin-top-lg am-text-center">
+<div class="am-margin-top-lg am-text-center am-text-grey">
     <img src="{{$attachment_host}}/static/common/images/loading.gif" />
     <p>处理中...</p>
 </div>
\ No newline at end of file

app/install/controller/Index.php

@@ -69,11 +69,11 @@ class Index extends Common
      */
     private function IsInstall()
     {
-        // 是否已安装
         if(file_exists(ROOT.'config/database.php'))
         {
-            exit('你已经安装过该系统，重新安装需要先删除 ./config/database.php 文件');
+            return DataReturn('你已经安装过该系统，重新安装需要先删除 ./config/database.php 文件', -1);
         }
+        return DataReturn('success', 0);
     }
 
     /**
@@ -86,7 +86,11 @@ class Index extends Common
      */
     public function Index()
     {
-        $this->IsInstall();
+        $ret = $this->IsInstall();
+        if($ret['code'] != 0)
+        {
+            exit($ret['msg']);
+        }
         $this->behavior_obj->ReportInstallLog(['msg'=>'协议阅读']);
         return MyView();
     }
@@ -101,7 +105,11 @@ class Index extends Common
      */
     public function Check()
     {
-        $this->IsInstall();
+        $ret = $this->IsInstall();
+        if($ret['code'] != 0)
+        {
+            exit($ret['msg']);
+        }
         $this->behavior_obj->ReportInstallLog(['msg'=>'环境检测']);
         return MyView();
     }
@@ -116,7 +124,11 @@ class Index extends Common
      */
     public function Create()
     {
-        $this->IsInstall();
+        $ret = $this->IsInstall();
+        if($ret['code'] != 0)
+        {
+            exit($ret['msg']);
+        }
         $this->behavior_obj->ReportInstallLog(['msg'=>'数据信息填写']);
 
         MyViewAssign('charset_type_list' , $this->charset_type_list);
@@ -164,10 +176,11 @@ class Index extends Common
         }
 
         // 配置文件校验
-        if(file_exists(ROOT.'config/database.php'))
+        $ret = $this->IsInstall();
+        if($ret['code'] != 0)
         {
-            $this->behavior_obj->ReportInstallLog(['msg'=>'你已经安装过该系统，重新安装需要先删除[./config/database.php 文件]']);
-            return DataReturn('你已经安装过该系统，重新安装需要先删除[./config/database.php 文件]', -1);
+            $this->behavior_obj->ReportInstallLog(['msg'=>'Confirm():'.$ret['msg']]);
+            return $ret;
         }
 
         // 安装应用数据库配置文件生成
@@ -191,6 +204,14 @@ class Index extends Common
             return MyView('public/error');
         }
 
+        // 配置文件校验
+        $ret = $this->IsInstall();
+        if($ret['code'] != 0)
+        {
+            $this->behavior_obj->ReportInstallLog(['msg'=>'Add():'.$ret['msg']]);
+            return $ret;
+        }
+
         // 开始安装
         $params = input('post.');
         $db = $this->DbObj($params);

app/install/view/index/create.html

@@ -81,7 +81,7 @@
 
         <div class="agree ongoing-button">
             <a href="{{:MyUrl('install/index/check')}}" class="am-btn am-btn-secondary am-radius am-btn-xs">上一步</a>
-            <button type="submit" class="am-btn am-btn-success am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'安装中...'}">确认</button>
+            <button type="submit" class="am-btn am-btn-success am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'安装中...'}">确认安装</button>
         </div>
     </form>
 </div>

app/service/ConstService.php

@@ -116,6 +116,7 @@ class ConstService
                 '2.2.8' => ['value' => '2.2.8', 'name' => 'v2.2.8'],
                 '2.2.9' => ['value' => '2.2.9', 'name' => 'v2.2.9'],
                 '2.3.0' => ['value' => '2.3.0', 'name' => 'v2.3.0'],
+                '2.3.1' => ['value' => '2.3.1', 'name' => 'v2.3.1'],
             ],
 
             // 用户注册类型列表

public/core.php

@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 // 系统版本
-define('APPLICATION_VERSION', 'v2.3.0');
+define('APPLICATION_VERSION', 'v2.3.1');
 
 // 检测PHP环境
 if(version_compare(PHP_VERSION,'7.4.0','<'))

public/static/common/css/color/black.css

@@ -200,6 +200,7 @@ form.am-form .am-form-group,
     background: #212121;
 }
 .coupon-content-module .module-items .view-to,
+.wallet-content-module .module-items .view-to,
 .am-form-group:hover>label {
     color: #f5f5f5 !important;
 }
@@ -211,15 +212,18 @@ form.am-form .am-form-group,
 .plug-file-upload-submit,
 .am-switch .am-switch-label,
 .form-table-fields-button-container,
-.coupon-content-module .module-items,
 #inspect-upgrade-popup .upgrade-bottom-content,
 .form-inventory-submit {
     background: #1e1e1e;
 }
+.wallet-content-module .module-items,
+.coupon-content-module .module-items {
+    background: #212121;
+}
 .business-operations-submit:hover,
 .plug-file-upload-submit:hover,
 .content-right [class*="-content"] .nav-items:hover {
-    border-color: #666;
+    border-color: #353535;
 }
 hr,
 .am-divider-default,
@@ -255,7 +259,8 @@ table.am-table .am-btn-default,
 .am-pagination > li > span:hover,
 .am-pagination > li > a:focus,
 .am-pagination > li > span:focus,
-.coupon-content-module .module-items p.total {
+.coupon-content-module .module-items p.total,
+.wallet-content-module .module-items p.total {
     color: #888;
 }
 .am-pagination > .am-disabled > span,

public/static/common/css/common.css

@@ -976,26 +976,26 @@ button.colorpicker-submit img {
 }
 .am-page-loading>div {
     display: inline-block;
-    width: 8px;
-    height: 20px;
+    width: 5px;
+    height: 15px;
     background: #03a9f4;
     border-radius: 5px;
-    animation: am-page-loading 0.3s ease-in-out infinite alternate;
+    animation: am-page-loading 0.25s ease-in-out infinite alternate;
 }
 .am-page-loading>div:nth-child(2) {
     animation-delay: 0.2s;
     background: #f44336;
 }
 .am-page-loading>div:nth-child(3) {
-    animation-delay: 0.4s;
+    animation-delay: 0.3s;
     background: #9c27b0;
 }
 .am-page-loading>div:nth-child(4) {
-    animation-delay: 0.6s;
+    animation-delay: 0.4s;
     background: #009688;
 }
 .am-page-loading>div:nth-child(5) {
-    animation-delay: 0.8s;
+    animation-delay: 0.5s;
     background: #ff9800;
 }
 @keyframes am-page-loading {