From e691be847ffbcdcd35b65acb79d27ff23163b204 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 14 Aug 2022 20:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=20v2.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/form/Warehousegoods.php             |  1 +
 .../view/default/site/attachment/index.html   |  6 +--
 app/admin/view/default/site/cache/index.html  |  2 +-
 .../view/default/site/extends/index.html      |  8 +--
 .../default/site/orderaftersale/index.html    |  2 +-
 .../view/default/site/siteset/goods.html      |  2 +-
 .../view/default/site/siteset/index.html      |  2 +-
 .../view/default/site/siteset/search.html     |  2 +-
 .../view/default/site/sitetype/index.html     |  2 +-
 app/admin/view/default/site/verify/index.html |  4 +-
 app/index/view/default/config.json            |  2 +-
 app/module/FormHandleModule.php               | 20 +++++---
 app/service/ConstService.php                  |  1 +
 changelog.txt                                 | 21 ++++++++
 public/core.php                               |  2 +-
 .../static/admin/default/css/color/black.css  | 49 +++++++++++++------
 16 files changed, 86 insertions(+), 40 deletions(-)

diff --git a/app/admin/form/Warehousegoods.php b/app/admin/form/Warehousegoods.php
index 539666bee..9ad194418 100644
--- a/app/admin/form/Warehousegoods.php
+++ b/app/admin/form/Warehousegoods.php
@@ -170,6 +170,7 @@ class WarehouseGoods
                 'table_obj'     => Db::name('WarehouseGoods')->alias('wg')->leftJoin('warehouse_goods_spec wgs', 'wg.id=wgs.warehouse_goods_id'),
                 'select_field'  => 'wg.*',
                 'order_by'      => 'wg.id desc',
+                'group'         => 'wg.id',
                 'detail_dkey'   => 'wg.id',
                 'data_handle'   => 'WarehouseGoodsService::WarehouseGoodsListHandle',
                 'is_page'       => 1,
diff --git a/app/admin/view/default/site/attachment/index.html b/app/admin/view/default/site/attachment/index.html
index 02ca38b50..29aabc79a 100644
--- a/app/admin/view/default/site/attachment/index.html
+++ b/app/admin/view/default/site/attachment/index.html
@@ -12,7 +12,7 @@
             <div class="am-form-group">
                 <label>{{$data.home_max_limit_image.name}}<span class="am-form-group-label-tips">{{$data.home_max_limit_image.describe}}</span></label>
                 <div class="am-input-group am-input-group-sm">
-                    <input type="number" min="0" name="{{$data.home_max_limit_image.only_tag}}" placeholder="{{$data.home_max_limit_image.name}}" data-validation-message="{{$data.home_max_limit_image.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_max_limit_image.value}}"{{/if}} />
+                    <input type="number" min="0" name="{{$data.home_max_limit_image.only_tag}}" placeholder="{{$data.home_max_limit_image.name}}" data-validation-message="{{$data.home_max_limit_image.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.home_max_limit_image.value}}"{{/if}} />
                     <span class="am-input-group-btn">
                         <button class="am-btn am-btn-default" type="button">B</button>
                   </span>
@@ -21,7 +21,7 @@
             <div class="am-form-group">
                 <label>{{$data.home_max_limit_file.name}}<span class="am-form-group-label-tips">{{$data.home_max_limit_file.describe}}</span></label>
                 <div class="am-input-group am-input-group-sm">
-                    <input type="number" min="0" name="{{$data.home_max_limit_file.only_tag}}" placeholder="{{$data.home_max_limit_file.name}}" data-validation-message="{{$data.home_max_limit_file.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_max_limit_file.value}}"{{/if}} />
+                    <input type="number" min="0" name="{{$data.home_max_limit_file.only_tag}}" placeholder="{{$data.home_max_limit_file.name}}" data-validation-message="{{$data.home_max_limit_file.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.home_max_limit_file.value}}"{{/if}} />
                     <span class="am-input-group-btn">
                         <button class="am-btn am-btn-default" type="button">B</button>
                   </span>
@@ -30,7 +30,7 @@
             <div class="am-form-group">
                 <label>{{$data.home_max_limit_video.name}}<span class="am-form-group-label-tips">{{$data.home_max_limit_video.describe}}</span></label>
                 <div class="am-input-group am-input-group-sm">
