diff --git a/app/admin/view/default/appmini/base_nav.html b/app/admin/view/default/appmini/base_nav.html
index 99c2bd4c5..4f44b42d0 100644
--- a/app/admin/view/default/appmini/base_nav.html
+++ b/app/admin/view/default/appmini/base_nav.html
@@ -6,7 +6,9 @@
             </li>
         {{/foreach}}
     {{/if}}
-    <li class="am-fr">
-        <a class="am-margin-left-sm" href="{{$store_theme_url}}" target="_blank">更多主题下载 <i class="am-icon-external-link"></i></a>
-    </li>
+    {{if !empty($store_theme_url)}}
+        <li class="am-fr">
+            <a class="am-margin-left-sm" href="{{$store_theme_url}}" target="_blank">更多主题下载 <i class="am-icon-external-link"></i></a>
+        </li>
+    {{/if}}
 </ul>
\ No newline at end of file
diff --git a/app/admin/view/default/article/save_info.html b/app/admin/view/default/article/save_info.html
index d91452ca3..81a215dec 100755
--- a/app/admin/view/default/article/save_info.html
+++ b/app/admin/view/default/article/save_info.html
@@ -40,7 +40,7 @@
 			<div class="am-cf">
         		<div class="am-u-md-6 am-padding-horizontal-0">
         			<div class="am-form-group">
-						<label>跳转url地址<a href="javascript:;" class="am-icon-question-circle am-text-warning am-form-group-label-tips-icon am-margin-left-sm" data-am-popover="{content: '带http://或https://，仅web端有效', trigger: 'hover focus', theme: 'sm'}"></a></label>
+						<label>跳转url地址<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '带http://或https://，仅web端有效', trigger: 'hover focus', theme: 'sm'}"></a></label>
 						<input type="url" name="jump_url" placeholder="跳转url地址" data-validation-message="跳转url地址格式有误" class="am-radius" {{if !empty($data)}} value="{{$data.jump_url}}"{{/if}} />
 					</div>
         		</div>
diff --git a/app/admin/view/default/customview/save_info.html b/app/admin/view/default/customview/save_info.html
index 9cb277517..49547d4a0 100755
--- a/app/admin/view/default/customview/save_info.html
+++ b/app/admin/view/default/customview/save_info.html
@@ -4,7 +4,7 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form form-validation" action="{{:MyUrl('admin/customview/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/customview/index', $params)}}">
+		<form class="am-form form-validation am-form-pure am-form-full-screen am-form-popup-fixed" action="{{:MyUrl('admin/customview/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/customview/index', $params)}}">
 			<legend>
 				<span class="am-text-default">自定义页面{{if empty($data['id'])}}添加{{else /}}编辑{{/if}}</span>
 				<a href="{{:MyUrl('admin/customview/index', $params)}}" class="am-fr am-text-sm am-margin-top-sm am-icon-mail-reply"> 返回</a>
@@ -13,31 +13,47 @@
 				<label>标题<span class="am-form-group-label-tips-must">*</span></label>
 				<input type="text" name="title" placeholder="标题" minlength="2" maxlength="60" data-validation-message="标题长度 2~60 个字符" class="am-radius" {{if !empty($data)}} value="{{$data.title}}" {{/if}} required />
 			</div>
-			<div class="am-form-group">
-			    <label class="block">是否启用</label>
-			    <input name="is_enable" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_enable']) and $data['is_enable'] eq 1) or !isset($data['is_enable'])}}checked="true"{{/if}} />
-			</div>
-
-			<div class="am-form-group">
-			    <label class="block">是否含头部</label>
-			    <input name="is_header" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_header']) and $data['is_header'] eq 1) or !isset($data['is_header'])}}checked="true"{{/if}} />
-			</div>
-
-			<div class="am-form-group">
-			    <label class="block">是否含尾部</label>
-			    <input name="is_footer" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_footer']) and $data['is_footer'] eq 1) or !isset($data['is_footer'])}}checked="true"{{/if}} />
-			</div>
-
-			<div class="am-form-group">
-			    <label class="block">是否满屏</label>
-			    <input name="is_full_screen" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_full_screen']) and $data['is_full_screen'] eq 1) or !isset($data['is_full_screen'])}}checked="true"{{/if}} />
-			</div>
+			<div class="am-cf">
+				<div class="am-u-md-6 am-padding-horizontal-0">
+					<div class="am-cf">
+		                <div class="am-u-sm-6 am-padding-horizontal-0">
+							<div class="am-form-group">
+							    <label class="am-block">是否启用</label>
+							    <input name="is_enable" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_enable']) and $data['is_enable'] eq 1) or !isset($data['is_enable'])}}checked="true"{{/if}} />
+							</div>
+						</div>
+						<div class="am-u-sm-6 am-padding-horizontal-0">
+							<div class="am-form-group">
+							    <label class="am-block">是否含头部</label>
+							    <input name="is_header" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_header']) and $data['is_header'] eq 1) or !isset($data['is_header'])}}checked="true"{{/if}} />
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="am-u-md-6 am-padding-horizontal-0">
+					<div class="am-cf">
+		                <div class="am-u-sm-6 am-padding-horizontal-0">
+		                	<div class="am-form-group">
+							    <label class="am-block">是否含尾部</label>
+							    <input name="is_footer" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_footer']) and $data['is_footer'] eq 1) or !isset($data['is_footer'])}}checked="true"{{/if}} />
+							</div>
+		                </div>
+		                <div class="am-u-sm-6 am-padding-horizontal-0">
+		                	<div class="am-form-group">
+							    <label class="am-block">是否满屏</label>
+							    <input name="is_full_screen" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_full_screen']) and $data['is_full_screen'] eq 1) or !isset($data['is_full_screen'])}}checked="true"{{/if}} />
+							</div>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
 
 			<div class="am-form-group">
 				<label>内容<span class="am-form-group-label-tips-must">*</span>{{if IsMobile()}}<span class="am-form-group-label-tips">更多编辑功能请使用电脑访问</span>{{/if}}</label>
 				<textarea class="am-radius am-validate" name="content" rows="5" minlength="10" maxlength="105000" {{if !IsMobile()}}id="editor-tag" data-url="{{:MyUrl('admin/ueditor/index', ['path_type'=>'customview'])}}" placeholder="内容长度最少 10~105000 个字符" {{else /}} placeholder="内容长度最少 10~105000 个字符更多编辑功能请使用电脑访问" {{/if}} data-validation-message="内容长度最少 10~105000 个字符" required>{{if !empty($data)}}{{$data.content}}{{/if}}</textarea>
 			</div>
-			<div class="am-form-group am-form-group-refreshing am-margin-top-lg am-padding-left-0">
+
+			<div class="am-form-popup-submit">
 				<input type="hidden" name="id" {{if !empty($data)}} value="{{$data.id}}"{{/if}} />
 				<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
 			</div>
diff --git a/app/admin/view/default/design/index.html b/app/admin/view/default/design/index.html
index 39e6d754c..048451dd3 100644
--- a/app/admin/view/default/design/index.html
+++ b/app/admin/view/default/design/index.html
@@ -7,7 +7,9 @@
     <a href="{{:MyUrl('admin/design/saveinfo')}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-plus" target="_blank"> 新增</a>
     <!-- 父级内容 -->
     {__block__}
