From 3a14c1f300c90f6e8f304e5caf5baa6092b14c95 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sat, 2 Mar 2019 21:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2ui=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/default/apphomenav/save_info.html    |  2 +-
 .../admin/view/default/article/save_info.html |  2 +-
 .../admin/view/default/goods/index.html       |  8 +--
 .../admin/view/default/goods/save_info.html   |  2 +-
 .../view/default/goodscategory/index.html     |  2 +-
 .../admin/view/default/public/header.html     |  4 +-
 .../admin/view/default/slide/save_info.html   |  2 +-
 .../commononlineservice/admin/saveinfo.html   |  2 +-
 .../commontopmaxpicture/admin/saveinfo.html   |  2 +-
 public/static/admin/default/css/common.css    | 58 ++++++++++++++++++-
 public/static/common/css/common.css           | 10 ++++
 public/static/common/js/common.js             |  6 +-
 .../css/commonrightnavigation/style.css       |  2 +-
 13 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/application/admin/view/default/apphomenav/save_info.html b/application/admin/view/default/apphomenav/save_info.html
index 84d669e25..6a3bb6c50 100755
--- a/application/admin/view/default/apphomenav/save_info.html
+++ b/application/admin/view/default/apphomenav/save_info.html
@@ -65,7 +65,7 @@
 			<div class="am-form-group">
 				<label>背景色</label>
 				<input type="hidden" name="bg_color" value="{{if !empty($data)}}{{$data.bg_color}}{{/if}}" />
-				<button class="am-btn am-btn-default 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" {{if !empty($data)}} style="background-color:{{$data.bg_color}};"{{/if}}>
+				<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" {{if !empty($data)}} style="background-color:{{$data.bg_color}};"{{/if}}>
 					<img src="{{$attachment_host}}/static/common/images/colorpicker.png" />
 				</button>
 			</div>
diff --git a/application/admin/view/default/article/save_info.html b/application/admin/view/default/article/save_info.html
index 2f596d115..75264ae7b 100755
--- a/application/admin/view/default/article/save_info.html
+++ b/application/admin/view/default/article/save_info.html
@@ -21,7 +21,7 @@
 					<input type="hidden" name="title_color" value="{{if !empty($data['title_color'])}}{{$data.title_color}}{{/if}}" />
 					<input type="text" name="title" placeholder="标题" minlength="2" maxlength="60" data-validation-message="标题长度 2~60 个字符" class="am-form-field am-radius" {{if !empty($data)}} value="{{$data.title}}" {{/if}} {{if !empty($data['title_color'])}} style="color:{{$data.title_color}};" {{/if}} required />
 					<span class="am-input-group-btn">
-						<button class="am-btn am-btn-default colorpicker-submit" type="button" data-input-tag="input[name='title']" data-color-tag="input[name='title_color']">
+						<button class="am-btn am-btn-default am-btn-xs colorpicker-submit" type="button" data-input-tag="input[name='title']" data-color-tag="input[name='title_color']">
 							<img src="{{$attachment_host}}/static/common/images/colorpicker.png" />
 						</button>
 					</span>
diff --git a/application/admin/view/default/goods/index.html b/application/admin/view/default/goods/index.html
index b9226d905..3b2e6535c 100755
--- a/application/admin/view/default/goods/index.html
+++ b/application/admin/view/default/goods/index.html
@@ -48,7 +48,7 @@
 			<thead>
 				<tr>
 					<th>标题名称</th>
-					<th>销售价格(元)</th>
+					<th class="am-hide-sm-only">销售价格(元)</th>
 					<th>上下架</th>
 					<th class="am-hide-sm-only">首页推荐</th>
 					<th class="am-hide-sm-only">库存数量</th>
@@ -68,7 +68,7 @@
 								</a>
 								<a href="{{$v.goods_url}}" target="_blank" title="{{$v.title}}" {{if !empty($v['title_color'])}} style="color:{{$v.title_color}};" {{/if}} >{{$v.title}}</a>
 							</td>
