From 59a76b2767da66512a23f7e559ec10e54efaafa9 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 26 Oct 2023 10:44:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=97=AE=E7=AD=94=E8=AF=A6=E6=83=85=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4=EF=BC=8C=E6=9B=B4=E5=A4=9A=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8F=98?=
 =?UTF-8?q?=E4=B8=BA=E5=B1=95=E5=BC=80=E6=8A=98=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                           |  21 +++
 .../ask-comments-goods/ask-comments-goods.vue |  28 +--
 components/blog-comments/blog-comments.vue    |   7 +-
 pages/plugins/ask/goods-list/goods-list.vue   | 163 +++++++++++++++---
 pages/plugins/ask/user-list/user-list.vue     |   2 +-
 5 files changed, 180 insertions(+), 41 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index 3bdd3315..b461676d 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -526,6 +526,27 @@ button:before {
     border-right: 1px solid #f5f5f5 !important;
 }
 
+
+.br-f9 {
+    border: 1px solid #f9f9f9 !important;
+}
+
+.br-b-f9 {
+    border-bottom: 1px solid #f9f9f9 !important;
+}
+
+.br-t-f9 {
+    border-top: 1px solid #f9f9f9 !important;
+}
+
+.br-l-f9 {
+    border-left: 1px solid #f9f9f9 !important;
+}
+
+.br-r-f9 {
+    border-right: 1px solid #f9f9f9 !important;
+}
+
 .br-e {
     border: 1px solid #eeeeee !important;
 }
diff --git a/components/ask-comments-goods/ask-comments-goods.vue b/components/ask-comments-goods/ask-comments-goods.vue
index 1875bd4a..3eda9969 100644
--- a/components/ask-comments-goods/ask-comments-goods.vue
+++ b/components/ask-comments-goods/ask-comments-goods.vue
@@ -1,23 +1,23 @@
 <template>
     <view>
         <block v-if="(propData || null) != null && propData.length > 0">
-            <view v-for="(item, index) in propData" :key="index" class="ask-comment-item flex-row">
-                <view class="title cr-white tc">问</view>
-                <view class="base-nav flex-1 flex-width margin-left-sm">
-                    <view class="oh nav padding-bottom-sm">
-                        <view class="flex-row jc-sb align-c">
-                            <text class="va-m single-text">{{ item.user.user_name_view }}</text>
-                            <view class="fr">
-                                <text class="cr-grey text-size-xs">共有12条回答</text>
+            <view v-for="(item, index) in propData" :key="index" class="ask-comment-item">
+                <navigator :url="item.url" hover-class="none" class="flex-row">
+                    <view class="title cr-white tc">问</view>
+                    <view class="base-nav flex-1 flex-width margin-left-sm">
+                        <view class="oh nav padding-bottom-sm">
+                            <view class="flex-row jc-sb align-c">
+                                <text class="va-m single-text flex-1 flex-width">{{ item.title }}</text>
+                                <text class="cr-grey text-size-xs">共有{{ item.comments_count }}条回答</text>
+                            </view>
+                            <view v-if="(item.images || null) != null && item.images.length > 0" class="images oh margin-top-lg">
+                                <block v-for="(iv, ix) in item.images" :key="ix">
+                                    <image class="br radius margin-right-sm" @tap="comment_images_show_event" :data-index="index" :data-ix="ix" :src="iv" mode="aspectFit"></image>
+                                </block>
                             </view>
                         </view>
-                        <view v-if="(item.images || null) != null && item.images.length > 0" class="images oh margin-top-lg">
-                            <block v-for="(iv, ix) in item.images" :key="ix">
-                                <image class="br radius margin-right-sm" @tap="comment_images_show_event" :data-index="index" :data-ix="ix" :src="iv" mode="aspectFit"></image>
-                            </block>
-                        </view>
                     </view>
-                </view>
+                </navigator>
             </view>
         </block>
         <block v-else>
diff --git a/components/blog-comments/blog-comments.vue b/components/blog-comments/blog-comments.vue
index 5c6287c6..9e6e29cd 100644
--- a/components/blog-comments/blog-comments.vue
+++ b/components/blog-comments/blog-comments.vue
@@ -27,7 +27,7 @@
                                 <image :src="common_static_url + 'emoji-icon.png'" mode="aspectFill" class="emoji-icon va-m" @tap="emoji_event"></image>
                                 <view class="flex-row align-e">
                                     <text class="text-size-xs cr-grey-d margin-right-sm">剩余{{ input_comments_length_value }}字</text>
-                                    <button type="default" size="mini" class="comment-btn cr-white border-radius-sm text-size-md va-m" :class="input_comments_value.length > 0 ? 'bg-main br-main ' : 'br-grey-d bg-grey-d'" @tap="comments_event">评论</button>
+                                    <button type="default" size="mini" class="comment-btn cr-white border-radius-sm text-size-md va-m" :class="input_comments_value.length > 0 ? 'bg-main br-main ' : 'comment-btn-default'" @tap="comments_event">评论</button>
                                 </view>
                             </view>
                         </view>
