diff --git a/application/admin/view/default/admin/index.html b/application/admin/view/default/admin/index.html
index eedd769f6..ea66e92f6 100755
--- a/application/admin/view/default/admin/index.html
+++ b/application/admin/view/default/admin/index.html
@@ -74,7 +74,7 @@
 		<!-- operation end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
 			<thead>
 				<tr>
 					<th>管理员</th>
diff --git a/application/admin/view/default/admin/save_info.html b/application/admin/view/default/admin/save_info.html
index b8751c95b..feca0a039 100755
--- a/application/admin/view/default/admin/save_info.html
+++ b/application/admin/view/default/admin/save_info.html
@@ -6,14 +6,14 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/admin/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/admin/index')}}">
 			<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						管理员添加
 					{{else /}}
 						管理员编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/admin/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/admin/index')}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 			<div class="am-form-group">
 				<label>用户名</label>
diff --git a/application/admin/view/default/agreement/nav.html b/application/admin/view/default/agreement/nav.html
index be0c2a930..1aee21f70 100644
--- a/application/admin/view/default/agreement/nav.html
+++ b/application/admin/view/default/agreement/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav m-b-10">
+<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
     <li {{if $nav_type eq 'register'}}class="am-active"{{/if}} data-type="register">
         <a href="{{:MyUrl('admin/agreement/index', ['nav_type'=>'register'])}}">用户注册协议</a>
     </li>
diff --git a/application/admin/view/default/answer/index.html b/application/admin/view/default/answer/index.html
index c40ab94d3..e29f10d9e 100755
--- a/application/admin/view/default/answer/index.html
+++ b/application/admin/view/default/answer/index.html
@@ -75,7 +75,7 @@
         <!-- operation end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
 			<thead>
 				<tr>
 					<th class="am-hide-md-down">用户信息</th>
diff --git a/application/admin/view/default/answer/save_info.html b/application/admin/view/default/answer/save_info.html
index 755242621..16499920c 100644
--- a/application/admin/view/default/answer/save_info.html
+++ b/application/admin/view/default/answer/save_info.html
@@ -6,14 +6,14 @@
         <!-- form start -->
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/answer/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/answer/index', $params)}}" enctype="multipart/form-data">
             <legend>
-                <span class="fs-16">
+                <span class="am-text-default">
                     {{if empty($data['id'])}}
                         问答添加
                     {{else /}}
                         问答编辑
                     {{/if}}
                 </span>
