diff --git a/application/admin/view/default/goods/index.html b/application/admin/view/default/goods/index.html index e7092967b..701cd0a20 100755 --- a/application/admin/view/default/goods/index.html +++ b/application/admin/view/default/goods/index.html @@ -138,8 +138,8 @@
| 编号 | -标题名称 | +商品ID | +标题名称 | 销售价格(元) | 上下架 | 首页推荐 | @@ -155,13 +155,13 @@ {{foreach $data_list as $v}}|||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{$v.id}} | -+ |
{{$v.simple_desc}} {{/if}} |
diff --git a/application/admin/view/default/user/index.html b/application/admin/view/default/user/index.html
index f6b7743b0..aab164254 100755
--- a/application/admin/view/default/user/index.html
+++ b/application/admin/view/default/user/index.html
@@ -97,163 +97,171 @@
-
没有相关数据
{{/if}}
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index b400fa5a2..55c6c4dc3 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -422,12 +422,19 @@ button.colorpicker-submit:active {
border: 0;
margin: 0;
}
+.am-table-scrollable-horizontal .am-table .am-nowrap-initial {
+ white-space: initial;
+}
.am-table-scrollable-horizontal .am-table tr th:first-child,
.am-table-scrollable-horizontal .am-table tr td:first-child {
border-left: 0;
}
.am-table-scrollable-horizontal .am-table tr th {
- background: #e0e0e0;
+ background: #e8e6e6;
+ min-width: 100px;
+}
+.am-table-scrollable-horizontal .am-table tr th.am-max-grid {
+ min-width: 300px;
}
.am-table-scrollable-horizontal .am-table-td-fixed-first th:nth-child(2),
.am-table-scrollable-horizontal .am-table-td-fixed-first td:nth-child(2) {
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index ae3d6b977..37d405e6c 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -1558,50 +1558,57 @@ function MapInit(lng, lat, level, point, is_dragend)
*/
function TableContainerInit()
{
- $('.am-table-scrollable-horizontal .am-table.am-table-td-fixed-first thead tr, .am-table-scrollable-horizontal .am-table.am-table-td-fixed-last thead tr').each(function(k, v)
- {
- // 第一列
- if($(this).parents('.am-table').hasClass('am-table-td-fixed-first'))
- {
- $(this).find('th:first').css('left', $(this).parents('.am-table').offset().left);
- }
+ if($('.am-table-scrollable-horizontal').length > 0)
+ {
+ // th
+ $('.am-table-scrollable-horizontal .am-table.am-table-td-fixed-first thead tr, .am-table-scrollable-horizontal .am-table.am-table-td-fixed-last thead tr').each(function(k, v)
+ {
+ // 第一列
+ if($(this).parents('.am-table').hasClass('am-table-td-fixed-first'))
+ {
+ $(this).find('th:first').css('left', $(this).parents('.am-table').offset().left);
+ }
- // 最后一列
- if($(this).parents('.am-table').hasClass('am-table-td-fixed-last'))
- {
- var $obj = $(this).parents('.am-table');
- var width = $(document.body).width();
- var left = $obj.offset().left;
- var right = (width > $obj.width()) ? width-$obj.width()-left : width-$obj.parent().width()-left;
- $(this).find('th:last').css('right', right);
- }
-
- });
- $('.am-table-scrollable-horizontal .am-table.am-table-td-fixed-first tbody tr, .am-table-scrollable-horizontal .am-table.am-table-td-fixed-last tbody tr').each(function(k, v)
- {
- // 容器
- var height = $(this).height();
- if(height > 0)
- {
- $(this).find('td').css('height', height+'px');
- }
-
- // 第一列
- if($(this).parents('.am-table').hasClass('am-table-td-fixed-first'))
- {
- $(this).find('td:first').css('left', $(this).parents('.am-table').offset().left);
- }
+ // 最后一列
+ if($(this).parents('.am-table').hasClass('am-table-td-fixed-last'))
+ {
+ var $obj = $(this).parents('.am-table');
+ var width = $(document.body).width();
+ var left = $obj.offset().left;
+ var right = width-$obj.parent().width()-left;
+ $(this).find('th:last').css('right', right);
+ }
+
+ });
- // 最后一列
- if($(this).parents('.am-table').hasClass('am-table-td-fixed-last'))
- {
- var $obj = $(this).parents('.am-table');
- var width = $(document.body).width();
- var left = $obj.offset().left;
- var right = (width > $obj.width()) ? width-$obj.width()-left : width-$obj.parent().width()-left;
- $(this).find('td:last').css('right', right);
- }
- });
+ // td
+ $('.am-table-scrollable-horizontal .am-table.am-table-td-fixed-first tbody tr, .am-table-scrollable-horizontal .am-table.am-table-td-fixed-last tbody tr').each(function(k, v)
+ {
+ console.log(1)
+ // 容器
+ var height = $(this).height();
+ if(height > 0)
+ {
+ $(this).find('td').css('height', height+'px');
+ }
+
+ // 第一列
+ if($(this).parents('.am-table').hasClass('am-table-td-fixed-first'))
+ {
+ $(this).find('td:first').css('left', $(this).parents('.am-table').offset().left);
+ }
+
+ // 最后一列
+ if($(this).parents('.am-table').hasClass('am-table-td-fixed-last'))
+ {
+ var $obj = $(this).parents('.am-table');
+ var width = $(document.body).width();
+ var left = $obj.offset().left;
+ var right = width-$obj.parent().width()-left;
+ $(this).find('td:last').css('right', right);
+ }
+ });
+ }
}
|