diff --git a/app/index/controller/Goods.php b/app/index/controller/Goods.php index d237e660b..65ace83dc 100755 --- a/app/index/controller/Goods.php +++ b/app/index/controller/Goods.php @@ -236,7 +236,7 @@ class Goods extends Common $params = $this->data_request; if(empty($params['goods_id'])) { - return DataReturn('参数有误', -1); + return ApiService::ApiDataReturn(DataReturn('参数有误', -1)); } // 分页 diff --git a/app/index/view/default/goods/index.html b/app/index/view/default/goods/index.html index 38201ee16..5355f566c 100755 --- a/app/index/view/default/goods/index.html +++ b/app/index/view/default/goods/index.html @@ -660,7 +660,7 @@
动态评分
@@ -776,7 +776,7 @@ {{if in_array('guess_you_like', $middle_tabs_nav['type'])}} -{{if !empty($detail_like_goods)}} diff --git a/public/static/common/css/layout.admin.css b/public/static/common/css/layout.admin.css index dbb335d58..aa86c542d 100644 --- a/public/static/common/css/layout.admin.css +++ b/public/static/common/css/layout.admin.css @@ -286,14 +286,6 @@ border-color: #ddd; } -/** - * 图片魔方展示类型 - */ -.config-view-show-style-images-magic-cube label:nth-child(7), -.config-view-show-style-images-magic-cube label:nth-child(13) { - margin-left: 0; -} - /** * 表单小组合组件 */ diff --git a/public/static/common/lib/assets/css/amazeui.css b/public/static/common/lib/assets/css/amazeui.css index f8cf30532..9d1e52e1c 100755 --- a/public/static/common/lib/assets/css/amazeui.css +++ b/public/static/common/lib/assets/css/amazeui.css @@ -2681,7 +2681,10 @@ input[type="date"].am-form-field .am-input-lg { .am-radio-inline + .am-radio-inline, .am-checkbox-inline + .am-checkbox-inline { margin-top: 0; - margin-left: 10px; +} +.am-radio-inline:not(:last-child), +.am-checkbox-inline:not(:last-child) { + margin-right: 10px; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -4136,7 +4139,7 @@ a.am-badge:focus { } .am-comment-hd { background: #f8f8f8; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #f7f7f7; display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; diff --git a/public/static/index/default/js/goods.js b/public/static/index/default/js/goods.js index b1a61ee2c..fd7afc594 100755 --- a/public/static/index/default/js/goods.js +++ b/public/static/index/default/js/goods.js @@ -28,7 +28,7 @@ function PoptitClose() */ function GoodsCommentsHtml(page) { - if((page || 1) <= 1) + if($('.goods-comment-content article').length <= 0) { $('.goods-page-no-data').removeClass('none'); $('.goods-page-no-data span').text(window['lang_loading_tips'] || '加载中...'); @@ -774,7 +774,7 @@ $(function() { // 获取数据 GoodsCommentsHtml(page); - // 回到评论顶部位置 + // 回到顶部位置 $(window).smoothScroll({position: $('.introduce-main').offset().top}); } });