-                    <input type="number" min="0" name="{{$data.home_max_limit_video.only_tag}}" placeholder="{{$data.home_max_limit_video.name}}" data-validation-message="{{$data.home_max_limit_video.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_max_limit_video.value}}"{{/if}} />
+                    <input type="number" min="0" name="{{$data.home_max_limit_video.only_tag}}" placeholder="{{$data.home_max_limit_video.name}}" data-validation-message="{{$data.home_max_limit_video.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.home_max_limit_video.value}}"{{/if}} />
                     <span class="am-input-group-btn">
                         <button class="am-btn am-btn-default" type="button">B</button>
                   </span>
diff --git a/app/admin/view/default/site/cache/index.html b/app/admin/view/default/site/cache/index.html
index 877c1f725..bc4191977 100644
--- a/app/admin/view/default/site/cache/index.html
+++ b/app/admin/view/default/site/cache/index.html
@@ -79,7 +79,7 @@
                     <div class="am-form-group">
                         <label>{{$data.common_cache_data_redis_expire.name}}<span class="am-form-group-label-tips">{{$data.common_cache_data_redis_expire.describe}}</span></label>
                         <div class="am-input-group am-input-group-sm">
-                            <input type="number" min="0" name="{{$data.common_cache_data_redis_expire.only_tag}}" placeholder="{{$data.common_cache_data_redis_expire.name}}" data-validation-message="{{$data.common_cache_data_redis_expire.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_cache_data_redis_expire.value}}"{{/if}} />
+                            <input type="number" min="0" name="{{$data.common_cache_data_redis_expire.only_tag}}" placeholder="{{$data.common_cache_data_redis_expire.name}}" data-validation-message="{{$data.common_cache_data_redis_expire.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.common_cache_data_redis_expire.value}}"{{/if}} />
                             <span class="am-input-group-btn">
                                 <button class="am-btn am-btn-default" type="button">秒</button>
                           </span>
diff --git a/app/admin/view/default/site/extends/index.html b/app/admin/view/default/site/extends/index.html
index cd8ffdb1c..827870728 100644
--- a/app/admin/view/default/site/extends/index.html
+++ b/app/admin/view/default/site/extends/index.html
@@ -39,7 +39,7 @@
                     <div class="am-form-group">
                         <label>{{$data.common_order_close_limit_time.name}}<span class="am-form-group-label-tips">{{$data.common_order_close_limit_time.describe}}</span></label>
                         <div class="am-input-group am-input-group-sm">
-                            <input type="number" min="0" name="{{$data.common_order_close_limit_time.only_tag}}" placeholder="{{$data.common_order_close_limit_time.name}}" data-validation-message="{{$data.common_order_close_limit_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_order_close_limit_time.value}}"{{/if}} />
+                            <input type="number" min="0" name="{{$data.common_order_close_limit_time.only_tag}}" placeholder="{{$data.common_order_close_limit_time.name}}" data-validation-message="{{$data.common_order_close_limit_time.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.common_order_close_limit_time.value}}"{{/if}} />
                             <span class="am-input-group-btn">
                                 <button class="am-btn am-btn-default" type="button">分钟</button>
                           </span>
@@ -52,7 +52,7 @@
                     <div class="am-form-group">
                         <label>{{$data.common_order_success_limit_time.name}}<span class="am-form-group-label-tips">{{$data.common_order_success_limit_time.describe}}</span></label>
                         <div class="am-input-group am-input-group-sm">
-                            <input type="number" min="0" name="{{$data.common_order_success_limit_time.only_tag}}" placeholder="{{$data.common_order_success_limit_time.name}}" data-validation-message="{{$data.common_order_success_limit_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_order_success_limit_time.value}}"{{/if}} />
+                            <input type="number" min="0" name="{{$data.common_order_success_limit_time.only_tag}}" placeholder="{{$data.common_order_success_limit_time.name}}" data-validation-message="{{$data.common_order_success_limit_time.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.common_order_success_limit_time.value}}"{{/if}} />
                             <span class="am-input-group-btn">
                                 <button class="am-btn am-btn-default" type="button">分钟</button>
                           </span>
@@ -65,7 +65,7 @@
                     <div class="am-form-group">
                         <label>{{$data.common_pay_log_order_close_limit_time.name}}<span class="am-form-group-label-tips">{{$data.common_pay_log_order_close_limit_time.describe}}</span></label>
                         <div class="am-input-group am-input-group-sm">