-    <a class="am-margin-left-sm" href="{{$store_design_url}}" target="_blank">更多设计模板下载 <i class="am-icon-external-link"></i></a>
+    {{if !empty($store_design_url)}}
+        <a class="am-margin-left-sm" href="{{$store_design_url}}" target="_blank">更多设计模板下载 <i class="am-icon-external-link"></i></a>
+    {{/if}}
 {{/block}}
 
 <!-- 扩展 -->
diff --git a/app/admin/view/default/goods/save_info.html b/app/admin/view/default/goods/save_info.html
index cbe99d4aa..849c2f7b9 100755
--- a/app/admin/view/default/goods/save_info.html
+++ b/app/admin/view/default/goods/save_info.html
@@ -146,7 +146,7 @@
                 		</div>
                 		<div class="am-u-sm-6 am-padding-horizontal-0">
                 			<div class="am-form-group">
-			                    <label>购买赠送积分比例<a href="javascript:;" class="am-icon-question-circle am-text-warning am-form-group-label-tips-icon am-margin-left-sm" data-am-popover="{content: '1. 按照商品金额比例乘以数量的比例进行发放<br />2. 订单完成自动将发放到用户锁定积分<br />3. 站点设置->扩展中脚本处理发放积分', trigger: 'hover focus', theme: 'sm'}"></a></label>
+			                    <label>购买赠送积分比例<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '1. 按照商品金额比例乘以数量的比例进行发放<br />2. 订单完成自动将发放到用户锁定积分<br />3. 站点设置->扩展中脚本处理发放积分', trigger: 'hover focus', theme: 'sm'}"></a></label>
 			                    <div class="am-input-group am-input-group-sm">
 			                        <input type="number" name="give_integral" placeholder="购买赠送积分" min="0" max="100" data-validation-message="购买赠送积分比例 0~100 的数字" class="am-form-field am-radius" {{if !empty($data['give_integral'])}} value="{{$data.give_integral}}"{{/if}} />
 			                        <span class="am-input-group-btn">
@@ -166,7 +166,7 @@
                 		</div>
                 		<div class="am-u-sm-6 am-padding-horizontal-0">
                 			<div class="am-form-group">
-								<label>单次最大购买数量<a href="javascript:;" class="am-icon-question-circle am-text-warning am-form-group-label-tips-icon am-margin-left-sm" data-am-popover="{content: '1. 单次最大数值 100000000<br />2. 小于等于0或空则不限', trigger: 'hover focus', theme: 'sm'}"></a></label>
+								<label>单次最大购买数量<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '1. 单次最大数值 100000000<br />2. 小于等于0或空则不限', trigger: 'hover focus', theme: 'sm'}"></a></label>
 								<input type="number" name="buy_max_number" placeholder="单次最大购买数量" min="0" max="100000000" data-validation-message="单次最大购买数量 1~100000000" class="am-radius" {{if !empty($data['buy_max_number'])}} value="{{$data.buy_max_number}}"{{/if}} />
 							</div>
                 		</div>
@@ -195,7 +195,7 @@
                 			<div class="am-cf">
                 				<div class="am-u-sm-6 am-padding-horizontal-0">
                 					<div class="am-form-group am-form-file">
-										<label class="block">封面图片<a href="javascript:;" class="am-icon-question-circle am-text-warning am-form-group-label-tips-icon am-margin-left-sm" data-am-popover="{content: '留空则取相册第一张图、建议800*800px', trigger: 'hover focus', theme: 'sm'}"></a></label>
+										<label class="block">封面图片<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '留空则取相册第一张图、建议800*800px', trigger: 'hover focus', theme: 'sm'}"></a></label>
 										<ul class="plug-file-upload-view goods-recommended-images-view" data-form-name="images" data-max-number="1" data-dialog-type="images">
 											{{if !empty($data['images'])}}
 												<li>
@@ -210,11 +210,11 @@
                 				</div>
                 				<div class="am-u-sm-6 am-padding-horizontal-0">
                 					<div class="am-form-group">
-										<label class="block">扣减库存<a href="javascript:;" class="am-icon-question-circle am-text-warning am-form-group-label-tips-icon am-margin-left-sm" data-am-popover="{content: '扣除规则根据后台配置->扣除库存规则而定', trigger: 'hover focus', theme: 'sm'}"></a></label>
+										<label class="block">扣减库存<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '扣除规则根据后台配置->扣除库存规则而定', trigger: 'hover focus', theme: 'sm'}"></a></label>
 										<input name="is_deduction_inventory" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_deduction_inventory']) and $data['is_deduction_inventory'] eq 1) or empty($data)}}checked="true"{{/if}} />
 									</div>
 									<div class="am-form-group">
-										<label class="block">上下架<a href="javascript:;" class="am-icon-question-circle am-text-warning am-form-group-label-tips-icon am-margin-left-sm" data-am-popover="{content: '下架后用户不可见', trigger: 'hover focus', theme: 'sm'}"></a></label>
+										<label class="block">上下架<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '下架后用户不可见', trigger: 'hover focus', theme: 'sm'}"></a></label>
 										<input name="is_shelves" value="1" type="checkbox" data-off-text="下架" data-on-text="上架" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_shelves']) and $data['is_shelves'] eq 1) or empty($data)}}checked="true"{{/if}} />
 									</div>
                 				</div>
diff --git a/app/admin/view/default/goodscategory/index.html b/app/admin/view/default/goodscategory/index.html
index 6a377f447..5f6898587 100755
--- a/app/admin/view/default/goodscategory/index.html
+++ b/app/admin/view/default/goodscategory/index.html
@@ -18,63 +18,97 @@
 				</div>
 				<div class="am-popup-bd">
 					<!-- form start -->
