diff --git a/app/admin/form/Goodsbrowse.php b/app/admin/form/Goodsbrowse.php index 5b6dd9788..71af48bdc 100644 --- a/app/admin/form/Goodsbrowse.php +++ b/app/admin/form/Goodsbrowse.php @@ -44,6 +44,7 @@ class GoodsBrowse 'is_delete' => 1, 'delete_url' => MyUrl('admin/goodsbrowse/delete'), 'delete_key' => 'ids', + 'is_middle' => 0, ], // 表单配置 'form' => [ diff --git a/app/admin/form/Goodscart.php b/app/admin/form/Goodscart.php index 97fa93371..3cb991bfb 100644 --- a/app/admin/form/Goodscart.php +++ b/app/admin/form/Goodscart.php @@ -44,6 +44,7 @@ class GoodsCart 'is_delete' => 1, 'delete_url' => MyUrl('admin/goodscart/delete'), 'delete_key' => 'ids', + 'is_middle' => 0, ], // 表单配置 'form' => [ diff --git a/app/admin/form/Goodsfavor.php b/app/admin/form/Goodsfavor.php index 352cea903..7b8ada02c 100644 --- a/app/admin/form/Goodsfavor.php +++ b/app/admin/form/Goodsfavor.php @@ -44,6 +44,7 @@ class GoodsFavor 'is_delete' => 1, 'delete_url' => MyUrl('admin/goodsfavor/delete'), 'delete_key' => 'ids', + 'is_middle' => 0, ], // 表单配置 'form' => [ diff --git a/app/admin/form/Goodsparamstemplate.php b/app/admin/form/Goodsparamstemplate.php index 2e4a06ed3..48db797e2 100644 --- a/app/admin/form/Goodsparamstemplate.php +++ b/app/admin/form/Goodsparamstemplate.php @@ -63,6 +63,7 @@ class GoodsParamsTemplate 'is_delete' => 1, 'delete_url' => MyUrl('admin/goodsparamstemplate/delete'), 'delete_key' => 'ids', + 'is_middle' => 0, 'detail_title' => '基础信息', ], // 表单配置 diff --git a/app/admin/form/Goodsspectemplate.php b/app/admin/form/Goodsspectemplate.php index ea324b4ca..d3167d707 100644 --- a/app/admin/form/Goodsspectemplate.php +++ b/app/admin/form/Goodsspectemplate.php @@ -63,6 +63,7 @@ class GoodsSpecTemplate 'is_delete' => 1, 'delete_url' => MyUrl('admin/goodsspectemplate/delete'), 'delete_key' => 'ids', + 'is_middle' => 0, ], // 表单配置 'form' => [ diff --git a/app/admin/form/Useraddress.php b/app/admin/form/Useraddress.php index a7a4f056f..1c8743fe2 100644 --- a/app/admin/form/Useraddress.php +++ b/app/admin/form/Useraddress.php @@ -45,6 +45,7 @@ class UserAddress 'is_delete' => 1, 'delete_url' => MyUrl('admin/useraddress/delete'), 'delete_key' => 'ids', + 'is_middle' => 0, ], // 表单配置 'form' => [ diff --git a/app/service/ResourcesService.php b/app/service/ResourcesService.php index 6a1d1014e..8b0b3025d 100755 --- a/app/service/ResourcesService.php +++ b/app/service/ResourcesService.php @@ -70,7 +70,7 @@ class ResourcesService * @version 1.0.0 * @date 2018-12-12 * @desc description - * @param [string] $value [附件路径地址] + * @param [string|array] $value [附件路径地址] */ public static function AttachmentPathHandle($value) { @@ -84,7 +84,27 @@ class ResourcesService __MY_ROOT_PUBLIC__, $attachment_host_path, ]; - return empty($value) ? '' : str_replace($search, DS, $value); + + // 是否数组 + if(!empty($value)) + { + if(is_array($value)) + { + foreach($value as &$v) + { + // 是否二级url + if(isset($v['url'])) + { + $v['url'] = empty($v['url']) ? '' : str_replace($search, DS, $v['url']); + } else { + $v = empty($v) ? '' : str_replace($search, DS, $v); + } + } + } else { + $value = empty($value) ? '' : str_replace($search, DS, $value); + } + } + return $value; } /** @@ -95,7 +115,7 @@ class ResourcesService * @date 2018-08-07 * @desc description * @param [array] $params [输入参数] - * @param [array] $data [字段列表] + * @param [array] $data [字段列表] */ public static function AttachmentParams($params, $data) { @@ -117,19 +137,42 @@ class ResourcesService * @blog http://gong.gg/ * @version 1.0.0 * @datetime 2019-01-13T15:13:30+0800 - * @param [string] $value [附件地址] + * @param [string|array] $value [附件地址] */ public static function AttachmentPathViewHandle($value) { if(!empty($value)) { - if(substr($value, 0, 4) != 'http') + // 附件地址 + $host = SystemBaseService::AttachmentHost(); + + // 是否数组 + if(is_array($value)) { - return SystemBaseService::AttachmentHost().$value; + foreach($value as &$v) + { + // 是否二级url + if(isset($v['url'])) + { + if(substr($v['url'], 0, 4) != 'http') + { + $v['url'] = $host.$v['url']; + } + } else { + if(substr($v, 0, 4) != 'http') + { + $v = $host.$v; + } + } + } + } else { + if(substr($value, 0, 4) != 'http') + { + $value = $host.$value; + } } - return $value; } - return ''; + return $value; } /** diff --git a/public/static/admin/default/js/common.js b/public/static/admin/default/js/common.js index 52f425eaa..1862c9810 100644 --- a/public/static/admin/default/js/common.js +++ b/public/static/admin/default/js/common.js @@ -72,7 +72,7 @@ function FormTableHeightHandle() // 内容高度 var height_top = $('.form-table-operate-top').outerHeight(true) || 0; var height_bottom = $('.form-table-operate-bottom').outerHeight(true) || 0; - $('.am-table-scrollable-horizontal').css('max-height', 'calc(100% - '+(height_top+height_bottom)+'px)'); + $('.am-table-scrollable-horizontal').css('height', 'calc(100% - '+(height_top+height_bottom)+'px)'); } // 表格内容外围高度 if($('.form-validation-search').length > 0) diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 4e30c96da..f097a3bf1 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -149,7 +149,6 @@ form.am-form-pure .business-form-block { form.am-form-full-screen .business-form-block { padding-right: 5px; } - .form-group-item > [class*="am-u-"]:first-child > .am-form-group, .form-group-item > [class*="am-u-"]:first-child > .am-cf > .am-form-group, .form-group-item > [class*="am-u-"]:first-child > .am-cf > [class*="am-u-"]:first-child .am-form-group { @@ -161,6 +160,21 @@ form.am-form-pure .business-form-block { padding-right: 0; } } +@media only screen and (max-width: 640px) { + .form-group-item [class*="am-u-md"] > .am-form-group:first-child, + .form-group-item [class*="am-u-lg"] > .am-form-group:last-child { + padding-left: 0; + padding-right: 0; + } + .form-group-item > [class*="am-u-sm"]:first-child > .am-form-group, + .form-group-item .am-cf > [class*="am-u-sm"]:first-child > .am-form-group { + padding-left: 0; + } + .form-group-item > [class*="am-u-sm"]:last-child > .am-form-group, + .form-group-item .am-cf > [class*="am-u-sm"]:last-child > .am-form-group { + padding-right: 0; + } +} /** * 水平表单 @@ -1055,14 +1069,14 @@ button.colorpicker-submit img { box-shadow: 0px 0px 1px #ddd; } .am-table-scrollable-horizontal .am-table tr .am-grid-fixed-left-shadow { - -webkit-box-shadow: 5px 0px 10px rgba(136, 136, 136, 0.2); - -moz-box-shadow: 5px 0px 10px rgba(136, 136, 136, 0.2); - box-shadow: 5px 0px 10px rgba(136, 136, 136, 0.2); + -webkit-box-shadow: 5px 0px 10px rgb(145 145 145 / 10%); + -moz-box-shadow: 5px 0px 10px rgb(145 145 145 / 10%); + box-shadow: 5px 0px 10px rgb(145 145 145 / 10%); } .am-table-scrollable-horizontal .am-table tr .am-grid-fixed-right-shadow { - -webkit-box-shadow: -5px 0px 10px rgba(136, 136, 136, 0.2); - -moz-box-shadow: -5px 0px 10px rgba(136, 136, 136, 0.2); - box-shadow: -5px 0px 10px rgba(136, 136, 136, 0.2); + -webkit-box-shadow: -5px 0px 10px rgb(145 145 145 / 10%); + -moz-box-shadow: -5px 0px 10px rgb(145 145 145 / 10%); + box-shadow: -5px 0px 10px rgb(145 145 145 / 10%); } .am-table-scrollable-horizontal .am-table > thead > tr > td { border-bottom: 1px solid rgba(0,0,0,.03); @@ -1071,6 +1085,9 @@ button.colorpicker-submit img { .am-table-scrollable-horizontal .am-table > tbody > tr:first-child > td { border-top: 0px !important; } +.am-table-scrollable-horizontal .am-table > tbody > tr:last-child td { + border-bottom: 1px solid rgb(123 123 123 / 3%); +} .am-table-scrollable-horizontal .am-table > tbody > tr > td .am-text-truncate-2 { max-height: 34px; height: auto; @@ -1255,13 +1272,6 @@ button.colorpicker-submit img { width: 100%; } -/** - * 文字颜色 - */ -.am-text-grey { - color: #c3c3c3; -} - /** * 小微章-镂空 */ diff --git a/public/static/common/lib/assets/css/amazeui.css b/public/static/common/lib/assets/css/amazeui.css index 79160a71f..b4a3b478b 100755 --- a/public/static/common/lib/assets/css/amazeui.css +++ b/public/static/common/lib/assets/css/amazeui.css @@ -8157,6 +8157,9 @@ img.am-thumbnail, .am-monospace { font-family: Monaco, Menlo, Consolas, "Courier New", "FontAwesome", monospace; } +.am-text-grey { + color: #b9b9b9; +} .am-text-primary { color: #0e90d2; }