-                            <input type="number" min="0" name="{{$data.common_pay_log_order_close_limit_time.only_tag}}" placeholder="{{$data.common_pay_log_order_close_limit_time.name}}" data-validation-message="{{$data.common_pay_log_order_close_limit_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_pay_log_order_close_limit_time.value}}"{{/if}} />
+                            <input type="number" min="0" name="{{$data.common_pay_log_order_close_limit_time.only_tag}}" placeholder="{{$data.common_pay_log_order_close_limit_time.name}}" data-validation-message="{{$data.common_pay_log_order_close_limit_time.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.common_pay_log_order_close_limit_time.value}}"{{/if}} />
                             <span class="am-input-group-btn">
                                 <button class="am-btn am-btn-default" type="button">分钟</button>
                           </span>
@@ -78,7 +78,7 @@
                     <div class="am-form-group">
                         <label>{{$data.common_goods_give_integral_limit_time.name}}<span class="am-form-group-label-tips">{{$data.common_goods_give_integral_limit_time.describe}}</span></label>
                         <div class="am-input-group am-input-group-sm">
-                            <input type="number" min="0" name="{{$data.common_goods_give_integral_limit_time.only_tag}}" placeholder="{{$data.common_goods_give_integral_limit_time.name}}" data-validation-message="{{$data.common_goods_give_integral_limit_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_goods_give_integral_limit_time.value}}"{{/if}} />
+                            <input type="number" min="0" name="{{$data.common_goods_give_integral_limit_time.only_tag}}" placeholder="{{$data.common_goods_give_integral_limit_time.name}}" data-validation-message="{{$data.common_goods_give_integral_limit_time.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.common_goods_give_integral_limit_time.value}}"{{/if}} />
                             <span class="am-input-group-btn">
                                 <button class="am-btn am-btn-default" type="button">分钟</button>
                           </span>
diff --git a/app/admin/view/default/site/orderaftersale/index.html b/app/admin/view/default/site/orderaftersale/index.html
index 52e5ee0d2..1ec4e1221 100644
--- a/app/admin/view/default/site/orderaftersale/index.html
+++ b/app/admin/view/default/site/orderaftersale/index.html
@@ -36,7 +36,7 @@
             <div class="am-form-group">
                 <label>{{$data.home_order_aftersale_return_launch_day.name}}<span class="am-form-group-label-tips">{{$data.home_order_aftersale_return_launch_day.describe}}</span></label>
                 <div class="am-input-group am-input-group-sm">
-                    <input type="number" min="0" name="{{$data.home_order_aftersale_return_launch_day.only_tag}}" placeholder="{{$data.home_order_aftersale_return_launch_day.name}}" data-validation-message="{{$data.home_order_aftersale_return_launch_day.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_order_aftersale_return_launch_day.value}}"{{/if}} />
+                    <input type="number" min="0" name="{{$data.home_order_aftersale_return_launch_day.only_tag}}" placeholder="{{$data.home_order_aftersale_return_launch_day.name}}" data-validation-message="{{$data.home_order_aftersale_return_launch_day.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.home_order_aftersale_return_launch_day.value}}"{{/if}} />
                     <span class="am-input-group-btn">
                         <button class="am-btn am-btn-default" type="button">天</button>
                   </span>
diff --git a/app/admin/view/default/site/siteset/goods.html b/app/admin/view/default/site/siteset/goods.html
index 1cd7a537f..b16e4efe3 100644
--- a/app/admin/view/default/site/siteset/goods.html
+++ b/app/admin/view/default/site/siteset/goods.html
@@ -34,7 +34,7 @@
             <div class="am-form-group">
                 <label>{{$data.common_show_goods_category_level.name}}<span class="am-form-group-label-tips">{{$data.common_show_goods_category_level.describe}}</span></label>
                 <div class="am-input-group am-input-group-sm">
-                    <input type="number" min="0" max="3" name="{{$data.common_show_goods_category_level.only_tag}}" placeholder="{{$data.common_show_goods_category_level.name}}" data-validation-message="{{$data.common_show_goods_category_level.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_show_goods_category_level.value}}"{{/if}} />
+                    <input type="number" min="0" max="3" name="{{$data.common_show_goods_category_level.only_tag}}" placeholder="{{$data.common_show_goods_category_level.name}}" data-validation-message="{{$data.common_show_goods_category_level.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.common_show_goods_category_level.value}}"{{/if}} />
                     <span class="am-input-group-btn">
                         <button class="am-btn am-btn-default" type="button">级</button>
                   </span>
