From 12a0c23dbdea27183caa5c853d4869d7a97c126c Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 31 Oct 2023 20:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/live.js                           |   9 +-
 components/sd-live-page/livepage.nvue | 324 ++++++++++++++++++++------
 pages/gather/gather.vue               |   4 +-
 pages/room/index.vue                  | 114 +++++----
 pages/room/spectator.nvue             |   3 +-
 static/img/gn.png                     | Bin 1721 -> 1626 bytes
 static/img/jl.png                     | Bin 0 -> 2399 bytes
 static/img/li.png                     | Bin 2666 -> 2579 bytes
 static/img/shanpin.png                | Bin 3727 -> 2971 bytes
 static/img/you.png                    | Bin 0 -> 1071 bytes
 10 files changed, 330 insertions(+), 124 deletions(-)
 create mode 100644 static/img/jl.png
 create mode 100644 static/img/you.png

diff --git a/api/live.js b/api/live.js
index a1d1b84..3c1edf0 100644
--- a/api/live.js
+++ b/api/live.js
@@ -88,7 +88,7 @@ export function getfocuslst(data) {
 
 //关注我的人
 export function getfanslst(data) {
-  return requesta.post('community/fans/lst',data);
+  return requesta.get('community/fans/lst',data);
 }
 
 //用户送礼
@@ -121,6 +121,13 @@ export function sendGift(data) {
   return request.post('zhibo/sendGift',data);
 }
 
+
+//获取主播关注人数
+export function fansNum(data) {
+  return requesta.get('zhibo/fansNum',data);
+}
+
+
 /**
  * 充值金额选择
  */
diff --git a/components/sd-live-page/livepage.nvue b/components/sd-live-page/livepage.nvue
index 4bb6ec4..c0eea3f 100644
--- a/components/sd-live-page/livepage.nvue
+++ b/components/sd-live-page/livepage.nvue
@@ -1,47 +1,48 @@
 <template>
 	<view class="container">
-			<view class="" :style="{'height':heightG+'px'}"  @click="quanju">
-		<view class="top-do-box">
-			<view class="room-info">
-				<view class="room-logo-box">
-					<image :src="room.cover" class="room-logo-box"></image>
-				</view>
-				<view class="room-info-message">
-					<view class="room-user-name">
-						<text
-							style="color: #fff;font-size: 25rpx;">{{room.live_name.length>6?room.live_name.substring(0, 6)+'...': room.live_name}}</text>
+		<view class="" :style="{'height':heightG+'px'}" @click="quanju">
+			<view class="top-do-box">
+				<view class="room-info">
+					<view class="room-logo-box">
+						<image :src="room.cover" class="room-logo-box"></image>
 					</view>
-					<view class="room-user-money">
-						<text style="color: #fff;font-size: 25rpx;">4000</text>
+					<view class="room-info-message">
+						<view class="room-user-name">
+							<text
+								style="color: #fff;font-size: 25rpx;">{{room.live_name.length>6?room.live_name.substring(0, 6)+'...': room.live_name}}</text>
+						</view>
+						<view class="room-user-money">
+							<text style="color: #fff;font-size: 25rpx;">{{count}}</text>
+						</view>
+						
+					</view>
+					<view class="room-guanzhu" @click="interest">
+						<text class="guanzhu" v-if="!follow">关注</text>
+						<text class="guanzhu" v-else>已关注</text>
 					</view>
 				</view>
-				<view class="room-guanzhu" @click="interest">
-					<text class="guanzhu" v-if="!follow">关注</text>
-					<text class="guanzhu" v-else>已关注</text>
+				<view class="room-users-box">
+					<scroll-view class="right_top_scroll" scroll-x="true" scroll-left="0">
+						<view class="top-scroll-users-header" v-for="(bitem,bindex) in users" :key="bindex">
+							<image :src="bitem.app_user_avatar" class="top-scroll-users-header"
+								v-if="bitem.app_user_avatar"></image>
+							<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/default_avtar.png"
+								class="top-scroll-users-header" mode="aspectFill"></image>
+						</view>
+					</scroll-view>
 				</view>
-			</view>
-			<view class="room-users-box">
-				<scroll-view class="right_top_scroll" scroll-x="true" scroll-left="0">
-					<view class="top-scroll-users-header" v-for="(bitem,bindex) in users" :key="bindex">
-						<image :src="bitem.app_user_avatar" class="top-scroll-users-header"
-							v-if="bitem.app_user_avatar"></image>
-						<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/default_avtar.png"
-							class="top-scroll-users-header" mode="aspectFill"></image>
-					</view>
-				</scroll-view>
-			</view>
 
-			<view class="users-count web-font">
 				<view class="users-count web-font">
-					<text class="users-count-text"> {{users.length}}</text>
-				</view>
-				<view class="users-count " @click="outroom">
-					<image src="@/static/img/close.png" class="users-count-img" mode="aspectFit"></image>
+					<view class="users-count web-font">
+						<text class="users-count-text"> {{users.length}}</text>
+					</view>
+					<view class="users-count " @click="outroom">
+						<image src="@/static/img/close.png" class="users-count-img" mode="aspectFit"></image>
+					</view>
 				</view>
 			</view>
+
 		</view>
-
-
 		<view class="top-left" v-if="isshow">
 			<view class="top-left-a" @click="switchCamera">
 				<image class="left-img" src="/static/img/qiehuan.png" mode=""></image>
@@ -51,7 +52,7 @@
 			<mh-msgList ref="msgList" :msgList="msgList"></mh-msgList>
 		</view>
 		<!-- 底部操作 -->
-</view>
+
 
 		<view class="inpit-box-bg" v-if="focus">
 			<view class="inpit-box-body">
@@ -77,7 +78,7 @@
 							<image class="ico-box-img" src="@/static/img/shanpin.png" mode="aspectFit"></image>
 						</view>
 						<view class="ico-box" @click="send_lick">
-							<image class="ico-box-img" src="@/static/img/gn.png"></image>
+							<image class="ico-box-img" src="@/static/img/jl.png"></image>
 						</view>
 					</view>
 				</view>
@@ -241,7 +242,46 @@
 				{{join.message}}
 			</text>
 		</view>
+	<uni-popup ref="giftrecord" :type="type" :custom="true" @change="change">
+			<view class="uni-record" >
+				<view class="uni-record-top">
+					<view class="uni-record-top-img" @click="closezb">
+						<image class="uni-record-top-img" src="@/static/img/you.png" mode=""></image>
+					</view>
+					<view class="uni-record-top-text">
+						<text class="uni-record-top-text">礼物记录</text>
+					</view>
+				</view>
+				<scroll-view scroll-y :style="{'height':380+'px','overflow':'hidden'}">
+					<view class="uni-record-content" v-for="(item,m) in recordlist" :key="m">
+						<view class="record-content-one">
+							<view class="content-onea">
+								<text class="content-onea">{{item.create_time}}</text>
+							</view>
 
+							<view class="content-oneb">
+								<image src="@/static/img/jb.png" class="content-oneb-img" mode="aspectFit">
+								</image>
+								<text class="content-oneb-txt" v-if='!isshow'>-{{item.amount}}</text>
+								<text class="content-oneb-txt" v-else>+{{item.amount}}</text>
+							</view>
+						</view>
+						<view class="record-content-two">
+							<view class="content-twoa">
+								<image class="content-twoa-img" src="@/static/missing-face.png" mode="aspectFit">
+								</image>
+								<text class="content-twoa-txt">{{item.nickname}}</text>
+							</view>
+							<view class="content-twob">
+								<text class="content-twob-txt"
+									v-if='!isshow'>给主播赠送{{item.gift_id}}个{{item.gift_name}}</text>
+								<text class="content-twob-txt" v-else>主播收到{{item.gift_id}}个{{item.gift_name}}</text>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
 		<gb-popup :isShow="isShow1" rName="确定" :isBut="false" lName="取消" @lEvent="show1" @rEvent="copyData"
 			title="请输入礼物数量">
 			<view style="padding: 30rpx;">
@@ -265,7 +305,9 @@
 		getuser,
 		getRechargeApi,
 		sendGift,
-		getAjuser
+		getAjuser,
+		getfanslst,
+		fansNum
 	} from '@/api/live.js'
 	import {
 		VUE_APP_WS_URL_ONE
@@ -288,9 +330,9 @@
 			room: {
 				type: Object,
 			},
-			heightG :{
+			heightG: {
 				type: String,
-				default: '760'
+				default: '750'
 			},
 		},
 		components: {
@@ -323,6 +365,7 @@
 				message_arr: [
 
 				],
+				recordlist:[],
 				msgList: [{
 					userName: "系统通知",
 					content: "倡导绿色直播，严禁发布涉黄涉毒涉赌，严禁发布涉政、违法及低俗违规内容。健康直播，文明互动",
@@ -349,6 +392,7 @@
 				gifsobj: {},
 				gift_num: '',
 				isShow1: false,
+				count:0
 			}
 			/*定义IM消息类型
 			1：进群通知
@@ -362,13 +406,15 @@
 
 			this.userinfo = JSON.parse(uni.getStorageSync('USER_INFO'))
 			this.getjuser()
-		
 			this.get_live_room(); //调用直播间信息
 			this.rewardList()
 			this.giftList()
 			this.liveAudience()
 			this.getuser()
 			this.getRecharg()
+			
+			
+			// console.log(this.room)
 
 		},
 		onReady() {
@@ -410,6 +456,26 @@
 			})
 		},
 		methods: {
+			//全局
+			quanju() {
+				this.focus = false;
+			},
+			//关注我的人
+			getfanslst() {
+				getfanslst().then((res) => {
+					if (res.status = 200) {
+						// console.log(res,'aaaaaaaaaa')
+						this.count = res.data.count
+					}
+				})
+			},
+			//获取主播关注人数
+			fansNum(id){
+				fansNum({master_id:id}).then((res=>{
+					// console.log(res,'SSSSSSS')
+					this.count=res.data.fan_num
+				}))
+			},
 			//关注
 			getjuser() {
 				getAjuser(this.room.app_user_id).then((res) => {
@@ -423,7 +489,7 @@
 			//获取充值数据
 			getRecharg() {
 				getRechargeApi().then((res) => {
-					console.log(res.data.recharge_quota, '11111111')
+					
 					this.Recharglist = res.data.recharge_quota
 					this.Recharglist.push({
 						data: {},
@@ -435,7 +501,7 @@
 			//获取余额
 			getuser() {
 				getuser().then((res) => {
-
+console.log(res.data.now_money)
 					this.now_money = res.data.now_money
 				})
 			},
@@ -452,7 +518,7 @@
 			//礼物列表
 			rewardList() {
 				rewardList().then((res) => {
-					console.log(res, '11111111')
+					this.recordlist = res.data.list
 				})
 			},
 			//送礼
@@ -466,13 +532,15 @@
 					live_stream_id: this.room.live_stream_id,
 					gift_num: gif.gift_num,
 				}
-				console.log(data)
+				
 				sendGift(data).then((res) => {
 
 					if (res.code == 1) {
+						this.getuser()
+						this.rewardList()
 						this.$refs.share.close()
 						uni.hideModal()
-						this.getuser()
+					
 					} else {
 						uni.showModal({
 							title: '提示',
@@ -578,7 +646,7 @@
 			shopp(item) {
 				// console.log(item)
 				uni.navigateTo({
-					url:'/pages/goods_details/index?id='+item.app_goods_id
+					url: '/pages/goods_details/index?id=' + item.app_goods_id
 				})
 			},
 			//绑定用户id
@@ -675,10 +743,10 @@
 							})
 
 						}
-					}  else if (obj.type == 'gift_message') {
+					} else if (obj.type == 'gift_message') {
 						let data1 = {
 							userName: '',
-							content: obj.text+'X'+obj.gift_num,
+							content: obj.text + 'X' + obj.gift_num,
 							avatar: obj.app_user_avatar,
 							cmd: "say",
 							msg_type: "user"
@@ -905,24 +973,24 @@
 			//关闭直播间
 			outroom: function() {
 				uni.showModal({
-				  title: '提示', // 对话框标题
-				  content: '是否确定退出直播间', // 对话框内容
-				  showCancel: true, // 是否显示取消按钮，默认为 true
-				  cancelText: '取消', // 取消按钮的文字，默认为 "取消"
-				  cancelColor: '#000000', // 取消按钮的文本颜色，默认为 "#000000"
-				  confirmText: '确定', // 确定按钮的文字，默认为 "确定"
-				  confirmColor: '#3CC51F', // 确定按钮的文本颜色，默认为 "#3CC51F"
-				  success(res) {
-				    if (res.confirm) {
-				    uni.redirectTo({
-				    	url: '/pages/room/index'
-				    })
-				    } else if (res.cancel) {
-				      console.log('用户点击了取消按钮')
-				    }
-				  }
+					title: '提示', // 对话框标题
+					content: '是否确定退出直播间', // 对话框内容
+					showCancel: true, // 是否显示取消按钮，默认为 true
+					cancelText: '取消', // 取消按钮的文字，默认为 "取消"
+					cancelColor: '#000000', // 取消按钮的文本颜色，默认为 "#000000"
+					confirmText: '确定', // 确定按钮的文字，默认为 "确定"
+					confirmColor: '#3CC51F', // 确定按钮的文本颜色，默认为 "#3CC51F"
+					success(res) {
+						if (res.confirm) {
+							uni.redirectTo({
+								url: '/pages/room/index'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击了取消按钮')
+						}
+					}
 				})
-				
+
 			},
 
 			get_live_room() {
@@ -938,6 +1006,8 @@
 						// console.log(this.room.app_user_id, uni.getStorageSync('user_id'), '房间id 以及当前用户id')
 						if (res.data.app_user_id == uni.getStorageSync('Uid')) {
 							this.isshow = true
+						}else{
+							this.fansNum(res.data.app_user_id)
 						}
 					}
 					this.connectSocketInit()
@@ -984,10 +1054,14 @@
 				this.type = 'bottom'
 				t.togglePopup('bottom', 'share');
 			},
+			//关闭
+			closezb() {
+				this.$refs['giftrecord'].close()
+			},
 			send_lick: function() {
-				this.sendGift()
-
+				// this.sendGift()
 
+	        this.$refs['giftrecord'].open()
 			},
 
 			//礼物弹窗
@@ -1092,13 +1166,109 @@
 		width: 100%;
 		/* 设置容器的宽度 */
 	}
+	.uni-record {
+		border-radius: 0;
+		flex: 1;
+		background-color: #F4F4F4 !important;
+	}
 
+	.uni-record-content {
+		height: 177rpx;
+		background: #FFFFFF;
+		padding: 0rpx 28rpx;
+		border-radius: 21rpx 21rpx;
+		margin-bottom: 21rpx;
+	}
+
+	.uni-record {
+		
+	}
+
+	.uni-record-top {
+		margin-top: 60rpx;
+		flex-direction: row;
+		margin-bottom: 30rpx;
+
+	}
+
+	.uni-record-top-img {
+		width: 59rpx;
+		height: 58rpx;
+	}
+
+	.uni-record-top-text {
+		font-size: 33rpx;
+		color: #000000;
+		margin-top: 5rpx;
+	}
+
+	.record-content-one {
+		flex-direction: row;
+		justify-content: space-between;
+		margin-top: 30rpx;
+		padding-bottom: 14rpx;
+		border-bottom: 1rpx solid #333333;
+	}
+
+	.content-onea {
+		font-size: 26rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+	}
+
+	.content-oneb {
+		flex-direction: row;
+	}
+
+	.content-oneb-img {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 10rpx;
+	}
+
+	.content-oneb-txt {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+
+	}
+
+	.record-content-two {
+		flex-direction: row;
+		justify-content: space-between;
+		padding-top: 25rpx;
+	}
+
+	.content-twoa {
+		flex-direction: row;
+	}
+
+	.content-twob-txt {
+		font-size: 30rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		margin-top: 20rpx;
+	}
+
+	.content-twoa-txt {
+		font-size: 26rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+		margin-top: 20rpx;
+		margin-left: 20rpx;
+	}
+
+	.content-twoa-img {
+		width: 56rpx;
+		height: 56rpx;
+	}
 	.dobox {
 		position: absolute;
-
 		bottom: 0rpx;
 		width: 750rpx;
-		background-color: #F8F8F8;
 	}
 
 	.inpit-box {
@@ -1879,12 +2049,15 @@
 		height: 30rpx;
 	}
 
+	
 	.gift-alert {
-		width: 430rpx;
+		// width: 480rpx;
 		flex-direction: row;
-		justify-content: space-between;
+		justify-content: space-around;
 		// background-color: green;
-		// animation: slideRight 1s linear forwards;
+		animation: slideRight 1s linear forwards;
+		z-index: 9999;
+		position: absolute;
 	}
 
 	.gift-alerta {
@@ -1956,13 +2129,12 @@
 		height: 60upx;
 
 	}
-
 	.send-boj-user-header {
 		width: 63upx;
 		height: 63upx;
 		border-radius: 50%;
-		margin-top: 0rpx;
-		margin-left: -7rpx;
+		margin-top: 3rpx;
+
 
 	}
 
@@ -2070,7 +2242,7 @@
 
 	}
 
-.room-users-box {
+	.room-users-box {
 		width: 200rpx;
 		height: 70upx;
 
@@ -2096,7 +2268,7 @@
 		border-radius: 50%;
 		margin-right: 10upx;
 		overflow: hidden;
-	
+
 	}
 
 	// .top-scroll-users-header image {
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 9d9670e..913bc68 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -211,12 +211,14 @@
 						},
 						type: 4,
 					},
