直播修改

api/api.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);
 }
 
 //用户送礼
@@ -99,12 +99,18 @@ export function reward(data) {
 export function rewardList(data) {
   return requesta.get('zhibo/rewardList',data);
 }
-
+//统计
+export function rewardAmount(data) {
+  return requesta.get('zhibo/rewardAmount',data);
+}
 //获取礼物
 export function giftList(data) {
   return request.get('zhibo/giftList',data);
 }
-
+//获取主播关注人数
+export function fansNum(data) {
+  return requesta.get('zhibo/fansNum',data);
+}
 //获取房间人数
 export function liveAudience(data) {
   return request.get('zhibo/liveAudience',data);

components/sd-live-page/livepage.nvue

@@ -1,5 +1,7 @@
 <template>
 	<view class="container">
+		<view class="" :style="{'height':heightG+'px','zIndex':'999999'}" @click="quanju">
+			<view class="">
 				<view class="top-do-box">
 					<view class="room-info">
 						<view class="room-logo-box">
@@ -11,7 +13,7 @@
 									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;">4000</text>
+								<text style="color: #fff;font-size: 25rpx;">{{count}}</text>
 							</view>
 						</view>
 						<view class="room-guanzhu" @click="interest" v-if="!isshow">
@@ -39,8 +41,6 @@
 						</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>
@@ -49,11 +49,13 @@
 				<view class="msgview">
 					<mh-msgList ref="msgList" :msgList="msgList"></mh-msgList>
 				</view>
+
+
+			</view>
 			<!-- 底部操作 -->
-
+		</view>
-
 		<view class="inpit-box-bg" v-if="focus">
-			<view class="inpit-box-body">
+			<view class="inpit-boxbody">
 				<input class="uni-input" @input="onKeyInput" maxlength="20" cursor-spacing="10" hold-keyboard
 					placeholder="说点什么吧..." :value="inputValue" :focus="focus" />
 				<view v-if="inputValue!=''" @click="send_message">
@@ -76,13 +78,14 @@
 							<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>
 			</view>
 		</view>
 
+
 		<!-- 底部分享弹窗 -->
 		<uni-popup ref="share" :type="type" :custom="true" @change="change">
 			<template v-if="popup==1">
@@ -205,6 +208,46 @@
 			</view>
 
 		</uni-popup>
+
+		<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>
 		<!-- 礼物弹窗 -->
 		<view class="gift-alert" v-for="(gift,gindex) in giftobj" :key="gindex"
 			:style="{ top: gift.top + 'px', left: gift.left + 'px' }">
@@ -254,7 +297,10 @@
 		getuser,
 		getRechargeApi,
 		sendGift,
-		getAjuser
+		getAjuser,
+		getfanslst,
+		rewardAmount,
+		fansNum
 	} from '@/api/api.js'
 	import {
 		VUE_APP_WS_URL
@@ -277,7 +323,12 @@
 			},
 			room: {
 				type: Object,
-			}
+			},
+			heightG: {
+				type: String,
+				default: '750'
+			},
+
 		},
 		components: {
 			uniPopup,
@@ -291,9 +342,11 @@
 				roomobj: [],
 				isShow1: false,
 				users: [],
+				recordlist: [],
 				rid: 0, //房间id
 				role: '', //角色
 				focus: false,
+
 				inputValue: '',
 				isshow: false,
 				message_arr: [
@@ -323,7 +376,9 @@
 				regIndex: -1,
 				gifts: [],
 				gifsobj: {},
-				gift_num: ''
+				gift_num: '',
+				count: 0,
+				zhiBodetail: ''
 
 			}
 
@@ -347,6 +402,7 @@
 			this.getuser()
 			this.getRecharg()
 			this.getjuser()
+			this.getfanslst()
 		},
 		onReady() {
 			this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
@@ -377,6 +433,37 @@
 
 		},
 		methods: {
+			//全局
+			quanju() {
+				this.focus = false;
+			},
+			//关注我的人
+			getfanslst() {
+				getfanslst().then((res) => {
+					if (res.status = 200) {
+						this.count = res.data.count
+					}
+				})
+			},
+			//获取主播关注人数
+			fansNum(id) {
+				fansNum({
+					master_id: id
+				}).then((res => {
+					// console.log(res,'SSSSSSS')
+					this.count = res.data.fan_num
+				}))
+			},
+			rewardAmount() {
+				rewardAmount({
+					live_stream_id: this.room.live_stream_id
+				}).then((res) => {
+					if (res.status = 200) {
+						this.zhiBodetail = '当前直播间收益:礼物*' + res.data.gift_num + '\u0020\u0020\u0020\u0020金币*' + res
+							.data.gift_amount + '\u0020\u0020\u0020\u0020'
+					}
+				})
+			},
 			//关注
 			getjuser() {
 				getAjuser(this.room.app_user_id).then((res) => {
@@ -402,7 +489,6 @@
 			//获取余额
 			getuser() {
 				getuser().then((res) => {
-
 					this.now_money = res.data.now_money
 				})
 			},
@@ -418,9 +504,23 @@
 			},
 			//礼物列表
 			rewardList() {
-				rewardList().then((res) => {
+				if (this.roomDetail.app_user_id == this.userinfo.uid) {
-					console.log(res, '11111111')
+					rewardList({
+						type: 2
+					}).then((res) => {
+						if (res.status = 200) {
+							this.recordlist = res.data.list
+						}
 					})
+				} else {
+					rewardList({
+						type: 1
+					}).then((res) => {
+						if (res.status = 200) {
+							this.recordlist = res.data.list
+						}
+					})
+				}
 			},
 			//送礼
 
@@ -432,12 +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()
+
 					} else {
 						uni.showModal({
 							title: '提示',
@@ -621,18 +724,16 @@
 						this.$refs.msgList.setMsgPanelScroll()
 					} else if (obj.type == 'stream') {
 						if (obj.status == -1) {
+							console.log('直播间已关闭')
 							uni.showModal({
-
 								title: '提示',
-								content: '直播间已关闭',
+								content: '主播已停播',
 								confirmColor: '#ee6666', //确定字体颜色
 								showCancel: false, //没有取消按钮的弹框
 								buttonText: '确定',
 								success: function(res) {
 									if (res.confirm) {
-										uni.redirectTo({
+
-											url: '/pages/room/room_list'
-										})
 									} else if (res.cancel) {
 										console.log('用户点击取消');
 									}
@@ -642,6 +743,15 @@
 						}
 					} else if (obj.type == 'gift_message') {
 						this.sendGift(obj)
+						let data1 = {
+							userName: obj.app_user_name,
+							content: obj.text + "X" + obj.gift_num,
+							avatar: obj.app_user_avatar,
+							cmd: "say",
+							msg_type: "user"
+						}
+						this.msgList.push(data1)
+						this.$refs.msgList.setMsgPanelScroll()
 
 					} else if (obj.type == 'audience') {
 						this.liveAudience()
@@ -667,6 +777,7 @@
 				gift.left = Math.random() * 200 // 随机生成礼物的位置
 
 				this.giftobj.push(gift);
+
 				setTimeout(() => {
 					this.giftobj.splice(this.gifts.indexOf(gift), 1); // 礼物消失
 				}, 3000);
@@ -709,24 +820,57 @@
 
 			//关闭直播间
 			outroom: function() {
+				// console.log(this.roomDetail.app_user_id , this.userinfo.uid)
 				if (this.roomDetail.app_user_id == this.userinfo.uid) {
 					// console.log(this.roomDetail)
+					this.rewardAmount()
 					stopPushLive({
 						app_name: 'shop',
 						stream_name: this.roomDetail.stream_name
 					}).then((res) => {
-
 						if (res.code == 1) {
-							console.log('关闭直播间')
+							uni.showModal({
+								title: '提示', // 对话框标题
+								content: this.zhiBodetail + '是否确定退出直播间', // 对话框内容
+								showCancel: true, // 是否显示取消按钮，默认为 true
+								cancelText: '取消', // 取消按钮的文字，默认为 "取消"
+								cancelColor: '#000000', // 取消按钮的文本颜色，默认为 "#000000"
+								confirmText: '确定', // 确定按钮的文字，默认为 "确定"
+								confirmColor: '#3CC51F', // 确定按钮的文本颜色，默认为 "#3CC51F"
+								success(res) {
+									if (res.confirm) {
 										uni.redirectTo({
 											url: '/pages/room/room_list'
 										})
+									} else if (res.cancel) {
+										console.log('用户点击了取消按钮')
+									}
 								}
 							})
+
+						}
+					})
+
 				} else {
+					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/room_list'
 								})
+							} else if (res.cancel) {
+								console.log('用户点击了取消按钮')
+							}
+						}
+					})
 				}
 			},
 			//获取房间详情
@@ -738,11 +882,13 @@
 
 					if (res.code == 1) {
 						this.roomDetail = res.data
-						console.log(res.data.app_user_id, this.userinfo.uid, 'AAAAAAAAAA')
+
 						if (res.data.app_user_id == this.userinfo.uid) {
 							this.isshow = true
 							this.userinfo.nickname = res.data.app_user_name
 							this.userinfo.avatar = res.data.app_user_avatar
+						} else {
+							this.fansNum(res.data.app_user_id)
 						}
 					}
 					this.connectSocketInit()
@@ -766,6 +912,10 @@
 			change(e) {
 				console.log('是否打开:' + e.show)
 			},
+			//关闭
+			closezb() {
+				this.$refs['giftrecord'].close()
+			},
 			//充值
 			rechargejb: function() {
 				this.$refs['share'].close()
@@ -790,9 +940,10 @@
 				t.togglePopup('bottom', 'share');
 			},
 			send_lick: function() {
-				this.sendGift()
+				// this.sendGift()
 
 
+				this.$refs['giftrecord'].open()
 			},
 			//礼物弹窗
 			show1() {
@@ -847,10 +998,9 @@
 					app_user_id: uni.getStorageSync('UID'),
 					message: this.inputValue
 				}
-
+				this.inputValue = ''
 				sendGroupMessage(data).then(res => {
 					console.log('发送的消息' + JSON.stringify(res))
-					this.inputValue = ''
 					if (res.code == 1) {
 						console.log('发送的消息成功')
 					}
@@ -898,12 +1048,110 @@
 		/* 设置容器的宽度 */
 	}
 
+	.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;
+	
+		z-index: 9999;
 	}
 
 	.inpit-box {
@@ -924,11 +1172,12 @@
 		z-index: 9999;
 	}
 
-	.inpit-box-body {
+	.inpit-boxbody {
 		display: flex;
 		flex-direction: row;
 		flex-wrap: nowrap;
 
+
 	}
 
 	.uni-input {
@@ -1007,7 +1256,7 @@
 
 	.top-left {
 		// height: auto;
-		position: absolute;
+		position: fixed;		
 		width: 40rpx;
 		right: 20rpx;
 		top: 230rpx;
@@ -1225,6 +1474,8 @@
 
 	}
 
+
+
 	.recharge-one {
 		display: flex;
 		justify-content: center; //弹性盒子对象在主轴上的对齐方式
@@ -1686,12 +1937,13 @@
 	}
 
 	.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;
 		z-index: 9999;
+		position: absolute;
 	}
 
 	.gift-alerta {
@@ -1863,9 +2115,10 @@
 
 	.room-users-box {
 		width: 200rpx;
-		height: 65upx;
+		height: 70upx;
 
 		display: flex;
+		margin-top: 10rpx;
 
 	}
 
@@ -1874,21 +2127,19 @@
 		flex-direction: row;
 		flex-wrap: nowrap;
 		width: 200rpx;
-		height: 85upx;
+		height: 75upx;
-		margin-top: 10rpx;
 
 	}
 
 
 
 	.top-scroll-users-header {
-		width: 60upx;
+		width: 63upx;
-		height: 60upx;
+		height: 63upx;
 		border-radius: 50%;
 		margin-right: 10upx;
 		overflow: hidden;
 
-
 	}
 
 	// .top-scroll-users-header image {
@@ -1912,6 +2163,10 @@
 		border-radius: 60upx;
 		background-color: rgba(0, 0, 0, .2);
 		margin-right: 30rpx;
+		font-size: 19px;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
 	}
 
 	.users-count-img {

pages/live/spectator.nvue

@@ -21,16 +21,19 @@
 									:src="item.pull_url" :muted="item.isplay" :enable-progress-gesture="false"
 									:page-gesture="false" :controls="false" :show-loading="true" :is-live='true'
 									@error='vedioerr' :show-fullscreen-btn="false" :show-center-play-btn="false"
-									:style="boxStyle" :object-fit="object_fit" @timeupdate="timeupdate($event,i)">
+									:style="boxStyle" :object-fit="object_fit" @timeupdate="timeupdate($event,i)"
+									@click="videoclick"
+									>
 
 								</video>
 								<!-- {{item}} {{i}} -->
 
 							</view>
-							<sd-float-page :room='room' :msgList='msgList'
+							<sd-float-page :room='room' :msgList='msgList' ref="childRef" :heightG='boxStyle.height'
 								:style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;position: absolute;' "></sd-float-page>
 						</view>
 						
+
 					</div>
 				</cell>
 			</list>
@@ -152,7 +155,7 @@
 			this.boxStyle.width = this.windowWidth + 'px' //给宽度加px
 			this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度
 			this.boxStyle.height = this.wHeight; //改变视频高度
-			console.log(this.boxStyle.height)
+			console.log(this.boxStyle.height,'1111111111111111')
 			this.room = JSON.parse(decodeURIComponent(options.data));
 
 			this.get()
@@ -165,7 +168,6 @@
 		methods: {
 			
 
-
 			autoPlay() {
 				this.isAutoplay = !this.isAutoplay;
 				if (!this.isAutoplay) {

pages/room/create_room.vue

@@ -87,9 +87,6 @@
 				cover_path: '',
 				inputValue: '新建直播间',
 
-
-
-
 				productList: [],
 				goodlist: [],
 				userinfo: {}

pages/room/room_list.vue

@@ -55,13 +55,13 @@
 
 				</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 v-for="(pp,index) in dataList" :key="index">
-						<view class="roomsbox-a" v-for="(kk,i) in pp" :key="i">
+						<view class="roomsbox-a">
 							<view class="roomsbox-title">
-								{{i}}
+								{{pp.date}}
 							</view>
 							<view class="roomsbox">
-								<view class="roomblock" style="border: 1px solid #e1d9d4;" v-for="(room,j) in kk"
+								<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>
@@ -84,7 +84,10 @@
 					</view>
 
 				</scroll-view>
-				<view class="noshuju" v-if="roomList.length==0">
+				<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>
 			</view>
@@ -121,6 +124,7 @@
 
 				],
 				roomList: [],
+				dataList: [],
 				user: [],
 				index: 0,
 				isGetLoginInfo: true,
@@ -161,6 +165,7 @@
 		},
 		onShow() {},
 		onReachBottom() {
+
 			if (this.isindex == 0) {
 				this.getRoomList()
 			} else {
@@ -178,6 +183,8 @@
 
 			//下拉刷新被触发
 			onRefresh() {
+				this.dataList = []
+				this.roomList = []
 				//以告知z-paging下拉刷新结束，这样才可以开始下一次的下拉刷新
 				setTimeout(() => {
 					//1.5秒之后停止刷新动画
@@ -209,6 +216,7 @@
 			search() {
 
 				this.page = 1
+				this.dataList = []
 				this.roomList = []
 				if (this.isindex == 0) {
 					this.getRoomList()
@@ -220,6 +228,7 @@
 			zhisort(i) {
 				this.isindex = i
 				this.page = 1
+				this.dataList = []
 				this.roomList = []
 				if (i == 0) {
 					this.getRoomList()
@@ -240,18 +249,35 @@
 						// this.roomList = res.data.lists
 						// this.roomList.push(res.data.lists)
 						if (res.data.lists.length > 0) {
-						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)
+							// 初始化一个空数组来存储结果
+							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
+							
 							// 输出结果
-						console.log(this.roomList);
+
 						}
 						// this.page = this.page + 1
 					}

store/modules/app.js

@@ -8,9 +8,7 @@ import {
   USER_INFO
 } from '../../config/cache';
 import Cache from '../../utils/cache';
-// #ifdef APP-PLUS
+
-// import Updater from '@/uni_modules/guyue-updater/index';
-// #endif
 
 const state = {
 	location: Cache.get('LOCATION_DATA', true) || {},
@@ -110,21 +108,7 @@ const actions = {
 	}
 };
 
-function compareVersions(version1, version2) {
-	const arr1 = version1.split('.').map(Number);
-	const arr2 = version2.split('.').map(Number);
-	for (let i = 0; i < Math.max(arr1.length, arr2.length); i++) {
-		const num1 = i < arr1.length ? arr1[i] : 0;
-		const num2 = i < arr2.length ? arr2[i] : 0;
 
-		if (num1 > num2) {
-			return 1;
-		} else if (num1 < num2) {
-			return -1;
-		}
-	}
-	return 0;
-}
 
 export default {
 	state,

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,7 +1,7 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/room/room_list","pages/room/create_room","pages/live/anchor","pages/live/spectator","pages/live/histroyroom","pages/login/login"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"惠农直播","compilerVersion":"3.94","entryPagePath":"pages/room/room_list","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/room/room_list","pages/room/create_room","pages/live/anchor","pages/live/spectator","pages/live/histroyroom","pages/login/login"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"惠农直播","compilerVersion":"3.95","entryPagePath":"pages/room/room_list","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
 var __uniRoutes = [{"path":"/pages/room/room_list","meta":{"isQuit":true},"window":{"navigationBarTitleText":"直播列表"}},{"path":"/pages/room/create_room","meta":{},"window":{"navigationBarTitleText":"创建直播间"}},{"path":"/pages/live/anchor","meta":{"isNVue":true},"window":{"navigationBarTitleText":"","navigationStyle":"custom"}},{"path":"/pages/live/spectator","meta":{"isNVue":true},"window":{"navigationBarTitleText":"观众直播间","navigationStyle":"custom"}},{"path":"/pages/live/histroyroom","meta":{"isNVue":true},"window":{"navigationBarTitleText":"历史直播间","navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录","navigationStyle":"custom"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/dev/app-plus/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__0E46DAD","name":"惠农直播","version":{"name":"1.1.0","code":110},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"VideoPlayer":{},"iBeacon":{},"Barcode":{},"Camera":{},"Payment":{},"Share":{},"OAuth":{},"UniMP":{"description":"uni小程序"},"Push":{},"LivePusher":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"titleNView":true,"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"icons":{"android":{"hdpi":"","xhdpi":"","xxhdpi":"","xxxhdpi":""},"ios":{"appstore":"","ipad":{"app":"","app@2x":"","notification":"","notification@2x":"","proapp@2x":"","settings":"","settings@2x":"","spotlight":"","spotlight@2x":""},"iphone":{"app@2x":"","app@3x":"","notification@2x":"","notification@3x":"","settings@2x":"","settings@3x":"","spotlight@2x":"","spotlight@3x":""}}},"splashscreen":{"useOriginalMsgbox":true},"google":{"resizeableActivity":true,"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissionExternalStorage":{"request":"none","prompt":"应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"},"permissionPhoneState":{"request":"none"}},"apple":{"privacyDescription":{"NSPhotoLibraryUsageDescription":"上传用户头像保存分享海报","NSPhotoLibraryAddUsageDescription":"上传用户头像保存分享海报","NSCameraUsageDescription":"上传用户头像保存分享海报","NSLocationWhenInUseUsageDescription":"根据客户地理位置推荐最近门店","NSLocationAlwaysUsageDescription":"根据客户地理位置推荐最近门店","NSLocationAlwaysAndWhenInUseUsageDescription":"根据客户地理位置推荐最近门店"},"idfa":false,"dSYMs":false},"plugins":{"maps":{"amap":{"appkey_ios":"82af93ec51139c712c4118d84ba684ee","appkey_android":"0799f37420c0784f1e6cba230a68bdb1"}},"payment":{"weixin":{"__platform__":["ios","android"],"appid":"wx9d68c92b550ddd1e","UniversalLinks":"https://shop.lihaink.cn/"}},"share":{"weixin":{"appid":"wx9d68c92b550ddd1e","UniversalLinks":"https://shop.lihaink.cn/"}},"geolocation":{"amap":{"__platform__":["ios","android"],"appkey_ios":"82af93ec51139c712c4118d84ba684ee","appkey_android":"0799f37420c0784f1e6cba230a68bdb1"}},"oauth":{},"ad":{},"push":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.94","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__0E46DAD","name":"惠农直播","version":{"name":"1.1.0","code":110},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"VideoPlayer":{},"iBeacon":{},"Barcode":{},"Camera":{},"Payment":{},"Share":{},"OAuth":{},"UniMP":{"description":"uni小程序"},"Push":{},"LivePusher":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"titleNView":true,"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"icons":{"android":{"hdpi":"","xhdpi":"","xxhdpi":"","xxxhdpi":""},"ios":{"appstore":"","ipad":{"app":"","app@2x":"","notification":"","notification@2x":"","proapp@2x":"","settings":"","settings@2x":"","spotlight":"","spotlight@2x":""},"iphone":{"app@2x":"","app@3x":"","notification@2x":"","notification@3x":"","settings@2x":"","settings@3x":"","spotlight@2x":"","spotlight@3x":""}}},"splashscreen":{"useOriginalMsgbox":true},"google":{"resizeableActivity":true,"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissionExternalStorage":{"request":"none","prompt":"应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"},"permissionPhoneState":{"request":"none"}},"apple":{"privacyDescription":{"NSPhotoLibraryUsageDescription":"上传用户头像保存分享海报","NSPhotoLibraryAddUsageDescription":"上传用户头像保存分享海报","NSCameraUsageDescription":"上传用户头像保存分享海报","NSLocationWhenInUseUsageDescription":"根据客户地理位置推荐最近门店","NSLocationAlwaysUsageDescription":"根据客户地理位置推荐最近门店","NSLocationAlwaysAndWhenInUseUsageDescription":"根据客户地理位置推荐最近门店"},"idfa":false,"dSYMs":false},"plugins":{"maps":{"amap":{"appkey_ios":"82af93ec51139c712c4118d84ba684ee","appkey_android":"0799f37420c0784f1e6cba230a68bdb1"}},"payment":{"weixin":{"__platform__":["ios","android"],"appid":"wx9d68c92b550ddd1e","UniversalLinks":"https://shop.lihaink.cn/"}},"share":{"weixin":{"appid":"wx9d68c92b550ddd1e","UniversalLinks":"https://shop.lihaink.cn/"}},"geolocation":{"amap":{"__platform__":["ios","android"],"appkey_ios":"82af93ec51139c712c4118d84ba684ee","appkey_android":"0799f37420c0784f1e6cba230a68bdb1"}},"oauth":{},"ad":{},"push":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.95","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}}