diff --git a/app/admin/view/default/site/siteset/index.html b/app/admin/view/default/site/siteset/index.html
index b449cf94c..a2f1a9068 100644
--- a/app/admin/view/default/site/siteset/index.html
+++ b/app/admin/view/default/site/siteset/index.html
@@ -111,7 +111,7 @@
                     <div class="am-form-group">
                         <label>{{$data.home_index_floor_goods_max_count.name}}<span class="am-form-group-label-tips">{{$data.home_index_floor_goods_max_count.describe}}</span></label>
                         <div class="am-input-group am-input-group-sm">
-                            <input type="number" min="0" name="{{$data.home_index_floor_goods_max_count.only_tag}}" placeholder="{{$data.home_index_floor_goods_max_count.name}}" data-validation-message="{{$data.home_index_floor_goods_max_count.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_index_floor_goods_max_count.value}}"{{/if}} />
+                            <input type="number" min="0" name="{{$data.home_index_floor_goods_max_count.only_tag}}" placeholder="{{$data.home_index_floor_goods_max_count.name}}" data-validation-message="{{$data.home_index_floor_goods_max_count.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.home_index_floor_goods_max_count.value}}"{{/if}} />
                             <span class="am-input-group-btn">
                                 <button class="am-btn am-btn-default" type="button">个</button>
                           </span>
diff --git a/app/admin/view/default/site/siteset/search.html b/app/admin/view/default/site/siteset/search.html
index e1ec5d528..067112807 100644
--- a/app/admin/view/default/site/siteset/search.html
+++ b/app/admin/view/default/site/siteset/search.html
@@ -29,7 +29,7 @@
             <div class="am-form-group">
                 <label>{{$data.home_search_limit_number.name}}<span class="am-form-group-label-tips">{{$data.home_search_limit_number.describe}}</span></label>
                 <div class="am-input-group am-input-group-sm">
-                    <input type="number" min="0" name="{{$data.home_search_limit_number.only_tag}}" placeholder="{{$data.home_search_limit_number.name}}" data-validation-message="{{$data.home_search_limit_number.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_search_limit_number.value}}"{{/if}} />
+                    <input type="number" min="0" name="{{$data.home_search_limit_number.only_tag}}" placeholder="{{$data.home_search_limit_number.name}}" data-validation-message="{{$data.home_search_limit_number.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.home_search_limit_number.value}}"{{/if}} />
                     <span class="am-input-group-btn">
                         <button class="am-btn am-btn-default" type="button">条</button>
                   </span>
diff --git a/app/admin/view/default/site/sitetype/index.html b/app/admin/view/default/site/sitetype/index.html
index e02261b7b..afe518266 100644
--- a/app/admin/view/default/site/sitetype/index.html
+++ b/app/admin/view/default/site/sitetype/index.html
@@ -140,7 +140,7 @@
                     <div class="am-input-group am-input-group-sm">
                         <input type="hidden" name="lng" id="form-lng" />
                         <input type="hidden" name="lat" id="form-lat" />
-                        <input type="text" name="address" id="form-address" placeholder="详细地址" minlength="2" maxlength="80" data-validation-message="详细地址格式 1~80 个字符之间" class="am-radius" required />
+                        <input type="text" name="address" id="form-address" placeholder="详细地址" minlength="2" maxlength="80" data-validation-message="详细地址格式 1~80 个字符之间" class="am-radius am-form-field" required />
                         <span class="am-input-group-btn">
                             <button class="am-btn am-btn-default am-radius" type="button" id="map-location-submit"><span class="am-icon-map-marker"></span> 定位</button>
                         </span>
diff --git a/app/admin/view/default/site/verify/index.html b/app/admin/view/default/site/verify/index.html
index 5d7ceecc7..6d620075c 100644
--- a/app/admin/view/default/site/verify/index.html
+++ b/app/admin/view/default/site/verify/index.html
@@ -12,7 +12,7 @@
             <div class="am-form-group">
                 <label>{{$data.common_verify_expire_time.name}}<span class="am-form-group-label-tips">{{$data.common_verify_expire_time.describe}}</span></label>
                 <div class="am-input-group am-input-group-sm">
-                    <input type="number" min="0" name="{{$data.common_verify_expire_time.only_tag}}" placeholder="{{$data.common_verify_expire_time.name}}" data-validation-message="{{$data.common_verify_expire_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_verify_expire_time.value}}"{{/if}} />
+                    <input type="number" min="0" name="{{$data.common_verify_expire_time.only_tag}}" placeholder="{{$data.common_verify_expire_time.name}}" data-validation-message="{{$data.common_verify_expire_time.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.common_verify_expire_time.value}}"{{/if}} />
                     <span class="am-input-group-btn">
                         <button class="am-btn am-btn-default" type="button">秒</button>
                   </span>