-                <a href="{{:MyUrl('admin/answer/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+                <a href="{{:MyUrl('admin/answer/index', $params)}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
             </legend>
             <div class="am-alert am-alert-secondary user-info" data-am-alert>
                 <p class="title">用户信息</p>
diff --git a/application/admin/view/default/appcenternav/index.html b/application/admin/view/default/appcenternav/index.html
index 318e17c59..9298ecb6d 100755
--- a/application/admin/view/default/appcenternav/index.html
+++ b/application/admin/view/default/appcenternav/index.html
@@ -87,7 +87,7 @@
         <!-- operation end -->
 
         <!-- list start -->
-        <table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+        <table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
             <thead>
                 <tr>
                     <th>名称</th>
diff --git a/application/admin/view/default/appcenternav/save_info.html b/application/admin/view/default/appcenternav/save_info.html
index 64eb382d5..9230b4181 100755
--- a/application/admin/view/default/appcenternav/save_info.html
+++ b/application/admin/view/default/appcenternav/save_info.html
@@ -6,14 +6,14 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/appcenternav/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/appcenternav/index', $params)}}" enctype="multipart/form-data">
 			<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						导航添加
 					{{else /}}
 						导航编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/appcenternav/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/appcenternav/index', $params)}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 			<div class="am-form-group">
 				<label>名称</label>
@@ -44,7 +44,7 @@
 			<div class="am-form-group">
 				<div class="am-alert am-alert-warning am-radius" data-am-alert>
 				    <button type="button" class="am-close">&times;</button>
-				    <p class="fs-12">
+				    <p class="am-text-xs">
 				    	WEB页面<br />&nbsp&nbsp&nbsp;1.以http开头<br />&nbsp&nbsp&nbsp;2.并在小程序后台加入白名单<br /><br /> 内部页面(小程序/APP内部地址)<br />&nbsp&nbsp&nbsp;1.小程序或APP内部地址<br />&nbsp&nbsp&nbsp;2.小程序以/pages开始<br />&nbsp&nbsp&nbsp;3.例如：/pages/user/user<br />&nbsp&nbsp&nbsp;4.支持带参数 ?x=xx<br /><br /> 跳转原生地图查看指定位置<br />&nbsp&nbsp&nbsp;1.以 | 竖线分割，分别顺序 名称|地址|经度|纬度<br />&nbsp&nbsp&nbsp;2.例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843
 				    </p>
 				</div>
diff --git a/application/admin/view/default/appconfig/nav.html b/application/admin/view/default/appconfig/nav.html
index c844bdf46..934e844f6 100644
--- a/application/admin/view/default/appconfig/nav.html
+++ b/application/admin/view/default/appconfig/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav m-b-10">
+<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
     <li {{if $nav_type eq 'base'}}class="am-active"{{/if}} data-type="base">
         <a href="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'base'])}}">基础配置</a>
     </li>
diff --git a/application/admin/view/default/apphomenav/index.html b/application/admin/view/default/apphomenav/index.html
index edf069dae..5844ef299 100755
--- a/application/admin/view/default/apphomenav/index.html
+++ b/application/admin/view/default/apphomenav/index.html
@@ -95,7 +95,7 @@
         <!-- operation end -->
 
         <!-- list start -->
-        <table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+        <table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
             <thead>
                 <tr>
                     <th>名称</th>
diff --git a/application/admin/view/default/apphomenav/save_info.html b/application/admin/view/default/apphomenav/save_info.html
index 77ba0aad3..53cf76135 100755
--- a/application/admin/view/default/apphomenav/save_info.html
+++ b/application/admin/view/default/apphomenav/save_info.html
@@ -6,14 +6,14 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/apphomenav/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/apphomenav/index', $params)}}" enctype="multipart/form-data">
 			<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						导航添加
 					{{else /}}
 						导航编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/apphomenav/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/apphomenav/index', $params)}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 			<div class="am-form-group">
 				<label>名称</label>
@@ -44,7 +44,7 @@
 			<div class="am-form-group">
 				<div class="am-alert am-alert-warning am-radius" data-am-alert>
 				    <button type="button" class="am-close">&times;</button>
-				    <p class="fs-12">
+				    <p class="am-text-xs">
 				    	WEB页面<br />&nbsp&nbsp&nbsp;1.以http开头<br />&nbsp&nbsp&nbsp;2.并在小程序后台加入白名单<br /><br /> 内部页面(小程序/APP内部地址)<br />&nbsp&nbsp&nbsp;1.小程序或APP内部地址<br />&nbsp&nbsp&nbsp;2.小程序以/pages开始<br />&nbsp&nbsp&nbsp;3.例如：/pages/user/user<br />&nbsp&nbsp&nbsp;4.支持带参数 ?x=xx<br /><br /> 跳转原生地图查看指定位置<br />&nbsp&nbsp&nbsp;1.以 | 竖线分割，分别顺序 名称|地址|经度|纬度<br />&nbsp&nbsp&nbsp;2.例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843
 				    </p>
 				</div>
diff --git a/application/admin/view/default/appminialipaylist/index.html b/application/admin/view/default/appminialipaylist/index.html
index c3e5bd5b8..824cf2625 100755
--- a/application/admin/view/default/appminialipaylist/index.html
+++ b/application/admin/view/default/appminialipaylist/index.html
@@ -25,7 +25,7 @@
 		{{/if}}
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 m-l-5">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm am-margin-left-xs">
 			<thead>
 				<tr>
 					<th>包名</th>
diff --git a/application/admin/view/default/appminibaidulist/index.html b/application/admin/view/default/appminibaidulist/index.html
index eb18efa4e..b0848d1fa 100755
--- a/application/admin/view/default/appminibaidulist/index.html
+++ b/application/admin/view/default/appminibaidulist/index.html
@@ -25,7 +25,7 @@
 		{{/if}}
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 m-l-5">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm am-margin-left-xs">
 			<thead>
 				<tr>
 					<th>包名</th>
diff --git a/application/admin/view/default/appminiweixinlist/index.html b/application/admin/view/default/appminiweixinlist/index.html
index 6bbf4a4be..78bcbec90 100755
--- a/application/admin/view/default/appminiweixinlist/index.html
+++ b/application/admin/view/default/appminiweixinlist/index.html
@@ -25,7 +25,7 @@
 		{{/if}}
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 m-l-5">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm am-margin-left-xs">
 			<thead>
 				<tr>
 					<th>包名</th>
diff --git a/application/admin/view/default/article/index.html b/application/admin/view/default/article/index.html
index 69dadf69f..a1205cf81 100755
--- a/application/admin/view/default/article/index.html
+++ b/application/admin/view/default/article/index.html
@@ -88,7 +88,7 @@
         <!-- operation end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
 			<thead>
 				<tr>
 					<th>标题</th>
diff --git a/application/admin/view/default/article/save_info.html b/application/admin/view/default/article/save_info.html
index b05100cca..78e422a68 100755
--- a/application/admin/view/default/article/save_info.html
+++ b/application/admin/view/default/article/save_info.html
@@ -6,14 +6,14 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/article/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/article/index', $params)}}">
 			<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						文章添加
 					{{else /}}
 						文章编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/article/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/article/index', $params)}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 			<div class="am-form-group">
 				<label>标题</label>
diff --git a/application/admin/view/default/brand/index.html b/application/admin/view/default/brand/index.html
index cdbaa9ce7..9d21d8102 100755
--- a/application/admin/view/default/brand/index.html
+++ b/application/admin/view/default/brand/index.html
@@ -73,7 +73,7 @@
         <!-- operation end -->
 
         <!-- list start -->
-        <table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+        <table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
             <thead>
                 <tr>
                     <th>名称</th>
diff --git a/application/admin/view/default/brand/save_info.html b/application/admin/view/default/brand/save_info.html
index 2a88a21ac..da2bb88fa 100755
--- a/application/admin/view/default/brand/save_info.html
+++ b/application/admin/view/default/brand/save_info.html
@@ -6,14 +6,14 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/brand/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/brand/index', $params)}}" enctype="multipart/form-data">
 			<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						品牌添加
 					{{else /}}
 						品牌编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/brand/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/brand/index', $params)}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 			<div class="am-form-group">
 				<label>名称</label>
diff --git a/application/admin/view/default/customview/index.html b/application/admin/view/default/customview/index.html
index c33cbf720..b2d862863 100755
--- a/application/admin/view/default/customview/index.html
+++ b/application/admin/view/default/customview/index.html
@@ -93,7 +93,7 @@
 		<!-- operation end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
 			<thead>
 				<tr>
 					<th>标题</th>
diff --git a/application/admin/view/default/customview/save_info.html b/application/admin/view/default/customview/save_info.html
index f3ac2f25b..ab9b01f13 100755
--- a/application/admin/view/default/customview/save_info.html
+++ b/application/admin/view/default/customview/save_info.html
@@ -6,14 +6,14 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/customview/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/customview/index')}}">
 			<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						自定义页面添加
 					{{else /}}
 						自定义页面编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/customview/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/customview/index')}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 			<div class="am-form-group">
 				<label>标题</label>
diff --git a/application/admin/view/default/email/nav.html b/application/admin/view/default/email/nav.html
index eda73d787..b6d9f8e77 100755
--- a/application/admin/view/default/email/nav.html
+++ b/application/admin/view/default/email/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav m-b-10">
+<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
 	<li {{if $nav_type eq 'email'}}class="am-active"{{/if}} data-type="email">
 		<a href="{{:MyUrl('admin/email/index', ['type'=>'email'])}}">邮箱设置</a>
 	</li>
diff --git a/application/admin/view/default/goods/index.html b/application/admin/view/default/goods/index.html
index 3c83200de..79d58c848 100755
--- a/application/admin/view/default/goods/index.html
+++ b/application/admin/view/default/goods/index.html
@@ -113,7 +113,7 @@
         <!-- operation end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 goods-list">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm goods-list">
 			<thead>
 				<tr>
 					<th>编号</th>
diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index e923952b9..caea46be6 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -6,14 +6,14 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/goods/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/goods/index', $params)}}" enctype="multipart/form-data">
 			<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						商品添加
 					{{else /}}
 						商品编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/goods/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/goods/index', $params)}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 
 			<nav class="goods-nav">
@@ -336,7 +336,7 @@
 									</td>
 									<td>
 										<input type="hidden" name="specifications_extends[]" value="" class="line-extend-input" />
-										<span class="fs-12 cr-blue c-p line-extend-btn">编辑</span>
+										<span class="am-text-xs cr-blue c-p line-extend-btn">编辑</span>
 									</td>
 									<td>
 										<!--operation-->
@@ -377,12 +377,12 @@
 													</td>
 													<td>
 														<input type="hidden" name="specifications_extends[]" value="{{$v.data.extends}}" class="line-extend-input" />
-														<span class="fs-12 cr-blue c-p line-extend-btn">编辑</span>
+														<span class="am-text-xs cr-blue c-p line-extend-btn">编辑</span>
 													</td>
 													<td>
 														{{if $line_k gt 0}}
-															<span class="fs-12 cr-blue c-p m-r-5 line-copy">复制</span>
-															<span class="fs-12 cr-red c-p line-remove">移除</span>
+															<span class="am-text-xs cr-blue c-p am-margin-right-xs line-copy">复制</span>
+															<span class="am-text-xs cr-red c-p line-remove">移除</span>
 														{{else /}}
 															<!--operation-->
 														{{/if}}
@@ -489,8 +489,8 @@
 										<textarea rows="5" name="content_app_text_{{$v.id}}" maxlength="105000" class="am-radius" placeholder="文本内容" data-validation-message="文本内容最多 105000 个字符">{{if !empty($v)}}{{$v.content_old|raw}}{{/if}}</textarea>
 									</div>
 								</div>
-								<i class="c-p fs-12 cr-red content-app-items-rem-sub">删除</i>
-								<i class="c-m fs-12 drag-sort-submit">拖拽排序</i>
+								<i class="c-p am-text-xs cr-red content-app-items-rem-sub">删除</i>
+								<i class="c-m am-text-xs drag-sort-submit">拖拽排序</i>
 							</li>
 						{{/foreach}}
 					{{/if}}
diff --git a/application/admin/view/default/goodscategory/index.html b/application/admin/view/default/goodscategory/index.html
index 90be07dcd..b9f095622 100755
--- a/application/admin/view/default/goodscategory/index.html
+++ b/application/admin/view/default/goodscategory/index.html
@@ -86,7 +86,7 @@
 						    <label>首页推荐</label>
 						    <div>
 						        {{foreach $common_is_text_list as $v}}
-						            <label class="am-radio-inline m-r-10">
+						            <label class="am-radio-inline am-margin-right-sm">
 						                <input type="radio" name="is_home_recommended" value="{{$v.id}}" data-am-ucheck /> {{$v.name}}
 						            </label>
 						        {{/foreach}}
diff --git a/application/admin/view/default/goodscomments/index.html b/application/admin/view/default/goodscomments/index.html
index 53dbb4023..dc4529c5b 100644
--- a/application/admin/view/default/goodscomments/index.html
+++ b/application/admin/view/default/goodscomments/index.html
@@ -91,7 +91,7 @@
         <!-- form end -->
 
         <!-- list start -->
-        <table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+        <table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
             <thead>
                 <tr>
                     <th class="am-hide-md-down">商品信息</th>
diff --git a/application/admin/view/default/goodscomments/save_info.html b/application/admin/view/default/goodscomments/save_info.html
index 9c400aa25..f53224616 100644
--- a/application/admin/view/default/goodscomments/save_info.html
+++ b/application/admin/view/default/goodscomments/save_info.html
@@ -6,8 +6,8 @@
         <!-- form start -->
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/goodscomments/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/goodscomments/index', $params)}}" enctype="multipart/form-data">
             <legend>
-                <span class="fs-16">商品评论编辑</span>
-                <a href="{{:MyUrl('admin/goodscomments/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+                <span class="am-text-default">商品评论编辑</span>
+                <a href="{{:MyUrl('admin/goodscomments/index', $params)}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
             </legend>
             <div class="am-alert am-alert-secondary goods-info" data-am-alert>
                 <p class="title">商品信息</p>
diff --git a/application/admin/view/default/integrallog/index.html b/application/admin/view/default/integrallog/index.html
index 85caca6d0..725ac5be9 100755
--- a/application/admin/view/default/integrallog/index.html
+++ b/application/admin/view/default/integrallog/index.html
@@ -67,7 +67,7 @@
         <!-- form end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 m-l-5">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm am-margin-left-xs">
 			<thead>
 				<tr>
 					<th>用户信息</th>
diff --git a/application/admin/view/default/lib/enable.html b/application/admin/view/default/lib/enable.html
index c056995d5..b9b2a74b1 100755
--- a/application/admin/view/default/lib/enable.html
+++ b/application/admin/view/default/lib/enable.html
@@ -3,7 +3,7 @@
     <label>是否启用</label>
     <div>
         {{foreach :lang('common_is_enable_list') as $v}}
-            <label class="am-radio-inline m-r-10">
+            <label class="am-radio-inline am-margin-right-sm">
                 <input type="radio" name="is_enable" value="{{$v.id}}" {{if isset($data['is_enable']) and $data['is_enable'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_enable']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
             </label>
         {{/foreach}}
diff --git a/application/admin/view/default/lib/excel_win_html.html b/application/admin/view/default/lib/excel_win_html.html
index 69b207f4a..43314297e 100755
--- a/application/admin/view/default/lib/excel_win_html.html
+++ b/application/admin/view/default/lib/excel_win_html.html
@@ -9,10 +9,10 @@
 			<form class="am-form form-validation excel-form" action="{{$excel_import_form_url}}" method="POST" request-type="ajax-fun" request-value="ExcelImportCallback" enctype="multipart/form-data">
 				<div class="am-alert am-radius am-alert-tips m-t-0" data-am-alert>
 					{{if !empty($excel_import_format_url)}}
-						<p class="m-b-10"><a href="{{$excel_import_format_url}}" class="cr-blue">Excel格式下载</a><span class="m-r-5"></p>
+						<p class="am-margin-bottom-sm"><a href="{{$excel_import_format_url}}" class="cr-blue">Excel格式下载</a><span class="am-margin-right-xs"></p>
 					{{/if}}
 					{{if !empty($excel_import_tips)}}
-						<p class="m-t-10">{{$excel_import_tips}}</p>
+						<p class="am-margin-top-sm">{{$excel_import_tips}}</p>
 					{{/if}}
 					<p class="cr-red">PS：导入数据建议一次不要超过10万条。</p>
 				</div>
diff --git a/application/admin/view/default/lib/gender.html b/application/admin/view/default/lib/gender.html
index 4a2479ee6..0144104ea 100755
--- a/application/admin/view/default/lib/gender.html
+++ b/application/admin/view/default/lib/gender.html
@@ -3,7 +3,7 @@
 	<label>性别</label>
 	<div>
 		{{foreach :lang('common_gender_list') as $v}}
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="gender" value="{{$v.id}}" {{if isset($data['gender']) and $data['gender'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['gender']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
 			</label>
 		{{/foreach}}
diff --git a/application/admin/view/default/lib/is_footer.html b/application/admin/view/default/lib/is_footer.html
index 622862394..62689d439 100755
--- a/application/admin/view/default/lib/is_footer.html
+++ b/application/admin/view/default/lib/is_footer.html
@@ -3,7 +3,7 @@
 	<label>是否含尾部</label>
 	<div>
         {{foreach :lang('common_is_footer_list') as $v}}
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="is_footer" value="{{$v.id}}" {{if isset($data['is_footer']) and $data['is_footer'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_footer']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
 			</label>
 		{{/foreach}}
diff --git a/application/admin/view/default/lib/is_full_screen.html b/application/admin/view/default/lib/is_full_screen.html
index 31304197c..23f09c4a4 100755
--- a/application/admin/view/default/lib/is_full_screen.html
+++ b/application/admin/view/default/lib/is_full_screen.html
@@ -3,7 +3,7 @@
 	<label>是否满屏</label>
 	<div>
         {{foreach :lang('common_is_full_screen_list') as $v}}
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="is_full_screen" value="{{$v.id}}" {{if isset($data['is_full_screen']) and $data['is_full_screen'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_full_screen']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
 			</label>
 		{{/foreach}}
diff --git a/application/admin/view/default/lib/is_header.html b/application/admin/view/default/lib/is_header.html
index 95eb802f2..dcaddd65a 100755
--- a/application/admin/view/default/lib/is_header.html
+++ b/application/admin/view/default/lib/is_header.html
@@ -3,7 +3,7 @@
 	<label>是否含头部</label>
 	<div>
         {{foreach :lang('common_is_header_list') as $v}}
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="is_header" value="{{$v.id}}" {{if isset($data['is_header']) and $data['is_header'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_header']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
 			</label>
 		{{/foreach}}
diff --git a/application/admin/view/default/lib/is_new_window_open.html b/application/admin/view/default/lib/is_new_window_open.html
index 8e9d63de1..dbca28f09 100755
--- a/application/admin/view/default/lib/is_new_window_open.html
+++ b/application/admin/view/default/lib/is_new_window_open.html
@@ -3,7 +3,7 @@
 	<label>是否新窗口打开</label>
 	<div>
         {{foreach :lang('common_is_new_window_open_list') as $v}}
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="is_new_window_open" value="{{$v.id}}" {{if isset($data['is_new_window_open']) and $data['is_new_window_open'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_new_window_open']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
 			</label>
 		{{/foreach}}
diff --git a/application/admin/view/default/lib/is_show.html b/application/admin/view/default/lib/is_show.html
index a7aaa07b8..fa172a3cd 100755
--- a/application/admin/view/default/lib/is_show.html
+++ b/application/admin/view/default/lib/is_show.html
@@ -3,7 +3,7 @@
 	<label>是否显示</label>
 	<div>
 		{{foreach :lang('common_is_show_list') as $v}}
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="is_show" value="{{$v.id}}" {{if isset($data['is_show']) and $data['is_show'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_show']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
 			</label>
 		{{/foreach}}
diff --git a/application/admin/view/default/link/index.html b/application/admin/view/default/link/index.html
index e4485d7eb..f0a4f334d 100755
--- a/application/admin/view/default/link/index.html
+++ b/application/admin/view/default/link/index.html
@@ -49,7 +49,7 @@
 		<!-- save win end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
 			<thead>
 				<tr>
 					<th>名称</th>
diff --git a/application/admin/view/default/message/index.html b/application/admin/view/default/message/index.html
index 75af7b658..c4f756e90 100755
--- a/application/admin/view/default/message/index.html
+++ b/application/admin/view/default/message/index.html
@@ -87,7 +87,7 @@
         <!-- form end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 m-l-5">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm am-margin-left-xs">
 			<thead>
 				<tr>
 					<th>用户信息</th>
diff --git a/application/admin/view/default/navigation/index.html b/application/admin/view/default/navigation/index.html
index ad69f2086..83d1490b5 100755
--- a/application/admin/view/default/navigation/index.html
+++ b/application/admin/view/default/navigation/index.html
@@ -17,7 +17,7 @@
 		<!-- operation end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
 			<thead>
 				<tr>
 					<th>导航名称</th>
diff --git a/application/admin/view/default/navigation/nav.html b/application/admin/view/default/navigation/nav.html
index 96d157948..93ba60a6a 100755
--- a/application/admin/view/default/navigation/nav.html
+++ b/application/admin/view/default/navigation/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav m-b-10">
+<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
 	<li {{if $nav_type eq 'header'}}class="am-active"{{/if}} data-type="header">
 		<a href="{{:MyUrl('admin/navigation/index', ['nav_type'=>'header'])}}">中间导航</a>
 	</li>
diff --git a/application/admin/view/default/order/index.html b/application/admin/view/default/order/index.html
index a2dc3e647..d17be5769 100755
--- a/application/admin/view/default/order/index.html
+++ b/application/admin/view/default/order/index.html
@@ -107,7 +107,7 @@
         <!-- operation end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
 			<thead>
 				<tr>
 					<th class="am-hide-sm-only th-goods">基础信息</th>
@@ -136,7 +136,7 @@
 											<a href="{{:MyUrl('index/goods/index', ['id'=>$vs['goods_id']])}}" target="_blank" title="{{$vs.title}}" {{if !empty($vs['title_color'])}} style="color:{{$vs.title_color}};" {{/if}} >{{$vs.title}}</a>
 										</div>
 										<div class="other">
-											<span class="fl fs-12">
+											<span class="am-fl am-text-xs">
 												{{if !empty($vs.spec_text)}}
 													{{$vs.spec_text}}
 												{{/if}}
@@ -182,14 +182,14 @@
 								<span class="block">{{$v.status_name}}</span>
 								
 								{{if $v['pay_status'] eq 1}}
-									<span class="block am-text-success fs-12">{{$v.pay_status_name}}</span>
+									<span class="block am-text-success am-text-xs">{{$v.pay_status_name}}</span>
 								{{elseif $v['pay_status'] gt 1 /}}
-									<span class="block am-text-danger fs-12">{{$v.pay_status_name}}</span>
+									<span class="block am-text-danger am-text-xs">{{$v.pay_status_name}}</span>
 								{{else /}}
-									<span class="block fs-12">{{$v.pay_status_name}}</span>
+									<span class="block am-text-xs">{{$v.pay_status_name}}</span>
 								{{/if}}
 								{{if $v['user_is_delete_time'] neq 0}}
-									<span class="block am-text-warning fs-12">用户已删除</span>
+									<span class="block am-text-warning am-text-xs">用户已删除</span>
 								{{/if}}
 							</td>
 							<td>
@@ -234,28 +234,28 @@
 																<a href="{{:MyUrl('index/goods/index', ['id'=>$vs['goods_id']])}}" target="_blank" title="{{$vs.title}}" {{if !empty($vs['title_color'])}} style="color:{{$vs.title_color}};" {{/if}} >{{$vs.title}}</a>
 															</div>
 															<div class="other">
-                                                                <span class="fl fs-12">
+                                                                <span class="am-fl am-text-xs">
                                                                     型号：
                                                                     {{if !empty($vs.model)}}
                                                                         {{$vs.model}}
                                                                     {{/if}}
                                                                 </span>
-																<span class="fl fs-12">
+																<span class="am-fl am-text-xs">
 																	规格：
 																	{{if !empty($vs.spec_text)}}
 																		{{$vs.spec_text}}
 																	{{/if}}
 																</span>
-																<span class="fl fs-12">
+																<span class="am-fl am-text-xs">
 																	重量：{{$vs.spec_weight}}
 																</span>
-																<span class="fl fs-12">
+																<span class="am-fl am-text-xs">
 																	编码：{{$vs.spec_coding}}
 																</span>
                                                                 {{if $vs['returned_quantity'] gt 0 or $vs['refund_price'] gt 0}}
                                                                     <span class="am-text-danger am-fr am-margin-left-sm">已退 {{$vs.returned_quantity}} / {{$vs.refund_price}}</span>
                                                                 {{/if}}
-																<span class="fr">{{$vs.price}}x{{$vs.buy_number}}</span>
+																<span class="am-fr">{{$vs.price}}x{{$vs.buy_number}}</span>
 															</div>
 														</div>
 													{{/foreach}}
diff --git a/application/admin/view/default/orderaftersale/index.html b/application/admin/view/default/orderaftersale/index.html
index ff976ffa4..2d4d0d2bf 100644
--- a/application/admin/view/default/orderaftersale/index.html
+++ b/application/admin/view/default/orderaftersale/index.html
@@ -72,7 +72,7 @@
         <!-- form end -->
 
         <!-- list start -->
-        <table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+        <table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
             <thead>
                 <tr>
                     <th class="row-goods am-hide-sm-only">商品信息</th>
diff --git a/application/admin/view/default/paylog/index.html b/application/admin/view/default/paylog/index.html
index 2c959ae4d..3d1400b12 100755
--- a/application/admin/view/default/paylog/index.html
+++ b/application/admin/view/default/paylog/index.html
@@ -90,7 +90,7 @@
         <!-- form end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 m-l-5">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm am-margin-left-xs">
 			<thead>
 				<tr>
 					<th>用户信息</th>
diff --git a/application/admin/view/default/payment/index.html b/application/admin/view/default/payment/index.html
index b8010a95d..70b717533 100755
--- a/application/admin/view/default/payment/index.html
+++ b/application/admin/view/default/payment/index.html
@@ -5,12 +5,12 @@
     <div class="content">
         <!-- operation start -->
         <div class="am-g">
-            <a href="javascript:;" class="am-btn am-btn-secondary am-btn-xs m-l-10 am-icon-cloud-upload am-radius" data-am-modal="{target: '#payment-upload-win'}"> 上传</a>
+            <a href="javascript:;" class="am-btn am-btn-secondary am-btn-xs am-margin-left-sm am-icon-cloud-upload am-radius" data-am-modal="{target: '#payment-upload-win'}"> 上传</a>
         </div>
         <!-- operation end -->
 
         <!-- list start -->
-        <table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+        <table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
             <thead>
                 <tr>
                     <th>名称</th>
@@ -121,7 +121,7 @@
                     <!-- win form start -->
                     <form class="am-form form-validation" action="{{:MyUrl('admin/payment/upload')}}" method="POST" request-type="ajax-reload" enctype="multipart/form-data">
                         <div class="am-alert am-radius am-alert-tips m-t-0" data-am-alert>
-                            <p class="m-t-10">
+                            <p class="am-margin-top-sm">
                                 1 类名必须于文件名一致（去除 .php ），如 Alipay.php 则取 Alipay<br />
                                 2 类必须定义三个方法<br />
                                 &nbsp;&nbsp;&nbsp; 2.1 Config 配置方法<br />
diff --git a/application/admin/view/default/payment/save_info.html b/application/admin/view/default/payment/save_info.html
index a7edec6ff..347ee5dc1 100755
--- a/application/admin/view/default/payment/save_info.html
+++ b/application/admin/view/default/payment/save_info.html
@@ -6,8 +6,8 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/payment/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/payment/index')}}" enctype="multipart/form-data">
 			<legend>
-				<span class="fs-16">支付方式编辑</span>
-				<a href="{{:MyUrl('admin/payment/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<span class="am-text-default">支付方式编辑</span>
+				<a href="{{:MyUrl('admin/payment/index')}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 			<div class="am-form-group">
 				<label>名称</label>
diff --git a/application/admin/view/default/pluginsadmin/first_step.html b/application/admin/view/default/pluginsadmin/first_step.html
index 900f01802..4761e9177 100755
--- a/application/admin/view/default/pluginsadmin/first_step.html
+++ b/application/admin/view/default/pluginsadmin/first_step.html
@@ -6,14 +6,14 @@
         <!-- form start -->
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/pluginsadmin/saveinfo')}}" method="POST" request-type="form" enctype="multipart/form-data">
             <legend>
-                <span class="fs-16">
+                <span class="am-text-default">
                     {{if empty($data['id'])}}
                         应用添加
                     {{else /}}
                         应用编辑
                     {{/if}}
                 </span>
-                <a href="{{:MyUrl('admin/pluginsadmin/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+                <a href="{{:MyUrl('admin/pluginsadmin/index')}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
             </legend>
 
             <div class="am-form-group">
diff --git a/application/admin/view/default/pluginsadmin/index.html b/application/admin/view/default/pluginsadmin/index.html
index c73caa579..22ddc4abc 100755
--- a/application/admin/view/default/pluginsadmin/index.html
+++ b/application/admin/view/default/pluginsadmin/index.html
@@ -9,7 +9,7 @@
 
         <!-- operation start -->
         {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
-            <div class="am-g m-b-10 m-t-10">
+            <div class="am-g am-margin-bottom-sm am-margin-top-sm">
                 <a href="{{:MyUrl('admin/pluginsadmin/saveinfo')}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus"> 新增</a>
             </div>
         {{/if}}
diff --git a/application/admin/view/default/pluginsadmin/save_info.html b/application/admin/view/default/pluginsadmin/save_info.html
index 963fae8b7..740c43f55 100755
--- a/application/admin/view/default/pluginsadmin/save_info.html
+++ b/application/admin/view/default/pluginsadmin/save_info.html
@@ -6,14 +6,14 @@
         <!-- form start -->
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/pluginsadmin/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/pluginsadmin/index')}}" enctype="multipart/form-data">
             <legend>
-                <span class="fs-16">
+                <span class="am-text-default">
                     {{if empty($data['id'])}}
                         应用添加
                     {{else /}}
                         应用编辑
                     {{/if}}
                 </span>
-                <a href="{{:MyUrl('admin/pluginsadmin/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+                <a href="{{:MyUrl('admin/pluginsadmin/index')}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
             </legend>
 
             <div class="am-form-group">
diff --git a/application/admin/view/default/pluginsadmin/upload.html b/application/admin/view/default/pluginsadmin/upload.html
index 17ccd67c4..6f7bf0cc4 100755
--- a/application/admin/view/default/pluginsadmin/upload.html
+++ b/application/admin/view/default/pluginsadmin/upload.html
@@ -13,7 +13,7 @@
                 <button type="button" class="am-btn am-btn-default am-btn-sm am-radius">
                 <i class="am-icon-cloud-upload"></i> 选择文件</button>
                 <input type="file" name="file" class="file-event" data-tips-tag="#form-file-tips" data-validation-message="请选择需要上传的文件" accept=".zip" multiple required />
-                <span class="tips fs-12">上传一个zip压缩格式的应用安装包</span>
+                <span class="tips am-text-xs">上传一个zip压缩格式的应用安装包</span>
                 <div id="form-file-tips" class="am-margin-top-xs"></div>
             </div>
             <div class="am-form-group am-form-group-refreshing">
diff --git a/application/admin/view/default/power/index.html b/application/admin/view/default/power/index.html
index 9af260960..8398c71cd 100755
--- a/application/admin/view/default/power/index.html
+++ b/application/admin/view/default/power/index.html
@@ -65,30 +65,30 @@
 			{{foreach $data as $v}}
 				<li id="data-list-{{$v.id}}" {{if $v['is_show'] eq 0}}class="bk-cr-ffd"{{/if}}>
 					{{if !empty($v['item'])}}
-						<i class="am-icon-plus c-p m-r-5"></i>
+						<i class="am-icon-plus c-p am-margin-right-xs"></i>
 						<label class="c-p">
 					{{else /}}
 						<label class="c-p m-l-20">
 					{{/if}}
 						<span>{{if !empty($v['icon'])}}<span class="iconfont {{$v.icon}}"></span>{{/if}} {{$v.name}}</span>
 					</label>
-					<div class="fr m-r-20 list-submit">
-						<span class="am-icon-edit am-icon-md c-p submit-edit {{if !empty($v['item'])}}m-r-5{{/if}}" data-am-modal="{target: '#power-save-win'}" data-json='{{:json_encode($v)}}' data-tag="power-save-win" data-item="{{if !empty($v['item'])}}ok{{else /}}no{{/if}}"></span>
+					<div class="am-fr m-r-20 list-submit">
+						<span class="am-icon-edit am-icon-md c-p submit-edit {{if !empty($v['item'])}}am-margin-right-xs{{/if}}" data-am-modal="{target: '#power-save-win'}" data-json='{{:json_encode($v)}}' data-tag="power-save-win" data-item="{{if !empty($v['item'])}}ok{{else /}}no{{/if}}"></span>
 						{{if empty($v['item'])}}
 							<span class="am-icon-trash-o am-icon-md c-p m-l-20 m-r-15 submit-delete" data-url="{{:MyUrl('admin/power/powerdelete')}}" data-id="{{$v.id}}"></span>
 						{{/if}}
 					</div>
 				</li>
 				{{if !empty($v['item'])}}
-					<ul class="list-find p-0 m-t-5" style="display:none;">
+					<ul class="list-find p-0 am-margin-top-xs" style="display:none;">
 						{{foreach $v.item as $vs}}
 							<li id="data-list-{{$vs.id}}" {{if $vs['is_show'] eq 0}}class="bk-cr-ffd"{{/if}}>
 								<label class="c-p">
 									<span>{{if !empty($vs['icon'])}}<span class="iconfont {{$vs.icon}}"></span>{{/if}} {{$vs.name}}</span>
 								</label>
-								<div class="fr m-l-10 find-submit">
+								<div class="am-fr am-margin-left-sm find-submit">
 									<span class="am-icon-edit am-icon-sm c-p submit-edit" data-am-modal="{target: '#power-save-win'}" data-json='{{:json_encode($vs)}}' data-tag="power-save-win" data-item="no"></span>
-									<span class="am-icon-trash-o am-icon-sm c-p m-l-10 m-r-10 submit-delete" data-url="{{:MyUrl('admin/power/powerdelete')}}" data-id="{{$vs.id}}"></span>
+									<span class="am-icon-trash-o am-icon-sm c-p am-margin-left-sm am-margin-right-sm submit-delete" data-url="{{:MyUrl('admin/power/powerdelete')}}" data-id="{{$vs.id}}"></span>
 								</div>
 							</li>
 						{{/foreach}}
diff --git a/application/admin/view/default/power/role.html b/application/admin/view/default/power/role.html
index aff28f933..34a2e7640 100755
--- a/application/admin/view/default/power/role.html
+++ b/application/admin/view/default/power/role.html
@@ -10,7 +10,7 @@
         <!-- operation end -->
 
         <!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 role-list">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm role-list">
 			<thead>
 				<tr>
 					<th>名称</th>
diff --git a/application/admin/view/default/power/role_save_info.html b/application/admin/view/default/power/role_save_info.html
index a4a56b64d..931301094 100755
--- a/application/admin/view/default/power/role_save_info.html
+++ b/application/admin/view/default/power/role_save_info.html
@@ -6,14 +6,14 @@
         <!-- form start -->
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/power/rolesave')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/power/role')}}">
         	<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						角色添加
 					{{else /}}
 						角色编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/power/role')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/power/role')}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
         	<div class="am-form-group">
 				<label>角色名称</label>
@@ -26,7 +26,7 @@
 					{{foreach $power as $v}}
 						<li {{if $v['is_show'] eq 0}}class="bk-cr-ffd"{{/if}}>
 							{{if !empty($v['item'])}}
-								<i class="am-icon-minus-square c-p m-r-5"></i>
+								<i class="am-icon-minus-square c-p am-margin-right-xs"></i>
 								<label class="c-p">
 							{{else /}}
 								<label class="c-p m-l-2">
@@ -36,7 +36,7 @@
 							</label>
 						</li>
 						{{if !empty($v['item'])}}
-							<ul class="list-find p-0 m-t-5">
+							<ul class="list-find p-0 am-margin-top-xs">
 								{{foreach $v.item as $vs}}
 									<li {{if $vs['is_show'] eq 0}}class="bk-cr-ffd"{{/if}}>
 										<label class="c-p">
diff --git a/application/admin/view/default/public/nav.html b/application/admin/view/default/public/nav.html
index 3b416e05a..503a1bf62 100755
--- a/application/admin/view/default/public/nav.html
+++ b/application/admin/view/default/public/nav.html
@@ -1,7 +1,7 @@
 <header class="am-topbar am-topbar-inverse admin-header">
 	<div class="am-topbar-brand">
 		<a href="{{:MyUrl('admin/index/index')}}">
-			<h2>ShopXO<span class="admin-site-vice-name m-l-5">后台管理系统</span></h2>
+			<h2>ShopXO<span class="admin-site-vice-name am-margin-left-xs">后台管理系统</span></h2>
 		</a>
 	</div>
 	<button class="am-topbar-btn am-topbar-toggle am-btn am-btn-xs am-btn-success am-show-sm-only am-radius header-nav-submit" data-am-collapse="{target: '#topbar-collapse'}">
diff --git a/application/admin/view/default/refundlog/index.html b/application/admin/view/default/refundlog/index.html
index c1d6a5cd0..a9a699909 100644
--- a/application/admin/view/default/refundlog/index.html
+++ b/application/admin/view/default/refundlog/index.html
@@ -90,7 +90,7 @@
         <!-- form end -->
 
         <!-- list start -->
-        <table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 m-l-5">
+        <table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm am-margin-left-xs">
             <thead>
                 <tr>
                     <th>用户信息</th>
diff --git a/application/admin/view/default/site/nav.html b/application/admin/view/default/site/nav.html
index 598f14394..f5e9ce496 100644
--- a/application/admin/view/default/site/nav.html
+++ b/application/admin/view/default/site/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav m-b-10">
+<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
     <li {{if $nav_type eq 'base'}}class="am-active"{{/if}} data-type="base">
         <a href="{{:MyUrl('admin/site/index', ['nav_type'=>'base'])}}">基础配置</a>
     </li>
@@ -32,12 +32,12 @@
     <!-- 登录/密码找回提示 -->
     <div class="am-alert am-alert-warning am-radius" data-am-alert>
         <button type="button" class="am-close">&times;</button>
-        <p class="fs-12">左侧图片最多可上传3张图片、每次随机展示其中一张</p>
+        <p class="am-text-xs">左侧图片最多可上传3张图片、每次随机展示其中一张</p>
     </div>
 {{elseif in_array($nav_type, ['register']) /}}
     <!-- 注册提示 -->
     <div class="am-alert am-alert-warning am-radius" data-am-alert>
         <button type="button" class="am-close">&times;</button>
-        <p class="fs-12">可自定义背景图片、默认底灰色</p>
+        <p class="am-text-xs">可自定义背景图片、默认底灰色</p>
     </div>
 {{/if}}
\ No newline at end of file
diff --git a/application/admin/view/default/slide/index.html b/application/admin/view/default/slide/index.html
index d909f614d..a372b7718 100755
--- a/application/admin/view/default/slide/index.html
+++ b/application/admin/view/default/slide/index.html
@@ -85,7 +85,7 @@
         <!-- operation end -->
 
         <!-- list start -->
-        <table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
+        <table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm">
             <thead>
                 <tr>
                     <th>名称</th>
diff --git a/application/admin/view/default/slide/save_info.html b/application/admin/view/default/slide/save_info.html
index 09d5b7106..d16ad03b0 100755
--- a/application/admin/view/default/slide/save_info.html
+++ b/application/admin/view/default/slide/save_info.html
@@ -6,14 +6,14 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/slide/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/slide/index')}}" enctype="multipart/form-data">
 			<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						轮播添加
 					{{else /}}
 						轮播编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/slide/index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/slide/index')}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 			<div class="am-form-group">
 				<label>名称</label>
@@ -42,7 +42,7 @@
 			<div class="am-form-group">
 				<div class="am-alert am-alert-warning am-radius" data-am-alert>
 				    <button type="button" class="am-close">&times;</button>
-				    <p class="fs-12">WEB页面<br />&nbsp&nbsp&nbsp;1.以http或https开头<br />&nbsp&nbsp&nbsp;2.并在小程序后台加入白名单<br /><br /> 内部页面(小程序/APP内部地址)<br />&nbsp&nbsp&nbsp;1.小程序或APP内部地址<br />&nbsp&nbsp&nbsp;2.小程序以/pages开始<br />&nbsp&nbsp&nbsp;3.例如：/pages/user/user<br />&nbsp&nbsp&nbsp;4.支持带参数 ?x=xx<br /><br /> 跳转原生地图查看指定位置<br />&nbsp&nbsp&nbsp;1.以 | 竖线分割，分别顺序 名称|地址|经度|纬度<br />&nbsp&nbsp&nbsp;2.例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843</p>
+				    <p class="am-text-xs">WEB页面<br />&nbsp&nbsp&nbsp;1.以http或https开头<br />&nbsp&nbsp&nbsp;2.并在小程序后台加入白名单<br /><br /> 内部页面(小程序/APP内部地址)<br />&nbsp&nbsp&nbsp;1.小程序或APP内部地址<br />&nbsp&nbsp&nbsp;2.小程序以/pages开始<br />&nbsp&nbsp&nbsp;3.例如：/pages/user/user<br />&nbsp&nbsp&nbsp;4.支持带参数 ?x=xx<br /><br /> 跳转原生地图查看指定位置<br />&nbsp&nbsp&nbsp;1.以 | 竖线分割，分别顺序 名称|地址|经度|纬度<br />&nbsp&nbsp&nbsp;2.例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843</p>
 				</div>
 				<label>事件值</label>
 				<input type="text" name="event_value" placeholder="事件值" data-validation-message="事件值最多 255 个字符" class="am-radius" {{if !empty($data)}} value="{{$data.event_value}}"{{/if}} />
diff --git a/application/admin/view/default/sms/nav.html b/application/admin/view/default/sms/nav.html
index c22dda2a4..7fcb60304 100755
--- a/application/admin/view/default/sms/nav.html
+++ b/application/admin/view/default/sms/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav m-b-10">
+<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
 	<li {{if $nav_type eq 'sms'}}class="am-active"{{/if}} data-type="sms">
 		<a href="{{:MyUrl('admin/sms/index', ['type'=>'sms'])}}">短信设置</a>
 	</li>
@@ -9,5 +9,5 @@
 
 <div class="am-alert am-alert-warning am-radius" data-am-alert>
     <button type="button" class="am-close">&times;</button>
-    <p class="fs-12">阿里云短信管理地址 https://dysms.console.aliyun.com/dysms.htm</p>
+    <p class="am-text-xs">阿里云短信管理地址 https://dysms.console.aliyun.com/dysms.htm</p>
 </div>
\ No newline at end of file
diff --git a/application/admin/view/default/sqlconsole/index.html b/application/admin/view/default/sqlconsole/index.html
index 8be9974a3..552ae08d2 100755
--- a/application/admin/view/default/sqlconsole/index.html
+++ b/application/admin/view/default/sqlconsole/index.html
@@ -5,7 +5,7 @@
     <div class="content">
         <div class="am-alert am-alert-warning am-radius" data-am-alert>
             <button type="button" class="am-close">&times;</button>
-            <p class="fs-12">PS：非开发人员请不要随意执行任何SQL语句，操作可能导致将整个系统数据库被删除。</p>
+            <p class="am-text-xs">PS：非开发人员请不要随意执行任何SQL语句，操作可能导致将整个系统数据库被删除。</p>
         </div>
         
         <!-- form start -->
diff --git a/application/admin/view/default/theme/upload.html b/application/admin/view/default/theme/upload.html
index 40d7136a9..f7a894f12 100755
--- a/application/admin/view/default/theme/upload.html
+++ b/application/admin/view/default/theme/upload.html
@@ -13,7 +13,7 @@
 				<button type="button" class="am-btn am-btn-default am-btn-sm am-radius">
 				<i class="am-icon-cloud-upload"></i> 选择文件</button>
 				<input type="file" name="theme" class="file-event" data-tips-tag="#form-theme-tips" data-validation-message="请选择需要上传的文件" accept=".zip" multiple required />
-				<span class="tips fs-12">上传一个zip压缩格式的主题安装包</span>
+				<span class="tips am-text-xs">上传一个zip压缩格式的主题安装包</span>
 				<div id="form-theme-tips" class="am-margin-top-xs"></div>
 			</div>
 			<div class="am-form-group">
diff --git a/application/admin/view/default/user/index.html b/application/admin/view/default/user/index.html
index 7d7f8a7d0..c9e75bf3d 100755
--- a/application/admin/view/default/user/index.html
+++ b/application/admin/view/default/user/index.html
@@ -70,13 +70,13 @@
         <div class="am-g m-t-15">
             <a href="{{:MyUrl('admin/user/saveinfo')}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus"> 新增</a>
             {{if !IsMobile()}}
-            	<a href="{{$excel_url}}" class="am-btn am-btn-success am-btn-xs m-l-10 am-icon-file-excel-o am-radius"> 导出Excel</a>
+            	<a href="{{$excel_url}}" class="am-btn am-btn-success am-btn-xs am-margin-left-sm am-icon-file-excel-o am-radius"> 导出Excel</a>
             {{/if}}
         </div>
         <!-- operation end -->
 
 		<!-- list start -->
-		<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10 m-l-5">
+		<table class="am-table am-table-striped am-table-hover am-text-middle am-margin-top-sm am-margin-left-xs">
 			<thead>
 				<tr>
 					<th>编号</th>
diff --git a/application/admin/view/default/user/save_info.html b/application/admin/view/default/user/save_info.html
index fed2a4398..62204b33f 100755
--- a/application/admin/view/default/user/save_info.html
+++ b/application/admin/view/default/user/save_info.html
@@ -6,14 +6,14 @@
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/user/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/user/index', $params)}}">
 			<legend>
-				<span class="fs-16">
+				<span class="am-text-default">
 					{{if empty($data['id'])}}
 						成员添加
 					{{else /}}
 						成员编辑
 					{{/if}}
 				</span>
-				<a href="{{:MyUrl('admin/user/index', $params)}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+				<a href="{{:MyUrl('admin/user/index', $params)}}" class="am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"> 返回</a>
 			</legend>
 			<div class="am-form-group">
 				<label>用户名</label>
diff --git a/application/index/view/default/answer/index.html b/application/index/view/default/answer/index.html
index 551a2538d..55bca8fd8 100755
--- a/application/index/view/default/answer/index.html
+++ b/application/index/view/default/answer/index.html
@@ -78,7 +78,7 @@
             </form>
 
             <!-- 列表 -->
-            <div class="data-list">
+            <div class="data-list am-margin-top-sm">
                 <table class="am-table am-table-striped">
                     <thead>
                         <tr>
diff --git a/application/index/view/default/lib/enable.html b/application/index/view/default/lib/enable.html
index 6667d049d..028d01e27 100755
--- a/application/index/view/default/lib/enable.html
+++ b/application/index/view/default/lib/enable.html
@@ -3,7 +3,7 @@
 	<label>{{:L('common_view_enable_title')}}</label>
 	<div>
 		<foreach name="common_is_enable_list" item="v">
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="is_enable" value="{{$v.id}}" <if condition="isset($data['is_enable']) and $data['is_enable'] eq $v['id']">checked="checked"<else /><if condition="!isset($data['is_enable']) and isset($v['checked']) and $v['checked'] eq true">checked="checked"</if></if> data-am-ucheck /> {{$v.name}}
 			</label>
 		</foreach>
diff --git a/application/index/view/default/lib/gender.html b/application/index/view/default/lib/gender.html
index 327d14275..edac039ae 100755
--- a/application/index/view/default/lib/gender.html
+++ b/application/index/view/default/lib/gender.html
@@ -3,7 +3,7 @@
 	<label>性别</label>
 	<div>
 		{{foreach $common_gender_list as $v}}
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="gender" value="{{$v.id}}" {{if isset($data['gender']) and $data['gender'] eq $v['id']}} checked="checked"{{else /}} {{if !isset($data['gender']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
 			</label>
 		{{/foreach}}
diff --git a/application/index/view/default/lib/is_new_window_open.html b/application/index/view/default/lib/is_new_window_open.html
index 0ebec9861..3a8b3f880 100755
--- a/application/index/view/default/lib/is_new_window_open.html
+++ b/application/index/view/default/lib/is_new_window_open.html
@@ -3,7 +3,7 @@
 	<label>{{:L('common_view_is_new_window_open_title')}}</label>
 	<div>
 		<foreach name="common_is_new_window_open_list" item="v">
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="is_new_window_open" value="{{$v.id}}" <if condition="isset($data['is_new_window_open']) and $data['is_new_window_open'] eq $v['id']">checked="checked"<else /><if condition="!isset($data['is_new_window_open']) and isset($v['checked']) and $v['checked'] eq true">checked="checked"</if></if> data-am-ucheck /> {{$v.name}}
 			</label>
 		</foreach>
diff --git a/application/index/view/default/lib/is_show.html b/application/index/view/default/lib/is_show.html
index b884fa349..2dc434538 100755
--- a/application/index/view/default/lib/is_show.html
+++ b/application/index/view/default/lib/is_show.html
@@ -3,7 +3,7 @@
 	<label>{{:L('common_view_is_show_title')}}</label>
 	<div>
 		<foreach name="common_is_show_list" item="v">
-			<label class="am-radio-inline m-r-10">
+			<label class="am-radio-inline am-margin-right-sm">
 				<input type="radio" name="is_show" value="{{$v.id}}" <if condition="isset($data['is_show']) and $data['is_show'] eq $v['id']">checked="checked"<else /><if condition="!isset($data['is_show']) and isset($v['checked']) and $v['checked'] eq true">checked="checked"</if></if> data-am-ucheck /> {{$v.name}}
 			</label>
 		</foreach>
diff --git a/application/index/view/default/message/index.html b/application/index/view/default/message/index.html
index ac2b7f3a7..27f3bd7eb 100755
--- a/application/index/view/default/message/index.html
+++ b/application/index/view/default/message/index.html
@@ -89,7 +89,7 @@
             </form>
 
             <!-- 列表 -->
-            <div class="data-list">
+            <div class="data-list am-margin-top-sm">
                 <table class="am-table am-table-striped">
                     <thead>
                         <tr>
diff --git a/application/index/view/default/personal/save_info.html b/application/index/view/default/personal/save_info.html
index 022009784..abae0653d 100755
--- a/application/index/view/default/personal/save_info.html
+++ b/application/index/view/default/personal/save_info.html
@@ -26,7 +26,7 @@
 			<form class="am-form form-validation view-save" action="{{:MyUrl('index/personal/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('index/personal/index')}}">
 				<legend>
 					<span class="legend-title">个人资料</span>
-					<a href="{{:MyUrl('index/personal/index')}}" class="am-fr am-icon-mail-reply"> 返回</a>
+					<a href="{{:MyUrl('index/personal/index')}}" class="am-fr am-margin-top-xs am-icon-mail-reply"> 返回</a>
 				</legend>
 				<div class="am-form-group">
 					<label>昵称</label>
diff --git a/application/index/view/default/safety/email_info.html b/application/index/view/default/safety/email_info.html
index dadac1630..3821b96e8 100755
--- a/application/index/view/default/safety/email_info.html
+++ b/application/index/view/default/safety/email_info.html
@@ -26,7 +26,7 @@
 			<form class="am-form form-validation view-save" action="{{:MyUrl('index/safety/verifycheck')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('index/safety/newemailinfo')}}">
 				<legend>
 					<span class="legend-title">原电子邮箱校验</span>
-					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-icon-mail-reply"> 返回</a>
+					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-margin-top-xs am-icon-mail-reply"> 返回</a>
 				</legend>
 				<div class="am-form-group">
 					<label>电子邮箱</label>
diff --git a/application/index/view/default/safety/index.html b/application/index/view/default/safety/index.html
index 26c6ecfb1..e5e640afa 100755
--- a/application/index/view/default/safety/index.html
+++ b/application/index/view/default/safety/index.html
@@ -40,7 +40,7 @@
 								{{/if}}
 							{{/if}}
 							{{if !empty($v['tips'])}}
-								<p class="fs-12 m-b-5 cr-999">{{$v.tips}}</p>
+								<p class="am-text-xs am-margin-bottom-xs cr-999">{{$v.tips}}</p>
 							{{/if}}
 						</div>
 						{{if empty($data[$v['type']]) and empty($v['msg'])}}
diff --git a/application/index/view/default/safety/login_pwd_info.html b/application/index/view/default/safety/login_pwd_info.html
index f950728e9..eca01f89d 100755
--- a/application/index/view/default/safety/login_pwd_info.html
+++ b/application/index/view/default/safety/login_pwd_info.html
@@ -26,7 +26,7 @@
 			<form class="am-form form-validation view-save" action="{{:MyUrl('index/safety/loginpwdupdate')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('index/safety/index')}}">
 				<legend>
 					<span class="legend-title">登录密码修改</span>
-					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-icon-mail-reply"> 返回</a>
+					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-margin-top-xs am-icon-mail-reply"> 返回</a>
 				</legend>
 				<div class="am-form-group">
 					<label>当前密码</label>
diff --git a/application/index/view/default/safety/mobile_info.html b/application/index/view/default/safety/mobile_info.html
index c7a696959..81905b6a5 100755
--- a/application/index/view/default/safety/mobile_info.html
+++ b/application/index/view/default/safety/mobile_info.html
@@ -26,7 +26,7 @@
 			<form class="am-form form-validation view-save" action="{{:MyUrl('index/safety/verifycheck')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('index/safety/newmobileinfo')}}">
 				<legend>
 					<span class="legend-title">原手机号码校验</span>
-					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-icon-mail-reply"> 返回</a>
+					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-margin-top-xs am-icon-mail-reply"> 返回</a>
 				</legend>
 				<div class="am-form-group">
 					<label>手机号码</label>
diff --git a/application/index/view/default/safety/new_email_info.html b/application/index/view/default/safety/new_email_info.html
index 2daaf523e..b349fcac7 100755
--- a/application/index/view/default/safety/new_email_info.html
+++ b/application/index/view/default/safety/new_email_info.html
@@ -26,7 +26,7 @@
 			<form class="am-form form-validation view-save" action="{{:MyUrl('index/safety/accountsupdate')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('index/safety/index')}}">
 				<legend>
 					<span class="legend-title">新电子邮箱校验</span>
-					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-icon-mail-reply"> 返回</a>
+					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-margin-top-xs am-icon-mail-reply"> 返回</a>
 				</legend>
 				<div class="am-form-group">
 					<label>电子邮箱</label>
diff --git a/application/index/view/default/safety/new_mobile_info.html b/application/index/view/default/safety/new_mobile_info.html
index 1209bd346..d7113fc74 100755
--- a/application/index/view/default/safety/new_mobile_info.html
+++ b/application/index/view/default/safety/new_mobile_info.html
@@ -26,7 +26,7 @@
 			<form class="am-form form-validation view-save" action="{{:MyUrl('index/safety/accountsupdate')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('index/safety/index')}}">
 				<legend>
 					<span class="legend-title">新手机号码校验</span>
-					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-icon-mail-reply"> 返回</a>
+					<a href="{{:MyUrl('index/safety/index')}}" class="am-fr am-margin-top-xs am-icon-mail-reply"> 返回</a>
 				</legend>
 				<div class="am-form-group">
 					<label>手机号码</label>
diff --git a/application/index/view/default/userfavor/goods.html b/application/index/view/default/userfavor/goods.html
index b2d174edd..da05cb6ea 100755
--- a/application/index/view/default/userfavor/goods.html
+++ b/application/index/view/default/userfavor/goods.html
@@ -34,7 +34,7 @@
             </form>
 
             <!-- 商品列表 -->
-            <div class="data-list">
+            <div class="data-list am-margin-top-sm">
                 <table class="am-table am-table-striped">
                     <thead>
                         <tr>
diff --git a/application/index/view/default/usergoodsbrowse/index.html b/application/index/view/default/usergoodsbrowse/index.html
index f689bb55f..5a3a9dd96 100755
--- a/application/index/view/default/usergoodsbrowse/index.html
+++ b/application/index/view/default/usergoodsbrowse/index.html
@@ -34,7 +34,7 @@
             </form>
 
             <!-- 商品列表 -->
-            <div class="data-list">
+            <div class="data-list am-margin-top-sm">
                 <table class="am-table am-table-striped">
                     <thead>
                         <tr>
diff --git a/application/index/view/default/userintegral/index.html b/application/index/view/default/userintegral/index.html
index 1354d0d67..5cdcb7249 100755
--- a/application/index/view/default/userintegral/index.html
+++ b/application/index/view/default/userintegral/index.html
@@ -80,7 +80,7 @@
             </form>
 
             <!-- 列表 -->
-            <div class="data-list">
+            <div class="data-list am-margin-top-sm">
                 <table class="am-table am-table-striped">
                     <thead>
                         <tr>
diff --git a/application/install/view/index/create.html b/application/install/view/index/create.html
index 30de501a4..c107d3d1d 100755
--- a/application/install/view/index/create.html
+++ b/application/install/view/index/create.html
@@ -8,11 +8,11 @@
     <h2>数据库信息</h2>
     <div class="am-alert am-alert-warning am-radius" data-am-alert>
         <button type="button" class="am-close">&times;</button>
-        <p class="fs-12">温馨提示</p>
-        <p class="fs-12">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;建议采用utf8mb4编码、MySQL版本5.6或5.7</p>
+        <p class="am-text-xs">温馨提示</p>
+        <p class="am-text-xs">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;建议采用utf8mb4编码、MySQL版本5.6或5.7</p>
         {{if !empty($charset_type_list)}}
             {{foreach $charset_type_list as $v}}
-                <p class="fs-12">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{$v.charset}}编码、MySQL版本需 {{$v.version}} 及以上版本 （{{$v.collate}}）</p>
+                <p class="am-text-xs">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{$v.charset}}编码、MySQL版本需 {{$v.version}} 及以上版本 （{{$v.collate}}）</p>
             {{/foreach}}
         {{/if}}
     </div>
diff --git a/public/static/index/default/css/userfavor.css b/public/static/index/default/css/userfavor.css
index 334ea8c7e..72902a45f 100755
--- a/public/static/index/default/css/userfavor.css
+++ b/public/static/index/default/css/userfavor.css
@@ -1,7 +1,6 @@
 /**
  * 商品列表
  */
-.data-list { margin-top: 10px; }
 .goods-detail img { width: 80px; height: 80px; }
 .goods-detail { position: relative; }
 .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }
diff --git a/public/static/index/default/css/usergoodsbrowse.css b/public/static/index/default/css/usergoodsbrowse.css
index 334ea8c7e..72902a45f 100755
--- a/public/static/index/default/css/usergoodsbrowse.css
+++ b/public/static/index/default/css/usergoodsbrowse.css
@@ -1,7 +1,6 @@
 /**
  * 商品列表
  */
-.data-list { margin-top: 10px; }
 .goods-detail img { width: 80px; height: 80px; }
 .goods-detail { position: relative; }
 .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }