diff --git a/components/author-img/author-img.vue b/components/author-img/author-img.vue
index 3734e4e..0cdf6f2 100644
--- a/components/author-img/author-img.vue
+++ b/components/author-img/author-img.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="item-author">
 		<view>
-			<u-avatar v-if="avatar && avatar!=''" shape="circle" :size="40" :src="fileBaseUrl + avatar" ></u-avatar>
+			<u-avatar v-if="avatar && avatar!=''" shape="circle" :size="size" :src="fileBaseUrl + avatar" ></u-avatar>
 			<view  v-else>
-			   <view v-if="sex == null" class="peo"></view>
-			   <view v-else>
+			   <view v-if="sex == null" class="peo" :style="{width:width,height:height}"></view>
+			   <view v-else :style="{width:width,height:height}">
 			   	  <view class="peo" v-if="sex === 1 "><image src="../../static/images/man.png" alt=""></view>
 			   	  <view class="peo" v-else><image src="../../static/images/woman.png" alt=""></view>
 			   </view>
@@ -39,7 +39,19 @@
 			sex:{
 				type:Number,
 				default:null
-			}
+			},
+			size:{
+				type:Number,
+				default:40
+			},
+			width:{
+				type:String,
+				default:'40px'
+			},
+			height:{
+				type:String,
+				default:'40px'
+			},
 		},
 		data(){
 			return {
@@ -74,8 +86,8 @@
 
 <style lang="scss" scoped>
 	.peo{
-		width: 40px;
-		height: 40px;
+		width: 100%;
+		height: 100%;
 		image{
 			width: 100%;
 			height: 100%;
diff --git a/components/comments/comments.vue b/components/comments/comments.vue
index a1869e7..b4f94cc 100644
--- a/components/comments/comments.vue
+++ b/components/comments/comments.vue
@@ -4,8 +4,8 @@
 		<view class="comments">
 			<view v-if="showTop" class="comments-top">
 				<view>
-					<text style="font-size: 30upx;font-weight: 500;">评论 </text>
-					<text style="font-size: 30upx;padding-left: 6upx;color: #000000;"> ( {{total}} )</text></view>
+					<text style="font-size: 32upx;font-weight: 500;">评论 </text>
+					<text style="font-size: 28upx;padding-left: 20upx;color: #333;font-weight: 400;"> ({{total}})</text></view>
 				<view>
 				<!-- <view v-if="showShare" class="share-btn" @click="addShare">
 					<view class="share-btn-icon"><img src="/static/images/icon/share.png" alt=""></view> 
@@ -17,23 +17,30 @@
 				<!--内容确定了，这部分样式要移到class中-->
 				<view v-for="(comm,commidx) in list" :key="commidx" class="comment">
 					<view class="comment-top">
-						<view style="display: flex;">
-							<author :showInfo="true" :data="comm"></author>
-							<!-- <author-info :avatar="comm.avatar" :name="comm.sysCreateBy"></author-info> -->
-						</view>
-						<view class="comment-time">
-							<time-show :time="comm.sysCreateTime"></time-show> 
-						</view>
+						<author-img :avatar="comm.avatar" :sex="comm.sex" width="30px" height="30px" :size="30"></author-img>
+						<text style="font-size: 28upx;ont-weight: 500;color: #333333;margin-left: 22upx;">{{comm.sysCreateBy}}</text>
 					</view>
 					<view class="comment-body">
+						
 						<view class="comment-content" v-html="comm.content"></view>
+						
 						<view class="comment-btns">
-							<view>
+							<view class="comment-time">
+								<time-show :time="comm.sysCreateTime"></time-show> 
+							</view>
+							<view class="" style="display: flex;">
+								<view style="font-size: 12px;color: #999999;line-height: 60upx;" @click="openInput(commidx)">
+									<image style="width: 36upx;height: 36upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-comment.png" size="24"></image>回复
+									<!-- <u-icon @click="openInput(commidx)" name="chat" color="#979797" size="18" label="回复"></u-icon> -->
+								</view>
+								<interact-bar :data="comm" :comments="false" :favorites="false"></interact-bar>
+							</view>
+							<!-- <view>
 								<u-icon @click="openInput(commidx)" name="chat" color="#979797" size="18" label="回复"></u-icon>
-							</view>
-							<view>
+							</view> -->
+							<!-- <view>
 								<u-icon @click="openBtns(commidx,-1,comm)" name="more-dot-fill" size="20"></u-icon>
-							</view>
+							</view> -->
 						</view>
 						<view v-if="comm.replyList && comm.replyList.length>0" class="comment-replys">
 							<view v-for="(reply,replyIdx) in comm.replyList" :key="replyIdx" class="comment">
@@ -43,23 +50,32 @@
 										<!-- <author-info :avatar="reply.avatar" :name="reply.sysCreateBy"></author-info> -->
 										<!-- <u-avatar shape="square" icon="account" :size="26" :src="reply.avatar"></u-avatar>
 										<text style="margin-left: 10upx;"> {{reply.sysCreateBy}}</text> -->
-										<text style="padding-left: 16upx;padding-top: 6upx;color: #979797;"> 回复 </text>
+										<text style="padding-left: 16upx;padding-top: 6upx;color: #979797;font-size: 20upx;"> 回复 </text>
 										<text style="padding-left: 16upx;padding-top: 6upx;font-size: 26upx;">{{reply.replyName}}</text>
 									</view>
-									<view class="comment-time">
-										<time-show :time="reply.sysCreateTime"></time-show> 
-									</view>
+								
 								</view>
-								<view class="comment-body">
+								<view class="comment-body" style="margin-left: 0;padding-left: 50upx;">
 									<view class="comment-content" v-html="reply.content"></view>
-									<view class="comment-btns">
-										<view>
-											<u-icon @click="openInput(commidx,replyIdx)" name="chat" color="#979797" size="18" label="回复"></u-icon>
+									<view class="" style="display: flex;justify-content: space-between;">
+										<view class="comment-time">
+											<time-show :time="reply.sysCreateTime"></time-show> 
 										</view>
-										<view>
-											<u-icon @click="openBtns(commidx,replyIdx,reply)" name="more-dot-fill" size="20"></u-icon>
+										<view class="comment-btns" style="line-height: 60upx;">
+											<view style="font-size: 12px;color: #999999;" @click="openInput(commidx,replyIdx)">
+												<image style="width: 36upx;height: 36upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-comment.png" size="24"></image>回复
+												<!-- <u-icon @click="openInput(commidx)" name="chat" color="#979797" size="18" label="回复"></u-icon> -->
+											</view>
+											<interact-bar :data="reply" :comments="false" :favorites="false"></interact-bar>
+										<!-- 	<view>
+												<u-icon @click="openInput(commidx,replyIdx)" name="chat" color="#979797" size="18" label="回复"></u-icon>
+											</view>
+											<view>
+												<u-icon @click="openBtns(commidx,replyIdx,reply)" name="more-dot-fill" size="20"></u-icon>
+											</view> -->
 										</view>
 									</view>
+									
 								</view>
 							</view>
 						</view>
@@ -75,12 +91,12 @@
 		<view v-if="total>pageSize">
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
-		<u-popup :show="inputShow" @close="closeInput">
+		<u-popup :show="inputShow" @close="closeInput" :round="16">
 			<view>
-				<view style="display: flex;">
-					<view style="flex: 1;"><u--textarea confirmType="done" :height="150" v-model="inputValue" placeholder="请输入内容" count ></u--textarea></view>
-					<view style="width:160upx;text-align: center;padding-top: 10px;line-height: 80upx;">
-						<view style="padding: 20upx;padding-top: 40px;"><u-button @click="submitReply()" type="primary" text="发布"></u-button></view>
+				<view style="padding: 60upx 30upx;">
+					<view><u--textarea confirmType="done" style="border: none;background: #F4F4F4;" :height="50" v-model="inputValue" placeholder="请输入内容" count ></u--textarea></view>
+					<view style="width:160upx;padding-top: 10px;line-height: 80upx;float: right;">
+						<view style="padding: 20upx;margin-top: 20upx;"><u-button style="padding: 2upx 30upx;height: 52upx;background: #87B3FF;border-color: #87B3FF;" @click="submitReply()" type="primary" text="发布"></u-button></view>
 					</view>
 				</view>
 				<view>
@@ -259,9 +275,12 @@
 			            list.forEach((item,index)=>{
 			              res.result.some(author=>{
 			                if(author.aid==item.sysCreateAid){
-								if(author.avatar != '') {
+								if(item.parentId == "-1" ) {
+									item.avatar= author.avatar;
+								} else if(author.avatar != ''){
 									item.avatar=this.$config.fileUrl + author.avatar;
 								}
+							  // item.avatar= author.avatar;
 							  item.sex=author.sex;
 			                  item.orgInfo=author.orgInfo;
 			                  return true;
@@ -544,7 +563,7 @@
 		padding-top: 20upx;
 		.comment-top{
 			display: flex;
-			justify-content: space-between;
+			// justify-content: space-between;
 			line-height: 50upx;
 			.comment-avatar{
 				height: 50upx;
@@ -557,13 +576,14 @@
 			}
 		}
 		.comment-body{
-			padding: 6upx 0upx 0upx 60upx;
+			margin-left: 22upx;
+			padding: 0 0upx 0upx 60upx;
 			color: #373737;
 			.comment-content{
 				word-break:break-all;
 				padding: 0upx 10upx 10upx 0upx;
 				font-size: 28upx;
-				color: #333333;
+				color: #666666;
 			}
 			.comment-btns{
 				display: flex;
diff --git a/components/interact-fixed/interact-fixed.vue b/components/interact-fixed/interact-fixed.vue
index 787d0c4..c98e3bf 100644
--- a/components/interact-fixed/interact-fixed.vue
+++ b/components/interact-fixed/interact-fixed.vue
@@ -15,34 +15,33 @@
 					<view class="interact-bar-icon"><image style="width:34upx;height: 31upx;" src="/static/images/icon/comment.png" alt=""></view>
 					<view class="interact-bar-txt">{{data.answers}}</view>
 				</view> -->
-				<view class="" style="display:flex;width: 50%;justify-content: flex-end;padding-right: 20rpx;">
+				<view class="" style="display:flex;width: 50%;justify-content: flex-end;padding-right: 20rpx;margin-top: 16upx;">
 					<view v-if="comments"  class="interact-bar-item" @click="handleComment()">
 						<view class="interact-bar-icon"><image style="width:40upx;height: 40upx;" src="/static/images/icon/comment.png" alt=""></view>
-						<view class="interact-bar-txt">{{data.comments}}</view>
+						<!-- <view class="interact-bar-txt">{{data.comments}}</view> -->
 					</view>
 					<view v-if="praises" @click="addPraise" class="interact-bar-item">
 						<view class="interact-bar-icon" v-if="isPraise"><image style="width:40upx;height: 40upx;" src="/static/images/icon/artice-praise-active.png" alt="" ></view>
 						<view class="interact-bar-icon" v-else><image style="width:40upx;height: 40upx;" src="/static/images/icon/artice-praise.png" alt="" ></view>
-						<view class="interact-bar-txt">{{data.praises}}</view>
-					</view>
-					<view v-if="shares" @click="addShare" class="interact-bar-item">
-						<view class="interact-bar-icon"><image style="width:40upx;height: 40upx;" src="/static/images/icon/share.png" alt=""></view>
-						<view class="interact-bar-txt">分享</view>
+						<!-- <view class="interact-bar-txt">{{data.praises}}</view> -->
 					</view>
 					<view v-if="favorites"  @click="addFavorite()" class="interact-bar-item">
 						<view class="interact-bar-icon" v-if="isFavorite"><image style="width:40upx;height: 40upx;" src="/static/images/icon/favorite-active.png" alt="" ></view>
 						<view class="interact-bar-icon" v-else><image style="width:40upx;height: 40upx;" src="/static/images/icon/favorite.png" alt="" ></view>
 						<!-- <view class="interact-bar-txt">收藏</view> -->
-						<view class="interact-bar-txt">{{data.favorites}}</view>
+						<!-- <view class="interact-bar-txt">{{data.favorites}}</view> -->
 						<!-- 这里需要一个是否已经收藏的变量来控制，已收藏就显示收藏数 -->
 					</view>
+					<view v-if="shares" @click="addShare" class="interact-bar-item">
+						<view class="interact-bar-icon"><image style="width:40upx;height: 40upx;" src="/static/images/icon/share.png" alt=""></view>
+						<!-- <view class="interact-bar-txt">分享</view> -->
+					</view>
 				</view>
-				
 			</view>
 			
 		</view>
 		<u-toast ref="interactToast"></u-toast>
-		<u-popup :show="inputShow" @close="closeInput" @open="openInput">
+		<u-popup :show="inputShow" @close="closeInput" @open="openInput" :round="16">
 		  <view class="users-box" v-show="usersListShow">
 		  	<view class="users-list" v-for="u in usersList" :key="u.id" @click="userSelect(u)">
 		  		<u-avatar shape="circle" :size="50" v-if="u.avatar != ''" :src="u.avatar"></u-avatar>
@@ -56,11 +55,11 @@
 		  </view>
 			
 			<view>
-				<view style="display: flex;">
-					<view style="flex: 1;"><u--textarea :height="150" v-model="inputValue" placeholder="写下您的评论(140字以内),可以@作者哦～" count ></u--textarea></view>
-					<view style="width:160upx;text-align: center;padding-top: 10px;line-height: 80upx;">
+				<view style="padding: 40upx 44upx 32upx 22upx;">
+					<view ><u--textarea style="border: none;background: #F4F4F4;" :height="50" v-model="inputValue" placeholder="写下您的评论(140字以内),可以@作者哦～" count ></u--textarea></view>
+					<view style="padding-top: 10px;line-height: 80upx;display: flex;float: right;">
 						<view @click="usersClick()">@</view>
-						<view style="padding: 20upx;"><u-button @click="submit" type="primary" text="发布"></u-button></view>
+						<view style="padding:20upx;"><u-button @click="submit" style="padding: 2upx 30upx;height: 52upx;background: #87B3FF;border-color: #87B3FF;" type="primary" text="发布"></u-button></view>
 					</view>
 				</view>
 				<view>
@@ -219,7 +218,8 @@ export default {
 	          conType,
 			  content,
 			  source:1,
-			  pageUrl:location.href,
+			  // pageUrl:location.href,
+			   pageUrl:'',
 			  sendAid:this.userInfo.aid,
 	        }
 	        apiMessage.save(message).then(res=>{
@@ -606,7 +606,7 @@ export default {
 		z-index: 999;
 		bottom: 0px;
 		width: 100%;
-		border-top: 1px solid #e8e8e8;
+		border-top: 1px solid rgba(153,153,153,0.12);;
 		height: 50px;
 		padding-top: 10px;
 		background-color: #FFFFFF;
@@ -639,15 +639,15 @@ export default {
 		height: 40px;
 		line-height: 30px;
 		background: rgb(247,247,249);
-		border-radius: 10upx;
+		border-radius: 34upx;
 		display: flex;
 		.field-icon{
 			margin-top: 2px;
 			margin-left: 10px;
 		}
 		.wenz{
-			font-size: 14px;
-			color: #000000;
+			font-size: 12px;
+			color: #666666;
 			margin-left: 2px;
 			margin-top: 6px;
 		}
diff --git a/pages/login/next.vue b/pages/login/next.vue
index c16f0c7..b212913 100644
--- a/pages/login/next.vue
+++ b/pages/login/next.vue
@@ -21,7 +21,7 @@
 			<!-- <u-icon name="phone"></u-icon> -->
 			<view @click="showHelp = true" style="color: rgba(51, 51, 51, 1);font-size: 14px;">如有问题联系管理员</view>
 		</view>
-		<view v-if="showHelp" style="display: flex;margin-top: 10px;">
+		<view v-if="showHelp" style="display: flex;margin-top: 2px;">
 			<view>
 				<u--form labelPosition="left" :labelWidth="52" labelAlign="right" :label-style="{'font-size':'14px','color':'rgba(153, 153, 153, 1)'}">
 					<u-form-item label="姓名: ">李玉冰<u-form-item label="工号: ">0000 4409</u-form-item></u-form-item>
diff --git a/pages/my/myFavorites.vue b/pages/my/myFavorites.vue
index 668e703..275be5c 100644
--- a/pages/my/myFavorites.vue
+++ b/pages/my/myFavorites.vue
@@ -14,7 +14,13 @@
 			</view>
 		</view>
 		<view v-if="conType == 1">
-			<view v-if="courseList.length > 0">
+			<view v-if="courseList.length == 0 && loadStatus == 'noMore'"  class="empt-box">
+				<u-empty 
+				        text="你还没有收藏哦～"
+				        icon="../../static/images/favorite-empt.png">
+				</u-empty>
+			</view>
+			<view v-else >
 				<view v-for="(item, idx) in courseList" :key="idx" class="course_box">
 					<view class="course" @click="toCourseDetail(item)">
 						<view class="course-info">
@@ -42,17 +48,15 @@
 					</view>
 				</view>
 			</view>
-			<view v-else class="empt-box">
-				<u-empty 
+		</view>
+		<view v-if="conType == 2">
+			<view class="empt-box" v-if="articleList.length == 0 && loadStatus == 'noMore'">
+				<u-empty
 				        text="你还没有收藏哦～"
 				        icon="../../static/images/favorite-empt.png">
 				</u-empty>
 			</view>
-			
-		</view>
-
-		<view v-if="conType == 2">
-			<view class="" v-if="articleList.length > 0">
+			<view v-else  >
 				<view class="article_one" v-for="(item, idx) in articleList" :key="idx">
 						<view class="articla_tit" @click="toArticleDetail(item)" v-html="$keywordActiveShow(item.title, query.keyword)"></view>
 						<text class="articla_text" v-html="$keywordActiveShow(item.summary, query.keyword)"></text>
@@ -65,15 +69,16 @@
 						</view>
 				</view>
 			</view>
-			<view v-else class="empt-box">
-				<u-empty
+			
+		</view>
+		<view v-if="conType == 4">
+			<view class="empt-box" v-if="qaList.length == 0 && loadStatus == 'noMore'">
+				<u-empty 
 				        text="你还没有收藏哦～"
 				        icon="../../static/images/favorite-empt.png">
 				</u-empty>
 			</view>
-		</view>
-		<view v-if="conType == 4">
-			<view v-if="qaList.length > 0">
+			<view >
 				<view v-for="(item, idx) in qaList" :key="idx" class="qa">
 					<view class="qa-body" @click="toQaDetail(item.question)">
 						<text v-if="item.question.isResolve" style="color:#08A890">【已解决】</text>
@@ -107,12 +112,7 @@
 					</view>
 				</view>
 			</view>
-			<view v-else  class="empt-box">
-				<u-empty 
-				        text="你还没有收藏哦～"
-				        icon="../../static/images/favorite-empt.png">
-				</u-empty>
-			</view>
+			
 		</view>
 		<!-- <view v-show="count > query.pageSize"><uni-load-more :status="loadStatus"></uni-load-more></view> -->
 		
diff --git a/pages/my/myub.vue b/pages/my/myub.vue
index 9fdf27a..4bf898e 100644
--- a/pages/my/myub.vue
+++ b/pages/my/myub.vue
@@ -7,7 +7,7 @@
 			</view>
 			<view class="top-content">
 				<view>{{uinfo.uCurrency}}</view>
-				统计时间：2022.11.4
+				统计时间：{{formatDate(new Date())}}
 			</view>
 		</view>
 		<view class="ub-list" v-for="(day, index) in uCoinRecord" :key="index">
@@ -22,14 +22,12 @@
 					{{info.uvalue}}
 				</view>
 			</view>
-
-
-
 		</view>
 	</view>
 </template>
 
 <script>
+	import {formatDate} from '../../utils/tools.js'
 	import { mapGetters } from 'vuex';
 	import apiStat from '@/api/phase2/stat.js';
 	export default {
@@ -41,6 +39,7 @@
 		},
 		data() {
 			return {
+				formatDate,
 				uCoinRecord: [],
 				uinfo: {
 					uCurrency: 0, // 用户累计U币
diff --git a/pages/resource/qaDetail.vue b/pages/resource/qaDetail.vue
index 0044b23..7df06ec 100644
--- a/pages/resource/qaDetail.vue
+++ b/pages/resource/qaDetail.vue
@@ -22,7 +22,7 @@
 				<view style="display: flex;line-height: 40upx;">
 					<author-info :name="detailData.sysCreateBy" :avatar="detailData.avatar" :sex="detailData.sex" :info="detailData.ucode" :showInfo="true"></author-info>
 				</view>
-				<view class="concern" v-if="hasFollow" @click="followShow = true">
+				<view class="concern" style="color: #979797;" v-if="hasFollow" @click="followShow = true">
 					已关注
 				</view>
 				<view class="concern" v-else @click="addFollow()">
@@ -41,7 +41,7 @@
 		<view>
 			<view class="comments">
 				<view class="comments-top">
-					<view  v-if="detailData.id">回答<text style="color: #818181;margin-left: 5px;">{{ answers }}</text></view>
+					<view  v-if="detailData.id">回答<text style="color: #333333;margin-left: 5px;">({{ answers }})</text></view>
 					<!-- <view class="share-btn" @click="openShare">
 						<view class="share-btn-icon"><img src="../../static/images/icon/share.png" alt="" /></view>
 						<view class="share-btn-name">分享</view>
@@ -52,14 +52,16 @@
 					<view v-for="(an, anidx) in answerList" :key="anidx" class="comment">
 						<view class="comment-top">
 							<view style="display: flex;">
-								<author v-if="an" :showInfo="true" :data="an"></author>
+								<!-- {{an}} -->
+								<author-img :avatar="an.avatar" :sex="an.sex" width="30px" height="30px" :size="30"></author-img>
+								<text style="color: #333333;font-weight: 500;font-size: 28upx;margin-left: 22upx;">{{an.sysCreateBy}}</text>
 							</view>
 							<view class="comment-time">
-								<view style="display: flex;">
+								<view>
 									<view v-if="detailData.isResolve">
 										<text v-if="an.isBest" style="color:#FFB30F;">最佳答案</text>
 									</view>
-									<view style="margin-left: 10px"><time-show :time="an.sysCreateTime"></time-show></view>
+									
 								</view>
 							</view>
 						</view>
@@ -68,18 +70,33 @@
 								<text v-html="displayAll(an)"></text>
 								<text style="color: #00aaff;word-break: normal; " v-if="an.content.length>minTextLen" @click="changeIsAll(an)">{{an.isAll?' 收起':' 全文'}}</text>
 							</view>
-							<view class="comment-btns">
-								<view style="display: flex;">
+							<view class="comment-btns" style="margin-bottom: 20upx;">
+								<view><time-show :time="an.sysCreateTime"></time-show></view>
+								<view class="" style="display: flex;">
+									<view style="font-size: 12px;color: #999999;line-height: 50upx;" @click="openReply(an,{})">
+										<image style="width: 32upx;height: 32upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-comment.png" size="24"></image>回复
+									</view>
+									<view v-if="!an.isPraise" style="font-size: 12px;color: #999999;line-height: 50upx;margin-left: 40upx;" @click="addPraise(anidx)">
+										<image style="width: 32upx;height: 32upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-praise.png" size="24"></image>
+										<text> {{an.praises}}</text>
+									</view>
+									<view v-if="an.isPraise" style="font-size: 12px;color: #999999;line-height: 50upx;margin-left: 40upx;"  @click="removePraise(anidx)">
+										<image style="width: 32upx;height: 32upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-praise-active.png" size="24"></image>
+										<text style="color: #387DF7;"> {{an.praises}}</text>
+									</view>
+									<!-- <interact-bar :data="comm" :comments="false" :favorites="false"></interact-bar> -->
+								</view>
+								<!-- <view style="display: flex;">
 									<u-icon style="margin-right: 15px;" @click="openReply(an,{})" name="chat" color="#979797" size="18" label="回复"></u-icon>
 									<u-icon v-if="an.isPraise" style="margin-right: 10px;" @click="removePraise(anidx)" name="thumb-up-fill" color="#979797" size="18" :label="an.praises"></u-icon>
 									<u-icon v-if="!an.isPraise" style="margin-right: 10px;" @click="addPraise(anidx)" name="thumb-up" color="#979797" size="18" :label="an.praises"></u-icon>
-								</view>
-								<view>
+								</view> -->
+								<!-- <view>
 									<u-icon v-if="userInfo.aid==an.sysCreateAid" @click="openBtns(an,anidx)" name="more-dot-fill" size="20"></u-icon>
-								</view>
+								</view> -->
 							</view>
 							<!--一级评论，二级数据-->
-							<view v-if="an.answers && an.answers.length!=0" class="comment-replys">
+						<!-- 	<view v-if="an.answers && an.answers.length!=0" class="comment-replys" style="margin-left: 60upx;">
 								<view v-for="(ele, replyIndex) in an.answers" :key="replyIndex" class="comment">
 									<view class="comment-top">
 										<view style="display: flex;">
@@ -87,9 +104,7 @@
 											<text style="padding-left: 16upx;padding-top: 6upx;color: #979797;">回复</text>
 											<text style="padding-left: 16upx;padding-top: 6upx;font-size: 26upx;">{{ele.replayName}}</text>
 										</view>
-										<view class="comment-time">
-											<time-show :time="ele.sysCreateTime"></time-show> 
-										</view>
+									
 									</view>
 									<view class="comment-body">
 										<view class="comment-content" style="word-break: break-all;white-space: pre-wrap;">
@@ -97,14 +112,23 @@
 											<text style="color: #00aaff; white-space: nowrap;" v-if="ele.content.length>minTextLen" @click="changeIsAll(ele)">{{ele.isAll?' 收起':' 全文'}}</text>
 										</view>
 										<view class="comment-btns">
-											<view>
-												<u-icon @click="openReply(ele,an)" name="chat" color="#979797" size="18" label="回复"></u-icon>
+											<view class="comment-time">
+												<time-show :time="ele.sysCreateTime"></time-show> 
 											</view>
-											<view>
-												<u-icon v-if="userInfo.aid==ele.sysCreateAid" @click="openBtns(ele,replyIndex)" name="more-dot-fill" size="20"></u-icon>
+											<view class="" style="display: flex;">
+												<view style="font-size: 12px;color: #999999;line-height: 50upx;" @click="openReply(ele,an)">
+													<image style="width: 32upx;height: 32upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-comment.png" size="24"></image>回复
+												</view>
+												<view v-if="!ele.isPraise" style="font-size: 12px;color: #999999;line-height: 50upx;margin-left: 40upx;" @click="addPraise(anidx)">
+													<image style="width: 32upx;height: 32upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-praise.png" size="24"></image>
+													<text> {{ele.praises}}</text>
+												</view>
+												<view v-if="ele.isPraise" style="font-size: 12px;color: #999999;line-height: 50upx;margin-left: 40upx;"  @click="removePraise(anidx)">
+													<image style="width: 32upx;height: 32upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-praise-active.png" size="24"></image>
+													<text style="color: #387DF7;"> {{ele.praises}}</text>
+												</view>
 											</view>
 										</view>
-										<!--评论的二级显示-->
 										<view v-if="ele.answers && ele.answers.length!=0" class="comment-replys">
 											<view v-for="(row, rowIdx) in ele.answers" :key="rowIdx" class="comment">
 												<view class="comment-top">
@@ -113,9 +137,7 @@
 															<text style="padding-left: 16upx;padding-top: 6upx;color: #979797;">回复</text>
 															<text style="padding-left: 16upx;padding-top: 6upx;font-size: 26upx;">{{row.replayName}}</text>
 														</view>
-														<view class="comment-time">
-															<time-show :time="row.sysCreateTime"></time-show> 
-														</view>
+														
 												</view>
 												<view class="comment-body">
 													<view class="comment-content" style="word-break: break-all;white-space: pre-wrap;">
@@ -123,11 +145,16 @@
 														<text style="color: #00aaff; white-space: nowrap;" v-if="row.content.length>minTextLen" @click="changeIsAll(row)">{{row.isAll?' 收起':' 全文'}}</text>
 													</view>
 													<view class="comment-btns">
-														<view>
-															<u-icon @click="openReply(row,ele)" name="chat" color="#979797" size="18" label="回复"></u-icon>
+														<view class="comment-time">
+															<time-show :time="row.sysCreateTime"></time-show> 
 														</view>
-														<view>
-															<u-icon v-if="userInfo.aid==row.sysCreateAid" @click="openBtns(row,rowIdx)" name="more-dot-fill" size="20"></u-icon>
+														<view v-if="!row.isPraise" style="font-size: 12px;color: #999999;line-height: 50upx;margin-left: 40upx;" @click="addPraise(anidx)">
+															<image style="width: 32upx;height: 32upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-praise.png" size="24"></image>
+															<text> {{row.praises}}</text>
+														</view>
+														<view v-if="row.isPraise" style="font-size: 12px;color: #999999;line-height: 50upx;margin-left: 40upx;"  @click="removePraise(anidx)">
+															<image style="width: 32upx;height: 32upx;vertical-align: middle;margin-right: 10upx;" src="../../static/images/icon/bar-praise-active.png" size="24"></image>
+															<text style="color: #387DF7;"> {{row.praises}}</text>
 														</view>
 													</view>
 												</view>
@@ -135,7 +162,7 @@
 										</view>
 									</view>
 								</view>
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</view>
@@ -146,28 +173,26 @@
 		<interact-fixed :data="detailData" ref="fiexdbar" :comments="false" :answers="true" :type="4">
 			<view class="field" @click="openAnswerInput()">
 				<u-icon name="edit-pen-fill" size="18" class="field-icon"></u-icon>
-				<text class="wenz">我来回答..</text>
+				<text class="wenz">写回答</text>
 			</view>
 		</interact-fixed>
 		<!--弹出回答的窗口-->
-		<u-popup :show="replyShow" @close="closeReply">
+		<u-popup :show="replyShow" @close="closeReply" :round="16">
 			<view>
-				<view style="display: flex;justify-content: space-around;">
-					<view style="padding: 20rpx;flex: 1; white-space: pre-wrap; word-break: break-all;">
-						<u--textarea  :height="120" v-model="answercontent" :placeholder="placeholder" count maxlength="200"></u--textarea>
+				<view>
+					<view style="padding: 40rpx;white-space: pre-wrap; word-break: break-all;">
+						<u--textarea style="border: none;background: #F4F4F4;"  :height="50" v-model="answercontent" :placeholder="placeholder" count maxlength="200"></u--textarea>
 					</view>
-					<view style="padding: 20px 10px">
-						<view style="line-height: 82upx;text-align: center;margin-bottom: 20upx" @click="askQuestioner">
-							<text v-if="replyLevel=='one'">@</text>
-						</view>
-						<u-button style="height: 60px;" @click="submitReply" type="primary" size="small" :text="replyLevel=='one'? '提交回答':'提交回复'"></u-button>
+					<view style="padding: 0 10px 40upx 0;display: flex;justify-content: flex-end;">
+						<text v-if="replyLevel=='one'"  @click="askQuestioner">@</text>
+						<u-button   style="padding: 10upx 30upx;height: 52upx;background: #87B3FF;border-color: #87B3FF;margin: 0 40upx 0 40upx;width: 200upx;" @click="submitReply" type="primary" size="small" :text="replyLevel=='one'? '提交回答':'提交回复'"></u-button>
 					</view>
 				</view>
 			</view>
 		</u-popup>
-		<u-popup :show="answerEdit.show" @close="closeAnswerEdit" @open="openAnswerEdit">
+		<u-popup :show="answerEdit.show" @close="closeAnswerEdit" @open="openAnswerEdit" :round="16">
 			<view>
-				<view style="display: flex;justify-content: space-around;">
+				<view>
 					<view style="padding: 20rpx;flex: 1;">
 						<u--textarea :height="120" v-model="curItem.content" placeholder="请输入5-1000个字" count maxlength="1000"></u--textarea>
 					</view>
@@ -353,11 +378,12 @@ export default {
 						   if(rs.status==200){
 							  if(rs.result!='' && rs.result.length>0){
 								  let author=rs.result[0];
-								  if(author.avatar != '') {
-									  res.result.avatar=$this.fileUrl+author.avatar;
-								  } else {
-									  res.result.avatar='';
-								  }
+								  // if(author.avatar != '') {
+									 //  res.result.avatar=$this.fileUrl+author.avatar;
+								  // } else {
+									 //  res.result.avatar='';
+								  // }
+								  res.result.avatar=author.avatar;
 								  res.result.sex = author.sex;
 								  res.result.orgInfo=author.orgInfo;
 								  res.result.ucode=author.code;
@@ -387,7 +413,9 @@ export default {
 			apiQa.page(params).then(res => {
 					if (res.status == 200) {
 						let allList=[];
-						this.answerList = [];
+						if(this.pageIndex == 1) {
+							this.answerList = [];
+						}
 						this.answers= res.result.count;
 						let uids=[];
 						let level3ParentIds=[];
@@ -561,9 +589,10 @@ export default {
 					list.forEach(item=>{
 						res.result.some(author=>{
 							if(author.aid==item.sysCreateAid){
-								if(author.avatar!=''){
-									item.avatar=$this.fileUrl+author.avatar;
-								}
+								// if(author.avatar!=''){
+								// 	item.avatar=$this.fileUrl+author.avatar;
+								// }
+								item.avatar=author.avatar;
 								item.sex=author.sex;
 								item.ucode=author.code;
 								item.orgInfo=author.orgInfo;
@@ -861,10 +890,10 @@ export default {
 }
 .field {
 	width: 200px;
-	height: 40px;
+	height: 36px;
 	line-height: 30px;
 	background: rgb(247,247,249);
-	border-radius: 10upx;
+	border-radius: 17px;
 	display: flex;
 	.field-icon{
 		margin-top: 2px;
@@ -885,8 +914,9 @@ export default {
 	.comments-top {
 		display: flex;
 		justify-content: space-between;
-		padding-bottom: 30upx;
-		border-bottom: 1px solid #f4f4f4;
+		padding-top: 20upx;
+		// padding-bottom: 30upx;
+		// border-bottom: 1px solid #f4f4f4;
 		font-weight: 500;
 		font-size: 30upx;
 	}
@@ -924,13 +954,13 @@ export default {
 			}
 		}
 		.comment-body{
-			padding: 6upx 0upx 0upx 60upx;
+			padding: 14upx 0upx 0upx 0;
 			color: #373737;
 			.comment-content{
 				word-break:break-all;
 				padding: 0upx 10upx 10upx 0upx;
 				font-size: 28upx;
-				color: #333333;
+				color: #666666;
 			}
 			.comment-btns{
 				display: flex;
diff --git a/static/images/icon/artice-praise.png b/static/images/icon/artice-praise.png
index bc0be12..cf64adb 100644
Binary files a/static/images/icon/artice-praise.png and b/static/images/icon/artice-praise.png differ
diff --git a/static/images/icon/bar-praise-active.png b/static/images/icon/bar-praise-active.png
new file mode 100644
index 0000000..03087ec
Binary files /dev/null and b/static/images/icon/bar-praise-active.png differ
diff --git a/static/images/icon/favorite.png b/static/images/icon/favorite.png
index 7ad924a..240a9f4 100644
Binary files a/static/images/icon/favorite.png and b/static/images/icon/favorite.png differ
diff --git a/static/images/icon/share.png b/static/images/icon/share.png
index af36388..f2455d2 100644
Binary files a/static/images/icon/share.png and b/static/images/icon/share.png differ