-							<td>
+							<td class="am-hide-sm-only">
 								{{$v.price}}
 								{{if !empty($v['original_price']) and $v['original_price'] gt 0}}
 									<br /><span class="am-badge am-radius">原价 {{$v.original_price}}</span>
@@ -150,9 +150,9 @@
 							</td>
 							<td class="view-operation">
 								<a href="{{:MyUrl('admin/goods/saveinfo', array_merge($params, ['id'=>$v['id']]))}}">
-									<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-edit"></button>
+									<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-edit"> 编辑</button>
 								</a>
-								<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/goods/delete')}}" data-id="{{$v.id}}"></button>
+								<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/goods/delete')}}" data-id="{{$v.id}}"> 删除</button>
 							</td>
 						</tr>
 					{{/foreach}}
diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index 82258cf92..548431ca9 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -48,7 +48,7 @@
 						<input type="hidden" name="title_color" value="{{if !empty($data['title_color'])}}{{$data.title_color}}{{/if}}" />
 						<input type="text" name="title" placeholder="标题名称" minlength="2" maxlength="60" data-validation-message="标题名称格式 2~60 个字符" class="am-form-field am-radius" {{if !empty($data)}} value="{{$data.title}}" {{/if}} {{if !empty($data['title_color'])}} style="color:{{$data.title_color}};" {{/if}} required />
 						<span class="am-input-group-btn">
-							<button class="am-btn am-btn-default colorpicker-submit" type="button" data-input-tag="input[name='title']" data-color-tag="input[name='title_color']">
+							<button class="am-btn am-btn-default am-btn-xs colorpicker-submit" type="button" data-input-tag="input[name='title']" data-color-tag="input[name='title_color']">
 								<img src="{{$attachment_host}}/static/common/images/colorpicker.png" />
 							</button>
 						</span>
diff --git a/application/admin/view/default/goodscategory/index.html b/application/admin/view/default/goodscategory/index.html
index 813a4e74b..cbb38ff2e 100755
--- a/application/admin/view/default/goodscategory/index.html
+++ b/application/admin/view/default/goodscategory/index.html
@@ -44,7 +44,7 @@
 						<div class="am-form-group">
 							<label>背景色</label>
 							<input type="hidden" name="bg_color" value="" />
-							<button class="am-btn am-btn-default 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">
+							<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>
diff --git a/application/admin/view/default/public/header.html b/application/admin/view/default/public/header.html
index 43d931343..6c9f39fba 100755
--- a/application/admin/view/default/public/header.html
+++ b/application/admin/view/default/public/header.html
@@ -10,10 +10,10 @@
 	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-chosen/amazeui.chosen.css" />
 	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-tagsinput/amazeui.tagsinput.css" />
 	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/css/common.css" />
-	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/admin/{{$default_theme}}/css/common.css?v=1117" />
+	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/admin/{{$default_theme}}/css/common.css" />
 	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/admin/{{$default_theme}}/css/iconfontmenu.css" />
 	{{if !empty($module_css)}}
-		<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_css}}?v=1117" />
+		<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_css}}" />
 	{{/if}}
 </head>
 <script type="text/javascript">
diff --git a/application/admin/view/default/slide/save_info.html b/application/admin/view/default/slide/save_info.html
index 590080034..2cb5b55f1 100755
--- a/application/admin/view/default/slide/save_info.html
+++ b/application/admin/view/default/slide/save_info.html
@@ -61,7 +61,7 @@
 			<div class="am-form-group">
 				<label>背景色</label>
 				<input type="hidden" name="bg_color" value="{{if !empty($data)}}{{$data.bg_color}}{{/if}}" />
-				<button class="am-btn am-btn-default 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" {{if !empty($data)}} style="background-color:{{$data.bg_color}};"{{/if}}>
+				<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" {{if !empty($data)}} style="background-color:{{$data.bg_color}};"{{/if}}>
 					<img src="{{$attachment_host}}/static/common/images/colorpicker.png" />
 				</button>
 			</div>