@@ -21,7 +21,7 @@
             <div class="am-form-group">
                 <label>{{$data.common_verify_interval_time.name}}<span class="am-form-group-label-tips">{{$data.common_verify_interval_time.describe}}</span></label>
                 <div class="am-input-group am-input-group-sm">
-                    <input type="number" min="0" name="{{$data.common_verify_interval_time.only_tag}}" placeholder="{{$data.common_verify_interval_time.name}}" data-validation-message="{{$data.common_verify_interval_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_verify_interval_time.value}}"{{/if}} />
+                    <input type="number" min="0" name="{{$data.common_verify_interval_time.only_tag}}" placeholder="{{$data.common_verify_interval_time.name}}" data-validation-message="{{$data.common_verify_interval_time.error_tips}}" class="am-radius am-form-field" {{if !empty($data)}}value="{{$data.common_verify_interval_time.value}}"{{/if}} />
                     <span class="am-input-group-btn">
                         <button class="am-btn am-btn-default" type="button">秒</button>
                   </span>
diff --git a/app/index/view/default/config.json b/app/index/view/default/config.json
index 12520d805..d070512e2 100755
--- a/app/index/view/default/config.json
+++ b/app/index/view/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.2.9",
+	"ver":"2.3.0",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/app/module/FormHandleModule.php b/app/module/FormHandleModule.php
index a7dfd68d1..332677f06 100644
--- a/app/module/FormHandleModule.php
+++ b/app/module/FormHandleModule.php
@@ -331,6 +331,19 @@ class FormHandleModule
                 $this->data_total = (int) $db->count();
                 if($this->data_total > 0)
                 {
+                    // 增加排序、未设置则默认[ id desc ]
+                    $order_by = empty($this->order_by['data']) ? (array_key_exists('order_by', $form_data) ? $form_data['order_by'] : 'id desc') : $this->order_by['data'];
+                    if(!empty($order_by))
+                    {
+                        $db->order($order_by);
+                    }
+
+                    // 分组
+                    if(!empty($form_data['group']))
+                    {
+                        $db->group($form_data['group']);
+                    }
+
                     // 是否使用分页
                     $is_page = (!isset($form_data['is_page']) || $form_data['is_page'] == 1);
                     if($is_page)
@@ -362,13 +375,6 @@ class FormHandleModule
                         $db->limit($this->page_start, $this->page_size);
                     }
 
-                    // 增加排序、未设置则默认[ id desc ]
-                    $order_by = empty($this->order_by['data']) ? (array_key_exists('order_by', $form_data) ? $form_data['order_by'] : 'id desc') : $this->order_by['data'];
-                    if(!empty($order_by))
-                    {
-                        $db->order($order_by);
-                    }
-
                     // 读取数据
                     $this->data_list = $db->select()->toArray();
                 }
diff --git a/app/service/ConstService.php b/app/service/ConstService.php
index 2c7c2056f..f20b872ac 100644
--- a/app/service/ConstService.php
+++ b/app/service/ConstService.php
@@ -95,6 +95,7 @@ class ConstService
                 '2.2.7' => ['value' => '2.2.7', 'name' => 'v2.2.7'],
                 '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'],
             ],
 
             // 用户注册类型列表
diff --git a/changelog.txt b/changelog.txt
index 4a5b5c9cd..1db7f5bfa 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,24 @@
++=========================================================+
+   ShopXO 2.3.0 Release 20220816 http://shopxo.net
++=========================================================+
+1. 搜索优化（关键字搜索筛选品牌）
+2. 后台右上角新增清除缓存快捷入口（缓存清除改为异步）
+3. 商品规格新增体积、运费插件新增体积
+4. 新增paypal支付方式（支持PC+H5+APP）
+5. 地图新增（高德、腾讯、天地图）、去除编辑器中的百度地图组件。
+6. 适配头条小程序导航新规
+7. 新增各端可配置默认支付方式
+8. 新增虚拟订单快速提交订单进入支付（跳过订单确认环节）
+9. 动态数据列表新增自动读取数据
+10. 头条小程序支持一键获取手机号码、并支持unionid绑定
+11. 插件安装及更新新增操作前事件
+12. 商品类型判断优化
+13. 后台管理新增夜间深色模式
+14. 公共分类组件优化
+15. 更新底层框架
+
+
+
 +=========================================================+
    ShopXO 2.2.9 Release 20220711 http://shopxo.net
 +=========================================================+
