Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/mobile into stat

components/interact-fixed/interact-fixed.vue

@@ -218,6 +218,9 @@ export default {
 	          sendType:1,
 	          conType,
 			  content,
+			  source:1,
+			  pageUrl:location.href,
+			  sendAid:this.userInfo.aid,
 	        }
 	        apiMessage.save(message).then(res=>{
 	          if(res.status==200){

components/system-news/system-news.vue

@@ -13,7 +13,8 @@
 				</view>
 				<view class="list-index-img">
 					<u-badge :isDot="!item.isRead" type="error" :absolute="true" :offset="[0,-2]"></u-badge>
-					<image style="width:80upx;height:80upx" src="../../static/images/woman.png" mode=""></image>
+					<author-img :avatar="item.authorInfo.avatar" :sex="item.authorInfo.sex"></author-img>
+					<!-- <image style="width:80upx;height:80upx" src="../../static/images/woman.png" mode=""></image> -->
 				</view>
 				<view class="list-index-cen">
 					<view class="cen-name">
@@ -54,6 +55,14 @@
 		},
 		methods: {
 			returnRouter(item) {
+				if(!item.isRead){
+					apiMessage.updateIsRead([item.id]).then(res=>{
+                       if(res.status == 200) {
+						   item.isRead = !item.isRead;
+					   }
+                    })
+				}
+				
 				if (item.refType == 2) {
 					uni.navigateTo({
 						url: '/pages/resource/articeDetail?id=' + item.refId
@@ -144,7 +153,6 @@
 						this.$emit('loadMessage');
 					}
 				})
-				console.log(ids,'ids')
 			}
 		}
 	}

pages/news/index.vue

@@ -89,7 +89,6 @@
 		},
 		methods: {
 			loadMessage() {
-				console.log('1111')
 				this.queryMessage(true);
 			},
 			queryMessage(flag) {
@@ -105,23 +104,17 @@
 						this.message.total = res.result.count;
 						if(res.result.list.length!=0){
 							res.result.list.forEach(item => {
-								// ids.push()
+								item.authorInfo={avatar:'',name:'',code:'',sex:null};
+								ids.push(item.sendAid);
 								item.checked = false;
 								this.message.list.push(item);
 							});
-							// this.loadAuthorInfo(res.result.list,ids);
+							this.loadAuthorInfo(res.result.list,ids)
-							//设置已读
+						}
-							// let ids=[];
+						if(this.message.list.length<this.message.total){
-							// for(let i=0;i<res.result.list.length;i++){
+							this.loadStatus='more'
-							// 	if(!res.result.list[i].isRead){
+						}else{
-							// 		ids.push(res.result.list[i].id)
+							this.loadStatus='noMore'
-							// 	}
-							// }
-							// apiMessage.updateIsRead(ids).then(res=>{
-							//           if(res.status==200){
-							            
-							//           }
-							//         })
 						}
 					} else {
 						this.$refs.toast.show({ message: '获取数据失败', type: 'error' })
@@ -153,6 +146,11 @@
 						})
 						this.loadAuthorInfo(res.result.list,ids);
 				 	}
+					if(this.data.length<this.total){
+						this.loadStatus='more'
+					}else{
+						this.loadStatus='noMore'
+					}
 				 }else{
 					this.$refs.interactToast.show({message:'加载@我的评论失败',type:'error'});
 				 }
@@ -164,17 +162,20 @@
 		    if (ids.length == 0) {
 		      return;
 		    }
+			let $this = this;
 		    const noReapetIds = [...new Set(ids)];
 		    apiUser.getByIds(ids).then(res => {
 		      if (res.status == 200) {
 		        list.forEach((item, index) => {
 		          res.result.some(author => {
-		            if (author.aid == item.sysCreateAid) {
+		            if ($this.tab == 0 && author.aid == item.sendAid) {
 		              item.authorInfo = author;
 		              return true;
+		            } else if($this.tab == 1 && author.aid == item.sysCreateAid){
+						item.authorInfo = author;
 		            } else {
-		              return false;
+						return false;
-		            }
+					}
 		          });
 		        });
 		      } else {

pages/resource/qaDetail.vue

@@ -478,6 +478,9 @@ export default {
 		    sendType:1,
 		    conType,
 			content,
+			source:1,
+			pageUrl:location.href,
+			sendAid:this.userInfo.aid,
 		  }
 		  apiMessage.save(message).then(res=>{
 		    if(res.status==200){