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 @@ - - + + @@ -155,13 +155,13 @@ {{foreach $data_list as $v}} -
编号标题名称商品ID标题名称 销售价格(元) 上下架 首页推荐
{{$v.id}} + - {{$v.title}} + {{$v.title}} {{if !empty($v['simple_desc'])}} -

{{$v.simple_desc}}

+

{{$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 !empty($data_list)}} - {{foreach $data_list as $v}} - - - - - - - - + + {{/foreach}} + {{/if}} + +
编号基础信息积分性别状态生日更多操作
{{$v.id}} - {{if empty($v['integral'])}}未填写{{else /}}{{$v.integral}}{{/if}} - - {{if empty($v['gender_text'])}}未设置{{else /}}{{$v.gender_text}}{{/if}} - - {{if empty($v['status_text'])}}未知{{else /}}{{$v.status_text}}{{/if}} - - {{if empty($v['birthday_text'])}}未填写{{else /}}{{$v.birthday_text}}{{/if}} - - 查看更多 -
-
-
-

详情内容

- × -
-
-
-
用户名
-
{{if empty($v['username'])}}未填写{{else /}}{{$v.username}}{{/if}}
+
+ + + + + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + - + - - {{/foreach}} - {{/if}} - -
用户ID基础信息积分性别状态生日更多操作
{{$v.id}} + {{if empty($v['integral'])}}未填写{{else /}}{{$v.integral}}{{/if}} + + {{if empty($v['gender_text'])}}未设置{{else /}}{{$v.gender_text}}{{/if}} + + {{if empty($v['status_text'])}}未知{{else /}}{{$v.status_text}}{{/if}} + + {{if empty($v['birthday_text'])}}未填写{{else /}}{{$v.birthday_text}}{{/if}} + + 查看更多 +
+
+
+

详情内容

