From 4e28c57777edd72826a400d65ad12566adb88434 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 19 Jan 2024 20:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9B=B4=E6=96=B0=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lang/cht.php                        |  1 +
 app/admin/lang/en.php                         |  1 +
 app/admin/lang/spa.php                        |  1 +
 app/admin/lang/zh.php                         |  1 +
 app/admin/view/default/index/init.html        | 27 ++++++++++++-------
 .../static/admin/default/css/index.init.css   | 20 --------------
 6 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/app/admin/lang/cht.php b/app/admin/lang/cht.php
index ee662a2d9..b2e00dcaa 100644
--- a/app/admin/lang/cht.php
+++ b/app/admin/lang/cht.php
@@ -35,6 +35,7 @@ return [
             'upgrade_date_name'                 => '更新日期：',
         ],
         // 页面基础
+        'base_update_system_title'              => '系統更新',
         'base_update_button_title'              => '立即更新',
         'base_item_base_stats_title'            => '商城統計',
         'base_item_base_stats_tips'             => '時間篩選僅對總數有效',
diff --git a/app/admin/lang/en.php b/app/admin/lang/en.php
index ee2d8f4f1..8305e807f 100644
--- a/app/admin/lang/en.php
+++ b/app/admin/lang/en.php
@@ -35,6 +35,7 @@ return [
             'upgrade_date_name'                 => 'Update Date：',
         ],
         // 页面基础
+        'base_update_system_title'              => 'System updates',
         'base_update_button_title'              => 'Update Now',
         'base_item_base_stats_title'            => 'Shop Statistics',
         'base_item_base_stats_tips'             => 'Time filtering is only valid for totals',
diff --git a/app/admin/lang/spa.php b/app/admin/lang/spa.php
index ae3226748..045b4c323 100644
--- a/app/admin/lang/spa.php
+++ b/app/admin/lang/spa.php
@@ -35,6 +35,7 @@ return [
             'upgrade_date_name'                 => 'Fecha de actualización:',
         ],
         // 页面基础
+        'base_update_system_title'              => 'Actualización del sistema',
         'base_update_button_title'              => 'Actualización inmediata',
         'base_item_base_stats_title'            => 'Estadísticas del centro comercial',
         'base_item_base_stats_tips'             => 'El cribado temporal solo es válido para el total',
diff --git a/app/admin/lang/zh.php b/app/admin/lang/zh.php
index 2e7896717..bed747428 100755
--- a/app/admin/lang/zh.php
+++ b/app/admin/lang/zh.php
@@ -35,6 +35,7 @@ return [
             'upgrade_date_name'                 => '更新日期：',
         ],
         // 页面基础
+        'base_update_system_title'              => '系统更新',
         'base_update_button_title'              => '立即更新',
         'base_item_base_stats_title'            => '商城统计',
         'base_item_base_stats_tips'             => '时间筛选仅对总数有效',
diff --git a/app/admin/view/default/index/init.html b/app/admin/view/default/index/init.html
index d866210a3..446a50592 100755
--- a/app/admin/view/default/index/init.html
+++ b/app/admin/view/default/index/init.html
@@ -752,17 +752,26 @@
 <!-- right content end  -->
 
 <!-- 检查更新显示信息 -->
-<div class="am-popup popup-not-title" id="inspect-upgrade-popup">
+<div class="am-popup am-radius" id="inspect-upgrade-popup">
     <div class="am-popup-inner">
-        <span data-am-modal-close class="am-close am-close-alt">&times;</span>
+        <div class="am-popup-hd">
+            <h4 class="am-popup-title">{{:MyLang('index.base_update_system_title')}}</h4>
+            <span data-am-modal-close class="am-close">&times;</span>
+        </div>
         <div class="am-popup-bd">
-        	<div class="upgrade-content"></div>
-			<div class="upgrade-bottom am-text-right">
-				<div class="upgrade-bottom-content">
-					<button type="button" class="am-btn am-btn-default am-radius am-btn-xs" data-am-modal-close>{{:MyLang('cancel_title')}}</button>
-					<button type="button" class="am-btn am-btn-success am-radius am-btn-xs am-margin-left-sm am-hide inspect-upgrade-confirm" data-url="{{:MyUrl('admin/index/inspectupgradeconfirm')}}">{{:MyLang('index.base_update_button_title')}}</button>
-				</div>
-			</div>
+            <form class="am-form am-form-popup-fixed">
+            	<div class="upgrade-content"></div>
+                <div class="am-form-popup-submit">
+                    <button type="button" class="am-btn am-btn-warning am-radius am-btn-xs btn-loading-example am-margin-right-lg" data-am-modal-close>
+                        <i class="am-icon-paint-brush"></i>
+                        <span>{{:MyLang('cancel_title')}}</span>
+                    </button>
+                    <button type="button" class="am-btn am-btn-primary am-radius am-btn-xs inspect-upgrade-confirm" data-url="{{:MyUrl('admin/index/inspectupgradeconfirm')}}">
+                        <i class="am-icon-check"></i>
+                        <span>{{:MyLang('index.base_update_button_title')}}</span>
+                    </button>
+                </div>
+            </form>
         </div>
     </div>
 </div>
diff --git a/public/static/admin/default/css/index.init.css b/public/static/admin/default/css/index.init.css
index 8677b7355..ec46d1265 100755
--- a/public/static/admin/default/css/index.init.css
+++ b/public/static/admin/default/css/index.init.css
@@ -367,10 +367,6 @@ body {
 /**
  * 更新信息展示
  */
-#inspect-upgrade-popup .am-popup-bd {
-    padding-bottom: 5rem;
-    overflow: auto;
-}
 
 #inspect-upgrade-popup .upgrade-title span {
     font-weight: bold;
@@ -387,22 +383,6 @@ body {
     min-height: 2.6rem;
 }
 
-#inspect-upgrade-popup .upgrade-bottom {
-    position: fixed;
-    left: 0;
-    bottom: 0px;
-    width: 100%;
-    height: 7rem;
-    padding: 0 2.5rem;
-}
-
-#inspect-upgrade-popup .upgrade-bottom-content {
-    background: #fff;
-    padding: 1rem 2rem 0 0;
-    height: 5rem;
-    border-top: 0.1rem solid #ececec;
-}
-
 /**
  * 常用功能
  */