直播更改

pages.json

@@ -8,7 +8,8 @@
 				"navigationBarTitleText": "首页",
 				"enablePullDownRefresh": true
 			}
-		}, {
+		}, 
+		{
 			"path": "pages/index/login",
 			"style": {
 				"navigationStyle": "custom"
@@ -74,13 +75,13 @@
 		}, {
 			"path": "videoList",
 			"style": {
-				"navigationBarTitleText": "直播大厅",
+				"navigationBarTitleText": "产品讲解",
 				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "liveDetail",
 			"style": {
-				"navigationBarTitleText": "直播详情"
+				"navigationBarTitleText": "产品讲解"
 			}
 		}, {
 			"path": "videoDetail",
@@ -90,12 +91,12 @@
 		}, {
 			"path": "plantVideo",
 			"style": {
-				"navigationBarTitleText": "共享种植直播"
+				"navigationBarTitleText": "共享种植视频"
 			}
 		}, {
 			"path": "pickVideo",
 			"style": {
-				"navigationBarTitleText": "自助采摘直播"
+				"navigationBarTitleText": "自助采摘"
 			}
 		}]
 	}, {

pages/index/index.vue

@@ -23,16 +23,16 @@
 		</view>
 		<view class="index-title">
 			<view class="title-text">精品推荐</view>
-			<view class="title-tip">直播带货，视频推荐</view>
+			<view class="title-tip">产品讲解，视频推荐</view>
 		</view>
 		<view class="content-box video-box">
 			<view class="video-col" style="margin-right: 11px;" @click="goToLiveList(1)">
-				<view class="video-title">直播大厅
+				<view class="video-title">产品讲解
 					<view class="circular">
 						<text class="iconfont iconfangxiang"></text>
 					</view>
 				</view>
-				<view v-if="!liveTelecast.imgUrl">暂无直播</view>
+				<view v-if="!liveTelecast.imgUrl">暂无</view>
 				<image class="video-img" :style="{height: (swiperHeight-30-12)+'px'}" :src="liveTelecast.imgUrl" v-if="liveTelecast"
 				 mode="aspectFill"></image>
 				<view class="video-name" v-if="liveTelecast">{{liveTelecast.liveName}}</view>
@@ -144,7 +144,7 @@
 					this.liveTelecast = res.data.list.length ? res.data.list[0] : null
 				}).catch(error => {
 					this.$refs.uTips.show({
-						title: '获取直播列表失败',
+						title: '获取列表失败',
 						type: 'warning',
 					})
 				})

pages/user/index.vue

@@ -78,11 +78,12 @@
 			<view class="line-box" v-if="userData.userName">
 				<view class="split-line"></view>
 			</view>
-			<view class="item-btn" @click="loginOut()" v-if="userData.userName">
+			<view class="item-btn" @click="modalShow = true" v-if="userData.userName">
 				<view class="iconfont iconguanyu item-btn-icon"></view>
 				<view class="item-btn-text">退出登录</view>
 				<view class="iconfont iconfangxiang"></view>
 			</view>
+			<u-modal v-model="modalShow" content="确定退出登录？" @confirm="loginOut()" :async-close="true" :show-cancel-button="true"></u-modal>
 		</view>
 		<u-top-tips ref="uTips"></u-top-tips>
 	</view>
@@ -111,7 +112,8 @@
 					unPay: 0,  // 待付款
 					unReceive: 0, // 待收货
 					unSend: 0 // 待发货
