25

pages/conversation/chating/index.vue

@@ -361,7 +361,7 @@
 					if (_this.storeCurrentUserID == data.sendID && diff < 120000) {
 						menu.push('撤回')
 					}
-					if(_this.isAdmin | _this.isOwner){
+					if(_this.isAdmin || _this.isOwner){
 						menu.push('撤回（管理员功能）')
 					}
 					uni.showActionSheet({

pages/conversation/groupAlbum/groupAlbum.vue

@@ -93,7 +93,7 @@
 				load_status:"loadmore",
 				param: {
 					groupID: "",
-					offset: 0,
+					offset: 999999999999,
 					limit: 10,
 					trace: 1,
 				}
@@ -120,9 +120,11 @@
 				this.getList(true);
 			},
 			getList(isFirstPage = false) {
+				this.param.offset = 21;
 				if (isFirstPage === true) {
 					this.list = [];
-					this.param.offset = 0;
+					this.param.offset = 20;
+					this.param.offset = 999999999999;
 				}
 				this.load_status = 'loading';
 				uni.$u.http.post('/group/album_list', this.param).then(res => {
@@ -258,7 +260,8 @@
 							
 						}
 					});
-					if(data.code == 0){
+					console.log(result);
+					if(result.code == 0){
 						_this.fileList[i].status = 1;
 						_this.list.unshift(result.data);
 					}else{