+ × +
+
+
+
用户名
+
{{if empty($v['username'])}}未填写{{else /}}{{$v.username}}{{/if}}
-
昵称
-
{{if empty($v['nickname'])}}未填写{{else /}}{{$v.nickname}}{{/if}}
+
昵称
+
{{if empty($v['nickname'])}}未填写{{else /}}{{$v.nickname}}{{/if}}
-
手机号码
-
{{if empty($v['mobile'])}}未填写{{else /}}{{$v.mobile}}{{/if}}
+
手机号码
+
{{if empty($v['mobile'])}}未填写{{else /}}{{$v.mobile}}{{/if}}
-
电子邮箱
-
{{if empty($v['email'])}}未填写{{else /}}{{$v.email}}{{/if}}
+
电子邮箱
+
{{if empty($v['email'])}}未填写{{else /}}{{$v.email}}{{/if}}
-
状态
-
{{if empty($v['status_text'])}}未知{{else /}}{{$v.status_text}}{{/if}}
+
状态
+
{{if empty($v['status_text'])}}未知{{else /}}{{$v.status_text}}{{/if}}
-
支付宝openid
-
{{if empty($v['alipay_openid'])}}未知{{else /}}{{$v.alipay_openid}}{{/if}}
+
支付宝openid
+
{{if empty($v['alipay_openid'])}}未知{{else /}}{{$v.alipay_openid}}{{/if}}
-
百度openid
-
{{if empty($v['baidu_openid'])}}未知{{else /}}{{$v.baidu_openid}}{{/if}}
+
百度openid
+
{{if empty($v['baidu_openid'])}}未知{{else /}}{{$v.baidu_openid}}{{/if}}
-
头条openid
-
{{if empty($v['toutiao_openid'])}}未知{{else /}}{{$v.toutiao_openid}}{{/if}}
+
头条openid
+
{{if empty($v['toutiao_openid'])}}未知{{else /}}{{$v.toutiao_openid}}{{/if}}
-
QQopenid
-
{{if empty($v['qq_openid'])}}未知{{else /}}{{$v.qq_openid}}{{/if}}
+
QQopenid
+
{{if empty($v['qq_openid'])}}未知{{else /}}{{$v.qq_openid}}{{/if}}
-
QQunionid
-
{{if empty($v['qq_unionid'])}}未知{{else /}}{{$v.qq_unionid}}{{/if}}
+
QQunionid
+
{{if empty($v['qq_unionid'])}}未知{{else /}}{{$v.qq_unionid}}{{/if}}
-
微信openid
-
{{if empty($v['weixin_openid'])}}未知{{else /}}{{$v.weixin_openid}}{{/if}}
+
微信openid
+
{{if empty($v['weixin_openid'])}}未知{{else /}}{{$v.weixin_openid}}{{/if}}
-
微信unionid
-
{{if empty($v['weixin_unionid'])}}未知{{else /}}{{$v.weixin_unionid}}{{/if}}
+
微信unionid
+
{{if empty($v['weixin_unionid'])}}未知{{else /}}{{$v.weixin_unionid}}{{/if}}
-
微信webopenid
-
{{if empty($v['weixin_web_openid'])}}未知{{else /}}{{$v.weixin_web_openid}}{{/if}}
+
微信webopenid
+
{{if empty($v['weixin_web_openid'])}}未知{{else /}}{{$v.weixin_web_openid}}{{/if}}
-
性别
-
{{if empty($v['gender_text'])}}未设置{{else /}}{{$v.gender_text}}{{/if}}
+
性别
+
{{if empty($v['gender_text'])}}未设置{{else /}}{{$v.gender_text}}{{/if}}
-
生日
-
{{if empty($v['birthday_text'])}}未填写{{else /}}{{$v.birthday_text}}{{/if}}
+
生日
+
{{if empty($v['birthday_text'])}}未填写{{else /}}{{$v.birthday_text}}{{/if}}
-
所在省
-
{{if empty($v['province'])}}未填写{{else /}}{{$v.province}}{{/if}}
+
所在省
+
{{if empty($v['province'])}}未填写{{else /}}{{$v.province}}{{/if}}
-
所在市
-
{{if empty($v['city'])}}未填写{{else /}}{{$v.city}}{{/if}}
+
所在市
+
{{if empty($v['city'])}}未填写{{else /}}{{$v.city}}{{/if}}
-
详细地址
-
{{if empty($v['address'])}}未填写{{else /}}{{$v.address}}{{/if}}
+
详细地址
+
{{if empty($v['address'])}}未填写{{else /}}{{$v.address}}{{/if}}
-
积分
-
{{if empty($v['integral'])}}未填写{{else /}}{{$v.integral}}{{/if}}
+
积分
+
{{if empty($v['integral'])}}未填写{{else /}}{{$v.integral}}{{/if}}
-
用户头像
-
- {{if !empty($v['avatar'])}} - - {{else /}} - 暂无图片 - {{/if}} -
+
用户头像
+
+ {{if !empty($v['avatar'])}} + + {{else /}} + 暂无图片 + {{/if}} +
-
注册时间
-
{{$v.add_time}}
+
注册时间
+
{{$v.add_time}}
-
更新时间
-
{{$v.upd_time}}
-
-
-
-
-
- - - - +
更新时间
+
{{$v.upd_time}}
+ + + + +
+ + + + - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} -
- plugins_view_admin_user_list_operation -
- {{/if}} - {{php}} - $hook_name = 'plugins_view_admin_user_list_operation'; - $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]); - if(!empty($hook_data) && is_array($hook_data)) - { - foreach($hook_data as $hook) + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_user_list_operation +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_user_list_operation'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]); + if(!empty($hook_data) && is_array($hook_data)) { - if(is_string($hook) || is_int($hook)) + foreach($hook_data as $hook) { - echo htmlspecialchars_decode($hook); + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } } } - } - {{/php}} -
+ {{/php}} +
+ {{if empty($data_list)}}
没有相关数据
{{/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); + } + }); + } }