+					
 					{
 						name: '里海直播',
 						icon: '/static/applet/live.png',
 						data: {
 							id:  "__UNI__0E46DAD",
-							url: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/app/__UNI__0E46DAD.wgt',
+							url:'https://lihai001.oss-cn-chengdu.aliyuncs.com/app/__UNI__0E46DAD.wgt',
+							
 						},
 						type: 4,
 						
diff --git a/pages/room/index.vue b/pages/room/index.vue
index 728e433..5b1aae5 100644
--- a/pages/room/index.vue
+++ b/pages/room/index.vue
@@ -43,39 +43,41 @@
 			
 			</scroll-view>
 			<scroll-view scroll-top="0" scroll-y="true" class="goods_body_scroll" v-if="isindex==1">
-				<view v-for="(pp,index) in roomList" :key="index">
-					<view class="roomsbox-a" v-for="(kk,i) in pp" :key="i">
-						<view class="roomsbox-title">
-							{{i}}
-						</view>
-						<view class="roomsbox">
-							<view class="roomblock" style="border: 1px solid #e1d9d4;" v-for="(room,j) in kk"
-								:key="j" @click="hsitroyjump(room)">
-								<image :src="room.cover" mode="aspectFill" v-if="room.cover"></image>
-								<image src="/static/lw/6.gif" mode="aspectFill" v-else></image>
-								<view class="livetitle">{{room.live_name}}</view>
-								<view class="roomstatus-d" v-if="room.status==1" style="background-color: #09BB07;">
+				<view v-for="(pp,index) in dataList" :key="index">
+						<view class="roomsbox-a">
+							<view class="roomsbox-title">
+								{{pp.date}}
+							</view>
+							<view class="roomsbox">
+								<view class="roomblock" style="border: 1px solid #e1d9d4;" v-for="(room,j) in pp.records"
+									:key="j" @click="hsitroyjump(room)">
+									<image :src="room.cover" mode="aspectFill" v-if="room.cover"></image>
+									<image src="/static/lw/6.gif" mode="aspectFill" v-else></image>
+									<view class="livetitle">{{room.live_name}}</view>
+									<view class="roomstatus-d" v-if="room.status==1" style="background-color: #09BB07;">
+									</view>
+									<view class="roomstatus-d" v-else style="background-color:  #fa2306;">
+									</view>
+									<view class="roomstatus-d" v-if="room.status==3" style="background-color: #e1d9d4;">
+									</view>
+									<view class="roomstatus" style="color: #00B26A;" v-if="room.status==1">直播中
+									</view>
+									<view class="roomstatus" style="color: #fa2306;" v-else>已停播
+									</view>
+				
 								</view>
-								<view class="roomstatus-d" v-if="room.status==2"
-									style="background-color:  #fa2306;">
-								</view>
-								<view class="roomstatus-d" v-if="room.status==3" style="background-color: #e1d9d4;">
-								</view>
-								<view class="roomstatus" style="color: #00B26A;" v-if="room.status==1">直播中
-								</view>
-								<view class="roomstatus" style="color: #fa2306;" v-else>已停播
-								</view>
-								
 							</view>
 						</view>
+				
 					</view>
-			
+				
+				</scroll-view>
+				<view class="noshuju" v-if="roomList.length==0&&isindex==0">
+					<emptyPage title="暂无房间信息"></emptyPage>
+				</view>
+				<view class="noshuju" v-if="dataList.length==0&&isindex==1">
+					<emptyPage title="暂无房间信息"></emptyPage>
 				</view>
-			
-			</scroll-view>
-			<view class="noshuju" v-if="roomList.length==0">
-				<emptyPage title="暂无房间信息"></emptyPage>
-			</view>
 		</view>
 
 
@@ -110,6 +112,7 @@
 
 				],
 				roomList: [],