diff --git a/application/plugins/view/commononlineservice/admin/saveinfo.html b/application/plugins/view/commononlineservice/admin/saveinfo.html
index 27ac184c3..c7a12191c 100755
--- a/application/plugins/view/commononlineservice/admin/saveinfo.html
+++ b/application/plugins/view/commononlineservice/admin/saveinfo.html
@@ -39,7 +39,7 @@
             <div class="am-form-group">
                 <label>背景色</label>
                 <input type="hidden" name="bg_color" value="{{if !empty($data['bg_color'])}}{{$data.bg_color}}{{/if}}" />
-                <button class="am-btn am-btn-default colorpicker-submit bg-color-tag am-btn-block bk-cr-white t-r am-radius" type="button" data-input-tag="button.bg-color-tag" data-color-tag="input[name='bg_color']" data-color-style="background-color" {{if !empty($data['bg_color'])}}style="background:{{$data.bg_color}}"{{/if}}>
+                <button class="am-btn am-btn-default am-btn-xs colorpicker-submit bg-color-tag am-btn-block bk-cr-white t-r am-radius" type="button" data-input-tag="button.bg-color-tag" data-color-tag="input[name='bg_color']" data-color-style="background-color" {{if !empty($data['bg_color'])}}style="background:{{$data.bg_color}}"{{/if}}>
                     <img src="{{$attachment_host}}/static/common/images/colorpicker.png" />
                 </button>
             </div>
diff --git a/application/plugins/view/commontopmaxpicture/admin/saveinfo.html b/application/plugins/view/commontopmaxpicture/admin/saveinfo.html
index 507cc5da9..af844a4a9 100755
--- a/application/plugins/view/commontopmaxpicture/admin/saveinfo.html
+++ b/application/plugins/view/commontopmaxpicture/admin/saveinfo.html
@@ -24,7 +24,7 @@
             <div class="am-form-group">
                 <label>背景色</label>
                 <input type="hidden" name="bg_color" value="{{if !empty($data['bg_color'])}}{{$data.bg_color}}{{/if}}" />
-                <button class="am-btn am-btn-default 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" {{if !empty($data['bg_color'])}}style="background:{{$data.bg_color}}"{{/if}}>
+                <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" {{if !empty($data['bg_color'])}}style="background:{{$data.bg_color}}"{{/if}}>
                     <img src="{{$attachment_host}}/static/common/images/colorpicker.png" />
                 </button>
             </div>
diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css
index c0bd21fd9..5504c0deb 100755
--- a/public/static/admin/default/css/common.css
+++ b/public/static/admin/default/css/common.css
@@ -467,4 +467,60 @@ ul {margin-top:0;}
 .menu-mini-container-popup ul li a:hover{background:rgba(118,119,120,0.1)}
 .menu-mini-container-popup ul li a span{font-size:12px}
 .menu-mini-container-popup ul li:not(:last-child){border-bottom:1px solid #2e2e31}
-.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c}
\ No newline at end of file
+.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c}
+
+
+/**
+ * 列表美化
+ */
+table.am-table .am-btn.am-icon-plus {
+    border: 1px solid #009688;
+    background: #fff;
+    color: #009688;
+}
+table.am-table .am-btn.am-icon-plus:hover {
+    background: #009688;
+    color: #fff;
+}
+
+table.am-table .am-btn.am-icon-edit {
+    border: 1px solid #3bb4f2;
+    background: #fff;
+    color: #3bb4f2;
+}
+table.am-table .am-btn.am-icon-edit:hover {
+    background: #3bb4f2;
+    color: #fff;
+}
+
+table.am-table .am-btn.am-icon-trash-o {
+    border: 1px solid #e7505a;
+    background: #fff;
+    color: #e7505a;
+}
+table.am-table .am-btn.am-icon-trash-o:hover {
+    background: #e7505a;
+    color: #fff;
+}
+
+table.am-table .am-btn.am-icon-cubes {
+    border: 1px solid #9C27B0;
+    background: #fff;
+    color: #9C27B0;
+}
+table.am-table .am-btn.am-icon-cubes:hover {
+    background: #9C27B0;
+    color: #fff;
+}
+
+
+/**
+ * 分类列表优化
+ */
+#tree table.am-table td {
+    line-height: 30px;
+    padding: 0.4rem 0.7rem;
+}
+#tree table.am-table td button.am-btn {
+    vertical-align: unset;
+}
\ No newline at end of file
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 22832cb35..9c7a84edb 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -241,6 +241,16 @@ ul.plug-file-upload-view-video li {
     border-bottom-right-radius: 2px;
     border-top-right-radius: 2px;
 }
