From 9f3b63d7ac50fdc495fccd8d73768e24cb5464ef Mon Sep 17 00:00:00 2001
From: naruto2018 <4563196@qq.com>
Date: Sat, 3 Jun 2023 20:07:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mini/src/layout/thread/comment/index.jsx      |  21 ++-
 .../thread/components/comment-list/index.jsx  |  20 ++-
 web/components/q-poster-s/h5/index.jsx        |   1 +
 web/components/q-poster-s/pc/index.jsx        |   5 +-
 web/layout/thread/pc/index.jsx                | 122 +++++++++---------
 5 files changed, 82 insertions(+), 87 deletions(-)

diff --git a/mini/src/layout/thread/comment/index.jsx b/mini/src/layout/thread/comment/index.jsx
index 01f526cef..2fda37120 100644
--- a/mini/src/layout/thread/comment/index.jsx
+++ b/mini/src/layout/thread/comment/index.jsx
@@ -611,21 +611,20 @@ class CommentH5Page extends React.Component {
             </View>
             <View className={styles.box}></View>
           </ScrollView>
+
           {isReady && (
             <View className={classNames(styles.inputFooterContainer, this.state.showCommentInput && styles.zindex)}>
               <View className={classNames(styles.inputFooter, this.state.showCommentInput && styles.zindex)}>
                 {/* 评论区触发 */}
-                {site.webConfig.setSite.siteComment[2].value && (
-                  <View className={footer.inputClick} onClick={() => this.onInputClick()}>
-                    <Input
-                      className={footer.input}
-                      placeholder="写评论"
-                      disabled
-                      prefixIcon="EditOutlined"
-                      placeholderClass={footer.inputPlaceholder}
-                    ></Input>
-                  </View>
-                )}
+                <View className={footer.inputClick} onClick={() => this.onInputClick()}>
+                  <Input
+                    className={footer.input}
+                    placeholder="写评论"
+                    disabled
+                    prefixIcon="EditOutlined"
+                    placeholderClass={footer.inputPlaceholder}
+                  ></Input>
+                </View>
 
                 {/* 操作区 */}
                 <View className={footer.operate}>
diff --git a/mini/src/layout/thread/components/comment-list/index.jsx b/mini/src/layout/thread/components/comment-list/index.jsx
index 1e6b9d1ab..3700a1ebc 100644
--- a/mini/src/layout/thread/components/comment-list/index.jsx
+++ b/mini/src/layout/thread/components/comment-list/index.jsx
@@ -221,18 +221,14 @@ class CommentList extends React.Component {
                 {!isApproved ? <View className={styles.isApproved}>审核中</View> : <View></View>}
               </View>
               {/* 评论内容 */}
-              {site.webConfig.setSite.siteComment[2].value && (
-                <>
-                  <View className={classNames(styles.commentListText)}>
-                    <PostContent
-                      onRedirectToDetail={() => this.toCommentDetail()}
-                      useShowMore={!!this.state.isShowOne}
-                      content={this.props?.data?.content}
-                      customHoverBg
-                    ></PostContent>
-                  </View>
-                </>
-              )}
+              <View className={classNames(styles.commentListText)}>
+                <PostContent
+                  onRedirectToDetail={() => this.toCommentDetail()}
+                  useShowMore={!!this.state.isShowOne}
+                  content={this.props?.data?.content}
+                  customHoverBg
+                ></PostContent>
+              </View>
               {/* <RichText
                 className={classNames(styles.commentListText, this.state.isShowOne && styles.isShowOne)}
                 content={this.filterContent()}
diff --git a/web/components/q-poster-s/h5/index.jsx b/web/components/q-poster-s/h5/index.jsx
index 4ecaeee28..bf539f603 100644
--- a/web/components/q-poster-s/h5/index.jsx
+++ b/web/components/q-poster-s/h5/index.jsx
@@ -39,6 +39,7 @@ class Index extends React.Component {
   			page: 1
   		},
   	}).then((res) => {
+		console.log('readThreadPoster222222222222')
   		console.log(res)
   		this.setState({
   			loading:false,
diff --git a/web/components/q-poster-s/pc/index.jsx b/web/components/q-poster-s/pc/index.jsx
index 9de15c34f..8dc1fd4be 100644
--- a/web/components/q-poster-s/pc/index.jsx
+++ b/web/components/q-poster-s/pc/index.jsx
@@ -24,14 +24,15 @@ class Index extends React.Component {
 			page: 1
 		},
   	}).then((res) => {
-  		console.log(res)
+		console.log('readThreadPoster222222')
+		console.log(res)
   		this.setState({
   			loading:false,
   			list:res.data.pageData
   		})
   	});
   	console.log('readThreadPoster')
-  	console.log(this.state.list)
+
   }
   gothead = (tid) => {
   	Router.push({url: `/thread/${tid}`});
diff --git a/web/layout/thread/pc/index.jsx b/web/layout/thread/pc/index.jsx
index 7e6b82f30..84bc52b18 100644
--- a/web/layout/thread/pc/index.jsx
+++ b/web/layout/thread/pc/index.jsx
@@ -91,20 +91,20 @@ class ThreadPCPage extends React.Component {
     if (threadBodyRef && threadBodyRef.current) {
       // 加载评论列表
       const scrollDistance = threadBodyRef?.current?.scrollTop;
-      // const offsetHeight = threadBodyRef?.current?.offsetHeight;
-      // const scrollHeight = threadBodyRef?.current?.scrollHeight;
-      // const { isCommentReady, isNoMore } = this.props.thread;
+      const offsetHeight = threadBodyRef?.current?.offsetHeight;
+      const scrollHeight = threadBodyRef?.current?.scrollHeight;
+      const { isCommentReady, isNoMore } = this.props.thread;
       // 记录当前的滚动位置
       this.props.thread.setScrollDistance(scrollDistance);
-      // if (
-      //   scrollDistance + offsetHeight >= scrollHeight - 20 &&
-      //   !this.state.isCommentLoading &&
-      //   isCommentReady &&
-      //   !isNoMore
-      // ) {
-      // this.page = this.page + 1;
-      // this.loadCommentList();
-      // }
+      if (
+        scrollDistance + offsetHeight >= scrollHeight - 20 &&
+        !this.state.isCommentLoading &&
+        isCommentReady &&
+        !isNoMore
+      ) {
+      this.page = this.page + 1;
+      this.loadCommentList();
+      }
     }
   }
 
@@ -819,57 +819,55 @@ class ThreadPCPage extends React.Component {
           <LoadingTips type="init"></LoadingTips>
         )}
 
-        {/*/!* 回复详情内容 *!/*/}
-		{/*{webConfig.setSite.siteComment[0].value && (*/}
-		{/*  <div className={`${layout.bottom}`}>*/}
-		{/*    {isCommentReady && isApproved ? (*/}
-		{/*      <Fragment>*/}
-		{/*        /!* 第一段列表 *!/*/}
-		{/*        {isCommentReady && isShowCommentList && (*/}
-		{/*          <Fragment>*/}
-		{/*            <RenderCommentList*/}
-		{/*              commentDataRef={this.commentDataRef}*/}
-		{/*              isPositionComment={true}*/}
-		{/*              router={this.props.router}*/}
-		{/*              sort={flag => this.onSortChange(flag)}*/}
-		{/*              replyAvatarClick={(comment, reply, floor) => this.replyAvatarClick(comment, reply, floor)}*/}
-		{/*            ></RenderCommentList>*/}
-		{/*            {!isCommentPositionNoMore && (*/}
-		{/*            // <BottomView*/}
-		{/*            //   onClick={() => this.onLoadMoreClick()}*/}
-		{/*            //   noMoreType="line"*/}
-		{/*            //   loadingText="点击加载更多"*/}
-		{/*            //   isError={isCommentListError}*/}
-		{/*            //   noMore={isCommentPositionNoMore}*/}
-		{/*            // ></BottomView>*/}
-		{/*  */}
-		{/*              <div className={layout.showMore} onClick={() => this.onLoadMoreClick()}>*/}
-		{/*                <div className={layout.hidePercent}>展开更多评论</div>*/}
-		{/*                <Icon className={layout.icon} name="RightOutlined" size={12} />*/}
-		{/*              </div>*/}
-		{/*            )}*/}
-		{/*          </Fragment>*/}
-		{/*        )}*/}
-		{/*  */}
-		{/*        <RenderCommentList*/}
-		{/*          canPublish={canPublish}*/}
-		{/*          positionRef={this.positionRef}*/}
-		{/*          showHeader={!isShowCommentList}*/}
-		{/*          router={this.props.router}*/}
-		{/*          sort={flag => this.onSortChange(flag)}*/}
-		{/*          onEditClick={comment => this.onEditClick(comment)}*/}
-		{/*          onPublishClick={(value, imageList) => this.onPublishClick(value, imageList)}*/}
-		{/*          onReportClick={comment => this.onReportClick(comment)}*/}
-		{/*        ></RenderCommentList>*/}
-		{/*        /!* {this.state.isCommentLoading && <LoadingTips></LoadingTips>} *!/*/}
-		{/*      </Fragment>*/}
-		{/*    ) : (*/}
-		{/*      isApproved && <LoadingTips isError={isCommentListError} type="init"></LoadingTips>*/}
-		{/*    )}*/}
-		{/*  </div>*/}
-		{/*)}*/}
+        {/* 回复详情内容 */}
+        <div className={`${layout.bottom}`}>
+          {isCommentReady && isApproved ? (
+              <Fragment>
+                {/* 第一段列表 */}
+                {isCommentReady && isShowCommentList && (
+                    <Fragment>
+                      <RenderCommentList
+                          commentDataRef={this.commentDataRef}
+                          isPositionComment={true}
+                          router={this.props.router}
+                          sort={flag => this.onSortChange(flag)}
+                          replyAvatarClick={(comment, reply, floor) => this.replyAvatarClick(comment, reply, floor)}
+                      ></RenderCommentList>
+                      {!isCommentPositionNoMore && (
+                          // <BottomView
+                          //   onClick={() => this.onLoadMoreClick()}
+                          //   noMoreType="line"
+                          //   loadingText="点击加载更多"
+                          //   isError={isCommentListError}
+                          //   noMore={isCommentPositionNoMore}
+                          // ></BottomView>
+
+                          <div className={layout.showMore} onClick={() => this.onLoadMoreClick()}>
+                            <div className={layout.hidePercent}>展开更多评论</div>
+                            <Icon className={layout.icon} name="RightOutlined" size={12} />
+                          </div>
+                      )}
+                    </Fragment>
+                )}
+
+                <RenderCommentList
+                    canPublish={canPublish}
+                    positionRef={this.positionRef}
+                    showHeader={!isShowCommentList}
+                    router={this.props.router}
+                    sort={flag => this.onSortChange(flag)}
+                    onEditClick={comment => this.onEditClick(comment)}
+                    onPublishClick={(value, imageList) => this.onPublishClick(value, imageList)}
+                    onReportClick={comment => this.onReportClick(comment)}
+                ></RenderCommentList>
+                {/* {this.state.isCommentLoading && <LoadingTips></LoadingTips>} */}
+              </Fragment>
+          ) : (
+              isApproved && <LoadingTips isError={isCommentListError} type="init"></LoadingTips>
+          )}
+        </div>
         
-        {/* {isNoMore && <NoMore empty={totalCount === 0}></NoMore>} */}
+         {/*{isNoMore && <NoMore empty={totalCount === 0}></NoMore>}*/}
       </div>
     );
   }
-- 
Gitee