+				dataList:[],
 				user: [],
 				index: 0,
 				isGetLoginInfo: true,
@@ -123,6 +126,7 @@
 		},
 		mounted() {
 			this.getRoomList()
+			this.getbackList()
 		},
 		onShow() {},
 		onReachBottom() {
@@ -132,6 +136,7 @@
 		onPullDownRefresh: function() {
 			console.log('下拉刷新')
 			this.getRoomList()
+			this.getbackList()
 		},
 		methods: {
 
@@ -147,6 +152,7 @@
 			search() {
 				this.page = 1
 				this.roomList=[]
+				this.dataList=[]
 				if (this.isindex == 0) {
 					this.getRoomList()
 				} else {
@@ -159,6 +165,7 @@
 				this.page = 1
 				this.keyword=''
 				this.roomList=[]
+				this.dataList=[]
 				if (i == 0) {
 					this.getRoomList()
 				} else {
@@ -173,22 +180,37 @@
 				   keyword: this.keyword
 				}).then(res => {
 				
-					if (res.data.code = 1) {
-						uni.hideLoading()
-						const groupedArray = res.data.lists.reduce((acc, obj) => {
-							const date = obj.date;
-							if (!acc[date]) {
-								acc[date] = [];
-							}
-							acc[date].push(obj);
-							return acc;
-						}, {});
-			
-						this.roomList.push(groupedArray)
-						// 输出结果
-						// console.log(this.roomList);
-						// this.page = this.page + 1
+				if (res.data.lists.length > 0) {
+				
+					// 初始化一个空数组来存储结果
+					let result = [];
+				
+					// 遍历每一条直播记录
+					for (let i = 0; i < res.data.lists.length; i++) {
+						let record = res.data.lists[i];
+						let date = record.date;
+				
+						// 检查结果数组中是否已存在该日期的分组
+						let group = result.find((item) => item.date === date);
+				
+						// 如果不存在，则创建一个新的分组
+						if (!group) {
+							group = {
+								date: date,
+								records: []
+							};
+							result.push(group);
+						}
+				
+						// 将当前记录添加到对应的分组中
+						group.records.push(record);
 					}
+				
+					this.dataList = result
+					
+					// 输出结果
+				
+				}
 				})
 			},
 			/**
@@ -203,7 +225,7 @@
 					app_name: 'shop',
 					keyword: this.keyword
 				}).then(res => {
-					console.log(res)
+				
 					if (res.data.code = 1) {
 						uni.hideLoading()
 						if (res.data.lists.length > 0) {
@@ -215,6 +237,10 @@
 							this.page = this.page + 1
 						}
 			
+					}else{
+						uni.showModal({
+							title:res.msg
+						})
 					}
 				})
 			},
diff --git a/pages/room/spectator.nvue b/pages/room/spectator.nvue
index 1ce042d..01cc644 100644
--- a/pages/room/spectator.nvue
+++ b/pages/room/spectator.nvue
@@ -27,7 +27,7 @@
 								<!-- {{item}} {{i}} -->
 
 							</view>
-							<sd-float-page :room='room' :msgList='msgList'
+							<sd-float-page :room='room' :msgList='msgList' :heightG='boxStyle.height'
 								:style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;position: absolute;' "></sd-float-page>
 						</view>
 
@@ -337,7 +337,6 @@
 					this.page = that.page + 1
 				}
 
-				console.log(this.dataList, this.dataList[this.k].id, 222222)
 			},
 			onpullingdown() {
 				this.refreshing = true
diff --git a/static/img/gn.png b/static/img/gn.png
index c0bc715adcfe85a66e411e95594db419b0310db1..ec67ad188cbab08522f846b55d5fe8baf63df179 100644
GIT binary patch
literal 1626
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
Y|K%t(C&<sLlK=n!07*qoM6N<$g4cH=F#rGn

literal 1721
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
P00000NkvXXu0mjf=$=n=

diff --git a/static/img/jl.png b/static/img/jl.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a74156542e5cbead643b365f209850676acd65e
GIT binary patch
literal 2399
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
R%9;QG002ovPDHLkV1h*Dh3o(T

literal 0
HcmV?d00001

diff --git a/static/img/li.png b/static/img/li.png
index 9e57558a6b7b5261d662299521ac4d99166e77cb..173c9137aa634c64d34d67cc5e0198973fe5d7c3 100644
GIT binary patch
literal 2579
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

literal 2666
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
Y2kZ97cs9l7H~;_u07*qoM6N<$f^+r+zyJUM

diff --git a/static/img/shanpin.png b/static/img/shanpin.png
index d4437e676a08f6fec95147244c52c67e5637bf5e..0662da4c072721447effe73e791f4050d9de61af 100644
GIT binary patch
literal 2971
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
R<>UYW002ovPDHLkV1l#xpA`TA

literal 3727
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

diff --git a/static/img/you.png b/static/img/you.png
new file mode 100644
index 0000000000000000000000000000000000000000..30feef68f1f8a762814fb24e39fd2501add04428
GIT binary patch
literal 1071
zcmV+~1kn45P)<h;3K|Lk000e1NJLTq0024w0024&1^@s6;k!yG00001b5ch_0Itp)
z=>Px&=}AOERA@u(+D(WYMHmL)_v`N2HU1(ZdvHChh=}a=OjRqQC?Y5t#Rvg|7(IyQ
zkPt;tq6psf5Jf>T5<yWsC`#0b82^F?K@UoOHM55S5krt%ym%4@o#`qm=~;@&dP-N<
zI6HNp9-eyZr|YXGY>`G=#ECg{){>qlI#2X}+5=NHbUU5S-D#S>0bpp1*{!wyuC9Ka
z8mN?VClP%BAagit?JvxH#Y{nk5Id42IRc<HhRqzbD2h9+wI37Ff`|MYzz$~qY9<nu
zQr-^WQy=N(XIYlJy4~*4x{&TU(dMX>^0o@O=z&I~(P&q%*ZZVSWHhJ{;+7;yJ_B%;
z2P%y*_iC-(T&=w|o@l$>zB$XX&jD=nk=EMX%<NX(AgxiT5aOmJNsa+H+go^yG3J48
zxBFfYVfE0)pzU`1hBQsTAfj`9q_y@zt@XPhk&Vq!A;fh_lDMtnJRb?*VP<|iG_nzB
zQ54q#_!_|Z9@1KC_h_x(Y62M?+UazzNz?TBBoe@0W_ItijkRENG|zL{YPG%vaDksB
z5$#t>z22BG<YJWP`AVzR`U${A6UfJvQm-_P3^H_=mzTFKEiHWyK=>eI%oAGcmt!D<
zK&6z=6VWq1$Xa`VnO}^BtQ{(ZxR{7eOzf41n0bFpWbM$RDE0w3<e`2Y3<g*A`+axp
zirQ*jb)}TYh-kYf+M|?uGpaDes#_GrZvZYG!^*N;>2|v(XA$a#=(rp*R7!1B4Ps;K
z9J*8##b0Bnwbn4RgO;(8wJ%0e%2Pyi$rv^q4zFBaU;lX)p<fb_E0O%$j4@AZtq;x|
zv?z*40r;<YzYhk3%lrNQpRuuZ&QYwct}ZPuE}rl!2mp>KrS6$2sKZDp4-(OV3D{w!
z)ZUobS`&4UJkQU`vg`*U$|v4;Ut{J+Vqt5CI>_4E+GPt13qShDv<mo=QtHVV*dWj<
zS(#<oaU!~KBH0(1`KhL{!JrNzgt$6M5?4yus4`T*=af><Hi-=ib&$>KMltr-;82IE
zDuLhl<<1J*Sk<8sXqD{suC_aID0gMg$F$b3h91U^L90FXMgZ>2>R0O>cAwVza7b*U
z&}xC&?EWQqLA!CN!)|t?=8km$9%ANqLL?gnS|xkh9jU`wYwy=uzh5^t8njxVZgm&J
zMC9Lkm!r|>zFx2QVV&5h&??#OM09lGJBE?9b|*8tTk%?2bZE8Dp7v!5fKy7TjY8X*
zYNrBPZ9R7p(MMj*=_E6+oGEbp`>BCebM}rjO<f)M4`YnmTW9YRxw?}3ujfovq9L(!
pXvp4;@$7k`F?v1Ze{PvX{{cUKeoD-MWmEtF002ovPDHLkV1gfx1ik<O

literal 0
HcmV?d00001