diff --git a/application/admin/view/default/goods/index.html b/application/admin/view/default/goods/index.html
index 3de3c37de..e7092967b 100755
--- a/application/admin/view/default/goods/index.html
+++ b/application/admin/view/default/goods/index.html
@@ -134,169 +134,177 @@
-
-
-
- | 编号 |
- 标题名称 |
- 销售价格(元) |
- 上下架 |
- 首页推荐 |
- 库存数量 |
- 商品型号 |
- 品牌 |
- 更多 |
- 操作 |
-
-
-
- {{if !empty($data_list)}}
- {{foreach $data_list as $v}}
-
- | {{$v.id}} |
-
-
-
-
- {{$v.title}}
- {{if !empty($v['simple_desc'])}}
- {{$v.simple_desc}}
- {{/if}}
- |
-
- {{$v.price}}
- {{if !empty($v['original_price']) and $v['original_price'] gt 0}}
- 原价 {{$v.original_price}}
- {{/if}}
- |
-
-
- |
-
-
- |
- {{$v.inventory}} {{$v.inventory_unit}} |
- {{$v.model}} |
- {{$v.brand_name}} |
-
- 查看更多
- |
+
+ {{/foreach}}
+ {{/if}}
+
+
+
{{if empty($data_list)}}
没有相关数据
{{/if}}
diff --git a/application/admin/view/default/public/header.html b/application/admin/view/default/public/header.html
index ec5c0df9f..f2ff5ab23 100755
--- a/application/admin/view/default/public/header.html
+++ b/application/admin/view/default/public/header.html
@@ -48,6 +48,8 @@
var __price_symbol__ = '{{$price_symbol}}';
+{{include file="public/page_loading" /}}
+
{{if !empty($plugins_admin_view_common_top_data) and is_array($plugins_admin_view_common_top_data) and (!isset($is_header) or $is_header eq 1)}}
{{foreach $plugins_admin_view_common_top_data as $hook}}
diff --git a/application/admin/view/default/public/page_loading.html b/application/admin/view/default/public/page_loading.html
new file mode 100644
index 000000000..6b1374c60
--- /dev/null
+++ b/application/admin/view/default/public/page_loading.html
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/application/tags.php b/application/tags.php
index ba5123987..44d9d8920 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -46,26 +46,26 @@ return array (
2 => 'app\\plugins\\distribution\\Hook',
3 => 'app\\plugins\\membershiplevelvip\\Hook',
),
+ 'plugins_service_buy_order_insert_begin' =>
+ array (
+ 0 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
+ ),
'plugins_service_buy_order_insert_end' =>
array (
0 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
1 => 'app\\plugins\\distribution\\Hook',
),
+ 'plugins_service_order_aftersale_audit_handle_end' =>
+ array (
+ 0 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
+ 1 => 'app\\plugins\\distribution\\Hook',
+ ),
'plugins_service_order_status_change_history_success_handle' =>
array (
0 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
1 => 'app\\plugins\\coupon\\Hook',
2 => 'app\\plugins\\distribution\\Hook',
),
- 'plugins_service_buy_order_insert_begin' =>
- array (
- 0 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
- ),
- 'plugins_service_order_aftersale_audit_handle_end' =>
- array (
- 0 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
- 1 => 'app\\plugins\\distribution\\Hook',
- ),
'plugins_css' =>
array (
0 => 'app\\plugins\\coupon\\Hook',
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 892307f74..b400fa5a2 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -400,4 +400,68 @@ button.colorpicker-submit:active {
-webkit-box-orient: vertical;
line-height: 18px;
height: 35px;
-}
\ No newline at end of file
+}
+
+/**
+ * 公共加载页面view
+ */
+.am-page-loading {
+ opacity: 1;
+ background: #f5f5f5;
+ display: block;
+}
+
+/**
+ * 表格样式
+ */
+.am-table-scrollable-horizontal {
+ border: 1px solid #ddd;
+}
+.am-table-scrollable-horizontal .am-table {
+ border-collapse: collapse;
+ border: 0;
+ margin: 0;
+}
+.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;
+}
+.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) {
+ padding-left: 110px;
+}
+.am-table-scrollable-horizontal .am-table-td-fixed-last th:nth-last-child(2),
+.am-table-scrollable-horizontal .am-table-td-fixed-last td:nth-last-child(2) {
+ padding-right: 110px;
+}
+
+.am-table-scrollable-horizontal .am-table-td-fixed-first th:first-child,
+.am-table-scrollable-horizontal .am-table-td-fixed-first td:first-child,
+.am-table-scrollable-horizontal .am-table-td-fixed-last th:last-child,
+.am-table-scrollable-horizontal .am-table-td-fixed-last td:last-child {
+ position: absolute;
+ width: 100px;
+ height: auto;
+ text-align: center;
+}
+.am-table-scrollable-horizontal .am-table-td-fixed-first td:first-child,
+.am-table-scrollable-horizontal .am-table-td-fixed-last td:last-child {
+ background: #fff;
+}
+.am-table-scrollable-horizontal .am-table-td-fixed-first th:first-child,
+.am-table-scrollable-horizontal .am-table-td-fixed-first td:first-child {
+ -webkit-box-shadow: 5px 0px 10px rgba(136, 136, 136, 0.3);
+ -moz-box-shadow: 5px 0px 10px rgba(136, 136, 136, 0.3);
+ box-shadow: 5px 0px 10px rgba(136, 136, 136, 0.3);
+ left: 0;
+}
+.am-table-scrollable-horizontal .am-table-td-fixed-last th:last-child,
+.am-table-scrollable-horizontal .am-table-td-fixed-last td:last-child {
+ -webkit-box-shadow: -5px 0px 10px rgba(136, 136, 136, 0.3);
+ -moz-box-shadow: -5px 0px 10px rgba(136, 136, 136, 0.3);
+ box-shadow: -5px 0px 10px rgba(136, 136, 136, 0.3);
+ right: 0;
+}
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index 0e7aecf1b..ae3d6b977 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -1548,10 +1548,76 @@ function MapInit(lng, lat, level, point, is_dragend)
}
}
+/**
+ * 表格容器处理
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2020-02-29
+ * @desc description
+ */
+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($(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.width()) ? width-$obj.width()-left : width-$obj.parent().width()-left;
+ $(this).find('td:last').css('right', right);
+ }
+ });
+}
+
// 公共数据操作
$(function()
{
+ // 浏览器窗口实时事件
+ $(window).resize(function()
+ {
+ // 表格初始化
+ TableContainerInit();
+ });
+
+ // 表格初始化
+ TableContainerInit();
+
// 全屏操作
$('.fullscreen-event').on('click', function()
{
@@ -2219,4 +2285,14 @@ $(function()
}
});
+ /**
+ * 页面加载 loading
+ */
+ if($('.am-page-loading').length > 0)
+ {
+ setTimeout(function() {
+ $('.am-page-loading').fadeOut(500);
+ }, 300);
+ }
+
});
\ No newline at end of file