From b8509cabb223be4f5e975878d2dfe8698ee04d74 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 5 Dec 2021 10:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/default/index/init.html  | 24 ++++++++++++------------
 app/admin/view/default/public/menu.html |  8 ++++----
 app/service/OrderService.php            |  5 ++++-
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/admin/view/default/index/init.html b/app/admin/view/default/index/init.html
index 3d3562ad0..4d06def6d 100755
--- a/app/admin/view/default/index/init.html
+++ b/app/admin/view/default/index/init.html
@@ -301,22 +301,22 @@
 						<span class="title">系统信息</span>
 					</div>
 					<dl class="dl-content">
-						<dt>软件版本</dt>
+						<dt class="am-text-truncate">软件版本</dt>
 						<dd>{{$data.ver}}</dd>
 
-						<dt>操作系统</dt>
+						<dt class="am-text-truncate">操作系统</dt>
 						<dd>{{$data.os_ver}}</dd>
 
-						<dt>PHP版本</dt>
+						<dt class="am-text-truncate">PHP版本</dt>
 						<dd>{{$data.php_ver}}</dd>
 
-						<dt>MySQL版本</dt>
+						<dt class="am-text-truncate">MySQL版本</dt>
 						<dd>{{$data.mysql_ver}}</dd>
 
-						<dt>服务器端信息</dt>
+						<dt class="am-text-truncate">服务器端信息</dt>
 						<dd>{{$data.server_ver}}</dd>
 
-						<dt>当前域名</dt>
+						<dt class="am-text-truncate">当前域名</dt>
 						<dd>{{$data.host}}</dd>
 					</dl>
 				</li>
@@ -327,36 +327,36 @@
 						<span class="title">开发团队</span>
 					</div>
 					<dl class="dl-content">
-						<dt>公司官网</dt>
+						<dt class="am-text-truncate">公司官网</dt>
 						<dd>
 							<a href="http://zongzhige.com/" target="_blank">上海纵之格科技有限公司</a>
 						</dd>
 
-						<dt>技术支持</dt>
+						<dt class="am-text-truncate">技术支持</dt>
 						<dd>
 							<a href="http://shopxo.net/" target="_blank">ShopXO企业级电商系统提供商</a>
 						</dd>
 
 						{{if !empty($site_store_links) and !empty($site_store_links['community_website'])}}
-							<dt>交流社区</dt>
+							<dt class="am-text-truncate">交流社区</dt>
 							<dd>
 								<a href="{{$site_store_links.community_website}}" target="_blank">ShopXO交流社区</a>
 							</dd>
 						{{/if}}
 
-						<dt>开源协议</dt>
+						<dt class="am-text-truncate">开源协议</dt>
 						<dd>
 							<a href="{{if !empty($site_store_links) and !empty($site_store_links['source_license'])}}{{$site_store_links.source_license}}{{else /}}https://opensource.org/licenses/mit-license.php{{/if}}" target="_blank">查看开源协议</a>
 						</dd>
 
 						{{if !empty($site_store_links) and !empty($site_store_links['system_update_log'])}}
-							<dt>更新日志</dt>
+							<dt class="am-text-truncate">更新日志</dt>
 							<dd>
 								<a href="{{$site_store_links.system_update_log}}" target="_blank">查看更新日志</a>
 							</dd>
 						{{/if}}
 
-						<dt>研发成员</dt>
+						<dt class="am-text-truncate">研发成员</dt>
 						<dd>
 							<a href="http://gong.gg/" target="_blank">龚哥哥</a>
 						</dd>
diff --git a/app/admin/view/default/public/menu.html b/app/admin/view/default/public/menu.html
index e90e487e8..36142431f 100755
--- a/app/admin/view/default/public/menu.html
+++ b/app/admin/view/default/public/menu.html
@@ -4,7 +4,7 @@
 			<li>
 				<a href="javascript:;" data-type="menu" data-url="{{:MyUrl('admin/index/init')}}" class="common-left-menu-active">
 					<span class="iconfont icon-shouye"></span>
-					<span class="nav-name">首页</span>
+					<p class="nav-name am-inline-block am-text-break">首页</p>
 				</a>
 			</li>
 			{{foreach $left_menu as $v}}
@@ -12,14 +12,14 @@
 					<li>
 						<a href="javascript:;" data-type="menu" data-url="{{$v.url}}">
 							{{if !empty($v['icon'])}}<span class="iconfont {{$v.icon}}"></span>{{/if}}
-							<span class="nav-name">{{$v.name}}</span>
+							<p class="nav-name am-inline-block am-text-break">{{$v.name}}</p>
 						</a>
 					</li>
 				{{else /}}
 					<li class="admin-parent">
 						<a data-type="menu" class="am-cf menu-parent-items-{{$v.id}}" data-am-collapse="{target: '#power-menu-{{$v.id}}'}">
 							{{if !empty($v['icon'])}}<span class="iconfont {{$v.icon}}"></span>{{/if}}
-							<span class="nav-name">{{$v.name}}</span>
+							<p class="nav-name am-inline-block am-text-break">{{$v.name}}</p>
 							<i class="am-icon-angle-down am-fr am-margin-right left-menu-more-ico-rotate"></i>
 						</a>
 						<ul class="am-list am-collapse admin-sidebar-sub" id="power-menu-{{$v.id}}">
@@ -27,7 +27,7 @@
 								<li>
 									<a href="javascript:;" class="menu-items-{{$vs.id}}" data-parent-id="{{$v.id}}" data-type="menu" data-url="{{$vs.url}}">
 										{{if !empty($vs['icon'])}}<span class="{{$vs.icon}}"></span>{{/if}}
-										<span class="nav-name">{{$vs.name}}</span>
+										<p class="nav-name am-inline-block am-text-break">{{$vs.name}}</p>
 									</a>
 								</li>
 							{{/foreach}}
diff --git a/app/service/OrderService.php b/app/service/OrderService.php
index b180e2c3a..b1ce34379 100755
--- a/app/service/OrderService.php
+++ b/app/service/OrderService.php
@@ -356,7 +356,10 @@ class OrderService
 
             return $ret;
         }
-        return DataReturn(empty($ret['msg']) ? '支付接口异常' : $ret['msg'], isset($ret['code']) ? $ret['code'] : -1, isset($ret['data']) ? $ret['data'] : '');
+        return DataReturn(
+            empty($ret['msg']) ? '支付接口异常' : $ret['msg'],
+            isset($ret['code']) ? $ret['code'] : -1,
+            isset($ret['data']) ? $ret['data'] : '');
     }
 
     /**
-- 
GitLab