able99 4 жил өмнө
parent
commit
902b35d14c

+ 2 - 2
jhim/jhim.js

@@ -108,8 +108,8 @@ class JhImGroup {
 	}
 	offReady(cb) {
 		if(!cb) return this;
-		this.tim.off(TIM.EVENT.SDK_READY, cb.jhimcbready);
-		this.tim.off(TIM.EVENT.SDK_NOT_READY, cb.jhimcbnotready);
+		this.jhim.tim.off(TIM.EVENT.SDK_READY, cb.jhimcbready);
+		this.jhim.tim.off(TIM.EVENT.SDK_NOT_READY, cb.jhimcbnotready);
 		return this;
 	}
 	sendText(text) {

+ 0 - 2
jhlive/jhlive.nvue

@@ -45,12 +45,10 @@
 					<!-- <view class="" v-if="isAuthor && showBeauty" @click="btnBeautify"> -->
 					<view v-if="isAuthor&&showBeauty" class="bottom-box-btns-arr" @click="btnBeautify">
 						<image class="btns-icon" :src="imgs.beauty"/>
-						<text class="btns-text">美颜</text>
 					</view>
 					<!-- <view class="" v-if="isAuthor && showSwitch" @click="btnChangeCamera"> -->
 					<view v-if="isAuthor&&showSwitch" class="bottom-box-btns-arr" @click="btnChangeCamera">
 						<image class="btns-icon" :src="imgs.switch"/>
-						<text class="btns-text">切换</text>
 					</view>
 					<view class="bottom-box-btns-arr" v-for="(item,index) in btns" :key="index" @click="clickBtns(index, item)">
 						<image class="btns-icon" :src="item.picture"/>

+ 3 - 2
pagesMedia/liveDetail.nvue

@@ -88,6 +88,7 @@
 			this.liveId = options.liveId
 			this.userData = uni.getStorageSync("userData");
 			this.userId = this.userData.userId;
+			this.userName = this.userData.userName;
 			let info = uni.getSystemInfoSync();
 			this.windowWidth = info.windowWidth;
 			this.windowHeight = info.windowHeight;
@@ -140,8 +141,8 @@
 			init() {
 				NET.request(API.startStream + 2, 'GET').then(res => {
 					this.avatar = res.data.imgUrl;
-					this.name = res.data.liveName;
-					this.roomId = Number(res.data.roomId);
+					this.title = res.data.liveName;
+					this.roomId = String(res.data.roomId);
 					this.$nextTick(() => this.enterRoom());
 				}).catch(res => {
 					uni.showToast({

+ 4 - 4
pagesMedia/pickVideo.nvue

@@ -4,7 +4,7 @@
 			ref="jhlive" class="jhlive" 
 			:sdkAppID="sdkAppID" :secretKey="secretKey" :userId="userId" :roomId="roomId"
 			:isAuthor="isAuthor" :linkMic="linkMic" 
-			:avatar="avatar" :subtitle="num?'已连接':'等待商家进入'" :title="title" 
+			:avatar="avatar" :subtitle="num?'已连接':'等待用户进入'" :title="title" 
 			:btns="btns" @onBtnClick="onBtnClick" 
       @onRemoteUser="handleRemoteUser" />
     <uni-popup ref="popup" animation type="bottom">
@@ -37,14 +37,14 @@
         goodsList: [],
         liveId: '',
 
-        isAuthor: false,
-        linkMic: true,
+        isAuthor: true,
+        linkMic: false,
         sdkAppID:API.sdkAppID,
 			  secretKey:API.secretKey,
         btns: [{picture:"../static/images/live-good.png",title:''}],
 				userId: '',
 				roomId: '',
-				title: "等待用户连接",
+				title: "暂无",
         num: 0,
         avatar: "../static/images/loginLogo.png",
 			}