diff --git a/public/core.php b/public/core.php
index 7c78d1d11..4e2170f5d 100755
--- a/public/core.php
+++ b/public/core.php
@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 // 系统版本
-define('APPLICATION_VERSION', 'v2.2.9');
+define('APPLICATION_VERSION', 'v2.3.0');
 
 // 检测PHP环境
 if(version_compare(PHP_VERSION,'7.4.0','<'))
diff --git a/public/static/admin/default/css/color/black.css b/public/static/admin/default/css/color/black.css
index 7a8678087..bed37d335 100644
--- a/public/static/admin/default/css/color/black.css
+++ b/public/static/admin/default/css/color/black.css
@@ -24,7 +24,6 @@ html,body {
 .am-table > thead > tr > th,
 .am-table > tbody > tr > th,
 .am-table > tfoot > tr > th,
-.am-table > thead > tr > td,
 .am-table > tbody > tr > td,
 .am-table > tfoot > tr > td,
 .am-table-bordered > thead + tbody > tr:first-child > th,
@@ -35,6 +34,13 @@ html,body {
 .form-inventory-submit {
     border-top: 1px solid #4c4d4f;
 }
+.am-table > thead > tr > td {
+    border-bottom: 1px solid #4c4d4f;
+}
+.am-table > thead > tr > td,
+.am-table > tbody > tr:first-child > td {
+    border-top: 0px !important;
+}
 .am-popup,
 .popup-not-title .am-popup-inner {
     border: 1px solid #4c4d4f;
@@ -84,18 +90,6 @@ iframe,
 .realstore-list-container li .am-switch .am-switch-handle-off {
     background: #3f3f3f;
 }
-.am-switch .am-switch-handle-on.am-switch-default,
-.am-switch .am-switch-handle-off.am-switch-default,
-.am-popup-hd .am-close:hover,
-ul.am-dropdown-content > li > a,
-.am-nav > li.am-active > a,
-.am-nav > li.am-active > a:hover,
-.am-nav > li.am-active > a:focus,
-.business-operations-submit:hover,
-.plug-file-upload-submit:hover,
-.content-right [class*="-content"] .nav-items:hover {
-    color: #999;
-}
 .second-nav li.am-active a,
 .goods-nav li a:hover, .goods-nav-active,
 ul.am-dropdown-content > li > a:hover,
@@ -350,7 +344,8 @@ table.am-table .am-btn-default,
 }
 .am-page-loading,
 .multilingual-page-loading,
-.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close,
+.am-tagsinput .am-badge-primary {
     background: #333;
 }
 .am-table-scrollable-horizontal {
@@ -398,6 +393,20 @@ table.am-table .am-btn-default,
 .admin-multilingual-select {
     color: #666 !important;
 }
+.am-switch .am-switch-handle-on.am-switch-default,
+.am-switch .am-switch-handle-off.am-switch-default,
+.am-popup-hd .am-close:hover,
+ul.am-dropdown-content > li > a,
+.am-nav > li.am-active > a,
+.am-nav > li.am-active > a:hover,
+.am-nav > li.am-active > a:focus,
+.business-operations-submit:hover,
+.plug-file-upload-submit:hover,
+.content-right [class*="-content"] .nav-items:hover,
+.chosen-container-single .chosen-default,
+.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
+    color: #999 !important;
+}
 .admin-multilingual-select,
 .common-nav-bar {
     box-shadow: 0 0 10px 2px #444444;
@@ -454,7 +463,9 @@ form.am-form .am-form-group-refreshing:hover {
 button.colorpicker-submit:hover {
     border: 1px solid #999;
 }
-button.colorpicker-submit:hover {
+button.colorpicker-submit:hover,
+.am-tagsinput .tag [data-role="remove"]:hover {
+    -webkit-box-shadow: none !important;
     box-shadow: none !important;
 }
 .edui-default .edui-dialog-caption,
@@ -544,7 +555,7 @@ fieldset[disabled] .am-form-field {
 }
 header {
     background-color: #19222c !important;
-    border-color: #0e1319 !important;
+    border-color: #151d26 !important;
 }
 .admin-sidebar-sub {
     background: #393939;
@@ -600,4 +611,10 @@ header {
 }
 .admin-login {
     background: rgba(0,0,0,.85);
+}
+/**
+ * 编辑器还是使用白底色
+ */
+.edui-default iframe {
+    background: transparent !important;
 }
\ No newline at end of file