-					<form class="am-form form-validation am-form-popup-fixed" action="{{:MyUrl('admin/goodscategory/save')}}" method="POST" request-type="ajax-fun" request-value="TreeFormSaveBack">
-						<div class="am-form-group am-form-file">
-							<label class="block">icon图标<span class="am-form-group-label-tips">建议100x100px</span></label>
-							<ul class="plug-file-upload-view goods-category-icon-images-view" data-form-name="icon" data-max-number="1" data-dialog-type="images">
-								<li>
-									<input type="hidden" name="icon" value="" />
-									<img src="{{$attachment_host}}/static/admin/default/images/default-images.jpg" />
-									<i>×</i>
-								</li>
-							</ul>
-							<div class="plug-file-upload-submit" data-view-tag="ul.goods-category-icon-images-view">+上传图片</div>
+					<form class="am-form form-validation am-form-pure am-form-full-screen am-form-popup-fixed" action="{{:MyUrl('admin/goodscategory/save')}}" method="POST" request-type="ajax-fun" request-value="TreeFormSaveBack">
+						<div class="am-cf">
+                			<div class="am-u-sm-6 am-padding-horizontal-0">
+                				<div class="am-form-group am-form-file">
+									<label class="block">icon图标<span class="am-form-group-label-tips">建议100*100px</span></label>
+									<ul class="plug-file-upload-view goods-category-icon-images-view" data-form-name="icon" data-max-number="1" data-dialog-type="images">
+										<li>
+											<input type="hidden" name="icon" value="" />
+											<img src="{{$attachment_host}}/static/admin/default/images/default-images.jpg" />
+											<i>×</i>
+										</li>
+									</ul>
+									<div class="plug-file-upload-submit" data-view-tag="ul.goods-category-icon-images-view">+上传图片</div>
+								</div>
+                			</div>
+                			<div class="am-u-sm-6 am-padding-horizontal-0">
+                				<div class="am-form-group am-form-file">
+									<label class="block">大图片<span class="am-form-group-label-tips">建议360*360px</span></label>
+									<ul class="plug-file-upload-view goods-category-big_images-images-view" data-form-name="big_images" data-max-number="1" data-dialog-type="images">
+										<li>
+											<input type="hidden" name="big_images" value="" />
+											<img src="{{$attachment_host}}/static/admin/default/images/default-images.jpg" />
+											<i>×</i>
+										</li>
+									</ul>
+									<div class="plug-file-upload-submit" data-view-tag="ul.goods-category-big_images-images-view">+上传图片</div>
+								</div>
+                			</div>
+                		</div>
+						
+                		<div class="am-cf">
+                			<div class="am-u-sm-8 am-padding-horizontal-0">
+                				<div class="am-cf">
+		                			<div class="am-u-sm-6 am-padding-horizontal-0">
+		                				<div class="am-form-group">
+											<label>名称<span class="am-form-group-label-tips-must">*</span></label>
+											<input type="text" placeholder="名称" name="name" minlength="2" maxlength="16" data-validation-message="名称格式 2~16 个字符" class="am-radius" required />
+										</div>
+		                			</div>
+		                			<div class="am-u-sm-6 am-padding-horizontal-0">
+		                				<div class="am-form-group">
+											<label>副名称</label>
+											<input type="text" placeholder="副名称" name="vice_name" minlength="0" maxlength="60" data-validation-message="副名称最大60个字符" class="am-radius" />
+										</div>
+		                			</div>
+		                		</div>
+                			</div>
+                			<div class="am-u-sm-4 am-padding-horizontal-0">
+                				<div class="am-form-group">
+									<label>背景色</label>
+									<input type="hidden" name="bg_color" value="" />
+									<button class="am-btn am-btn-default am-btn-xs colorpicker-submit bg-color-tag am-btn-block bk-cr-white t-r" type="button" data-input-tag="button.bg-color-tag" data-color-tag="input[name='bg_color']" data-color-style="background-color">
+										<img src="{{$attachment_host}}/static/common/images/colorpicker.png" />
+									</button>
+								</div>
+                			</div>
+                		</div>
+
+						<div class="am-cf">
+							<div class="am-u-sm-6 am-padding-horizontal-0">
+								<div class="am-form-group">
+									<label>描述</label>
+									<textarea rows="1" name="describe" maxlength="200" class="am-radius" placeholder="描述" data-validation-message="描述最大200个字符"></textarea>
+								</div>
+							</div>
+							<div class="am-u-sm-6 am-padding-horizontal-0">
+								<div class="am-form-group">
+									<label>顺序</label>
+									<input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
+								</div>
+							</div>
 						</div>
-						<div class="am-form-group am-form-file">
-							<label class="block">大图片<span class="am-form-group-label-tips">建议360x360px</span></label>
-							<ul class="plug-file-upload-view goods-category-big_images-images-view" data-form-name="big_images" data-max-number="1" data-dialog-type="images">
-								<li>
-									<input type="hidden" name="big_images" value="" />
-									<img src="{{$attachment_host}}/static/admin/default/images/default-images.jpg" />
-									<i>×</i>
-								</li>
-							</ul>
-							<div class="plug-file-upload-submit" data-view-tag="ul.goods-category-big_images-images-view">+上传图片</div>
-						</div>
-						<div class="am-form-group">
-							<label>背景色</label>
-							<input type="hidden" name="bg_color" value="" />
-							<button class="am-btn am-btn-default am-btn-xs colorpicker-submit bg-color-tag am-btn-block bk-cr-white t-r" type="button" data-input-tag="button.bg-color-tag" data-color-tag="input[name='bg_color']" data-color-style="background-color">
-								<img src="{{$attachment_host}}/static/common/images/colorpicker.png" />
-							</button>
-						</div>
-						<div class="am-form-group">
-							<label>名称<span class="am-form-group-label-tips-must">*</span></label>
-							<input type="text" placeholder="名称" name="name" minlength="2" maxlength="16" data-validation-message="名称格式 2~16 个字符" class="am-radius" required />
-						</div>
-						<div class="am-form-group">
-							<label>副名称</label>
-							<input type="text" placeholder="副名称" name="vice_name" minlength="0" maxlength="60" data-validation-message="副名称最大60个字符" class="am-radius" />
-						</div>
-						<div class="am-form-group">
-							<label>描述</label>
-							<textarea rows="5" name="describe" maxlength="200" class="am-radius" placeholder="描述" data-validation-message="描述最大200个字符"></textarea>
-						</div>
-						<div class="am-form-group">
-						    <label>首页推荐</label>
-						    <div>
-						        {{foreach $common_is_text_list as $v}}
-						            <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}}
-						    </div>
-						</div>
-						<div class="am-form-group">
-							<label>顺序</label>
-							<input type="number" placeholder="顺序" name="sort" min="0" max="255" data-validation-message="顺序 0~255 之间的数值" class="am-radius" value="0" required />
-						</div>
-						{{include file="lib/enable" /}}
+
+						<div class="am-cf">
+                			<div class="am-u-sm-6 am-padding-horizontal-0">
+                				<div class="am-form-group">
+								    <label>首页推荐</label>
+								    <div>
+								        {{foreach $common_is_text_list as $v}}
+								            <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}}
+								    </div>
+								</div>
+                			</div>
+                			<div class="am-u-sm-6 am-padding-horizontal-0">
+                				{{include file="lib/enable" /}}
+                			</div>
+                		</div>
+						
 						<div class="am-alert am-alert-secondary">
 							{{include file="lib/seo" /}}
 						</div>
diff --git a/app/admin/view/default/goodscomments/save_info.html b/app/admin/view/default/goodscomments/save_info.html
index 28d5919bf..8204debd1 100644
--- a/app/admin/view/default/goodscomments/save_info.html
+++ b/app/admin/view/default/goodscomments/save_info.html
@@ -4,94 +4,119 @@
 <div class="content-right">
     <div class="content">
         <!-- form start -->
-        <form class="am-form form-validation" action="{{:MyUrl('admin/goodscomments/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/goodscomments/index', $params)}}" enctype="multipart/form-data">
+        <form class="am-form form-validation am-form-pure am-form-full-screen am-form-popup-fixed" 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="am-text-default">商品评论{{if empty($data['id'])}}添加{{else /}}编辑{{/if}}</span>
                 <a href="{{:MyUrl('admin/goodscomments/index', $params)}}" class="am-fr am-text-sm am-margin-top-sm am-icon-mail-reply"> 返回</a>
             </legend>
