Merge pull request 'xbx' (#55) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/55

components/GoEasyAudioPlayer/GoEasyAudioPlayer.vue

@@ -40,11 +40,12 @@
         padding: 6rpx 10rpx;
         height: 72rpx;
         line-height: 72rpx;
-        background: #D02129;
+        background: #FF780F;
         font-size: 24rpx;
         border-radius: 14rpx;
         color: #ffffff;
         display: flex;
+        flex-direction: row-reverse;
     }
     .audio-facade-bg{
         background: url("./images/voice.png") no-repeat center;

components/order-item/index.vue

@@ -19,6 +19,7 @@
 			<view class="info">
 				<view class="num">共{{info.count_number}}件商品</view>
 				<view class="price">实付<span>￥{{info.order_amount}}</span></view>
+                <view class="time">{{ info.payment_time.slice(5,16) }}</view>
 			</view>
 		</view>
 	</view>
@@ -48,14 +49,14 @@ export default {
 	height: 220rpx;
 	background: rgba(255,255,255,1);
 	border-radius: 10rpx;
-	padding: 30rpx;
+	padding: 20rpx 10rpx;
 	display: flex; 
 	align-items: center;
 	> image {
 		width: 160rpx;
 		height: 160rpx;
 		flex-shrink: 0;
-		margin-right: 25rpx;
+		margin-right: 20rpx;
 	}
 	.goods {
 		display: flex;
@@ -82,9 +83,10 @@ export default {
 			margin-bottom: 30rpx;
 		}
 		.info {
-			width: 100%;
+			width: 470rpx;
 			display: flex;
 			align-items: center;
+            justify-content: space-between;
 			font-size: 26rpx;
 			color: rgba(102,102,102,1);
 			.price {
@@ -94,6 +96,9 @@ export default {
 				}
 			}
 		}
+        .time {
+            font-size: 20rpx;
+        }
 	}
 }
 </style>

components/order-item/testlist.vue

@@ -16,6 +16,7 @@
 			<view class="info">
 				<view class="num">共{{info.goods_try_num}}件商品</view>
 				<view class="price">实付<span>￥{{info.price}}</span></view>
+                <!-- <view class="time">{{ info.payment_time.slice(5,16) }}</view> -->
 			</view>
 		</view>
 	</view>

components/release/tap_tosign.vue

@@ -2,10 +2,16 @@
 	<view id="release">
 		<!-- 标签 -->
 		<view>
-			<view class="titles">标签</view>
+			<view class="titles flex-title">
+			    <text>标签</text>
+			    <text @click="editing">{{ is_edit ? "取消编辑" : "编辑" }}</text>
+			</view>
 			<view class="form-view" @click="show_add()">+ 新建标签</view>
 			<view class="form-view" :class=" {'cur': rSelect.indexOf(item.id)!=-1} " @tap="tapInfo(item.id)" v-for="(item,index) in fileListes"
-			 :key="index">{{item.name}}</view>
+			 :key="index">
+             {{item.name}}
+             <u-icon v-show="is_edit && item.user_id != 0" class="close" name="close" color="#666" size="18" @click="isTable(item.id,index)"></u-icon>
+             </view>
 		</view>
 		<!-- 添加标签的按钮 -->
 		<u-popup v-model="show" mode="center" border-radius="14" :closeable="true">
@@ -35,7 +41,8 @@
 				action: 'http://www.example.com/upload',
 				fileList: [],
 				show: false,
-				rSelect: []
+				rSelect: [],
+                is_edit: false,
 			}
 		},
 		props:['fileListes'],
@@ -44,6 +51,10 @@
 				console.log(this.show)
 				this.show = !this.show
 			},
+            // 编辑标签
+            editing() {
+                this.is_edit = !this.is_edit;
+            },
 			// 颜色切换
 			tapInfo(e) {
 				if (this.rSelect.indexOf(e) == -1) {
@@ -54,6 +65,31 @@
 				}
 				this.$emit("qiehuan",this.rSelect)
 			},
