diff --git a/common/commonJS.js b/common/commonJS.js
index 0d7b9682..87ed07bb 100644
--- a/common/commonJS.js
+++ b/common/commonJS.js
@@ -45,6 +45,8 @@ export default {
         }
         uni.navigateBack({ delta: 1 });
     },
+
+  
     //复制内容
     handleCopy(value, title) {
         uniCopy({
diff --git a/components/qizai-dynamic/Dynamic.vue b/components/qizai-dynamic/Dynamic.vue
index 24b93370..0fc9f12a 100644
--- a/components/qizai-dynamic/Dynamic.vue
+++ b/components/qizai-dynamic/Dynamic.vue
@@ -25,7 +25,7 @@
             @click.stop="clickUser()"
             >{{ name }}</text
           >
-          <view style="display: flex; align-items: center;margin-top: 14rpx;"
+          <view style="display: flex; align-items: center;margin-top:8rpx;"
             ><text class="user__content-note uni-ellipsis">{{
 
              createTime
@@ -56,7 +56,7 @@
             height: auto;
             color: #4b4b4b;
             margin-bottom: 40rpx;
-            font-size: 28rpx;
+            font-size: 28rpx;text-indent: 0px !important;
           "
       /></u-read-more>
       <view class="allImage">
@@ -263,9 +263,31 @@ export default {
     },
     // 自适应判断
     judgeImg() {
-      if (this.imgList.length == 1) {
-        this.imgWidth = ((this.windowWidth - 60) * 2) / 3;
-        this.imgHeight = (this.windowHeight * 3) / 5;
+      if (this.imgList.length === 1) {
+        const firstImg = this.imgList[0];
+
+        // 获取图片的宽高信息
+        uni.getImageInfo({
+          src: firstImg, // 获取图片路径
+          success: (res) => {
+            const imgWidth = res.width;
+            const imgHeight = res.height;
+
+            // 如果是横向图片（宽大于高）
+            if (imgWidth > imgHeight) {
+              // 横向图片尺寸设置
+              this.imgWidth = ((this.windowWidth - 90) * 2) / 2;
+              this.imgHeight = (this.windowHeight * 3) / 5;
+            } else {
+              // 纵向图片尺寸设置
+              this.imgWidth = (this.windowWidth - 80) * 0.7; // 纵向图片稍微缩小宽度
+              this.imgHeight = (this.windowHeight * 3) / 5;
+            }
+          },
+          fail: (err) => {
+            console.error("图片加载失败", err);
+          },
+        });
       } else if (this.imgList.length == 4) {
         this.imgWidth = (this.windowWidth - 60) / 3.3;
         this.imgHeight = this.imgWidth;
@@ -461,7 +483,7 @@ export default {
   overflow: hidden;
 }
 .user__content-note {
-  margin-top: 3px;
+  margin-top: 2rpx;
   color: #aaacab;
   font-size: 26rpx;
   letter-spacing: 1rpx;
@@ -485,23 +507,37 @@ export default {
   text-align: justify;
   color: #292929;
   font-weight: 600;
-  font-size: 32rpx;
-  margin-bottom: 10rpx;
+  font-size: 38rpx;
+  line-height: 42rpx;
+  margin-bottom: 20rpx;
 }
 .user__content-title {
   color: #5a6988;
   font-weight: 600;
   font-size: 30rpx;
-  line-height: 38rpx;
+  line-height: 34rpx;
+  // margin-top: 8rpx;
 }
 ::v-deep rich-text {
   text-align: justify;
   white-space: pre-wrap;
   word-wrap: break-word;
 }
-::v-deep rich-text p {
+::v-deep rich-text p,h1,h2 {
   text-indent: 0 !important;
 }
+/deep/ rich-text br {
+  height: 0 !important;
+  display: none;
+}
+::v-deep rich-text h1 {
+  font-size: 34rpx;
+    line-height: 40rpx;
+}
+::v-deep rich-text h2 {
+  font-size: 30rpx;
+    line-height: 30rpx;
+}
 .likeList {
   background: #f7f7f7;
   border-radius: 4rpx;
@@ -513,8 +549,8 @@ export default {
   margin-top: 0;
 }
 .hidden2 {
-  line-height: 24px;
-  max-height: 120px;
+  line-height: 20px;
+  max-height: 100px;
   -webkit-line-clamp: 5;
   height: auto;
 }
diff --git a/pages/articleList/article.vue b/pages/articleList/article.vue
index 235543c1..49b7011a 100644
--- a/pages/articleList/article.vue
+++ b/pages/articleList/article.vue
@@ -2,44 +2,81 @@
   <view
     class="content"
     :class="`${options.type == 'detail' ? 'content_detail' : ''}`"
+    :style="options.statusId == 0 ? 'background-color: #f0f0f026;' : ''"
   >
+    <u-loading-page
+      :loading="submitLoading"
+      style="
+        width: 100vw;
+        height: 100vh;
+        z-index: 9999;
+        top: 0;
+        background-color: #00000080;
+      "
+      loading-text="文章正在发布中，请稍后..."
+      color="#fff"
+    ></u-loading-page>
+
     <z-nav-bar
       :title="options.navTitle"
-      :bgColor="options.type == 'detail' ? '#d8e6ff73' : '#5188e5'"
-      :fontColor="options.type == 'detail' ? '#5188e5' : '#fff'"
+      :bgColor="
+        options.type == 'detail'
+          ? options.statusId == 0
+            ? '#f7f7f7'
+            : '#d8e6ff73'
+          : '#5188e5'
+      "
+      :fontColor="
+        options.type == 'detail'
+          ? options.statusId == 0
+            ? '#333'
+            : '#333'
+          : '#fff'
+      "
     >
       <template v-slot:right>
         <view
           class="top_right"
+          style="
+            background-color: #fff;
+            margin-right: 10rpx;
+            border-radius: 4rpx;
+          "
           @tap="handleOpenShowSubmit"
           v-if="options.type == 'add'"
         >
           <text
             style="
-              padding: 4rpx 10rpx;
-              margin-right: 10rpx;
+              padding: 2rpx 20rpx;
+
               border-radius: 20rpx;
-              line-height: 40rpx;
-              color: #fff;
+              line-height: 50rpx;
+              color: #215fc7;
             "
             >提交</text
           >
         </view>
         <view
-          v-if="options.type == 'detail'"
+          v-if="options.type == 'detail' && options.statusId == 1"
           class="top_right"
-          @tap="showDel = true"
           style="display: flex; align-items: center"
         >
           <uni-icons
-            type="trash-filled"
-            size="22"
-            style="color: #aa3629; margin-left: 40rpx"
+            type="redo-filled"
+            size="28"
+            @tap="newOnShare()"
+            style="color: #66bc54"
           ></uni-icons>
 
           <text
-            style="letter-spacing: 4rpx; color: #aa3629; margin-right: 20rpx"
-            >删除</text
+            style="
+              letter-spacing: 2rpx;
+              color: #66bc54;
+              margin-right: 20rpx;
+              margin-left: 10rpx;
+              font-weight: 600;
+            "
+            >分享</text
           >
         </view>
       </template>
@@ -123,15 +160,17 @@
         </view>
       </scroll-view>
     </view>
-
-    <view
-      class="home_wrap home_wrap_analysis"
+    <scroll-view
+      :scroll-into-view="targetId"
+      scroll-y
+      class="home_wrap home_wrap_analysis home"
+      ref="homeContainer"
       v-if="options.type == 'detail'"
       :style="`height: calc(100% - ${
-        48 + statusBarHeight + 60
-      }px);padding:40rpx 20rpx;text-align: justify;`"
+        48 + statusBarHeight + (options.statusId == 0 ? 10 : 60)
+      }px);padding:0 20rpx;text-align: justify;`"
     >
-      <view class="analysis_box" style="height: auto">
+      <view class="analysis_box" style="height: auto; padding-top: 40rpx">
         <view class="analysis_img_box">
           <view class="analysis_img">
             <image
@@ -172,7 +211,11 @@
         </view>
         <view
           class="analysis_title analysis_title_detail"
-          style="color: #302f35; font-size: 32rpx"
+          style="
+            color: #302f35;
+            font-size: 40rpx !important;
+            line-height: 50rpx;
+          "
         >
           {{ articleInfo.title }}
         </view>
@@ -210,9 +253,23 @@
         </view>
       </view>
       <view
-        style="letter-spacing: 1rpx; color: #aaacab; margin-top: 20rpx"
+        style="
+          letter-spacing: 1rpx;
+          color: #aaacab;
+          margin-top: 20rpx;
+          margin-bottom: 20rpx;
+          display: flex;
+          align-items: center;
+        "
         v-if="articleInfo.createTime"
         >{{ articleInfo.createTime }}
+        <uni-icons
+          v-if="articleInfo.come == 0"
+          type="trash-filled"
+          size="24"
+          @tap="showDel = true"
+          style="color: #aa3629; margin-left: 20rpx; margin-right: 20rpx"
+        ></uni-icons>
       </view>
       <view class="likeList" v-if="likeList.length > 0" style="color: #5188e5">
         <uni-icons
@@ -228,6 +285,22 @@
             .join(" , ")
         }}</view>
       </view>
+      <view v-if="commentData" id="commentData">
+        <hb-comment
+          :isDisable="options.statusId == 0 ? true : false"
+          :isShowList="true"
+          :articleUserId="articleInfo.userId"
+          style=""
+          :user="currentUser"
+          ref="hbComment"
+          @add="sendComment"
+          @del="del"
+          @focusOn="focusOn"
+          :deleteTip="'确认删除？'"
+          :cmData="commentData"
+          v-if="commentData"
+        ></hb-comment>
+      </view>
       <!-- 显示聊天记录 -->
       <!-- <articleDetail
         :loading="loading"
@@ -242,7 +315,7 @@
         ref="commonMedicalDetail"
       ></articleDetail> -->
 
-      <view class="footer_box">
+      <!-- <view class="footer_box" v-if="options.statusId != 0">
         <template>
           <view
             class="footer_item"
@@ -280,6 +353,7 @@
             <text style="letter-spacing: 4rpx">评论</text>
           </view>
           <view
+            v-if="articleInfo.showFlag != 0"
             class="footer_item"
             style="color: #9a9a9a"
             @click.stop="newOnShare"
@@ -294,8 +368,8 @@
             <text style="letter-spacing: 4rpx">分享</text>
           </view>
         </template>
-      </view>
-    </view>
+      </view> -->
+    </scroll-view>
     <view style="padding-bottom: 20px">
       <uni-popup ref="share" type="share" safeArea backgroundColor="#fff">
         <uni-popup-share :bottom="500" @select="haveSelected"></uni-popup-share>
@@ -368,6 +442,7 @@
     >
       <view class="slot-content"> 是否立即发布文章？ </view>
     </u-modal>
+  
   </view>
 </template>
 
@@ -387,6 +462,9 @@ export default {
   },
   data() {
     return {
+      targetId: null,
+      submitLoading: false,
+
       currentUser: {},
       likeList: [],
 
@@ -495,7 +573,9 @@ export default {
     }
   },
 
-  async onShow() {},
+  async onShow() {
+    this.submitLoading = false;
+  },
   async onPullDownRefresh() {
     this.isRefreshing = true;
     console.log("下拉刷新");
@@ -518,6 +598,14 @@ export default {
     }, 800);
   },
   methods: {
+    scrollToView(id) {
+      // commentData
+      this.targetId = id; // 设置目标元素 id
+      setTimeout(() => {
+        this.targetId = null;
+      }, 1000);
+    },
+
     confirmDel: throttle(function () {
       this.delArticle();
     }, 2000),
@@ -534,10 +622,13 @@ export default {
         this.$commonJS.showToast("请至少上传一张图片");
         return;
       }
-      this.showSubmit = true;
+      // this.showSubmit = true;
+      this.confirmSubmit();
     },
 
     confirmSubmit: throttle(function () {
+      this.submitLoading = true;
+      this.showSubmit = false;
       this.handleSubmit("submit");
     }, 2000),
 
@@ -626,9 +717,31 @@ export default {
     },
     // 自适应判断
     judgeImg() {
-      if (this.fileList1.length == 1) {
-        this.imgWidth = ((this.windowWidth - 10) * 2) / 3;
-        this.imgHeight = (this.windowHeight * 3) / 5;
+      if (this.fileList1.length === 1) {
+        const firstImg = this.fileList1[0];
+
+        // 获取图片的宽高信息
+        uni.getImageInfo({
+          src: firstImg, // 获取图片路径
+          success: (res) => {
+            const imgWidth = res.width;
+            const imgHeight = res.height;
+
+            // 如果是横向图片（宽大于高）
+            if (imgWidth > imgHeight) {
+              // 横向图片尺寸设置
+              this.imgWidth = ((this.windowWidth - 40) * 2) / 2;
+              this.imgHeight = (this.windowHeight * 3) / 5;
+            } else {
+              // 纵向图片尺寸设置
+              this.imgWidth = ((this.windowWidth - 40) * 2) / 3;
+              this.imgHeight = (this.windowHeight * 3) / 5;
+            }
+          },
+          fail: (err) => {
+            console.error("图片加载失败", err);
+          },
+        });
       } else if (this.fileList1.length == 4) {
         this.imgWidth = (this.windowWidth - 10) / 3.3;
         this.imgHeight = this.imgWidth;
@@ -637,6 +750,7 @@ export default {
         this.imgHeight = this.imgWidth;
       }
     },
+
     previewImg(index) {
       uni.previewImage({
         urls: this.fileList1,
@@ -705,12 +819,18 @@ export default {
         })
         .then((res) => {
           if (res.code == 0) {
-            this.$commonJS.refreshPrevPageData(1);
+            setTimeout(() => {
+              this.$commonJS.refreshPrevPageData(1);
+              this.submitLoading = false;
+            }, 2000);
           } else {
+            this.submitLoading = false;
             this.$commonJS.showToast(res.msg);
           }
         })
-        .catch((err) => {});
+        .catch((err) => {
+          this.submitLoading = false;
+        });
     }, 3000),
 
     async addPic(e) {
@@ -955,8 +1075,35 @@ export default {
           }
         });
     },
+    scrollToComment() {
+      // 获取容器
+      const container = this.$refs.homeWrap;
+
+      // 先获取目标元素的位置
+      const query = uni.createSelectorQuery().in(this);
+      query
+        .select("#commentData")
+        .boundingClientRect((rect) => {
+          if (rect) {
+            // 获取容器的位置
+            query
+              .select("#home_wrap")
+              .boundingClientRect((containerRect) => {
+                if (containerRect) {
+                  console.log("containerRect at line 1068:", containerRect);
+                  // 计算相对位置并设置 scrollTop
+                  const scrollTop =
+                    container.scrollTop + (rect.top - containerRect.top);
+                  container.scrollTop = scrollTop; // 滚动容器到目标位置
+                }
+              })
+              .exec(); // 执行容器位置查询
+          }
+        })
+        .exec(); // 执行目标元素位置查询
+    },
     //创建新对话
-    sendComment(comment, pid) {
+    sendComment: throttle(function (comment, pid) {
       this.$http
         .request({
           url: "common/taihuTalentArticle/addArticleComment",
@@ -974,11 +1121,19 @@ export default {
           console.log("res at line 713:", res);
           if (res.code == 0) {
             this.getMedicalDetail();
+            if(pid==0){
+              setTimeout(() => {
+                this.scrollToView("commentData");
+              }, 500);
+            }
+          
+
+            // this.scrollToComment();
           } else {
             this.$commonJS.showToast("评论失败");
           }
         });
-    },
+    }),
 
     //交谈请求，获取回答
     getTree(data) {
@@ -1017,6 +1172,7 @@ export default {
             this.loading = false;
 
             this.articleInfo = res.article;
+            this.options.statusId = res.article.showFlag;
             this.medicalForm = { ...this.articleInfo };
             console.log("this.medicalForm at line 193:", this.articleInfo);
             if (this.articleInfo.img) {
@@ -1550,9 +1706,9 @@ h3 {
   }
   .analysis_title_detail {
     margin-top: 10rpx;
-    margin-bottom: 10rpx;
+    margin-bottom: 40rpx;
     // color: #1781ff;
-    font-size: 42rpx;
+    font-size: 38rpx !important;
     font-weight: 700;
   }
 }
@@ -1642,6 +1798,7 @@ h3 {
 }
 .allImage {
   margin-top: 40rpx;
+
   display: flex;
 
   flex-wrap: wrap;
@@ -1672,4 +1829,26 @@ h3 {
   display: flex;
   align-items: center;
 }
+::v-deep rich-text {
+  text-align: justify;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+::v-deep rich-text p,
+h1,
+h2 {
+  text-indent: 0 !important;
+}
+/deep/ rich-text br {
+  height: 0 !important;
+  display: none;
+}
+::v-deep rich-text h1 {
+  font-size: 36rpx;
+  line-height: 40rpx;
+}
+::v-deep rich-text h2 {
+  font-size: 32rpx;
+  line-height: 30rpx;
+}
 </style>
diff --git a/pages/articleList/index.vue b/pages/articleList/index.vue
index 7b2e86f6..5a2fa314 100644
--- a/pages/articleList/index.vue
+++ b/pages/articleList/index.vue
@@ -1,5 +1,6 @@
 <template>
   <view class="content" style="background-color: #d8e6ff57">
+   
     <z-nav-bar title="我的文章" bgColor="#5188e5" fontColor="#fff">
       <template v-slot:right>
         <view class="top_right" @tap="createFolder">
@@ -94,7 +95,8 @@
                           >评论</view
                         ></view
                       >
-                      <view
+                      <view v-if="item.showFlag != 0"
+
                         class="operate"
                         @click.stop="handleMore(item)"
                         style="
@@ -104,12 +106,27 @@
                         "
                       >
                         ...
-                        <!-- <button class="like" @click.stop="handleLike">
-                          赞
-                        </button>
-                        <button class="comment" @click.stop="handleComment">
-                          评论
-                        </button> -->
+                       
+                      </view>
+                      <view v-else
+
+                        class="operate"
+                       @click.stop="selectArticleId = item.id;showDel=true" 
+                        style="
+                          line-height: 10rpx;
+                          font-size: 38rpx;
+                          /* margin-top: -20rpx; */
+                        "
+                      >
+                      <uni-icons
+                     
+
+                        type="trash-filled"
+                        size="22"
+                        color="#aa3629"
+                      ></uni-icons
+                      >
+                       
                       </view>
                       <!-- <view style="color: #5188e5"
                       ><uni-icons
@@ -153,37 +170,34 @@
       cancelText="取消"
       round="8"
     ></u-action-sheet>
+    <u-modal
+      :show="showDel"
+      @confirm="confirmDel"
+      @cancel="showDel = false"
+      ref="uModalDel"
+      :asyncClose="true"
+      :showCancelButton="true"
+      confirmText="删除"
+      confirmColor="#aa3629"
+      title="提示"
+    >
+      <view class="slot-content"> 您确定要删除该文章吗？ </view>
+    </u-modal>
   </view>
 </template>
 
 <script>
 import $http from "@/config/requestConfig.js";
 import PrecisionImageGrid from "./PrecisionImageGrid.vue";
+import { debounce, throttle } from "@/common/debounce.js";
 export default {
   components: { PrecisionImageGrid },
   data() {
     return {
       selectArticleId: null,
+      showDel: false, // 控制弹窗显示隐藏
       showOperate: false, // 控制弹窗显示隐藏
-      operateList: [
-        {
-          name: "查看评论",
-
-          fontSize: "16",
-        },
-        {
-          name: "分享文章",
-
-          fontSize: "16",
-        },
-        {
-          name: "删除",
-
-          color: "#aa3629",
-
-          fontSize: "16",
-        },
-      ],
+      operateList: [],
 
       tabsList: [],
       currentCateIndex: 0,
@@ -223,46 +237,44 @@ export default {
   },
   onLoad() {
     uni.hideTabBar();
-    this.getTabData()
-  
+    this.getTabData();
   },
   onShow() {
     // this.getListData(this.taihumedId);
-  
-    
   },
-  
+
   methods: {
+ 
+
+    confirmDel: throttle(function () {
+      this.delArticle();
+    }, 2000),
     refreshData(reset) {
       this.current = 1;
       this.list = [];
       this.noMore = false;
-      if(reset){
+      if (reset) {
         this.currentCateIndex = 0;
-      this.courseName = "";
-      this.taihumedId = this.tabsList[this.currentCateIndex].id;
-      this.statusTitle = this.tabsList[this.currentCateIndex].statusTitle;
-      this.statusColor = this.tabsList[this.currentCateIndex].color;
-      //重置
-      this.list = [];
-      this.noMore = false;
-      this.show = false;
-      this.count = 0;
-      this.current = 1;
-      this.getListData(this.taihumedId);
-      }else{
- this.getListData(this.taihumedId);
+        this.courseName = "";
+        this.taihumedId = this.tabsList[this.currentCateIndex].id;
+        this.statusTitle = this.tabsList[this.currentCateIndex].statusTitle;
+        this.statusColor = this.tabsList[this.currentCateIndex].color;
+        //重置
+        this.list = [];
+        this.noMore = false;
+        this.show = false;
+        this.count = 0;
+        this.current = 1;
+        this.getListData(this.taihumedId);
+      } else {
+        this.getListData(this.taihumedId);
       }
-
-      
-
-     
     },
 
     selectClick(e) {
       console.log(e.name);
       if (e.name == "删除") {
-        this.delArticle();
+        this.showDel=true;
       } else {
         uni.navigateTo({
           url: `/pages/articleList/article?navTitle=文章详情&title=文章详情&id=${this.selectArticleId}&type=detail&statusId=1&open=${e.name}`,
@@ -279,6 +291,37 @@ export default {
       //     console.log('调用失败', err);
       //   }
       // })
+      var list = [];
+      if (item.showFlag != 0) {
+       list = [
+        // {
+        //   name: "查看评论",
+
+        //   fontSize: "16",
+        // },
+        {
+          name: "分享文章",
+
+          fontSize: "16",
+        }
+      ];
+       
+      }
+
+      if (item.come == 1) {
+        this.operateList = list;
+      } else {
+        this.operateList = [
+          ...list,
+          {
+            name: "删除文章",
+
+            color: "#aa3629",
+
+            fontSize: "16",
+          },
+        ];
+      }
       this.selectArticleId = item.id;
       this.showOperate = true;
       // this.$refs.commentLikePopup.showCommentPopup();
@@ -365,23 +408,17 @@ export default {
               icon: "success",
               duration: 2000,
             });
-
-           
           }
-          this.$nextTick(()=>{
-           this.list=this.list.filter((e)=>{
-            return e.id!=this.selectArticleId
-           })
-this.count=this.list.length
-
-          })
-         
-         
-
+          this.$nextTick(() => {
+            this.list = this.list.filter((e) => {
+              return e.id != this.selectArticleId;
+            });
+            this.count = this.list.length;
+          });
         });
     },
     getListData(taihumedId, type) {
-    console.log('taihumedId at line 344:', taihumedId)
+      console.log("taihumedId at line 344:", taihumedId);
       if (type) {
         this.current = 1;
         this.list = [];
@@ -390,6 +427,9 @@ this.count=this.list.length
       if (this.noMore) {
         return false;
       }
+      if (this.current == 1) {
+        this.list = [];
+      }
       uni.showLoading({
         title: "加载中",
       });
@@ -421,15 +461,28 @@ this.count=this.list.length
             ) {
               this.noMore = true;
             }
-            this.list = [
-              ...this.list,
-              ...res.page.records.map((e) => {
-                return {
-                  ...e,
-                  fileList1: e.img ? e.img.split(",") : [],
-                };
-              }),
-            ];
+
+            if (this.current == 1) {
+              this.list = [
+                ...res.page.records.map((e) => {
+                  return {
+                    ...e,
+                    fileList1: e.img ? e.img.split(",") : [],
+                  };
+                }),
+              ];
+            } else {
+              this.list = [
+                ...this.list,
+                ...res.page.records.map((e) => {
+                  return {
+                    ...e,
+                    fileList1: e.img ? e.img.split(",") : [],
+                  };
+                }),
+              ];
+            }
+
             this.current += 1; //更新页码
             //显示提示语
             this.showText = true;
@@ -473,21 +526,13 @@ this.count=this.list.length
 
       switch (this.taihumedId) {
         case 0:
-          navTitle = "编辑文章";
-          type = "edit";
+          navTitle = "文章详情";
+          type = "detail";
           break;
         case 1:
           navTitle = "文章详情";
           type = "detail";
           break;
-        case 3:
-          navTitle = "文章详情";
-          type = "detail";
-          break;
-        case 2:
-          navTitle = "文章详情";
-          type = "detail";
-          break;
       }
       uni.navigateTo({
         url: `/pages/articleList/article?navTitle=${navTitle}&title=${navTitle}&id=${item.id}&type=${type}&statusId=${this.taihumedId}`,
diff --git a/pages/articleList/likeList.vue b/pages/articleList/likeList.vue
index 5244c071..b71b9128 100644
--- a/pages/articleList/likeList.vue
+++ b/pages/articleList/likeList.vue
@@ -5,6 +5,8 @@
       mode="bottom"
       :round="8"
       :background="'#fff'"
+      @close="closeOrderModalShow"
+
       style="background: #fff" backgroundColor="#fff"
     >
       <view class="orderModalShow popup_box">
@@ -29,7 +31,7 @@
         
         
         
-          <view class="hb-comment" style="height: 80vh">
+          <view class="hb-comment" style="max-height: 70vh">
           <view class="comment-list" v-if="likeList.length != 0">
           <view class="comment-box" v-for="(item, index) in likeList">
         <view class="comment-box-item">
@@ -109,6 +111,18 @@ export default {
   async onLoad(options) {
 
   },
+  watch: {
+    orderModalShow: {
+      handler(newVal, oldVal) {
+        
+            this.$emit("show",this.orderModalShow);
+        
+      
+
+      },
+      immediate: true,
+    },
+  }, 
    onShow() {
 
 
@@ -128,13 +142,16 @@ export default {
         this.articleInfo.taihuTalent
       );
       await this.getMedicalDetail(()=>{
+        
         this.orderModalShow = true;
       });
 
       
     },
     closeOrderModalShow() {
+     
       this.orderModalShow = false;
+     
       this.$emit("close",this.articleId);
 
     },
@@ -351,7 +368,7 @@ export default {
 }
 
 .comment-main-top {
-  width: 600rpx;
+  width: 100%;
   padding-top: 12rpx;
   display: flex;
   justify-content: space-between;
diff --git a/pages/articleList/pinglun.vue b/pages/articleList/pinglun.vue
index 99a43c7a..b579f83e 100644
--- a/pages/articleList/pinglun.vue
+++ b/pages/articleList/pinglun.vue
@@ -4,8 +4,10 @@
       :show="orderModalShow"
       mode="bottom"
       :round="8"
+      @close="closeOrderModalShow"
       :background="'#fff'"
-      style="background: #fff" backgroundColor="#fff"
+      style="background: #fff"
+      backgroundColor="#fff"
     >
       <view class="orderModalShow popup_box">
         <view style="text-align: center"
@@ -24,17 +26,21 @@
             top: 20rpx;
           "
         ></u-icon>
-        <hb-comment
-          style="padding-top: 40rpx; overflow: auto; padding-bottom: 100rpx"
-          :user="currentUser"
-          ref="hbComment"
-          @add="sendComment"
-          @del="del"
-          @focusOn="focusOn"
-          :deleteTip="'确认删除？'"
-          :cmData="commentData"
-          v-if="commentData"
-        ></hb-comment>
+        <scroll-view :scroll-into-view="targetId" scroll-y style="height: 70vh;padding-top: 40rpx;  padding-bottom: 100rpx">
+          <hb-comment
+            style=""
+            :user="currentUser"
+            :isPopup="true"
+            :articleUserId="articleInfo.userId"
+            ref="hbComment"
+            @add="sendComment"
+            @del="del"
+            @focusOn="focusOn"
+            :deleteTip="'确认删除？'"
+            :cmData="commentData"
+            v-if="commentData"
+          ></hb-comment
+        ></scroll-view>
       </view>
     </u-popup>
   </view>
@@ -43,58 +49,59 @@
 <script>
 import $http from "@/config/requestConfig.js";
 import { mapState, mapMutations } from "vuex";
-
-
+import { debounce, throttle } from "@/common/debounce.js";
 export default {
-  components: {
-
-  },
-  props:[],
+  components: {},
+  props: [],
   data() {
     return {
+      targetId: null,
       articleId: null,
       currentUser: {},
 
       orderModalShow: false,
       commentData: [],
       articleInfo: {},
-
     };
   },
   computed: {
     ...mapState(["userInfo"]),
   },
-  async onLoad(options) {
-
-  },
-   onShow() {
-
-
-
+  async onLoad(options) {},
+  onShow() {},
+  watch: {
+    orderModalShow: {
+      handler(newVal, oldVal) {
+        this.$emit("show", this.orderModalShow);
+      },
+      immediate: true,
+    },
   },
 
   methods: {
     // 自适应判断
+    scrollToView(id) {
+      // commentData
+      this.targetId = id; // 设置目标元素 id
+      setTimeout(() => {
+        this.targetId = null;
+      }, 1000);
+    },
 
-
-
-   async onHandleClickOpenComment(id) {
-      this.articleId=id;
+    async onHandleClickOpenComment(id) {
+      this.articleId = id;
       console.log("111 at line 384:", 111);
       console.log(
         "this.currentUser at line 365:",
         this.articleInfo.taihuTalent
       );
-      await this.getMedicalDetail(()=>{
+      await this.getMedicalDetail(() => {
         this.orderModalShow = true;
       });
-
-      
     },
     closeOrderModalShow() {
       this.orderModalShow = false;
-      this.$emit("close",this.articleId);
-
+      this.$emit("close", this.articleId);
     },
     saveContens(content) {
       console.log("content at line 322:", content);
@@ -148,14 +155,10 @@ export default {
         .catch((err) => {});
     },
 
-
-
-
     //点击每个记录
 
-
     //创建新对话
-    sendComment(comment, pid) {
+    sendComment: throttle(function (comment, pid) {
       this.$http
         .request({
           url: "common/taihuTalentArticle/addArticleComment",
@@ -174,11 +177,16 @@ export default {
           console.log("res at line 713:", res);
           if (res.code == 0) {
             this.getMedicalDetail();
+            if (pid == 0) {
+              setTimeout(() => {
+                this.scrollToView("commentData");
+              }, 500);
+            }
           } else {
             this.$commonJS.showToast("评论失败");
           }
         });
-    },
+    }),
 
     //交谈请求，获取回答
     getTree(data) {
@@ -205,7 +213,7 @@ export default {
           url: "common/taihuTalentArticle/getArticleLikeAndComment",
           method: "POST",
           data: {
-            articleId:  this.articleId,
+            articleId: this.articleId,
           },
           header: {
             "Content-Type": "application/json",
@@ -219,14 +227,17 @@ export default {
             this.articleInfo = res.article;
             this.medicalForm = { ...this.articleInfo };
             console.log("this.medicalForm at line 193:", this.articleInfo);
-           
+
             this.$nextTick(() => {
               // if (this.userInfo.id == this.articleInfo.userId) {
               //   this.currentUser = this.articleInfo.taihuTalent;
               // } else {
-                this.currentUser = {...this.userInfo,icon:this.userInfo.avatar};
+              this.currentUser = {
+                ...this.userInfo,
+                icon: this.userInfo.avatar,
+              };
 
-                console.log('this.currentUser at line 823:', this.currentUser)
+              console.log("this.currentUser at line 823:", this.currentUser);
               // }
             });
             this.commentData = res.comments;
@@ -234,8 +245,8 @@ export default {
               commentSize: res.commentCount,
               comment: this.getTree(this.commentData),
             };
-           
-            if(fn){
+
+            if (fn) {
               fn();
             }
 
diff --git a/pages/doctors/index.vue b/pages/doctors/index.vue
index 10cc8ca3..19835570 100644
--- a/pages/doctors/index.vue
+++ b/pages/doctors/index.vue
@@ -6,13 +6,13 @@
       fontColor="#fff"
       :backState="2000"
     >
-    <template v-slot:right v-if="activeTab === 1">
-        <view class="top_right" @tap="createFolder" style="margin-right: 20rpx;">
+      <template v-slot:right v-if="activeTab === 1">
+        <view class="top_right" @tap="createFolder" style="margin-right: 20rpx">
           <uni-icons type="folder-add" size="17" color="#fff"></uni-icons>
           <text>发布文章</text>
         </view>
       </template>
-  </z-nav-bar>
+    </z-nav-bar>
     <view
       class="doctors_module"
       :style="`top: ${42 + statusBarHeight}px;`"
@@ -198,8 +198,8 @@
           v-for="(item, index) in list"
           :key="item.id"
           :imgList="item.fileList1"
-          :avatar="item.taihuTalent.icon"
-          :name="item.taihuTalent.name"
+          :avatar="item.taihuTalent&&item.taihuTalent.icon?item.taihuTalent.icon:''"
+          :name="item.taihuTalent&&item.taihuTalent.name?item.taihuTalent.name:''"
           :createTime="item.createTime"
           :title="item.title"
           :content="item.content"
@@ -211,7 +211,7 @@
           :giveRewardNumber="item.giveRewardNumber"
           :commentCount="item.commentCount"
           @clickDynamic="clickDynamic(index)"
-          @clickUser="clickUser(item.id)"
+          @clickUser="clickUser(item)"
           @clickFocus="clickFocus(index)"
           @clickThumbsup="(type) => clickThumbsup(item.id, type)"
           @clickGiveReward="clickGiveReward(item.id)"
@@ -227,8 +227,8 @@
     <text class="null_text" v-else>{{ null_text }}</text>
 
     <z-navigation></z-navigation>
-    <common-pinglun ref="pinglun" @close="close"></common-pinglun>
-    <common-likeList ref="commonLikeList" @close="close"></common-likeList>
+    <common-pinglun ref="pinglun" @close="close" @show="(e)=>pinglunShow=e"></common-pinglun>
+    <common-likeList ref="commonLikeList" @close="close"  @show="(e)=>likeShow=e"></common-likeList>
     <uni-popup ref="share" type="share" safeArea backgroundColor="#fff">
       <uni-popup-share @select="haveSelected"></uni-popup-share>
     </uni-popup>
@@ -252,7 +252,8 @@ export default {
       list: [],
 
       null_text: "",
-
+      pinglunShow:false,
+      likeShow:false,
       current: 1,
       limit: 10,
       courseName: "",
@@ -275,6 +276,14 @@ export default {
   },
 
   onPullDownRefresh() {
+    if(this.pinglunShow){
+      uni.stopPullDownRefresh();
+      return false
+    }
+    if(this.likeShow){
+      uni.stopPullDownRefresh();
+      return false
+    }
     this.isRefreshing = true;
     console.log("下拉刷新");
 
@@ -288,7 +297,6 @@ export default {
         this.getArticleListData();
       }
 
-      
       uni.stopPullDownRefresh();
       this.isRefreshing = false;
       console.log("下拉刷新已停止");
@@ -300,6 +308,19 @@ export default {
   },
   onShow() {},
   methods: {
+    refreshData(reset) {
+      if (reset) {
+        this.currentCateIndex = 0;
+
+        //重置
+        this.list = [];
+        this.noMore = false;
+        this.show = false;
+        this.count = 0;
+        this.current = 1;
+        this.getArticleListData();
+      }
+    },
     createFolder() {
       uni.navigateTo({
         url: `/pages/articleList/article?navTitle=文章&title=文章&type=add`,
@@ -359,6 +380,9 @@ export default {
     clickUser(e) {
       console.log(e);
       console.log("childUser");
+      uni.navigateTo({
+        url: "/pages/talents/detail?id=" + e.taihuTalent.id,
+      });
     },
     // 点击关注
     clickFocus(e) {
diff --git a/pages/medicalRecords/index.vue b/pages/medicalRecords/index.vue
index 026a9032..9a2fa634 100644
--- a/pages/medicalRecords/index.vue
+++ b/pages/medicalRecords/index.vue
@@ -69,7 +69,7 @@
                     class="card_label"
                     v-if="statusTitle"
                     :style="`background-color:${statusColor} ;`"
-                    >{{item.state==4?'质检未通过': statusTitle }}</text
+                    >{{ item.state == 4 ? "质检未通过" : statusTitle }}</text
                   >
                   <image
                     v-if="currentCateIndex == 3 && item.state == 6"
@@ -168,22 +168,50 @@
                   "
                 >
                   <view
-                    @click.stop="changeShowFlag(item)"
                     v-if="taihumedId == 4"
                     :style="`color: ${
                       item.showFlag == 1 ? '#5188e5' : '#5e6d82'
                     };display: flex;align-items: center;`"
                   >
-                    <text style="margin-right: 10rpx"
-                      >是否在我的医案中展示</text
-                    >
-                    <uni-icons
-                      :color="item.showFlag == 1 ? '#5188e5' : '#5e6d82'"
-                      :type="
-                        item.showFlag == 0 ? 'eye-slash-filled' : 'eye-filled'
+                    <template @click.stop="changeShowFlag(item)">
+                      <text style="margin-right: 10rpx"
+                        >是否在我的医案中展示</text
+                      >
+                      <uni-icons
+                        :color="item.showFlag == 1 ? '#5188e5' : '#5e6d82'"
+                        :type="
+                          item.showFlag == 0 ? 'eye-slash-filled' : 'eye-filled'
+                        "
+                        size="24"
+                      ></uni-icons>
+                    </template>
+
+                    <view @click.stop="changeShowArticleFlag(item)"
+                      v-if="item.articleFlag == 0"
+                      style="
+                        position: absolute;
+                        right: 20rpx;
+                        top: 0;
+                        background-color: #0552c5;
+                        padding: 2rpx 20rpx;
+                        border-radius: 8rpx;
+                        color: #fff;
                       "
-                      size="24"
-                    ></uni-icons>
+                      >发布医案文章</view
+                    >
+                    <view
+                      v-else
+                      style="
+                        position: absolute;
+                        right: 20rpx;
+                        top: 0;
+                        background-color: #fff;
+                        padding: 2rpx 20rpx;
+                        border-radius: 8rpx;
+                        color: #0552c5;
+                      "
+                      >已发布</view
+                    >
                   </view>
                   <!-- <view @click.stop="changeShowFlag(item)"  v-if="taihumedId == 4" :style="`color: ${item.article_flag==1?'#5188e5':'#5e6d82'};display: flex;align-items: center;`">
                    <text style="margin-right: 10rpx;">是否在我的文章中展示</text>
@@ -401,6 +429,24 @@ export default {
           this.getListData(this.taihumedId);
         });
     },
+    changeShowArticleFlag(data) {
+      this.$http
+        .request({
+          url: "common/medicalRecords/addTaihuTalentArticle",
+          method: "POST",
+          data: {
+            ...data,
+            showArticleFlag: 1,
+
+          },
+          header: {
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          this.getListData(this.taihumedId);
+        });
+    },
     //加载更多
     loadMore() {
       this.getListData(this.taihumedId);
diff --git a/pages/medicalRecords/medical.vue b/pages/medicalRecords/medical.vue
index cb52eed1..4f54e0d6 100644
--- a/pages/medicalRecords/medical.vue
+++ b/pages/medicalRecords/medical.vue
@@ -382,6 +382,10 @@ export default {
           this.$commonJS.showToast("请输入 " + titleHtml);
           return false;
         }
+        if (this.fileList1.length == 0) {
+        this.$commonJS.showToast("请至少上传一张图片");
+        return;
+      }
       }
       if (
         ["妇科", "儿科"].includes(this.medicalForm.labelTitle) &&
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 2f790d65..d429eafa 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -270,11 +270,7 @@ export default {
           url: "/pages/curriculum/index/index",
           type: "pageJump",
         },
-        {
-          name: "我的文章",
-          url: "/pages/articleList/index",
-          type: "pageJump",
-        },
+        
         {
           name: "个人资料",
           url: "/pages/my/persData",
@@ -295,9 +291,10 @@ export default {
   if (this.userInfo.id != undefined) {
     try {
       // 同时发送两个请求，使用 Promise.all 确保并行处理
-      const [res1, res2] = await Promise.all([
+      const [res1, res2,res3] = await Promise.all([
         this.$http.post("common/medicalRecords/getMedicalRecordsRoleByUser"),
-        this.$http.post("common/medicalRecords/canCheck")
+        this.$http.post("common/medicalRecords/canCheck"),
+        this.$http.post("common/taihuTalentArticle/getArticleRoleByUser")
       ]);
 
       console.log("res1 at line 237:", res1);
@@ -313,13 +310,24 @@ export default {
           type: "pageJump",
           contentType: "shengpi",
         });
-      }   if (res1.code == 0 && res1.roleFlag == 1) {
+      }  
+      
+      if (res1.code == 0 && res1.roleFlag == 1) {
         this.pageList.splice(2, 0, {
           name: "我的医案",
           url: "/pages/medicalRecords/index",
           type: "pageJump",
         });
       }
+      if (res3.code == 0 && res3.roleFlag == 1) {
+        this.pageList.splice(2, 0, {
+         
+          name: "我的文章",
+          url: "/pages/articleList/index",
+          type: "pageJump",
+      
+        });
+      }
 
       // 在两个请求都成功后更新 pageList
    
diff --git a/uni_modules/hb-comment/components/hb-comment/Telecloud-emoji.vue b/uni_modules/hb-comment/components/hb-comment/Telecloud-emoji.vue
new file mode 100644
index 00000000..5123f666
--- /dev/null
+++ b/uni_modules/hb-comment/components/hb-comment/Telecloud-emoji.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="bottom_input_box" :style="show ? 'bottom: 430rpx' : ''">
+	  <!-- <image src="../static/audio.png" mode=""></image> -->
+	 
+	  <image src="./emoji.png"  @click="emojichet" mode=""></image><Emoji :show="show" @emoji="emojiChange" @emojiblur="emojiblur" />
+	</view>
+  
+	
+	
+  </template>
+  
+  <script>
+  import Emoji from './emoji.vue'
+
+  export default {
+	data() {
+	  return {
+		show: false, // 表示 emoji 列表是否显示
+		inputValue: '', // 输入框的值
+		focus: false, // 是否获得焦点
+	  };
+	},
+	components: {
+		Emoji
+	},
+
+	methods: {
+	  confirm() {
+		this.$emit('inputvalue', this.inputValue); // 发送按钮点击时，把input的值传递给父组件
+	  },
+  
+	  emojiblur() {
+		this.show = false; // 关闭 emoji 列表
+	  },
+  
+	  emojiChange(e) {
+		this.inputValue += e; // 添加 emoji 到输入框中
+	  },
+  
+	  keychange() {
+		this.show = false; // 关闭 emoji 列表并打开键盘
+		this.focus = true;
+	  },
+  
+	  emojichet() {
+		this.show = true; // 打开 emoji 列表
+	  }
+	}
+  };
+  </script>
+  
+  <style scoped lang="scss">
+  .bottom_input_box {
+	position: fixed;
+	bottom: 0;
+	height: 160rpx;
+	width: 100%;
+	z-index: 99;
+	background: #fff;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	border-radius: 20rpx 20rpx 0px 0px;
+  
+	image {
+	  height: 62rpx;
+	  width: 62rpx;
+	}
+  
+	.input_ {
+	  height: 62rpx;
+	  width: calc(100% - 300rpx);
+	  border: 1rpx solid #bbbbbb;
+	  border-radius: 30rpx;
+  
+	  input {
+		width: 90%;
+		height: 100%;
+		margin: 0 auto;
+	  }
+	}
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/uni_modules/hb-comment/components/hb-comment/emoji.png b/uni_modules/hb-comment/components/hb-comment/emoji.png
new file mode 100644
index 00000000..f3cb8fbf
Binary files /dev/null and b/uni_modules/hb-comment/components/hb-comment/emoji.png differ
diff --git a/uni_modules/hb-comment/components/hb-comment/emoji.vue b/uni_modules/hb-comment/components/hb-comment/emoji.vue
new file mode 100644
index 00000000..88054ac4
--- /dev/null
+++ b/uni_modules/hb-comment/components/hb-comment/emoji.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="emoji_blur" @click="emoji_blur" v-if="show">
+	  <view class="emoji_box">
+		<scroll-view class="scrool" scroll-y="true">
+		  <view class="emojis">
+			<text 
+			  @click.stop="tap(item)" 
+			  v-for="(item, index) in list" 
+			  :key="index"
+			>
+			  {{ item }}
+			</text>
+		  </view>
+		</scroll-view>
+	  </view>
+	</view>
+  </template>
+  
+  <script>
+  export default {
+	props: {
+	  show: Boolean
+	},
+	data() {
+	  return {
+		list: [
+		  '😃', '😆', '😅', '🤣', '😂', '🙂', '🙃', '😉', '😊', '😇', '🥰', '😍', '🤩', '😘', '😗', '☺️', '😚', '😙',
+		  '😋', '😛', '😜', '🤪', '😝', '🤑', '😩', '😖', '😨', '😭', '😞', '🤓', '🤠', '😎', '🥳', '😵', '🤧', '🤕',
+		  '🤗', '🤭', '🤫', '🤔', '🤐', '🤨', '😐', '😑', '😶', '😏', '😒', '🙄', '😬', '🤥', '😶‍🌫️', '😮‍🌫️', '😴',
+		  '🤮', '❤️', '💯', '💔', '💩', '🤡', '🤖', '👻', '🙈', '🙉', '🙊', '💣', '💋', '😡', '🤬', '😠'
+		]
+	  };
+	},
+	methods: {
+	  tap(item) {
+		this.$emit('emoji', item); // 触发 emoji 事件，将选择的 emoji 传给父组件
+	  },
+	  emoji_blur() {
+		this.$emit('emojiblur'); // 触发 emojiblur 事件，告诉父组件关闭 emoji 选择器
+	  }
+	}
+  };
+  </script>
+  
+  <style scoped lang="less">
+  .emoji_blur {
+	height: 100vh;
+	width: 100%;
+	position: absolute;
+	top: 0;
+	background: transparent;
+  }
+  
+  .emoji_box {
+	height: 430rpx;
+	background: #f6f6f6;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+  }
+  
+  .scrool {
+	height: 400rpx;
+	width: 100%;
+	margin-top: 30rpx;
+  }
+  
+  .emojis {
+	width: 95%;
+	margin: 0 auto;
+	font-size: 40rpx;
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10rpx 25rpx;
+	flex-shrink: 3;
+	padding-bottom: 50rpx;
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/uni_modules/hb-comment/components/hb-comment/hb-comment.vue b/uni_modules/hb-comment/components/hb-comment/hb-comment.vue
index 210e2a2b..b8351785 100644
--- a/uni_modules/hb-comment/components/hb-comment/hb-comment.vue
+++ b/uni_modules/hb-comment/components/hb-comment/hb-comment.vue
@@ -1,5 +1,9 @@
 <template>
-  <view class="hb-comment" style="height: 60vh">
+  <view
+    class="hb-comment"
+    :style="isDisable || isShowList || isPopup ? 'height:auto' : 'height: 70vh'"
+    id="commentData"
+  >
     <!-- 阅读数-start -->
 
     <!-- 阅读数-end -->
@@ -11,7 +15,21 @@
 		</view> -->
     <!-- 阅读数下边那条线-end -->
     <!-- 评论主体-start -->
-    <view class="comment-list" v-if="commentData.comment.length != 0">
+    <view
+      class="comment-list"
+      :style="
+        isDisable || isShowList
+          ? ' background-color: #f7f7f7;padding: 4px 10px;display: flex;align-items:flex-start'
+          : ''
+      "
+      v-if="commentData.comment.length != 0"
+    >
+      <uni-icons
+        v-if="isDisable || isShowList"
+        type="chat"
+        size="22"
+        style="color: #5188e5; margin-right: 10rpx; margin-top: 10rpx"
+      ></uni-icons>
       <!-- 评论主体-顶部数量及发表评论按钮-start -->
       <!-- <view class="comment-num">
         <view>共 {{ commentData.commentSize }} 条评论</view>
@@ -23,191 +41,213 @@
       </view> -->
       <!-- 评论主体-顶部数量及发表评论按钮-end -->
       <!-- 评论列表-start -->
-      <view class="comment-box" v-for="(item, index) in commentData.comment">
-        <view class="comment-box-item">
-          <view>
-            <image
-              v-if="item.user.avatar"
-              :src="item.user.avatar"
-              mode="aspectFill"
-              class="avatar"
-            ></image>
-            <image
-              v-else
-              src="/static/icon/noIcon.png"
-              mode="aspectFill"
-              class="avatar"
-            ></image>
-          </view>
-          <view class="comment-main">
-            <!-- 父评论体-start -->
-            <view class="comment-main-top">
-              <view class="nick-name-box">
-                <view class="nick-name"
-                  >{{ item.user.nickname ? item.user.nickname : "普通用户" }}
-                  <text
-                    class="zuozhe"
-                    v-if="user.userId || user.id == item.user.userId"
-                    >作者</text
-                  ></view
-                >
-              </view>
+      <view :style="isDisable || isShowList ? 'width:calc(100% - 46rpx);' : ''">
+        <view class="comment-box" v-for="(item, index) in commentData.comment">
+          <view class="comment-box-item">
+            <view>
+              <image
+                v-if="item.user.avatar"
+                :src="item.user.avatar"
+                mode="aspectFill"
+                class="avatar"
+              ></image>
+              <image
+                v-else
+                src="/static/icon/noIcon.png"
+                mode="aspectFill"
+                class="avatar"
+              ></image>
             </view>
-            <view
-              class="comment-main-content"
-              style="color: #232325; line-height: 38rpx"
-              @click="reply(item.user.nickname, item.user.nickname, item.id)"
-            >
-              {{ item.content }}
-              <!-- {{
+            <view class="comment-main">
+              <!-- 父评论体-start -->
+              <view class="comment-main-top">
+                <view class="nick-name-box">
+                  <view class="nick-name"
+                    >{{ item.user.nickname ? item.user.nickname : "普通用户" }}
+                    <text class="zuozhe" v-if="articleUserId == item.userId"
+                      >作者</text
+                    ></view
+                  >
+                </view>
+              </view>
+              <view
+                class="comment-main-content"
+                style="color: #232325; line-height: 38rpx"
+                @click="reply(item.user.nickname, item.user.nickname, item.id)"
+              >
+                {{ item.content }}
+                <!-- {{
                 item.content.length > 60
                   ? item.content.slice(0, 59)
                   : item.content
               }} -->
-              <!-- <span v-if="item.content.length > 60">
+                <!-- <span v-if="item.content.length > 60">
                 {{ item.hasShowMore ? item.content.slice(59) : "..." }}
                 <span class="foot-btn" @click="showMore(item.id)"  style="color: #5188e5 !important;">
                   {{ item.hasShowMore ? "收起" : "展开" }}
                 </span>
               </span> -->
-            </view>
-            <view class="comment-main-foot">
-              <view
-                class="foot-time"
-                style="color: #b7b8ba; letter-spacing: 1rpx; font-size: 24rpx"
-                >{{ item.createTime }}</view
-              >
-              <view
-                class="foot-btn"
-                style="color: #777775"
-                @click="reply(item.user.nickname, item.user.nickname, item.id)"
-                >回复</view
-              >
-              <!-- <view
+              </view>
+              <view class="comment-main-foot">
+                <view
+                  @click="
+                    reply(item.user.nickname, item.user.nickname, item.id)
+                  "
+                  class="foot-time"
+                  style="color: #b7b8ba; letter-spacing: 1rpx; font-size: 24rpx"
+                  >{{ item.createTime }}</view
+                >
+                <view
+                  class="foot-btn"
+                  style="color: #777775"
+                  v-if="!isDisable"
+                  @click="
+                    reply(item.user.nickname, item.user.nickname, item.id)
+                  "
+                  >回复</view
+                >
+                <!-- <view
                 class="foot-btn"
                 v-if="item.owner"
                 @click="confirmDelete(item.id)"
                 >删除</view
               > -->
-            </view>
-            <!-- 父评论体-end -->
-            <!-- 子评论列表-start -->
-            <view class="comment-sub-box" v-if="item.children.length != 0">
-              <view class="comment-sub-item" v-for="each in item.children">
-                <view>
-                  <image
-                    v-if="each.user.avatar"
-                    :src="each.user.avatar"
-                    mode="aspectFill"
-                    class="avatar"
-                  ></image>
-                  <image
-                    v-else
-                    src="/static/icon/noIcon.png"
-                    mode="aspectFill"
-                    class="avatar"
-                  ></image>
-                </view>
-                <view class="comment-main">
-                  <view class="sub-comment-main-top">
-                    <view class="nick-name" v-if="each.user"
-                      >{{
-                        each.user.nickname ? each.user.nickname : "普通用户"
-                      }}
-                      <text
-                        class="zuozhe"
-                        v-if="user.userId || user.id == each.user.userId"
-                        >作者</text
-                      >
+              </view>
+              <!-- 父评论体-end -->
+              <!-- 子评论列表-start -->
+              <view class="comment-sub-box" v-if="item.children.length != 0">
+                <view class="comment-sub-item" v-for="each in item.children">
+                  <view>
+                    <image
+                      v-if="each.user.avatar"
+                      :src="each.user.avatar"
+                      mode="aspectFill"
+                      class="avatar"
+                    ></image>
+                    <image
+                      v-else
+                      src="/static/icon/noIcon.png"
+                      mode="aspectFill"
+                      class="avatar"
+                    ></image>
+                  </view>
+                  <view class="comment-main">
+                    <view class="sub-comment-main-top">
+                      <view class="nick-name" v-if="each.user"
+                        >{{
+                          each.user.nickname ? each.user.nickname : "普通用户"
+                        }}
+                        <text class="zuozhe" v-if="articleUserId == each.userId"
+                          >作者</text
+                        >
+                      </view>
                     </view>
-                  </view>
-                  <view
-                    class="comment-main-content"
-                    style="color: #232325 !important; line-height: 38rpx"
-                  >
-                    {{ each.content }}
-                  </view>
-                  <view class="comment-main-foot">
                     <view
-                      class="foot-time"
-                      style="
-                        color: #b7b8ba;
-                        letter-spacing: 1rpx;
-                        font-size: 24rpx;
-                      "
-                      >{{ each.createTime }}</view
-                    >
-                    <view
-                      class="foot-btn"
-                      style="color: #777775"
-                      v-if="each.user"
+                      class="comment-main-content"
+                      style="color: #232325 !important; line-height: 38rpx"
                       @click="
                         reply(each.user.nickname, each.user.nickname, item.id)
                       "
                     >
-                      回复</view
-                    >
-                    <!-- <view
+                      {{ each.content }}
+                    </view>
+                    <view class="comment-main-foot">
+                      <view
+                        @click="
+                          reply(each.user.nickname, each.user.nickname, item.id)
+                        "
+                        class="foot-time"
+                        style="
+                          color: #b7b8ba;
+                          letter-spacing: 1rpx;
+                          font-size: 24rpx;
+                        "
+                        >{{ each.createTime }}</view
+                      >
+                      <view
+                        class="foot-btn"
+                        style="color: #777775"
+                        v-if="each.user && !isDisable"
+                        @click="
+                          reply(each.user.nickname, each.user.nickname, item.id)
+                        "
+                      >
+                        回复</view
+                      >
+                      <!-- <view
                       class="foot-btn"
                       v-if="each.owner"
                       @click="confirmDelete(each.id)"
                       >删除
                     </view> -->
+                    </view>
                   </view>
                 </view>
               </view>
+              <!-- 子评论列表-end -->
             </view>
-            <!-- 子评论列表-end -->
           </view>
         </view>
       </view>
+
       <!-- 评论列表-end -->
     </view>
     <!-- 评论主体-end -->
     <!-- 无评论-start -->
-    <view class="comment-none">
-      <image v-if="user.icon"
+    <view
+      class="comment-none"
+      @click="
+        showInput = false;
+        commentContent = '';
+      "
+      v-if="!isDisable"
+      style="background-color: #fafafa"
+    >
+      <!-- <image
+        v-if="user.icon"
         :src="user.icon"
         style="
-          width: 60rpx;
-          height: 60rpx;
+          width: 64rpx;
+          height: 64rpx;
           margin: 0 8rpx;
           display: block;
-          border-radius: 60rpx;
+          border-radius: 64rpx;
           margin-top: 4rpx;
         "
       />
-      <image v-else
+      <image
+        v-else
         src="/static/icon/noIcon.png"
         style="
-          width: 60rpx;
-          height: 60rpx;
+          width: 64rpx;
+          height: 64rpx;
           margin: 0 8rpx;
           display: block;
-          border-radius: 60rpx;margin-top: 4rpx;
+          border-radius: 64rpx;
+          margin-top: 4rpx;
         "
-      />
+      /> -->
 
       <!-- background-color: #dadada59; -->
       <view
         style="
-          width: calc(100% - 100rpx);
+          width: calc(100% - 20rpx);
           margin-right: 20rpx;
           position: relative;
           padding: 14rpx 20rpx;
           border-radius: 10rpx;
         "
       >
-        <view v-if="currentInputComment" style="position: absolute; top: 10rpx"
+        <!-- <view v-if="currentInputComment" style="position: absolute; top: 10rpx"
           ><text @click="currentInputComment = ''">清空</text
           ><text @click="sendComment">发送</text></view
-        >
+        > -->
         <!-- @click="showInput = true" -->
         <view
-          style="font-size: 30rpx; width: calc(100%)"
-          @click="reply('', '', 0)"
+          style="font-size: 28rpx; width: calc(100%)"
+          @click.stop="reply('', '', 0)"
           v-if="!showInput"
-          >写评论...</view
+          >发表评论...</view
         >
       </view>
       <view
@@ -215,18 +255,51 @@
         :style="{ bottom: keyboardHeight + 'px' }"
         v-if="showInput"
       >
-        <view style="overflow: hidden; margin-bottom: 4rpx;font-size: 26rpx"
+        <view style="overflow: hidden; margin-bottom: 4rpx; font-size: 28rpx"
           ><text
-            @click="
+            @click.stop="
               showInput = false;
               commentContent = '';
             "
             style="float: left"
             >取消</text
-          ><text @click="sendComment" style="float: right; color: #1985fd"
+          >
+
+          <text @click.stop="sendComment" style="float: right; color: #1985fd"
             >发送</text
-          ></view
+          >
+          <image v-if="!show"
+            src="./emoji.png"
+            @click.stop="emojichet()"
+            mode=""
+            style="
+              height: 52rpx;
+              width: 52rpx;
+              object-fit: fill;
+              float: right;
+              margin-right: 2%;
+              margin-top: -4rpx;
+            "
+          ></image
         >
+          <image v-else
+            src="./jianpan.png"
+            @click.stop="emojichet()"
+            mode=""
+            style="
+              height: 52rpx;
+              width: 52rpx;
+              object-fit: fill;
+              float: right;
+              margin-right: 2%;
+              margin-top: -4rpx;
+            "
+          ></image
+        >
+      
+      
+      
+      </view>
         <view>
           <textarea
             auto-height
@@ -234,19 +307,37 @@
             v-model="commentContent"
             class="comment-input"
             maxlength="-1"
-            :placeholder="placeholder ? placeholder : '写评论...'"
-            @focus="onInputFocus"
-            @blur="onInputBlur"
+            :placeholder="placeholder ? placeholder : '发表评论...'"
+            @focus.stop="onInputFocus"
+            @blur.stop="onInputBlur"
             :auto-focus="showInput"
           />
         </view>
+
+        <view
+          class="emoji_box"
+          v-if="show"
+          :style="{ height: keyboardHeight + 'px' }"
+        >
+          <scroll-view class="scrool" scroll-y="true">
+            <view class="emojis">
+              <text
+                @click.stop="tap(item)"
+                v-for="(item, index) in list"
+                :key="index"
+              >
+                {{ item }}
+              </text>
+            </view>
+          </scroll-view>
+        </view>
       </view>
 
       <!-- 暂无评论，<span @click="commentInput" style="color: #007AFF;">立即评论</span> -->
     </view>
     <!-- 无评论-end -->
     <!-- 新增评论-start -->
-    <view class="comment-submit-box" v-if="submit" @click="closeInput">
+    <view class="comment-submit-box" v-if="submit" @click.stop="closeInput">
       <!-- 下边的click.stop.prevent用于让上边的click不传下去，以防点到下边的空白处触发closeInput方法 -->
       <view
         class="comment-add"
@@ -271,19 +362,21 @@
           :placeholder="placeholder"
           :adjust-position="false"
           :show-confirm-bar="false"
-          @blur="blur"
-          @focus="focusOn"
+          @blur.stop="blur"
+          @focus.stop="focusOn"
           :focus="focus"
           maxlength="800"
         ></textarea>
       </view>
     </view>
+    <!-- <Emoji :show="show" @emoji="emojiChange" @emojiblur="emojiblur" /> -->
     <!-- 新增评论-end -->
   </view>
 </template>
 
 <script>
 import text from "uview-ui/libs/config/props/text";
+import Emoji from "./emoji.vue";
 
 export default {
   name: "hb-comment",
@@ -294,12 +387,35 @@ export default {
         return null;
       },
     },
+    isDisable: {
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
+    isShowList: {
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
+    isPopup: {
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
     user: {
       type: Object,
       default: () => {
         return null;
       },
     },
+    articleUserId: {
+      default: () => {
+        return null;
+      },
+    },
     deleteTip: {
       type: String,
       default: () => {
@@ -315,9 +431,84 @@ export default {
       immediate: true,
     },
   },
+  components: {
+    Emoji,
+  },
   data() {
     return {
+      list: [
+        "😃",
+        "😆",
+        "😅",
+        "🤣",
+        "😂",
+        "🙂",
+        "🙃",
+        "😉",
+        "😊",
+        "😇",
+        "🥰",
+        "😍",
+        "🤩",
+        "😘",
+        "😗",
+        "☺️",
+        "😚",
+        "😙",
+        "😋",
+        "😛",
+        "😜",
+        "🤪",
+        "😝",
+        "🤑",
+        "😩",
+        "😖",
+        "😨",
+        "😭",
+        "😞",
+        "🤓",
+        "🤠",
+        "😎",
+        "🥳",
+        "😵",
+        "🤧",
+        "🤕",
+        "🤗",
+        "🤭",
+        "🤫",
+        "🤔",
+        "🤐",
+        "🤨",
+        "😐",
+        "😑",
+        "😶",
+        "😏",
+        "😒",
+        "🙄",
+        "😬",
+        "🤥",
+        "😶‍🌫️",
+        "😮‍🌫️",
+        "😴",
+        "🤮",
+        "❤️",
+        "💯",
+        "💔",
+        "💩",
+        "🤡",
+        "🤖",
+        "👻",
+        "🙈",
+        "🙉",
+        "🙊",
+        "💣",
+        "💋",
+        "😡",
+        "🤬",
+        "😠",
+      ],
       pId: 0,
+      show: false, // 是否显示输入框
       showInput: false, // 是否显示输入框
       commentContent: "", // 评论内容
       keyboardHeight: 0, // 软键盘高度
@@ -339,7 +530,7 @@ export default {
   mounted: function () {
     this.pId = 0;
     this.showInput = false;
-    this.placeholder = "写评论...";
+    this.placeholder = "发表评论...";
     this.commentContent = "";
 
     this.keyboardListener = uni.onKeyboardHeightChange((res) => {
@@ -356,16 +547,44 @@ export default {
     }
   },
   methods: {
+    tap(item) {
+      console.log("item at line 515:", item);
+      this.commentContent += item;
+
+      // this.$emit("emoji", item); // 触发 emoji 事件，将选择的 emoji 传给父组件
+    },
+
+    emojichet() {
+      // this.reply("", "", 0);
+      
+      this.show = !this.show; // 打开 emoji 列表
+    },
+
+    scrollToView(callback) {
+      const query = uni.createSelectorQuery().in(this);
+      query
+        .select("#commentData")
+        .boundingClientRect((rect) => {
+          if (rect) {
+            callback(rect);
+          }
+        })
+        .exec();
+    },
     onInputFocus() {
       // 可以在这里添加额外的逻辑，如滚动到输入框位置
     },
 
     // 输入框失去焦点
     onInputBlur() {
+      console.log(11111111111);
+      setTimeout(() => {
+        if (!this.commentContent.trim() && !this.show) {
+          this.showInput = false;
+        }
+      }, 200);
+
       // 如果输入框为空，点击空白处关闭输入框
-      if (!this.commentContent.trim()) {
-        this.showInput = false;
-      }
     },
 
     // 发送评论
@@ -378,6 +597,8 @@ export default {
         // 发送成功后清空并隐藏输入框
         this.commentContent = "";
         this.showInput = false;
+      } else {
+        this.$commonJS.showToast("请输入评论");
       }
     },
     // 初始化评论
@@ -394,6 +615,9 @@ export default {
     stopPrevent() {},
     // 回复评论
     reply(pUser, reUser, pId) {
+      if (this.isDisable) {
+        return false;
+      }
       this.pUser = pUser;
       this.commentReq.pId = pId;
       this.pId = pId;
@@ -402,7 +626,7 @@ export default {
         this.placeholder = "回复 " + str + ":";
       } else {
         var str = "";
-        this.placeholder = "写评论...";
+        this.placeholder = "发表评论...";
       }
 
       //   if (reUser) {
@@ -585,14 +809,14 @@ export default {
 }
 
 .comment-main {
-  width: calc(100% - 70rpx);
+  width: calc(100% - 64rpx);
 
   padding-left: 20rpx;
 }
 
 .comment-main-top {
-  width: 600rpx;
-  padding-top: 12rpx;
+  width: 100%;
+  padding-top: 4rpx;
   display: flex;
   justify-content: space-between;
 }
@@ -605,8 +829,8 @@ export default {
 }
 
 .avatar {
-  width: 70rpx;
-  height: 70rpx;
+  width: 64rpx;
+  height: 64rpx;
   border-radius: 50%;
 }
 
@@ -709,11 +933,12 @@ export default {
 }
 
 .comment-none {
+  height: auto;
   padding: 4rpx 0;
   width: 100%;
   //   text-align: center;
   color: #999999;
-  position: absolute;
+  position: fixed;
   bottom: 0;
   left: 0;
   display: flex;
@@ -826,4 +1051,37 @@ export default {
   line-height: 20rpx;
   margin-top: -4rpx;
 }
+
+.emoji_blur {
+  height: 100vh;
+  width: 100%;
+  position: absolute;
+  top: 0;
+  background: transparent;
+}
+
+.emoji_box {
+  height: 440rpx;
+  background: #f6f6f6;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+}
+
+.scrool {
+  height: 400rpx;
+  width: 100%;
+  margin-top: 30rpx;
+}
+
+.emojis {
+  width: 95%;
+  margin: 0 auto;
+  font-size: 40rpx;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10rpx 25rpx;
+  flex-shrink: 3;
+  // padding-bottom: 50rpx;
+}
 </style>
diff --git a/uni_modules/hb-comment/components/hb-comment/jianpan.png b/uni_modules/hb-comment/components/hb-comment/jianpan.png
new file mode 100644
index 00000000..9b618003
Binary files /dev/null and b/uni_modules/hb-comment/components/hb-comment/jianpan.png differ