-            <div class="am-alert am-alert-secondary goods-info" data-am-alert>
-                <p class="am-text-lg">商品信息</p>
-                {{if !empty($data['goods'])}}
-                    <div class="base am-nbfc">
-                        <a href="{{$data.goods.goods_url}}" target="_blank">
-                            <img src="{{$data.goods.images}}" alt="{{$data.goods.title}}" class="am-img-thumbnail am-radius am-align-left am-margin-right-xs am-fl" width="60" height="60" />
-                        </a>
-                        <a class="am-text-top" href="{{$data.goods.goods_url}}" target="_blank">{{$data.goods.title}}</a>
+            <div class="am-cf">
+                <div class="am-u-md-6 am-padding-horizontal-0">
+                    <div class="am-alert am-alert-secondary goods-info" data-am-alert>
+                        <p class="am-text-sm">商品信息</p>
+                        {{if !empty($data['goods'])}}
+                            <div class="base am-nbfc">
+                                <a href="{{$data.goods.goods_url}}" target="_blank">
+                                    <img src="{{$data.goods.images}}" alt="{{$data.goods.title}}" class="am-img-thumbnail am-radius am-align-left am-margin-right-xs am-fl" width="60" height="60" />
+                                </a>
+                                <a class="am-text-top" href="{{$data.goods.goods_url}}" target="_blank">{{$data.goods.title}}</a>
+                            </div>
+                            <p class="am-text-danger">{{$currency_symbol}}{{$data.goods.price}}</p>
+                        {{else /}}
+                            商品信息异常
+                        {{/if}}
                     </div>
-                    <p>{{$currency_symbol}}{{$data.goods.price}}</p>
-                {{else /}}
-                    商品信息异常
-                {{/if}}
+                </div>
+                <div class="am-u-md-6 am-padding-horizontal-0">
+                    <div class="am-alert am-alert-secondary user-info" data-am-alert>
+                        <p class="am-text-sm">用户信息</p>
+                        {{if !empty($data['user'])}}
+                            <img src="{{$data.user.avatar}}" alt="{{$data.user.user_name_view}}" class="am-img-thumbnail am-radius am-align-left am-margin-right-xs am-margin-bottom-0" width="35" height="35" />
+                            <ul class="user-base">
+                                <li>名称：{{if empty($data['user']['username'])}}<span class="am-text-grey">未填写</span>{{else /}}{{$data.user.username}}{{/if}}</li>
+                                <li>昵称：{{if empty($data['user']['nickname'])}}<span class="am-text-grey">未填写</span>{{else /}}{{$data.user.nickname}}{{/if}}</li>
+                                <li>手机：{{if empty($data['user']['mobile'])}}<span class="am-text-grey">未填写</span>{{else /}}{{$data.user.mobile}}{{/if}}</li>
+                                <li>邮箱：{{if empty($data['user']['email'])}}<span class="am-text-grey">未填写</span>{{else /}}{{$data.user.email}}{{/if}}</li>
+                            </ul>
+                        {{else /}}
+                            用户信息异常
+                        {{/if}}
+                    </div>
+                </div>
             </div>
 
-            <div class="am-alert am-alert-secondary user-info" data-am-alert>
-                <p class="am-text-lg">用户信息</p>
-                {{if !empty($data['user'])}}
-                    <img src="{{$data.user.avatar}}" alt="{{$data.user.user_name_view}}" class="am-img-thumbnail am-radius am-align-left am-margin-right-xs am-margin-bottom-0" width="35" height="35" />
-                    <ul class="user-base">
-                        <li>名称：{{if empty($data['user']['username'])}}<span class="am-text-grey">未填写</span>{{else /}}{{$data.user.username}}{{/if}}</li>
-                        <li>昵称：{{if empty($data['user']['nickname'])}}<span class="am-text-grey">未填写</span>{{else /}}{{$data.user.nickname}}{{/if}}</li>
-                        <li>手机：{{if empty($data['user']['mobile'])}}<span class="am-text-grey">未填写</span>{{else /}}{{$data.user.mobile}}{{/if}}</li>
-                        <li>邮箱：{{if empty($data['user']['email'])}}<span class="am-text-grey">未填写</span>{{else /}}{{$data.user.email}}{{/if}}</li>
-                    </ul>
-                {{else /}}
-                    用户信息异常
-                {{/if}}
+            <div class="am-cf">
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-form-group">
+                        <label>业务类型<span class="am-form-group-label-tips-must">*</span></label>
+                        <select name="business_type" class="chosen-select" data-placeholder="业务类型..." data-validation-message="请选择业务类型" required>
+                            {{if !empty($common_goods_comments_business_type_list)}}
+                                {{foreach $common_goods_comments_business_type_list as $v}}
+                                    <option value="{{$v.value}}" {{if isset($data['business_type']) and $data['business_type'] eq $v.value}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            {{/if}}
+                        </select>
+                    </div>
+                </div>
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-form-group">
+                        <label>评分</label>
+                        <select name="rating" class="chosen-select" data-placeholder="未评分" data-validation-message="请选择评分" required>
+                            {{if !empty($common_goods_comments_rating_list)}}
+                                {{foreach $common_goods_comments_rating_list as $k=>$v}}
+                                    <option value="{{$k}}" {{if isset($data['rating']) and $data['rating'] eq $k}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            {{/if}}
+                        </select>
+                    </div>
+                </div>
             </div>
 
-            <div class="am-form-group">
-                <label>业务类型<span class="am-form-group-label-tips-must">必选</span></label>
-                <select name="business_type" class="chosen-select" data-placeholder="业务类型..." data-validation-message="请选择业务类型" required>
-                    {{if !empty($common_goods_comments_business_type_list)}}
-                        {{foreach $common_goods_comments_business_type_list as $v}}
-                            <option value="{{$v.value}}" {{if isset($data['business_type']) and $data['business_type'] eq $v.value}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    {{/if}}
-                </select>
+            <div class="am-cf">
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-form-group">
+                        <label>评论内容<span class="am-form-group-label-tips-must">*</span></label>
+                        <textarea name="content" class="am-radius" rows="4" minlength="6" maxlength="230" data-validation-message="评论内容 6~230 个字符之间" required>{{if !empty($data['content'])}}{{$data.content}}{{/if}}</textarea>
+                    </div>
+                </div>
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-form-group">
+                        <label>回复内容</label>
+                        <textarea class="am-radius" name="reply" rows="4" maxlength="230" placeholder="回复内容最多 230 个字符" data-validation-message="回复内容最多 230 个字符">{{if !empty($data['reply'])}}{{$data.reply}}{{/if}}</textarea>
+                    </div>
+                </div>
             </div>
 
-            <div class="am-form-group">
-                <label>评论内容<span class="am-form-group-label-tips-must">必填</span></label>
-                <textarea name="content" class="am-radius" rows="4" minlength="6" maxlength="230" data-validation-message="评论内容 6~230 个字符之间" required>{{if !empty($data['content'])}}{{$data.content}}{{/if}}</textarea>
+            <div class="am-cf">
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-form-group">
+                        <label>回复时间</label>
+                        <input type="text" name="reply_time" class="am-form-field am-radius Wdate" placeholder="生日" data-validation-message="回复时间格式有误" {{if !empty($data)}} value="{{if isset($data['reply_time_time'])}}{{$data.reply_time_time}}{{/if}}"{{/if}} onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" />
+                    </div>
+                </div>
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-form-group">
+                        <label class="block">是否已回复</label>
+                        <input name="is_reply" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if isset($data['is_reply']) and $data['is_reply'] eq 1}}checked="true"{{/if}} />
+                    </div>
+                </div>
             </div>
 
-            <div class="am-form-group">
-                <label>回复内容</label>
-                <textarea class="am-radius" name="reply" rows="4" maxlength="230" placeholder="回复内容最多 230 个字符" data-validation-message="回复内容最多 230 个字符">{{if !empty($data['reply'])}}{{$data.reply}}{{/if}}</textarea>
+            <div class="am-cf">
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-form-group">
+                        <label class="am-block">是否匿名</label>
+                        <input name="is_anonymous" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if isset($data['is_anonymous']) and $data['is_anonymous'] eq 1}}checked="true"{{/if}} />
+                    </div>
+                </div>
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-form-group">
+                        <label class="am-block">是否显示</label>
+                        <input name="is_show" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if isset($data['is_show']) and $data['is_show'] eq 1}}checked="true"{{/if}} />
+                    </div>
+                </div>
             </div>
 