+            // 删除标签
+            isTable(id,index) {
+                uni.showModal({
+                    title: "提示",
+                    content: "是否删除此标签？",
+                    success: (res) => {
+                        console.log();
+                        if (res.confirm) {
+                            this.delTable(id,index);
+                        }
+                    }
+                })
+            },
+            delTable(id,index) {
+                let me = this;
+                this.$u.post("Streaming/deltLabel", {label_id: id}).then(res => {
+                    if (res.errCode == 0) {
+                        this.$refs.uToast.show({
+                        	title: res.message,
+                        	type: 'success'
+                        });
+                        this.fileListes.splice(index,1);
+                    }
+                })
+            },
 			chuangjian(){
 				this.$u.api.createLivesp({spec_name:this.form.name}).then((res)=>{
 					if(res.errCode != 0){
@@ -62,7 +98,8 @@
 							type: 'error'
 						})
 					}else{
-						this.show_add()
+						this.show_add();
+                        this.fileListes.push(res.data);
 						this.$refs.uToast.show({
 							title: res.message,
 							type: 'success'
@@ -80,7 +117,12 @@
 	#release {
 		width: 690rpx;
 		margin: 0 auto;
-
+        
+        .flex-title {
+            display: flex;
+            justify-content: space-between;
+        }
+        
 		.form-view {
 			background: rgba(255, 255, 255, 1);
 			border-radius: 6rpx;
@@ -90,6 +132,10 @@
 			display: inline-block;
 			margin-bottom: 28rpx;
 			color: #333;
+            .close {
+                margin-left: 10rpx;
+                vertical-align: middle;
+            }
 		}
 
 		.titles {

pages/index/details.vue

@@ -75,6 +75,10 @@
 				<view :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
 				<view :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
 			</view>
+			<view v-if="cur != 2 && (pushid || selctcar)">
+				<view class="title">{{cur == 0 ? '快递单号':'骑手信息'}}</view>
+				<view class="value">{{ cur == 0 ? pushid ? companyidA.express_name + ": " + pushid : '' : selctcar ? selctcar.label : '' }}</view>
+			</view>
 			<view class="btn" @click="confirmpushstyle">确认</view>
 		</view>
 		<!-- 已发货 -->
@@ -147,7 +151,7 @@ export default {
 	data() {
 		return {
 			status: 1, // 订单状态
-			cur: Number,
+			cur: 2,
 			showDelivery: false, // 填写骑手信息
 			showExpress: false, // 填写快递单号
 			showRefunds: false, // 平台退货处理
@@ -266,12 +270,19 @@ export default {
 		//
 		confirm() {
 			this.showRefunds = false;
+            if (!this.refundid) {
+                this.$refs.uToast.show({
+                	title: "请选择商品",
+                	type: "warning"
+                });
+                return;
+            }
 			if (this.cur == 0) {
 				// 确定退款
 				this.$u.api.refund({
 					refund_id: this.refundid,
-					seller_state:2,
-					seller_message:""
+					seller_state: 3,
+					seller_message: ""
 				}).then(res => {
 					if (res.errCode != 0) {
 						this.$refs.uToast.show({
@@ -283,18 +294,21 @@ export default {
 							title: res.message,
 							type: 'success'
 						});
+                        let pages = getCurrentPages();
+                        let prePage = pages[pages.length - 2];
+                        console.log(prePage.$vm);
+                        prePage.$vm.del_id = this.orderid;
 						uni.navigateBack({
 							delta: 1
 						});
-						console.log(res);
 					}
 				});
 			} else {
 				// 不进行退款
 				this.$u.api.refund({
 					refund_id: this.refundid,
-					seller_state:3,
-					seller_message:""
+					seller_state: 2,
+					seller_message: ""
 				}).then(res => {
 					if (res.errCode != 0) {
 						this.$refs.uToast.show({
@@ -327,17 +341,32 @@ export default {
 		// 选择快递公司
 		getselectcompany(e) {
 			let obj = this.companylist[e[0]];
-			this.companyidA = obj.express_id;
+			this.companyidA = obj;
 			this.showExpress = true;
 		},
 		// 绑定配送方式
 		confirmpushstyle() {
+            console.log(this.cur);
+            if (this.cur != 0 && this.cur != 1) {
+                this.$refs.uToast.show({
+                    title: '请选择派送方式！',
+                    type: 'warning ',
+                })
+                return;
+            }
 			if (this.cur == 0) {
+                if (!this.companyidA) {
+                    this.$refs.uToast.show({
+                        title: '请选择派送方式！',
+                        type: 'warning ',
+                    })
+                    return;
+                }
 				console.log(this.pushid);
 				this.$u.api.bindpushid({
 					order_id: this.orderid,
 					shipping_code: this.pushid,
-					shipping_express_id: this.companyidA
+					shipping_express_id: this.companyidA.express_id
 				}).then(res => {
 					if (res.errCode != 0) {
 						this.$refs.uToast.show({
@@ -355,6 +384,13 @@ export default {
 					}
 				});
 			} else {
+                if (!this.selctcar) {
+                    this.$refs.uToast.show({
+                        title: '请选择派送方式！',
+                        type: 'warning ',
+                    })
+                    return;
+                }
 				this.$u.api.bindcarer({
 					order_id: this.orderid,
 					takeawayer_id: this.selctcar.takeawayer_id

pages/index/index.vue

@@ -134,7 +134,8 @@ export default {
 			badlist: [], //退货列表
 			carlist: [], //可投诉订单列表
 			reportinfo: null, //投诉信息
-			reportcontent: '' //投诉内容
+			reportcontent: '', //投诉内容
+            del_id: 0, // 删除id
 		};
 	},
 	onLoad() {
@@ -146,12 +147,13 @@ export default {
 		this.getallorder(0);
 		const user = uni.getStorageSync('userinfo');
 		console.log(user)
-		this.imService.login(user.userId,user.member_avatar,"")
+		this.imService.login(user.userId,user.member_nickname,user.member_avatar)
 		this.imService.connectIM()
 		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
 	},
 	onShow() {
 		this.publishstate = false;
+		this.tabsChange(this.current);
 	},
 	onReachBottom() {
 		this.num++;
@@ -283,7 +285,7 @@ export default {
 		getshiftlist() {
 			let that = this;
 			this.$u.api.getshiftlist({}).then(res => {
-				console.log(res);
+				console.log(JSON.stringify(res));
 				if (res.errCode != 0) {
 					this.$refs.uToast.show({
 						title: res.message,

pages/messages/messagesList.vue

@@ -113,10 +113,7 @@
 		font-size: 26rpx;
 		color: #666666;
 		height: 30rpx;
-		height: 30rpx;
-		overflow:hidden; //超出的文本隐藏
-		text-overflow:ellipsis; //用省略号显示
-		white-space:nowrap; //不换行
+		line-height: 30rpx;
 	}
 	.times{
 		position: absolute;

pages/messages/privateChat.vue

@@ -312,7 +312,7 @@
 		box-sizing: border-box;
 	}
 	.chatInterface .top{
-		font-size: 24rpx;
+		font-size: 20rpx;
 		height: 90rpx;
 		display: flex;
 		flex-direction: column;
@@ -322,7 +322,7 @@
 		color: blue;
 	}
 	.chatInterface .top .description{
-		text-decoration: underline;
+		/* text-decoration: underline; */
 	}
 
 	.chatInterface .message-item{

pages/release/index.vue

@@ -31,10 +31,14 @@
 			></u-upload>
 			<!-- 标签 -->
 			<view>
-				<view class="titles">标签</view>
+				<view class="titles flex-title">
+                    <text>标签</text>
+                    <text @click="editing">{{ is_edit ? "取消编辑" : "编辑" }}</text>
+                </view>
 				<view class="form-view active" @click="show_add()">+ 新建标签</view>
 				<view :class="['form-view', item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
 					{{ item.name }}
+                    <u-icon v-show="is_edit && item.user_id != 0" class="close" name="close" color="#666" size="18" @click="isTable(item.id,index)"></u-icon>
 				</view>
 			</view>
 			<!-- 简介 -->
@@ -80,13 +84,13 @@
 				</view>
 			</view>
 			<!-- 提交 -->
-			<u-button class="custom-style" shape="circle" size="default" @click="publish">发表</u-button>
+			<u-button :hair-line="false" class="custom-style" shape="circle" size="default" @click="publish">发表</u-button>
 		</u-form>
 		<!-- 添加标签的按钮 -->
 		<u-popup v-model="show" mode="center" border-radius="14">
 			<view class="text">创建属于你的标签吧</view>
 			<view class="u-inputes"><u-input v-model="tagcontent" /></view>
-			<u-button class="custom-style-button" shape="circle" size="default" @click="addLiveSpec">确定</u-button>
+			<u-button :hair-line="false" class="custom-style-button" shape="circle" size="default" @click="addLiveSpec">确定</u-button>
 		</u-popup>
 		<u-toast ref="uToast" />
 	</view>
@@ -131,7 +135,8 @@ export default {
 			imgarr: [], //上传图片数组
 			cover: '', //图文封面
 			selectarr: [], //选中标签
-			tagcontent: ''
+			tagcontent: '',
+            is_edit: false, // 编辑
 		};
 	},
 	onLoad() {
@@ -233,6 +238,7 @@ export default {
 					} else {
 						this.tagcontent = '';
 						this.show = false;
+                        this.fileListes.push(res.data);
 						this.$refs.uToast.show({
 							title: res.message,
 							type: 'success'
@@ -240,6 +246,31 @@ export default {
 					}
 				});
 		},
+        // 删除标签
+        isTable(id,index) {
+            uni.showModal({
+                title: "提示",
+                content: "是否删除此标签？",
+                success: (res) => {
+                    console.log();
+                    if (res.confirm) {
+                        this.delTable(id,index);
+                    }
+                }
+            })
+        },
+        delTable(id,index) {
+            let me = this;
+            this.$u.post("Streaming/deltLabel", {label_id: id}).then(res => {
+                if (res.errCode == 0) {
+                    this.$refs.uToast.show({
+                    	title: res.message,
+                    	type: 'success'
+                    });
+                    this.fileListes.splice(index,1);
+                }
+            })
+        },
 		// 上传封面
 		uploadcover(data) {
 			console.log(data);
@@ -274,6 +305,10 @@ export default {
 		show_add() {
 			this.show = !this.show;
 		},
+        // 编辑标签
+        editing() {
+            this.is_edit = !this.is_edit;
+        },
 		// 选中某个复选框时，由checkbox时触发
 		checkboxChange(e) {
 			let that = this;
@@ -338,19 +373,27 @@ export default {
 #release {
 	width: 690rpx;
 	margin: 0 auto;
-
+	padding-bottom:20rpx;
+    .flex-title {
+        display: flex;
+        justify-content: space-between;
+    }
 	.form-view {
-		background: #cdc7c8;
-		border-radius: 6rpx;
-		margin-right: 20rpx;
-		font-size: 24rpx;
-		padding: 8rpx 20rpx;
 		display: inline-block;
+		padding: 8rpx 20rpx;
+		margin-right: 20rpx;
 		margin-bottom: 28rpx;
+		font-size: 24rpx;
 		color: #fff;
+		border-radius: 6rpx;
+		background-color: #cdc7c8;
+        .close {
+            margin-left: 10rpx;
+            vertical-align: middle;
+        }
 	}
 	.active {
-		background: #ff780f;
+		background-color: #ff780f;
 	}
 	.scroll {
 		width: 100%;
@@ -460,6 +503,28 @@ export default {
 		color: #333;
 	}
 }
+.u-btn {
+	width: 628rpx;
+	height: 98rpx;
+	background: rgba(255, 120, 15, 1) !important;
+	border-radius: 49rpx;
+	margin: 0 auto;
+	font-size: 36rpx;
+	color: rgba(255, 255, 255, 1) !important;
+	line-height: 36px;
+	border: 1px #ff780f solid;
+	outline: none;
+	border-color: rgba(255, 120, 15, 1) !important;
+}
+.custom-style-button {
+	background: rgba(255, 120, 15, 1) !important;
+	color: #fff !important;
+	font-size: 28rpx;
+	width: 200rpx;
+	margin-bottom: 23rpx;
+	line-height: 60rpx;
+	height: 60rpx;
+}
 
 .titles_border,
 .uni-textarea-compute {

pages/release/tosign.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- tosign页面 -->
 	<view>
-		<view class="tosign" style="padding-bottom:180rpx">
+		<view class="tosign" style="">
 			<image class="images" src="../../static/image/login/login(2).png"></image>
 			<view class="backes"></view>
 			<!-- z自定义导航卡 -->
@@ -75,7 +75,8 @@
 			},
 			shangchuan(){
 				uni.showLoading({
-					title: '上传中'
+					title: '上传中',
+					mask:true
 				});
 			},
 			tupian(){
@@ -110,9 +111,9 @@
 			tupian(a){
                 // console.log(JSON.parse(a.data));
                 let info = JSON.parse(a.data);
-                console.log(info.data.file_path);
+                console.log(info.data);
 				// console.log(JSON.stringify(a.data))
-				this.image = info.data.file_path;
+				this.image = info.data.file_name;
 			},
 			navto(url){
 				this.$u.route({
@@ -124,6 +125,7 @@
 					return ;
 				}
 				this.tiaozhuan = true
+				console.log(this.image)
 				this.$u.api.createChatRoom({
 					chat_name:this.max,
 					live_desc:this.form.text,
@@ -141,12 +143,14 @@
 					}
 					this.$u.route({
 						url:"/pages/release/zhibo",
+						type:"redirectTo",
 						params:{
 							url:res.data.url.replace("&","*"),
 							id:res.data.chat_id,
 							live_id: res.data.live_id
 						}
 					})
+					this.tiaozhuan = true
 				})
 			},
 			init(){
@@ -508,11 +512,11 @@
 	}
 
 	.button-uview {
-		position: fixed;
-		bottom: 40rpx;
-		left: 0;
-		right: 0;
-		margin: auto;
-		z-index: 10;
+		// position: fixed;
+		// bottom: 40rpx;
+		// left: 0;
+		// right: 0;
+		margin: 20rpx auto;
+		// z-index: 10;
 	}
 </style>

pages/release/video.vue

@@ -1,5 +1,5 @@
 <template>
-	<view id="release">
+	<view id="release" >
 		<u-form :model="form" ref="uForm">
 			<u-form-item label="标题" label-position="right"><u-input v-model="form.name" placeholder="请输入标题" /></u-form-item>
 			<view class="titles">封面</view>
@@ -16,17 +16,26 @@
 				@on-success="uploadcover"
 			></u-upload>
 			<view class="titles">视频</view>
-			<view class="videobox" v-if="videostate == false" @click="uploadvideo">
+			<view class="videobox video-flex" v-if="videostate == false" @click="uploadvideo">
 				<u-icon name="plus" class="u-add-btn" size="40"></u-icon>
 				<view class="videotext">选择视频</view>
 			</view>
-			<view class="videobox" v-else @click="uploadvideo"><video :src="videopath" controls></video></view>
+			<view class="videobox" v-else @click="uploadvideo">
+                <video v-if="!is_video" :src="videopath" controls></video>
+                <view v-else class="video-mode">
+                    <image src="../../static/videoPlay.png" mode=""></image>
+                </view>
+            </view>
 			<!-- 标签 -->
 			<view>
-				<view class="titles">标签</view>
+				<view class="titles flex-title">
+				    <text>标签</text>
+				    <text @click="editing">{{ is_edit ? "取消编辑" : "编辑" }}</text>
+				</view>
 				<view class="form-view active" @click="show_add()">+ 新建标签</view>
 				<view :class="['form-view', item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
 					{{ item.name }}
+                    <u-icon v-show="is_edit && item.user_id != 0" class="close" name="close" color="#666" size="18" @click="isTable(item.id,index)"></u-icon>
 				</view>
 			</view>
 			<!-- 简介 -->
@@ -64,13 +73,13 @@
 				</view>
 			</view>
 			<!-- 提交 -->
-			<u-button class="custom-style" shape="circle" size="default" @click="publish">发表</u-button>
+			<u-button class="custom-style" shape="circle" size="default"  :hair-line="false" @click="publish">发表</u-button>
 		</u-form>
 		<!-- 添加标签的按钮 -->
 		<u-popup v-model="show" mode="center" border-radius="14" :closeable="true">
 			<view class="text">创建属于你的标签吧</view>
 			<view class="u-inputes"><u-input v-model="tagcontent" /></view>
-			<u-button class="custom-style-button" shape="circle" size="default" @click="addLiveSpec">确定</u-button>
+			<u-button  :hair-line="false" class="custom-style-button" shape="circle" size="default" @click="addLiveSpec">确定</u-button>
 		</u-popup>
 		<u-toast ref="uToast" />
 	</view>
@@ -167,6 +176,7 @@ export default {
 			videopath: '', //视频链接
 			fileListes: [],
 			show: false,
+            is_video: false,
 			show_two: false,
 			arres_list: [],
 			shoplist: [], //选择商品列表
@@ -176,13 +186,27 @@ export default {
 			tagcontent: '', //新建标签名字
 			selectvideo: '', //视频名字
 			videostate: false, //视频状态
-			progress: 0
+			progress: 0,
+            is_edit: false, // 编辑标签
 		};
 	},
 	onLoad() {
 		this.getLiveSpec();
 		this.resetgood();
 	},
+    watch: {
+      show() {
+          let me = this;
+          if (this.show) {
+              this.is_video = true;
+          } else {
+              setTimeout(function() {
+                  me.is_video = false;
+              },600)
+          }
+      },
+      immediate: true
+    },
 	methods: {
 		// 获取可以推荐的商品
 		resetgood() {
@@ -265,6 +289,7 @@ export default {
 				} else {
 					this.tagcontent = '';
 					this.show = false;
+                    this.fileListes.push(res.data);
 					this.$refs.uToast.show({
 						title: res.message,
 						type: 'success'
@@ -290,6 +315,31 @@ export default {
 				}
 			});
 		},
+        // 删除标签
+        isTable(id,index) {
+            uni.showModal({
+                title: "提示",
+                content: "是否删除此标签？",
+                success: (res) => {
+                    console.log();
+                    if (res.confirm) {
+                        this.delTable(id,index);
+                    }
+                }
+            })
+        },
+        delTable(id,index) {
+            let me = this;
+            this.$u.post("Streaming/deltLabel", {label_id: id}).then(res => {
+                if (res.errCode == 0) {
+                    this.$refs.uToast.show({
+                    	title: res.message,
+                    	type: 'success'
+                    });
+                    this.fileListes.splice(index,1);
+                }
+            })
+        },
 		// 上传封面
 		uploadcover(data) {
 			let obj = data.data;
@@ -304,6 +354,10 @@ export default {
 		show_add() {
 			this.show = !this.show;
 		},
+        // 编辑标签
+        editing() {
+            this.is_edit = !this.is_edit;
+        },
 		// 选择直播商品点击确定
 		changes() {
 			let that = this;
@@ -351,6 +405,11 @@ export default {
 #release {
 	width: 690rpx;
 	margin: 0 auto;
+	padding-bottom:20rpx;
+    .flex-title {
+        display: flex;
+        justify-content: space-between;
+    }
 	.titles_border,
 	.uni-textarea-compute {
 		border: 1px #bababa solid !important;
@@ -485,6 +544,10 @@ export default {
 		display: inline-block;
 		margin-bottom: 28rpx;
 		color: #fff;
+        .close {
+            margin-left: 10rpx;
+            vertical-align: middle;
+        }
 	}
 	.active {
 		background: #ff780f;
@@ -495,16 +558,33 @@ export default {
 		color: rgba(51, 51, 51, 1);
 		margin: 30rpx 0;
 	}
+    .video-flex {
+        flex-direction: column;
+        font-size: 28rpx;
+        color: #666;
+    }
 	.videobox {
 		width: 200rpx;
 		height: 200rpx;
 		display: flex;
-		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		background: #f4f5f6;
+		background-color: #f4f5f6;
 		margin-left: 10rpx;
 		border-radius: 10rpx;
+        
+        .video-mode {
+            width: 200rpx;
+            height: 200rpx;
+            line-height: 280rpx;
+            text-align: center;
+            border-radius: 10rpx;
+            background-color: #000;
+            & > image {
+                width: 100rpx;
+                height: 100rpx;
+            }
+        }
 	}
 	.videotext {
 		margin-top: 10rpx;
@@ -519,7 +599,20 @@ export default {
 	.custom-style {
 		background: rgba(255, 120, 15, 1) !important;
 		color: #fff !important;
+		// font-size: 36rpx;
+	}
+	.u-btn {
+		width: 628rpx;
+		height: 98rpx;
+		background: rgba(255, 120, 15, 1) !important;
+		border-radius: 49rpx;
+		margin: 0 auto;
 		font-size: 36rpx;
+		color: rgba(255, 255, 255, 1) !important;
+		line-height: 36px;
+		border: 1px #ff780f solid;
+		outline: none;
+		border-color: rgba(255, 120, 15, 1) !important;
 	}
 	.custom-style-button {
 		background: rgba(255, 120, 15, 1) !important;

pages/release/zhibo.nvue

@@ -10,7 +10,7 @@
                 <div class="head">
                     <div style="flex-direction: row;align-items:center">
                         <text class="title">全部商品</text>
-                        <text class="num">2件</text>
+                        <text class="num">{{list.length}}件</text>
                     </div>
                     <!-- <div class="add">
                         <text style="font-size:28rpx;color: #fff;text-align:center">添加/管理商品</text>
@@ -35,21 +35,21 @@
             </div>
             
         </div>
-        <div class="user">
+        <div v-if="zhibo" class="user">
         </div>
-        <div style="position: fixed;top: 60rpx;left: 30rpx;flex-direction: row;align-items:center">
+        <div v-if="zhibo" style="position: fixed;top: 60rpx;left: 30rpx;flex-direction: row;align-items:center">
             <image class="userhead" :src="info.member_avatar"></image>
             <div class="userinfo">
-                <text class="username">{{info.member_name}}</text>
-                <text class="username" style="font-size:20rpx">{{time}} | sadasdas</text>
+                <text class="username">{{info.member_nickname}}</text>
+                <text class="username" style="font-size:20rpx">{{time}} | {{room.onlineUsers.users.length - 1 < 0 ? 0 : room.onlineUsers.users.length - 1}}</text>
             </div>
         </div>
-        <image class="closeimg" src="../../static/image/close.png" @click="closes"></image>
-        <image class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
-        <image class="shoptapimg" @click="xianshi" src="../../static/image/shop.png"></image>
-        <text style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx">德铭阳光在线绿色直播，请遵循相关法律法规，警察叔叔24小时巡查哦。为了保障直播系统稳定，现将全局开放防主播沉迷功能。主播积累直播16小时将自动下播休息2小时后方可继续开播。请大家注意休息/避免空播。
+        <image v-if="zhibo" class="closeimg" src="../../static/image/close.png" @click="closes"></image>
+        <image v-if="zhibo" class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
+        <image v-if="zhibo" class="shoptapimg" @click="xianshi" src="../../static/image/shop.png"></image>
+        <text v-if="zhibo" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx">德铭阳光在线绿色直播，请遵循相关法律法规，警察叔叔24小时巡查哦。为了保障直播系统稳定，现将全局开放防主播沉迷功能。主播积累直播16小时将自动下播休息2小时后方可继续开播。请大家注意休息/避免空播。
         </text>
-        <div class="danmulist">
+        <div v-if="zhibo" class="danmulist">
             <text class="danmuitem" v-for="(i,j) in danmulist" :key="j">{{i.senderNickname}}:{{i.content}}</text>
             
         </div>
@@ -59,12 +59,12 @@
             <text class="menutitle">直播工具</text>
             <view class="menutool">
                 <view class="menutoolitem" @click="switchCamera">
-                    <image class="menutoolitemimg"></image>
+                    <image src="../../static/images/fanzhuan.png" class="menutoolitemimg"></image>
                     <text class="menutoolitemtitle">翻转</text>
                 </view>
                  <picker @change="bindPickerChange" :value="meiyan" :range="[1,2,3,4,5,6,7,8,9]">
                         <view class="menutoolitem">
-                            <image class="menutoolitemimg"></image>
+                            <image src="../../static/images/meiyan.png" class="menutoolitemimg"></image>
                             <text class="menutoolitemtitle">美颜</text>
                         </view>
                 </picker>
@@ -72,6 +72,27 @@
             </view>
         </view>
         </div>
+        <div class="jieshu" v-if="!zhibo" :style="{'height':height + 'px'}">
+            <div class="jieshuback" :style="{'height':height + 'px'}"></div>
+            <image class="closeimg" src="../../static/image/cloneb.png" @click="closes"></image>
+            <text class="jieshutitle">徳铭阳光在线</text>
+            <image class="jieshuheadimg" :src="info.member_avatar"></image>
+            <text class="jieshuusername">{{info.member_nickname}}</text>
+            <div class="jieshubox">
+                <view class="jieshuboxitem">
+                    <text style="color:#fff;font-size:30rpx">{{jieshu.newfans}}</text>
+                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">新粉丝</text>
+                </view>
+                <view class="jieshuboxitem">
+                    <text style="color:#fff;font-size:30rpx">{{renshumax}}</text>
+                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">热度</text>
+                </view>
+                <view class="jieshuboxitem">
+                    <text style="color:#fff;font-size:30rpx">RMB {{jieshu.sales_amount}}</text>
+                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">直播销量</text>
+                </view>
+            </div>
+        </div>
         <!-- <button class="btn" @click="start">开始推流1</button>
         <button class="btn" @click="pause">暂停推流</button>
         <button class="btn" @click="resume">resume</button>
@@ -84,6 +105,57 @@
     </div>
 </template>
 <style lang="scss" scoped>
+.jieshuboxitem{
+    width: 210rpx;
+    height: 120rpx;
+    align-items: center;
+    justify-content: center;
+}
+.jieshubox{
+    width: 438rpx;
+    height: 288rpx;
+    border-width: 1rpx;
+    border-color: #fff;
+    margin-top: 78rpx;
+    flex-direction: row;
+    flex-wrap: wrap;
+
+}
+.jieshuusername{
+    font-size: 30rpx;
+    margin-top: 31rpx;
+    color: #fff;
+}
+.jieshuheadimg{
+    width: 154rpx;
+    height: 154rpx;
+    border-radius: 77rpx;
+}
+.jieshutitle{
+    font-size: 30rpx;
+    color:#fff;
+    position: fixed;
+    top: 70rpx;
+    left: 31rpx;
+    height: 31rpx;
+}
+.jieshuback{
+    background-color: #000;
+    opacity: 0.8;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 750rpx;
+    
+}
+.jieshu{
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 750rpx;
+    align-items: center;
+    justify-content: center;
+}
 .shoptapimg{
     width: 65rpx;
     height: 65rpx;
@@ -104,6 +176,7 @@
     right: 31rpx;
     width: 31rpx;
     height: 31rpx;
+    z-index:99999;
 }
 .username{
     font-size: 24rpx;
@@ -290,7 +363,10 @@
             time:'00:00:00',
             room:{},
             chatRoomService:{},
-            danmulist:[]
+            danmulist:[],
+            zhibo:true,
+            jieshu:{},
+            renshumax:0
         },
         onLaunch: function() {
             console.log('App Launch');
@@ -343,10 +419,18 @@
             },500)
             
         },
-        
+        onBackPress(options) {  
+            if (options.from === 'navigateBack' || !this.zhibo) {  
+                return false;  
+            }  
+            this.closes();  
+            return true;  
+        }, 
         onLoad(a){
 		    console.log(getApp().globalData.im)
-
+            uni.setKeepScreenOn({
+                keepScreenOn: true
+            });
             this.url = a.url.replace("*","&")
             let that = this
             const token = uni.getStorageSync('token');
@@ -393,6 +477,7 @@
                     that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
                     //获取当前聊天室数据
                     that.room = that.chatRoomService.room;
+                    that.chatRoomService.initialWhenOnlineUserChange(that.renqu)
                 }
             })
             let shi = 0;
@@ -474,6 +559,11 @@
 
         },  
         methods: {
+            renqu(res){
+                if(res.users.length > this.renqu){
+                    this.renqu = res.users.length
+                }
+            },
             whenNewMessage (message) {//新消息监听
 				// if(message.type == this.room.MessageType.PROP){
 				// 	this.propAnimation(parseInt(message.content))
@@ -496,6 +586,12 @@
                 });
             },
             closes(){
+                if(!this.zhibo){
+                    uni.switchTab({
+                        url: '/pages/index/index'
+                    });
+                    return ;
+                }
                 const token = uni.getStorageSync('token');
                 let that = this
                 console.log(that.url)
@@ -517,9 +613,12 @@
                                 },
                                 success(res){
                                     console.log(res)
-                                    uni.navigateBack({
-                                        delta: 1
-                                    });
+                                    that.stop()
+                                    that.jieshu = res.data.data
+                                    that.zhibo = false
+                                    // uni.navigateBack({
+                                    //     delta: 1
+                                    // });
                                     // that.list= res.data.data
                                 }
                             })
@@ -630,6 +729,7 @@
                         arr.push(this.list[i].goods_id)
                     }
                 }
+                console.log(arr.join(','))
                 let that = this
                 uni.request({
                     url:"https://dmmall.sdbairui.com/storeapi/Streaming/updateGoods",

static/imservice.js

@@ -299,7 +299,8 @@ IMService.prototype.initialIMListeners = function () {
                         friend.text = message.type != "text" ? "其他消息" : message.payload.text
                         let time = new Date(message.timestamp)
                         friend.date = message.timestamp
-                        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+
                         console.log(that.friends)
                         that.friendsarr = []
                         for(let i in that.friends){
@@ -325,7 +326,8 @@ IMService.prototype.initialIMListeners = function () {
                 friend.text = message.type != "text" ? "其他消息" : message.payload.text
                 let time = new Date(message.timestamp)
                 friend.date = message.timestamp
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+
                 console.log(this.friends)  
                 that.friendsarr = []
                 for(let i in this.friends){
@@ -424,7 +426,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
                 friend.text = message
                 let time = new Date()
                 friend.date = time.getTime()
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+
                 console.log(that.friends)
                 that.friendsarr = []
                 for(let i in that.friends){
@@ -448,7 +451,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
         friend.text = message
         let time = new Date()
         friend.date = time.getTime()
-        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+
         console.log(this.friends)  
         that.friendsarr = []
         for(let i in this.friends){