From b0abd568bdf6679bb2525585218f4d8835ab6527 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 4 Dec 2022 19:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E4=B8=AD?=
 =?UTF-8?q?=E9=97=B4=E5=AF=BC=E8=88=AA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/controller/Goods.php                  | 2 +-
 app/index/view/default/goods/index.html         | 8 ++++----
 public/static/common/css/layout.admin.css       | 8 --------
 public/static/common/lib/assets/css/amazeui.css | 7 +++++--
 public/static/index/default/js/goods.js         | 4 ++--
 5 files changed, 12 insertions(+), 17 deletions(-)

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 @@
                     <ul class="am-avg-sm-{{:count($middle_tabs_nav['nav'])}} am-tabs-nav am-nav am-nav-tabs" data-am-sticky="{animation: 'slide-top'}">
                         {{foreach $middle_tabs_nav.nav as $k=>$v}}
                             <li class="{{if isset($v['active']) and $v['active'] eq 1}}am-active{{/if}} goods-middle-nav-{{$v.type}}">
-                                <a href="[data-tab-panel-{{$k}}]" data-type="{{$v.type}}" data-value="{{if isset($v['value'])}}{{$v.value}}{{/if}}">{{$v.name}}</a>
+                                <a href="#goods-middle-tabs-nav-{{$v.type}}" data-title="{{$v.name}}" data-type="{{$v.type}}" data-value="{{if isset($v['value'])}}{{$v.value}}{{/if}}">{{$v.name}}</a>
                             </li>
                         {{/foreach}}
                     </ul>
@@ -669,7 +669,7 @@
                     <div class="am-tabs-bd">
                         <!-- 详情 -->
                         {{if in_array('detail', $middle_tabs_nav['type'])}}
-                            <div class="am-tab-panel am-in am-active">
+                            <div class="am-tab-panel am-in am-active" id="goods-middle-tabs-nav-detail">
                                 {{if !empty($goods['parameters']) and !empty($goods['parameters']['detail'])}}
                                     <!-- 商品详情参数 -->
                                     <div class="am-cf tabs-nav-base-container">
@@ -732,7 +732,7 @@
 
                         <!-- 评价 -->
                         {{if in_array('comments', $middle_tabs_nav['type'])}}
-                            <div class="am-tab-panel goods-comment" data-goods-id="{{$goods.id}}" data-url="{{:MyUrl('index/goods/comments')}}">
+                            <div class="am-tab-panel goods-comment" id="goods-middle-tabs-nav-comments" data-goods-id="{{$goods.id}}" data-url="{{:MyUrl('index/goods/comments')}}">
                                 <div class="am-cf tabs-nav-base-container score-container">
                                     <div class="score am-fl">
                                         <p class="name">动态评分</p>
@@ -776,7 +776,7 @@
 
                         <!-- 猜你喜欢 -->
                         {{if in_array('guess_you_like', $middle_tabs_nav['type'])}}
-                            <div class="am-tab-panel">
+                            <div class="am-tab-panel" id="goods-middle-tabs-nav-guess_you_like">
                                 <div class="like">
                                     <ul class="am-avg-sm-2 am-avg-md-3 am-avg-lg-4 boxes">
                                         {{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});
         }
     });