-				}
+				},
+				modalShow: false
 			}
 		},
 		onShow() {
@@ -130,6 +132,7 @@
 			loginOut() {
 			    try {
 			        uni.clearStorageSync();
+					this.modalShow = false
 					uni.reLaunch({
 						url: '/pages/index/login'
 					});

pagesGood/liveDetail.nvue

@@ -7,7 +7,8 @@
 			:avatar="avatar" :subtitle="subtitle" :title="title" 
 			:showFav="showFav" :isFav="isLiveFav" @onLiveFav="onLiveFav" 
 			:btns="btns" @onBtnClick="onBtnClick"
-			:showIm="true" :imStatus="imStatus" :imMsgs="imMsgs" @onImSend="onImSend" />
+			:showIm="true" :imStatus="imStatus" :imMsgs="imMsgs" @onImSend="onImSend" 
+			@onRemoteUser="num=$event.length" />
 		<uni-popup ref="popup" animation type="bottom">
 			<view class="popup-box">
 				<view class="popup-close">
@@ -44,6 +45,7 @@
 				</scroll-view>
 			</view>
 		</uni-popup>
+		<u-modal v-if="num<=0" :value="true" content="讲解员未进入" :show-confirm-button="false" :async-close="true"></u-modal>
 	</view>
 </template>
 
@@ -81,6 +83,7 @@
 				isLiveFav: false,
 				imStatus: '',
 				imMsgs: [],
+				num: 0, // 开麦人数
 				// #ifdef MP-WEIXIN
 				showFav: true, // 是否展示收藏，app中不展示，小程序中 展示
 				// #endif
@@ -113,6 +116,7 @@
 
 			this.init();
 		},
+		//  #ifdef APP-PLUS
 		beforeCreate() {
 		  let domModule = weex.requireModule('dom');
 		  domModule.addRule('fontFace',{
@@ -120,6 +124,7 @@
 			'src': "url('https://at.alicdn.com/t/font_2119167_43jbldmjpr3.ttf')"
 		  })
 		},
+		// #endif 
 		onUnload() {
 			this.exitRoom();
 		},

pagesGood/videoList.vue

@@ -11,11 +11,11 @@
 			<view class="video-col" v-for="(item, index) in videoList" :key="index" @click="goToVideoDetail(item)">
 				<image class="video-img" :src="videoType == 1 ? item.imgUrl : item.coverUrl" mode="aspectFill"></image>
 				<view class="video-title">{{videoType == 1 ? item.liveName : item.videoName}}</view>
-				<view class="video-date" v-if="videoType == 1">直播时间：{{item.liveStartTime}}-{{item.liveEndTime}}</view>
-				<view class="video-mask" v-if="videoType == 1 && item.liveStatus == 2">
+				<view class="video-date" v-if="videoType == 1">时间：{{item.liveStartTime}}-{{item.liveEndTime}}</view>
+				<!-- <view class="video-mask" v-if="videoType == 1 && item.liveStatus == 2">
 					<view class="video-mask-horn"></view>
-					<view class="video-mask-text">未开播</view>
-				</view>
+					<view class="video-mask-text">未开始</view>
+				</view> -->
 			</view>
 		</scroll-view>
 		<u-top-tips ref="uTips"></u-top-tips>
@@ -97,7 +97,7 @@
 					this.videoList = this.videoList.concat(res.data.list)
 				}).catch(res => {
 					this.$refs.uTips.show({
-						title: '获取直播列表失败',
+						title: '获取列表失败',
 						type: 'warning',
 					})
 				})
@@ -119,11 +119,16 @@
 						data: item.liveName
 					})
 				}
+				uni.navigateTo({
+					url: '/pagesGood/' + (this.videoType == 1 ? ('liveDetail?liveId=' + item.liveId + '&roomId=' + item.roomId) :
+						('videoDetail?videoId=' + item.videoId))
+				});
+				return;
 				if(this.videoType == 1){
 					var that=this;
 					if(item.liveStatus==2){
 						this.$refs.uTips.show({
-							title: '直播未开始',
+							title: '未开始',
 							type: 'warning',
 						})
 						wx.requestSubscribeMessage({

pagesMain/messageForm.vue

@@ -4,7 +4,7 @@
 			<u-cell-group :border="false">
 				<u-field type="textarea" placeholder="请输入留言" v-model="formData.leaMsgContent" label-width="0"></u-field>
 			</u-cell-group>
-			<u-upload :action="uploadUrl" max-count="5" :form-data="uploadData" @on-success="uploadSuccess" @on-error="uploadError" @on-remove="uploadRemove"></u-upload>
+			<!-- <u-upload :action="uploadUrl" max-count="5" :form-data="uploadData" @on-success="uploadSuccess" @on-error="uploadError" @on-remove="uploadRemove"></u-upl -->oad>
 		</view>
 		<view class="form-handle">
 			<u-button type="success" shape="circle" :ripple="true" @click="submitData" class="handle-custom">发布</u-button>

pagesMain/messageList.vue

@@ -11,7 +11,7 @@
 					<view class="message-date">{{item.leaMsgTime}}</view>
 					<view class="message-text">{{item.leaMsgContent}}</view>
 					<view class="message-img-box" v-for="(site, index2) in item.orderLeaImgResVOs" :key="index2">
-						<image class="message-img" :src="site.imgUrl"></image>
+						<!-- <image class="message-img -->" :src="site.imgUrl" mode="aspectFill"></image>
 					</view>
 				</view>
 			</view>