From fa37b497be52be00944d24251570da8712daf650 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 31 Oct 2023 22:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=84=E8=AE=BA=E3=80=81?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E3=80=81=E6=90=9C=E7=B4=A2=E7=BB=84=E5=BB=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/search/search.vue            | 14 +++---
 pages/goods-category/goods-category.vue |  1 -
 pages/goods-comment/goods-comment.vue   | 63 ++++++++++++-------------
 3 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/components/search/search.vue b/components/search/search.vue
index 961b45e3..aaa9b453 100644
--- a/components/search/search.vue
+++ b/components/search/search.vue
@@ -2,7 +2,7 @@
     <view>
         <view class="search-content pr">
             <view class="search-icon dis-inline-block pa" @tap="search_icon_event">
-                <iconfont :name="propIcon" :color="propIconColor" size="24rpx"></iconfont>
+                <iconfont :name="propIcon" :color="propIconColor" size="28rpx"></iconfont>
             </view>
             <input
                 type="text"
@@ -184,15 +184,17 @@
 </script>
 <style>
     .search-content .search-icon {
-        z-index: 1;
-        left: 20rpx;
-        top: calc(50% - 12rpx);
-        line-height: 26rpx;
+        z-index: 1;
+        left: 0;
+        top: 0;
+        padding: 14rpx 20rpx 0 20rpx;
+        line-height: 28rpx;
+        height: 42rpx;
     }
 
     .search-content input {
         font-size: 24rpx;
-        padding: 0 32rpx 0 58rpx;
+        padding: 0 32rpx 0 68rpx;
         box-sizing: border-box;
         height: 56rpx;
         line-height: 56rpx;
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 324c2993..0bb5bb17 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -549,7 +549,6 @@
                                     // tab切换参数、访问请求参数
                                     if (((this.tabbar_params || null) != null && (this.tabbar_params.id || null) != null && temp_category[i]['id'] == this.tabbar_params.id) || ((this.params || null) != null && (this.params.id || null) != null && temp_category[i]['id'] == this.params.id)) {
                                         active_index = i;
-                                        break;
                                     }
                                     // 是否全部数据都无二级
                                     if ((temp_category[i]['items'] || null) != null && temp_category[i]['items'].length > 0) {
diff --git a/pages/goods-comment/goods-comment.vue b/pages/goods-comment/goods-comment.vue
index 497e901c..47ae50fe 100644
--- a/pages/goods-comment/goods-comment.vue
+++ b/pages/goods-comment/goods-comment.vue
@@ -1,35 +1,39 @@
 <template>
-    <view>
-        <!-- 评分 -->
-        <view v-if="goods_score != null" class="score-container oh padding-main">
-            <view class="bg-white border-radius-main padding-main flex-row jc-sb align-c">
-                <view class="score tc">
-                    <view class="cr-base">综合评分</view>
-                    <view class="value cr-main">{{ goods_score.avg || "0.0" }}</view>
-                </view>
-                <view class="progress tc border-radius-main flex-1 flex-width">
-                    <block v-if="goods_score.avg > 0">
-                        <block v-for="(item, index) in goods_score.rating" :key="index">
-                            <view v-if="item.portion > 0" :class="'progress-bar ' + progress_class[index]" :style="'width: ' + item.portion + '%;'">{{ item.name }}</view>
+    <view>
+        <!-- 提示信息 -->
+        <block v-if="data_list_loding_status == 1">
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </block>
+        <block v-else>
+            <!-- 评分 -->
+            <view v-if="goods_score != null" class="score-container oh padding-main">
+                <view class="bg-white border-radius-main padding-main flex-row jc-sb align-c">
+                    <view class="score tc">
+                        <view class="cr-base">综合评分</view>
+                        <view class="value cr-main">{{ goods_score.avg || "0.0" }}</view>
+                    </view>
+                    <view class="progress tc border-radius-main flex-1 flex-width">
+                        <block v-if="goods_score.avg > 0">
+                            <block v-for="(item, index) in goods_score.rating" :key="index">
+                                <view v-if="item.portion > 0" :class="'progress-bar ' + progress_class[index]" :style="'width: ' + item.portion + '%;'">{{ item.name }}</view>
+                            </block>
                         </block>
-                    </block>
-                    <text v-else class="cr-grey">暂无评分</text>
+                        <text v-else class="cr-grey">暂无评分</text>
+                    </view>
                 </view>
             </view>
-        </view>
 
-        <!-- 列表 -->
-        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
-            <view class="padding-horizontal-main goods-comment">
-                <!-- 评价 -->
-                <component-goods-comments :prop-data="data_list" :prop-is-reply="true" prop-class="bg-white padding-main border-radius-main"></component-goods-comments>
-                <!-- 提示信息 -->
-                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+            <!-- 列表 -->
+            <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
+                <view class="padding-horizontal-main goods-comment">
+                    <!-- 评价 -->
+                    <component-goods-comments :prop-data="data_list" :prop-is-reply="true" prop-class="bg-white padding-main border-radius-main"></component-goods-comments>
 
-                <!-- 结尾 -->
-                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
-            </view>
-        </scroll-view>
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                </view>
+            </scroll-view>
+        </block>
     </view>
 </template>
 <script>
@@ -145,10 +149,6 @@ export default {
                     data_list_loding_status: 1,
                 });
 
-                // 加载loding
-                uni.showLoading({
-                    title: "加载中...",
-                });
                 uni.request({
                     url: app.globalData.get_request_url("comments", "goods"),
                     method: "POST",
@@ -158,9 +158,7 @@ export default {
                     },
                     dataType: "json",
                     success: (res) => {
-                        uni.hideLoading();
                         uni.stopPullDownRefresh();
-
                         if (res.data.code == 0) {
                             if (res.data.data.data.length > 0) {
                                 if (this.data_page <= 1) {
@@ -208,7 +206,6 @@ export default {
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
                         uni.stopPullDownRefresh();
                         this.setData({
                             data_list_loding_status: 2,