+.am-checkbox, .am-radio, .am-checkbox-inline, .am-radio-inline {
+    font-size: 12px;
+    padding-left: 18px;
+}
+.am-ucheck-icons {
+    line-height: 18px;
+}
+.am-checkbox .am-icon-checked, .am-radio .am-icon-checked, .am-checkbox-inline .am-icon-checked, .am-radio-inline .am-icon-checked, .am-checkbox .am-icon-checked, .am-radio .am-icon-checked, .am-checkbox-inline .am-icon-checked, .am-radio-inline .am-icon-checked, .am-checkbox .am-icon-unchecked, .am-radio .am-icon-unchecked, .am-checkbox-inline .am-icon-unchecked, .am-radio-inline .am-icon-unchecked {
+    font-size: 16px;
+}
 
 /**
  * 颜色选择插件
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index 1be1f528d..971eb05d5 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -544,18 +544,18 @@ function Tree(id, url, level, is_add_node, is_delete_all)
 					var rank = tmp_level/20+1;
 					if(is_add_node == 1 && (is_astrict_rank == 0 || rank < is_astrict_rank))
 					{
-						html += '<span class="am-icon-plus am-icon-sm c-p m-r-20 tree-submit-add-node" data-am-modal="{target: \'#data-save-win\'}" data-id="'+result.data[i]['id']+'"></span>';
+						html += '<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-plus c-p m-r-20 tree-submit-add-node" data-am-modal="{target: \'#data-save-win\'}" data-id="'+result.data[i]['id']+'"> 新增</button>';
 					}
 
 					// 编辑
-					html += '<span class="am-icon-edit am-icon-sm c-p submit-edit" data-am-modal="{target: \'#data-save-win\'}" data-json=\''+result.data[i]['json']+'\' data-is_exist_son="'+result.data[i]['is_son']+'"></span>';
+					html += '<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-edit c-p submit-edit" data-am-modal="{target: \'#data-save-win\'}" data-json=\''+result.data[i]['json']+'\' data-is_exist_son="'+result.data[i]['is_son']+'"> 编辑</button>';
 					if(result.data[i]['is_son'] != 'ok' || is_delete_all == 1)
 					{
 						// 是否需要删除子数据
 						var pid_class = is_delete_all == 1 ? '.tree-pid-'+result.data[i]['id'] : '';
 
 						// 删除
-						html += '<span class="am-icon-trash-o am-icon-sm c-p m-l-20 m-r-15 submit-delete" data-id="'+result.data[i]['id']+'" data-url="'+result.data[i]['delete_url']+'" data-ext-delete-tag="'+pid_class+'"></span>';
+						html += '<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o c-p m-l-20 m-r-15 submit-delete" data-id="'+result.data[i]['id']+'" data-url="'+result.data[i]['delete_url']+'" data-ext-delete-tag="'+pid_class+'"> 删除</button>';
 					}
 					html += '</div>';
 					// 操作项 end
diff --git a/public/static/plugins/css/commonrightnavigation/style.css b/public/static/plugins/css/commonrightnavigation/style.css
index 699c8deab..520156ed7 100755
--- a/public/static/plugins/css/commonrightnavigation/style.css
+++ b/public/static/plugins/css/commonrightnavigation/style.css
@@ -347,6 +347,6 @@
 .commonrightnavigation-cart .cart-content .mixed-tips-content {
     margin-top: 20px;
 }
-form.am-form .am-form-group {
+.commonrightnavigation-right-nav form.am-form .am-form-group {
     padding: 0 !important;
 }
\ No newline at end of file