From 0fdce434dcecf26c38606fc719e9051822bd8210 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Wed, 16 Nov 2022 14:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/modules/comments.js                      |  6 +++++-
 components/interact-share/interact-share.vue | 11 +++++------
 pages/my/follow.vue                          |  7 +++++--
 pages/news/index.vue                         |  3 +--
 pages/resource/search.vue                    | 13 ++++++++++++-
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/api/modules/comments.js b/api/modules/comments.js
index 697c571..494cfae 100644
--- a/api/modules/comments.js
+++ b/api/modules/comments.js
@@ -28,6 +28,9 @@ send 姓名
 const pagelist=function(query){
 	return ajax.post('/xboe/m/comment/tome/page',query);
 }
+const mobilepage=function(query){
+	return ajax.post('/xboe/m/comment/tome/mobilepage',query);
+}
 /*
  保存评论
  {Object }
@@ -87,5 +90,6 @@ export default{
 	pageQuery,
   reply,
   replyList,
-  delReply
+  delReply,
+  mobilepage
 }
diff --git a/components/interact-share/interact-share.vue b/components/interact-share/interact-share.vue
index 8248620..1d85d6f 100644
--- a/components/interact-share/interact-share.vue
+++ b/components/interact-share/interact-share.vue
@@ -18,12 +18,11 @@
 					<view v-if="users.length>0" style="overflow-x: auto;height: 160upx;white-space: nowrap;overflow-y: hidden;">
 						<view style="line-height: 60upx;display: inline-block;margin: 10upx;" v-for="(su,suidx) in users" :key="suidx" @click="confirmShare(su)">
 							<view style="text-align: center;"><!--用户头像-->
-								<view v-if="su.avatar"><image :src="su.avatar" shape="circle" style="width: 80upx;height: 80upx;"></image></view>
+								<view v-if="su.avatar" style="border-radius: 50%;"><image :src="$config.fileUrl+su.avatar" shape="circle" style="width: 80upx;height: 80upx;border-radius: 50%;"></image></view>
 								<view v-else>
 									<image v-if="su.sex === 1 " shape="circle" src="../../static/images/man.png" style="width: 80upx;height: 80upx;" alt=""></image>
 									<image v-else shape="circle" src="../../static/images/woman.png" style="width: 80upx;height: 80upx;" alt=""></image>
 								</view>
-								
 							</view>
 							<view style="text-align: center;font-size: 22upx;">{{su.name}}({{su.code}})</view>
 						</view>
@@ -144,7 +143,7 @@
 									// 	item.sex=1;
 									// 	ids.push(item.aid);
 									// }
-									item.avatar='';
+									// item.avatar='';
 									item.sex=1;
 									ids.push(item.aid);
 								});
@@ -242,9 +241,9 @@
 								item.avatar= author.avatar;
 								item.code= author.code;
 								item.sex=author.sex;
-								if(author.avatar != '') {
-									item.avatar=this.$config.fileUrl + author.avatar;
-								}
+								// if(author.avatar != '') {
+								// 	item.avatar=this.$config.fileUrl + author.avatar;
+								// }
 								return true;
 							}else{
 								return false;
diff --git a/pages/my/follow.vue b/pages/my/follow.vue
index 457d535..c024b09 100644
--- a/pages/my/follow.vue
+++ b/pages/my/follow.vue
@@ -147,7 +147,10 @@
 			        } else {
 					   $this.follow.list.splice(this.cancelIndex,1);
 			        }
-					this.$refs.messager.show({message:'停止关注成功',type:'info'});
+					uni.showToast({
+						title:'停止关注成功'
+					})
+					// this.$refs.messager.show({message:'停止关注成功',type:'info'});
 			       }
 			    })
 			},
@@ -226,7 +229,7 @@
 			            });
 			        });
 			        } else {
-			        this.$message.error(res.message);
+			        // this.$message.error(res.message);
 			        }
 			    });
 			 },
diff --git a/pages/news/index.vue b/pages/news/index.vue
index 1015c97..755d969 100644
--- a/pages/news/index.vue
+++ b/pages/news/index.vue
@@ -46,7 +46,6 @@
 				loadStatus:'noMore',//more,loading,noMore
 				query:{
 					pageIndex:1,//当前页
-					type:null,//当前只限于文章
 					pageSize:10,//条数
 				},//查询条件
 				message:{
@@ -133,7 +132,7 @@
 					this.data=[]
 					this.pageIndex=1
 				}
-			 apiComments.pagelist(this.query).then(res=>{
+			 apiComments.mobilepage(this.query).then(res=>{
 				 if (res.status == 200) {
 					 this.total=res.result.count;
 					 let ids = [];
diff --git a/pages/resource/search.vue b/pages/resource/search.vue
index bbede9a..9ffbc34 100644
--- a/pages/resource/search.vue
+++ b/pages/resource/search.vue
@@ -742,7 +742,18 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+	/deep/ .u-modal{
+		width: 288px !important;
+		border-radius: 28upx;
+	}
+	/deep/ .u-modal__content{
+		text-align: center;
+		font-size: 36upx;
+		font-weight: 600;
+		color: #333333;
+		padding: 33px 25px 33px 25px;
+	}
 	.article-bottom{
 		display: flex;
 		.article-author{