-            <div class="am-form-group">
-                <label>回复时间</label>
-                <input type="text" name="reply_time" class="am-form-field am-radius Wdate" placeholder="生日" data-validation-message="回复时间格式有误" {{if !empty($data)}} value="{{if isset($data['reply_time_time'])}}{{$data.reply_time_time}}{{/if}}"{{/if}} onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" />
-            </div>
-
-            <div class="am-form-group">
-                <label>评分<span class="am-form-group-label-tips-must">必选</span></label>
-                <select name="rating" class="chosen-select" data-placeholder="评分..." data-validation-message="请选择评分" required>
-                    {{if !empty($common_goods_comments_rating_list)}}
-                        {{foreach $common_goods_comments_rating_list as $k=>$v}}
-                            <option value="{{$k}}" {{if isset($data['rating']) and $data['rating'] eq $k}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    {{/if}}
-                </select>
-            </div>
-
-            <div class="am-form-group">
-                <label class="block">是否已回复</label>
-                <input name="is_reply" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if isset($data['is_reply']) and $data['is_reply'] eq 1}}checked="true"{{/if}} />
-            </div>
-
-            <div class="am-form-group">
-                <label class="block">是否匿名</label>
-                <input name="is_anonymous" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if isset($data['is_anonymous']) and $data['is_anonymous'] eq 1}}checked="true"{{/if}} />
-            </div>
-
-            <div class="am-form-group">
-                <label class="block">是否显示</label>
-                <input name="is_show" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if isset($data['is_show']) and $data['is_show'] eq 1}}checked="true"{{/if}} />
-            </div>
-
-            <div class="am-form-group am-form-group-refreshing am-margin-top-lg am-padding-left-0">
+            <div class="am-form-popup-submit">
                 <input type="hidden" name="id" {{if !empty($data['id'])}} value="{{$data.id}}"{{/if}} />
                 <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
             </div>