@@ -585,7 +585,10 @@
         height: 56rpx;
         line-height: 56rpx;
         padding: 0 24rpx;
-        background: #d8dadc;
+    }
+    .comment-btn-default {
+        border: 2rpx solid #D8DADC;
+        background-color: #D8DADC;
     }
 
     /**
diff --git a/pages/plugins/ask/goods-list/goods-list.vue b/pages/plugins/ask/goods-list/goods-list.vue
index defb47c5..8718d6ff 100644
--- a/pages/plugins/ask/goods-list/goods-list.vue
+++ b/pages/plugins/ask/goods-list/goods-list.vue
@@ -1,44 +1,63 @@
 <template>
     <view class="padding-main">
         <block v-if="data_list.length > 0">
-            <view v-for="(item, index) in data_list" :key="index" class="bg-white border-radius-main padding-main oh" :class="data_list.length > index + 1 ? 'spacing-b':''">
+            <view v-for="(item, index) in data_list" :key="index" class="bg-white border-radius-main padding-main oh" :class="data_list.length > index + 1 ? 'spacing-mb' : ''">
                 <view class="title flex-row jc-sb align-c wh-auto">
                     <view class="name flex-1 flex-width cr-base">{{ item.name }}的提问</view>
                     <view class="date cr-grey-9">{{ item.add_time_date }}</view>
                 </view>
-                <view class="question flex-row spacing-mt">
-                    <view class="title cr-white tc margin-right-sm">问</view>
-                    <view class="flex-1 flex-width">
-                        <view class="fw-b">{{ item.content }}</view>
-                        <view v-if="(item.images || null) != null && item.images.length > 0" class="avatar spacing-mt-10 radius margin-right-sm oh">
-                            <image class="wh-auto" @tap="comment_images_show_event" :data-index="index" :data-ix="ix" :src="iv" mode="aspectFit"></image>
+                <view class="question spacing-mt">
+                    <navigator :url="item.url" hover-class="none" class="flex-row">
+                        <view class="title cr-white tc margin-right-sm">问</view>
+                        <view class="flex-1 flex-width">
+                            <view class="fw-b">{{ item.content }}</view>
+                            <view v-if="(item.images || null) != null && item.images.length > 0" class="avatar spacing-mt-10 radius margin-right-sm oh">
+                                <image v-for="(img, i) in item.images" class="wh-auto" @tap="comment_images_show_event" :data-index="i" :data-ix="i + 1" :src="img" mode="aspectFit"></image>
+                            </view>
                         </view>
-                    </view>
+                    </navigator>
                 </view>
-                <block v-if="item.is_reply == 1 || item.comments_count > 0 ">
+                <block v-if="item.is_reply == 1 || item.comments_count > 0">
                     <view class="ask flex-row spacing-mt">
                         <view class="title cr-white tc margin-right-sm">答</view>
                         <view class="flex-1 flex-width">
-                            <view class="cr-base">
-                                <block v-if="item.reply">
-                                    {{ item.reply }}
+                            <block v-for="(it, ix) in item.comments_list" :key="ix">
+                                <block v-if="item.bool_more">
+                                    <view class="cr-base br-b-f9 padding-bottom-main" :class="ix + 1 < item.comments_list.length ? 'margin-bottom-main' : ''">
+                                        <block v-if="item.reply">
+                                            {{ item.reply }}
+                                        </block>
+                                        <block v-else>
+                                            {{ it.content }}
+                                        </block>
+                                    </view>
                                 </block>
-                                <block v-if="(item.comments_list || null ) !== null && item.comments_list.length > 0 ">
-                                    {{ item.comments_list[0].content }}
+                                <block v-else>
+                                    <view v-if="ix < 1" class="cr-base br-b-f9 padding-bottom-main" :class="ix + 1 < item.comments_list.length ? 'margin-bottom-main' : ''">
+                                        <block v-if="item.reply">
+                                            {{ item.reply }}
+                                        </block>
+                                        <block v-else>
+                                            {{ it.content }}
+                                        </block>
+                                    </view>
                                 </block>
-                            </view>
-                            <view v-if="(item.images || null) != null && item.images.length > 0" class="avatar spacing-mt-10 radius margin-right-sm oh">
-                                <image class="wh-auto" @tap="comment_images_show_event" :data-index="index" :data-ix="ix" :src="iv" mode="aspectFit"></image>
-                            </view>
+                                <view v-if="(it.images || null) != null && it.images.length > 0" class="avatar spacing-mt-10 radius margin-right-sm oh">
+                                    <image v-for="(img, i) in it.images" class="wh-auto" @tap="comment_images_show_event" :data-index="i" :data-ix="i + 1" :src="img" mode="aspectFit"></image>
+                                </view>
+                            </block>
                         </view>
                     </view>
                     <view class="more flex-row jc-e align-c spacing-mt">
-                        <navigator :url="item.url" hover-class="none">
-                            <view class="cr-red text-size-xs">
-                                查看全部{{ item.comments_count }}个回答
-                                <iconfont name="icon-qiandao-jiantou2" size="24rpx" class="pr top-xs"></iconfont>
-                            </view>
-                        </navigator>
+                        <view v-if="(item.hide_more || false) === false" class="cr-red text-size-xs" @tap="open_more(item.id, index)">
+                            <block v-if="!item.hide_comments_list_num"> 查看全部{{ item.comments_count }}个回答 </block>
+                            <block v-else>查看更多</block>
+                            <iconfont :name="item.bool_more ? 'icon-mendian-jiantou2' : 'icon-fenlei-top'" size="24rpx" class="pr top-xs"></iconfont>
+                        </view>
+                        <view v-if="item.bool_more" class="cr-red text-size-xs margin-left-main" @tap="close_more(index)">
+                            收起回答
+                            <iconfont name="icon-fenlei-top" size="24rpx" class="pr top-xs"></iconfont>
+                        </view>
                     </view>
                 </block>
             </view>
@@ -68,6 +87,7 @@
                 data_bottom_line_status: false,
                 data_is_loading: 0,
                 goods_id: null,
+                comments_list: [],
             };
         },
 
@@ -89,6 +109,14 @@
             this.init();
         },
 
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1,
+            });
+            this.get_data_list(1);
+        },
+
         methods: {
             init() {
                 var user = app.globalData.get_user_info(this, 'init');
@@ -212,6 +240,93 @@
                     urls: this.data_list[index]['images'],
                 });
             },
+            // 查看更多
+            open_more(id, i) {
+                var new_data_list = this.data_list;
+                new_data_list[i].bool_more = true;
+                if (new_data_list[i].bool_api === undefined || new_data_list[i].bool_api === true) {
+                    // 加载loding
+                    uni.showLoading({
+                        title: '加载中...',
+                    });
+                    // 获取数据
+                    uni.request({
+                        url: app.globalData.get_request_url('commentsreplylist', 'index', 'ask'),
+                        method: 'POST',
+                        data: {
+                            ask_id: id,
+                            ask_comments_id: 0,
+                            page: new_data_list[i].page || 1,
+                            is_comments: 1,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            uni.stopPullDownRefresh();
+                            if (res.data.code == 0) {
+                                if (res.data.data.data.length > 0) {
+                                    if ((new_data_list[i].page || 1) <= 1) {
+                                        new_data_list[i].comments_list = res.data.data.data;
+                                    } else {
+                                        new_data_list[i].comments_list = new_data_list[i].comments_list.concat(res.data.data.data);
+                                    }
+                                    new_data_list[i].hide_comments_list_num = true;
+                                    // 判断当前页数是否小于总页数，如果是则继续显示更多按钮，且当前页+1，如果不是则隐藏更多按钮
+                                    if (res.data.data.page < res.data.data.page_total) {
+                                        new_data_list[i].hide_more = false;
+                                        new_data_list[i].page = (new_data_list[i].page || 1) + 1;
+                                    } else {
+                                        new_data_list[i].hide_more = true;
+                                    }
+                                    new_data_list[i].page_total = res.data.data.page_total;
+                                    new_data_list[i].bool_api = true;
+                                    this.setData({
+                                        data_list: new_data_list,
+                                    });
+                                }
+                            } else {
+                                if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast('服务器请求出错');
+                        },
+                    });
+                } else {
+                    // 查看更多是否调用接口
+                    new_data_list[i].bool_api = true;
+                    // 是否隐藏更多查看按钮
+                    new_data_list[i].hide_more = false;
+                    if (new_data_list[i].page < new_data_list[i].page_total) {
+                        // 是否隐藏更多查看按钮
+                        new_data_list[i].hide_more = false;
+                    } else {
+                        // 是否隐藏更多查看按钮
+                        new_data_list[i].hide_more = true;
+                    }
+                    this.setData({
+                        data_list: new_data_list,
+                    });
+                }
+            },
+            // 收起更多
+            close_more(i) {
+                var new_data_list = this.data_list;
+                // 查看更多是否调用接口
+                new_data_list[i].bool_api = false;
+                // 是否隐藏更多查看按钮
+                new_data_list[i].hide_more = false;
+                // 是否展示更多内容
+                new_data_list[i].bool_more = false;
+                // 显示查看更多的数量
+                new_data_list[i].hide_comments_list_num = false;
+                this.setData({
+                    data_list: new_data_list,
+                });
+            },
         },
     };
 </script>
diff --git a/pages/plugins/ask/user-list/user-list.vue b/pages/plugins/ask/user-list/user-list.vue
index d3656ad6..85b7a1d8 100644
--- a/pages/plugins/ask/user-list/user-list.vue
+++ b/pages/plugins/ask/user-list/user-list.vue
@@ -34,7 +34,7 @@
 
         <view class="bottom-fixed question-btn bg-white">
             <view class="bottom-line-exclude">
-                <navigator url="/pages/plugins/ask/user-form/user-form" hover-class="none">
+                <navigator url="/pages/plugins/ask/form/form" hover-class="none">
                     <button class="bg-white br-main cr-main round text-size" type="default" form-type="submit" hover-class="none">我要提问</button>
                 </navigator>
             </view>