diff --git a/app/admin/view/default/goodsparamstemplate/save_info.html b/app/admin/view/default/goodsparamstemplate/save_info.html
index 4ad2d57a7..de29eacee 100755
--- a/app/admin/view/default/goodsparamstemplate/save_info.html
+++ b/app/admin/view/default/goodsparamstemplate/save_info.html
@@ -4,25 +4,31 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form form-validation am-form-full-screen" action="{{:MyUrl('admin/goodsparamstemplate/save')}}" method="POST" request-type="ajax-reload" request-value="parent">
-			<div class="am-form-group">
-				<label>商品分类<span class="am-form-group-label-tips-must">必选、包含子级</span></label>
-				<br />
-				<select name="category_id" class="am-radius chosen-select" data-placeholder="请选择..." data-validation-message="请选择商品分类" required>
-					{{if !empty($goods_category_list)}}
-						<option value="">请选择...</option>
-						{{foreach $goods_category_list as $v}}
-							<option value="{{$v.id}}" {{if isset($data['category_id']) and $data['category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					{{/if}}
-				</select>
-			</div>
-			<div class="am-form-group">
-				<label>名称<span class="am-form-group-label-tips-must">必填</span></label>
-				<input type="text" name="name" placeholder="名称" minlength="2" maxlength="30" data-validation-message="名称格式 2~30 个字符" class="am-radius" {{if !empty($data['name'])}} value="{{$data.name}}"{{/if}} required />
-			</div>
+		<form class="am-form form-validation am-form-pure am-form-full-screen am-form-popup-fixed" action="{{:MyUrl('admin/goodsparamstemplate/save')}}" method="POST" request-type="ajax-reload" request-value="parent">
+			<div class="am-cf">
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                	<div class="am-form-group">
+						<label>名称<span class="am-form-group-label-tips-must">*</span></label>
+						<input type="text" name="name" placeholder="名称" minlength="2" maxlength="30" data-validation-message="名称格式 2~30 个字符" class="am-radius" {{if !empty($data['name'])}} value="{{$data.name}}"{{/if}} required />
+					</div>
+                </div>
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                	<div class="am-form-group">
+						<label class="am-block">商品分类<span class="am-form-group-label-tips-must">*</span><span class="am-form-group-label-tips">包含子级</span></label>
+						<select name="category_id" class="am-radius chosen-select" data-placeholder="请选择..." data-validation-message="请选择商品分类" required>
+							{{if !empty($goods_category_list)}}
+								<option value="">请选择...</option>
+								{{foreach $goods_category_list as $v}}
+									<option value="{{$v.id}}" {{if isset($data['category_id']) and $data['category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							{{/if}}
+						</select>
+					</div>
+                </div>
+            </div>
+
 			<div class="business-form-group">
-				<label class="block">参数配置<span class="am-form-group-label-tips-must">必填</span></label>
+				<label class="block">参数配置<span class="am-form-group-label-tips-must">*</span></label>
 				{{include file="public/goodsparamstemplate/tips" /}}
 				<!-- 通过配置生成商品参数 -->
 				<div class="am-dropdown" id="parameters-quick-container" data-am-dropdown>
@@ -73,11 +79,9 @@
 			{{/if}}
 			<!-- 插件扩展数据 end -->
 
-			<div class="am-form-group am-form-group-refreshing am-margin-top-lg">
-				<div class="am-padding-bottom-sm">
-					<input type="hidden" name="id" {{if !empty($data['id'])}} value="{{$data.id}}"{{/if}} />
-					<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
-				</div>
+			<div class="am-form-popup-submit">
+				<input type="hidden" name="id" {{if !empty($data['id'])}} value="{{$data.id}}"{{/if}} />
+				<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
 			</div>
 		</form>
         <!-- form end -->
diff --git a/app/admin/view/default/goodsspectemplate/save_info.html b/app/admin/view/default/goodsspectemplate/save_info.html
index 78386a620..d702a7d33 100755
--- a/app/admin/view/default/goodsspectemplate/save_info.html
+++ b/app/admin/view/default/goodsspectemplate/save_info.html
@@ -4,23 +4,29 @@
 <div class="content-right">
 	<div class="content">
 		<!-- form start -->
-		<form class="am-form form-validation am-form-full-screen" action="{{:MyUrl('admin/goodsspectemplate/save')}}" method="POST" request-type="ajax-reload" request-value="parent">
-			<div class="am-form-group">
-				<label>商品分类<span class="am-form-group-label-tips-must">必选、包含子级</span></label>
-				<br />
-				<select name="category_id" class="am-radius chosen-select" data-placeholder="请选择..." data-validation-message="请选择商品分类" required>
-					{{if !empty($goods_category_list)}}
-						<option value="">请选择...</option>
-						{{foreach $goods_category_list as $v}}
-							<option value="{{$v.id}}" {{if isset($data['category_id']) and $data['category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-						{{/foreach}}
-					{{/if}}
-				</select>
-			</div>
-			<div class="am-form-group">
-				<label>规格名称<span class="am-form-group-label-tips-must">必填</span></label>
-				<input type="text" name="name" placeholder="规格名称" minlength="1" maxlength="30" data-validation-message="规格名称格式1~30个字符" class="am-radius" {{if !empty($data['name'])}} value="{{$data.name}}"{{/if}} required />
-			</div>
+		<form class="am-form form-validation am-form-pure am-form-full-screen am-form-popup-fixed" action="{{:MyUrl('admin/goodsspectemplate/save')}}" method="POST" request-type="ajax-reload" request-value="parent">
+			<div class="am-cf">
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                	<div class="am-form-group">
+						<label>规格名称<span class="am-form-group-label-tips-must">*</span></label>
+						<input type="text" name="name" placeholder="规格名称" minlength="1" maxlength="30" data-validation-message="规格名称格式1~30个字符" class="am-radius" {{if !empty($data['name'])}} value="{{$data.name}}"{{/if}} required />
+					</div>
+                </div>
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                	<div class="am-form-group">
+						<label class="am-block">商品分类<span class="am-form-group-label-tips-must">*</span><span class="am-form-group-label-tips">包含子级</span></label>
+						<select name="category_id" class="am-radius chosen-select" data-placeholder="请选择..." data-validation-message="请选择商品分类" required>
+							{{if !empty($goods_category_list)}}
+								<option value="">请选择...</option>
+								{{foreach $goods_category_list as $v}}
+									<option value="{{$v.id}}" {{if isset($data['category_id']) and $data['category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+								{{/foreach}}
+							{{/if}}
+						</select>
+					</div>
+                </div>
+            </div>
+
 			<div class="am-form-group">
 				<label>规格值<span class="am-form-group-label-tips-must">必填</span></label>
 				<input type="text" name="content" placeholder="规格值（输入回车可实现多个）" minlength="1" maxlength="1000" data-validation-message="规格值格式1~1000个字符" class="am-radius" {{if !empty($data['content'])}} value="{{$data.content}}"{{/if}} required data-am-tagsinput />
@@ -50,7 +56,7 @@
 			{{/if}}
 			<!-- 插件扩展数据 end -->
 
-			<div class="am-form-group am-form-group-refreshing am-margin-top-lg">
+			<div class="am-form-popup-submit">
 				<div class="am-padding-bottom-sm">
 					<input type="hidden" name="id" {{if !empty($data['id'])}} value="{{$data.id}}"{{/if}} />
 					<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
diff --git a/app/admin/view/default/lib/seo.html b/app/admin/view/default/lib/seo.html
index cffd8da82..b3b8ff4f5 100644
--- a/app/admin/view/default/lib/seo.html
+++ b/app/admin/view/default/lib/seo.html
@@ -1,12 +1,20 @@
-<div class="am-form-group">
-    <label>SEO标题<span class="am-form-group-label-tips">一般不超过80个字符</span></label>
-    <input type="text" name="seo_title" placeholder="SEO标题" maxlength="100" data-validation-message="SEO标题格式 最多80个字符" class="am-radius" {{if !empty($data['seo_title'])}} value="{{$data.seo_title}}"{{/if}} />
-</div>
-<div class="am-form-group">
-    <label>SEO关键字<span class="am-form-group-label-tips">一般不超过100个字符，多个关键字以半圆角逗号 [ , ] 隔开</span></label>
-    <input type="text" name="seo_keywords" placeholder="SEO关键字" maxlength="130" data-validation-message="SEO关键字格式 最多130个字符" class="am-radius" {{if !empty($data['seo_keywords'])}} value="{{$data.seo_keywords}}"{{/if}} />
-</div>
-<div class="am-form-group">
-    <label>SEO描述<span class="am-form-group-label-tips">一般不超过200个字符</span></label>
-    <textarea rows="4" name="seo_desc" maxlength="230" class="am-radius" placeholder="SEO描述" data-validation-message="SEO描述格式 最多230个字符">{{if !empty($data['seo_desc'])}}{{$data.seo_desc}}{{/if}}</textarea>
+<div class="am-cf">
+    <div class="am-u-sm-4 am-padding-horizontal-0">
+        <div class="am-form-group">
+            <label>SEO标题<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '一般不超过80个字符', trigger: 'hover focus', theme: 'sm'}"></a></label>
+            <input type="text" name="seo_title" placeholder="SEO标题" maxlength="100" data-validation-message="SEO标题格式 最多80个字符" class="am-radius" {{if !empty($data['seo_title'])}} value="{{$data.seo_title}}"{{/if}} />
+        </div>
+    </div>
+    <div class="am-u-sm-4 am-padding-horizontal-0">
+        <div class="am-form-group">
+            <label>SEO关键字<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '一般不超过100个字符<br />多个关键字以半圆角逗号 [ , ] 隔开', trigger: 'hover focus', theme: 'sm'}"></a></label>
+            <input type="text" name="seo_keywords" placeholder="SEO关键字" maxlength="130" data-validation-message="SEO关键字格式 最多130个字符" class="am-radius" {{if !empty($data['seo_keywords'])}} value="{{$data.seo_keywords}}"{{/if}} />
+        </div>
+    </div>
+    <div class="am-u-sm-4 am-padding-horizontal-0">
+        <div class="am-form-group">
+            <label>SEO描述<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '一般不超过200个字符', trigger: 'hover focus', theme: 'sm'}"></a></label>
+            <textarea rows="1" name="seo_desc" maxlength="230" class="am-radius" placeholder="SEO描述" data-validation-message="SEO描述格式 最多230个字符">{{if !empty($data['seo_desc'])}}{{$data.seo_desc}}{{/if}}</textarea>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/app/admin/view/default/payment/index.html b/app/admin/view/default/payment/index.html
index f5fcb82b5..528ec3406 100755
--- a/app/admin/view/default/payment/index.html
+++ b/app/admin/view/default/payment/index.html
@@ -4,7 +4,9 @@
 <!-- 表单顶部操作栏 -->
 {{block name="form_operate_top"}}
     <button type="button" class="am-btn am-btn-success am-btn-xs am-icon-cloud-upload am-radius" data-am-modal="{target: '#payment-upload-win'}"> 上传</button>
-    <a class="am-margin-left-sm" href="{{$store_payment_url}}" target="_blank">更多支付插件下载 <i class="am-icon-external-link"></i></a>
+    {{if !empty($store_payment_url)}}
+        <a class="am-margin-left-sm" href="{{$store_payment_url}}" target="_blank">更多支付插件下载 <i class="am-icon-external-link"></i></a>
+    {{/if}}
     <!-- 父级内容 -->
     {__block__}
 {{/block}}
diff --git a/app/admin/view/default/pluginsadmin/index.html b/app/admin/view/default/pluginsadmin/index.html
index 828578640..8517eaca7 100755
--- a/app/admin/view/default/pluginsadmin/index.html
+++ b/app/admin/view/default/pluginsadmin/index.html
@@ -57,7 +57,9 @@
                                         <div class="base">
                                             <h3 class="name">{{$v.name}}</h3>
                                             <p>作者：{{$v.author}}</p>
-                                            <p>主页：<a href="{{$v.author_url}}" target="_blank">{{$v.author_url}}</a></p>
+                                            {{if empty($site_store_info) or empty($site_store_info['vip']) or !isset($site_store_info['vip']['status']) or $site_store_info['vip']['status'] eq 0}}
+                                                <p>主页：<a href="{{$v.author_url}}" target="_blank">{{$v.author_url}}</a></p>
+                                            {{/if}}
                                             <p>版本：{{$v.version}}</p>
                                         </div>
                                         <div class="desc">{{$v.desc}}</div>
@@ -109,7 +111,9 @@
                                         <div class="base">
                                             <h3 class="name">{{$v.name}}</h3>
                                             <p>作者：{{$v.author}}</p>
-                                            <p>主页：<a href="{{$v.author_url}}" target="_blank">{{$v.author_url}}</a></p>
+                                            {{if empty($site_store_info) or empty($site_store_info['vip']) or !isset($site_store_info['vip']['status']) or $site_store_info['vip']['status'] eq 0}}
+                                                <p>主页：<a href="{{$v.author_url}}" target="_blank">{{$v.author_url}}</a></p>
+                                            {{/if}}
                                             <p>版本：{{$v.version}}</p>
                                         </div>
                                         <div class="desc">{{$v.desc}}</div>
diff --git a/app/admin/view/default/pluginsadmin/nav.html b/app/admin/view/default/pluginsadmin/nav.html
index fafac9769..400ee66b9 100755
--- a/app/admin/view/default/pluginsadmin/nav.html
+++ b/app/admin/view/default/pluginsadmin/nav.html
@@ -5,7 +5,9 @@
     <li {{if $view_type eq 'upload'}}class="am-active"{{/if}}>
         <a href="{{:MyUrl('admin/pluginsadmin/index', ['view_type'=>'upload'])}}">上传应用</a>
     </li>
-    <li class="am-fr">
-        <a class="am-margin-left-sm" href="{{$store_url}}" target="_blank">更多插件下载 <i class="am-icon-external-link"></i></a>
-    </li>
+    {{if !empty($store_url)}}
+        <li class="am-fr">
+            <a class="am-margin-left-sm" href="{{$store_url}}" target="_blank">更多插件下载 <i class="am-icon-external-link"></i></a>
+        </li>
+    {{/if}}
 </ul>
\ No newline at end of file
diff --git a/app/admin/view/default/theme/nav.html b/app/admin/view/default/theme/nav.html
index 344050a3f..87abf7c58 100755
--- a/app/admin/view/default/theme/nav.html
+++ b/app/admin/view/default/theme/nav.html
@@ -5,7 +5,9 @@
 	<li {{if $view_type eq 'upload'}}class="am-active"{{/if}}>
 		<a href="{{:MyUrl('admin/theme/index', ['view_type'=>'upload'])}}">主题安装</a>
 	</li>
-    <li class="am-fr">
-        <a class="am-margin-left-sm" href="{{$store_theme_url}}" target="_blank">更多主题下载 <i class="am-icon-external-link"></i></a>
-    </li>
+	{{if !empty($store_theme_url)}}
+	    <li class="am-fr">
+	        <a class="am-margin-left-sm" href="{{$store_theme_url}}" target="_blank">更多主题下载 <i class="am-icon-external-link"></i></a>
+	    </li>
+    {{/if}}
 </ul>
\ No newline at end of file
diff --git a/app/admin/view/default/warehouse/save_info.html b/app/admin/view/default/warehouse/save_info.html
index 200045281..a95df0a57 100644
--- a/app/admin/view/default/warehouse/save_info.html
+++ b/app/admin/view/default/warehouse/save_info.html
@@ -4,32 +4,70 @@
 <div class="content-right">
     <div class="content">
         <!-- form start -->
-        <form class="am-form form-validation" action="{{:MyUrl('admin/warehouse/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/warehouse/index', $params)}}">
+        <form class="am-form form-validation am-form-pure am-form-full-screen am-form-popup-fixed" action="{{:MyUrl('admin/warehouse/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/warehouse/index', $params)}}">
             <legend>
                 <span class="am-text-default">仓库{{if empty($data['id'])}}添加{{else /}}编辑{{/if}}</span>
                 <a href="{{:MyUrl('admin/warehouse/index', $params)}}" class="am-fr am-text-sm am-margin-top-sm am-icon-mail-reply"> 返回</a>
             </legend>
 
-            <div class="am-form-group">
-                <label>名称<span class="am-form-group-label-tips-must">*</span></label>
-                <input type="text" name="name" placeholder="名称" minlength="2" maxlength="30" data-validation-message="名称格式 2~30 个字符之间" class="am-radius" {{if !empty($data)}} value="{{$data.name}}"{{/if}} required />
+            <div class="am-cf">
+                <div class="am-u-md-6 am-padding-horizontal-0">
+                    <div class="am-cf">
+                        <div class="am-u-sm-8 am-padding-horizontal-0">
+                            <div class="am-form-group">
+                                <label>名称<span class="am-form-group-label-tips-must">*</span></label>
+                                <input type="text" name="name" placeholder="名称" minlength="2" maxlength="30" data-validation-message="名称格式 2~30 个字符之间" class="am-radius" {{if !empty($data)}} value="{{$data.name}}"{{/if}} required />
+                            </div>
+                        </div>
+                        <div class="am-u-sm-4 am-padding-horizontal-0">
+                            <div class="am-form-group">
+                                <label>别名</label>
+                                <input type="text" name="alias" placeholder="别名" minlength="0" maxlength="16" data-validation-message="别名格式最多 16 个字符" class="am-radius" {{if !empty($data)}} value="{{$data.alias}}"{{/if}} />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="am-u-md-6 am-padding-horizontal-0">
+                    <div class="am-cf">
+                        <div class="am-u-sm-6 am-padding-horizontal-0">
+                            <div class="am-form-group">
+                                <label class="block">是否默认</label>
+                                <input name="is_default" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="49" data-am-switch {{if isset($data['is_default']) and $data['is_default'] eq 1}}checked="true"{{/if}} />
+                            </div>
+                        </div>
+                        <div class="am-u-sm-6 am-padding-horizontal-0">
+                            <div class="am-form-group">
+                                <label class="block">是否启用</label>
+                                <input name="is_enable" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="49" data-am-switch {{if isset($data['is_enable']) and $data['is_enable'] eq 1}}checked="true"{{/if}} />
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div class="am-form-group">
-                <label>别名</label>
-                <input type="text" name="alias" placeholder="别名" minlength="0" maxlength="16" data-validation-message="别名格式最多 16 个字符" class="am-radius" {{if !empty($data)}} value="{{$data.alias}}"{{/if}} />
-            </div>
-            <div class="am-form-group">
-                <label>权重<span class="am-form-group-label-tips">权重数值越大代表权重越高</span></label>
-                <input type="number" name="level" placeholder="权重" minlength="0" maxlength="16" data-validation-message="请输入有效权重数值" class="am-radius" {{if !empty($data)}} value="{{$data.level}}"{{/if}} />
-            </div>
-
-            <div class="am-form-group">
-                <label>联系人<span class="am-form-group-label-tips-must">*</span></label>
-                <input type="text" name="contacts_name" placeholder="联系人" minlength="2" maxlength="16" data-validation-message="联系人格式 2~16 个字符之间" class="am-radius" {{if !empty($data)}} value="{{$data.contacts_name}}"{{/if}} required />
-            </div>
-            <div class="am-form-group">
-                <label>联系电话<span class="am-form-group-label-tips-must">*</span></label>
-                <input type="text" name="contacts_tel" placeholder="电话" minlength="6" maxlength="30" data-validation-message="电话格式有误" class="am-radius" {{if !empty($data)}} value="{{$data.contacts_tel}}"{{/if}} required />
+            
+            <div class="am-cf">
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-form-group">
+                        <label>权重<span class="am-form-group-label-tips">权重数值越大代表权重越高</span></label>
+                        <input type="number" name="level" placeholder="权重" minlength="0" maxlength="16" data-validation-message="请输入有效权重数值" class="am-radius" {{if !empty($data)}} value="{{$data.level}}"{{/if}} />
+                    </div>
+                </div>
+                <div class="am-u-sm-6 am-padding-horizontal-0">
+                    <div class="am-cf">
+                        <div class="am-u-sm-6 am-padding-horizontal-0">
+                            <div class="am-form-group">
+                                <label>联系人<span class="am-form-group-label-tips-must">*</span></label>
+                                <input type="text" name="contacts_name" placeholder="联系人" minlength="2" maxlength="16" data-validation-message="联系人格式 2~16 个字符之间" class="am-radius" {{if !empty($data)}} value="{{$data.contacts_name}}"{{/if}} required />
+                            </div>
+                        </div>
+                        <div class="am-u-sm-6 am-padding-horizontal-0">
+                            <div class="am-form-group">
+                                <label>联系电话<span class="am-form-group-label-tips-must">*</span></label>
+                                <input type="text" name="contacts_tel" placeholder="电话" minlength="6" maxlength="30" data-validation-message="电话格式有误" class="am-radius" {{if !empty($data)}} value="{{$data.contacts_tel}}"{{/if}} required />
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
 
             {{include file="lib/region_linkage" /}}
@@ -46,17 +84,7 @@
                 <div id="map" data-level="17" class="am-margin-top-xs"></div>
             </div>
 
-            <div class="am-form-group">
-                <label class="block">是否默认</label>
-                <input name="is_default" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="49" data-am-switch {{if isset($data['is_default']) and $data['is_default'] eq 1}}checked="true"{{/if}} />
-            </div>
-
-            <div class="am-form-group">
-                <label class="block">是否启用</label>
-                <input name="is_enable" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="49" data-am-switch {{if isset($data['is_enable']) and $data['is_enable'] eq 1}}checked="true"{{/if}} />
-            </div>
-
-            <div class="am-form-group am-form-group-refreshing am-margin-top-lg am-padding-left-0">
+            <div class="am-form-popup-submit">
                 <input type="hidden" name="id" {{if !empty($data)}} value="{{$data.id}}"{{/if}} />
                 <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
             </div>
diff --git a/app/tpl/think_exception.tpl b/app/tpl/think_exception.tpl
index 7c00999ef..f61628115 100644
--- a/app/tpl/think_exception.tpl
+++ b/app/tpl/think_exception.tpl
@@ -102,6 +102,7 @@ if (!function_exists('echo_value')) {
             font: 16px Verdana, "Helvetica Neue", helvetica, Arial, 'Microsoft YaHei', sans-serif;
             margin: 0;
             padding: 0 20px 20px;
+            background: #f5f5f5;
         }
         h1{
             margin: 10px 0 0;
@@ -168,9 +169,9 @@ if (!function_exists('echo_value')) {
             border-top-right-radius: 4px;
             font-family: Consolas,"Liberation Mono",Courier,Verdana,"微软雅黑",serif;
         }
-        .exception .error-message h1 {
+        .exception .error-message {
             text-align: center;
-            margin-top: 10%;
+            margin-top: 18%;
         }
         .exception .code{
             float: left;
@@ -426,10 +427,6 @@ if (!function_exists('echo_value')) {
                 <span><?php echo implode('', ['T','h','i','n','k','P','H','P']); ?> v<?php echo \think\facade\App::version(); ?></span>
             </p>
         </div>
-    <?php } else { ?>
-        <div class="copyright">
-            <a title="<?php echo implode('', ['S','h','o','p','X','O','企','业','级','免','费','开','源','商','城','系','统']); ?>" href="<?php echo implode('', ['h','t','t','p',':','/','/','e','r','r','o','r','.','s','h','o','p','x','o','.','n','e','t','/']); ?>" target="_blank"><?php echo implode('', ['查','看','解','决','方','案']); ?></a>
-        </div>
     <?php } ?>
 
     <?php if (\think\facade\App::isDebug()) { ?>
diff --git a/config/app.php b/config/app.php
index 80d5cc7b4..2ea542eed 100644
--- a/config/app.php
+++ b/config/app.php
@@ -35,8 +35,8 @@ return [
     'exception_tmpl'   => APP_PATH . 'tpl/think_exception.tpl',
 
     // 错误显示信息,非调试模式有效
-    'error_message'    => '系统出现错误、请联系管理员或到'.implode('', ['S','h','o','p','X','O']).'社区查阅~',
+    'error_message'    => '系统出现错误、请联系网站管理员处理！',
     // 显示错误信息
-    'show_error_msg'   => false,
+    'show_error_msg'   => true,
 ];
 ?>
\ No newline at end of file
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index 9e8e8801f..b5611784d 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -1838,7 +1838,7 @@ function TreeFormInit()
 	$title.text($title.attr('data-add-title'));
 
 	// 填充数据
-	var data = {"id":"", "pid":0, "name":"", "sort":0, "is_enable":1, "icon":"", "seo_title":"", "seo_keywords":"", "seo_desc":""};
+	var data = {id:"", pid:0, name:"", vice_name: "", describe: "", sort:0, is_enable:1, icon:"", big_images: "", seo_title:"", seo_keywords:"", seo_desc:""};
 
 	// 额外处理数据
 	data = FunSaveWinAdditional(data, 'init');