From 06092fb183418ca700d68d15b21c51343090382c Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 13 Aug 2020 11:32:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=83=AD=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=8E=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/release/index.vue  |  28 +++++++++--
 pages/release/tosign.vue |  15 +++---
 pages/release/video.vue  |  20 ++++++--
 pages/release/zhibo.nvue | 106 +++++++++++++++++++++++++++++++++++----
 static/image/cloneb.png  | Bin 0 -> 1259 bytes
 5 files changed, 145 insertions(+), 24 deletions(-)
 create mode 100644 static/image/cloneb.png

diff --git a/pages/release/index.vue b/pages/release/index.vue
index 36edde1..81d6762 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -80,13 +80,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>
@@ -338,7 +338,7 @@ export default {
 #release {
 	width: 690rpx;
 	margin: 0 auto;
-
+	padding-bottom:20rpx;
 	.form-view {
 		background: #cdc7c8;
 		border-radius: 6rpx;
@@ -460,6 +460,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 {
diff --git a/pages/release/tosign.vue b/pages/release/tosign.vue
index 42fc825..b2f8f28 100644
--- a/pages/release/tosign.vue
+++ b/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自定义导航卡 -->
@@ -147,6 +147,7 @@
 							live_id: res.data.live_id
 						}
 					})
+					this.tiaozhuan = true
 				})
 			},
 			init(){
@@ -508,11 +509,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>
diff --git a/pages/release/video.vue b/pages/release/video.vue
index b240598..6eb2771 100644
--- a/pages/release/video.vue
+++ b/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>
@@ -71,13 +71,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>
@@ -330,6 +330,7 @@ export default {
 #release {
 	width: 690rpx;
 	margin: 0 auto;
+	padding-bottom:20rpx;
 	.titles_border,
 	.uni-textarea-compute {
 		border: 1px #bababa solid !important;
@@ -498,7 +499,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;
diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue
index 9008f9d..32821f0 100644
--- a/pages/release/zhibo.nvue
+++ b/pages/release/zhibo.nvue
@@ -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>
             </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>
@@ -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_name}}</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:false,
+            jieshu:{},
+            renshumax:0
         },
         onLaunch: function() {
             console.log('App Launch');
@@ -393,6 +469,7 @@
                     that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
                     //获取当前聊天室数据
                     that.room = that.chatRoomService.room;
+                    that.chatRoomService.whenOnlineUserChange = that.renqu
                 }
             })
             let shi = 0;
@@ -474,6 +551,11 @@
 
         },  
         methods: {
+            renqu(res){
+                if(this.room.onlineUsers.users.length > this.renqu){
+                    this.renqu = this.room.onlineUsers.users.length 
+                }
+            },
             whenNewMessage (message) {//新消息监听
 				// if(message.type == this.room.MessageType.PROP){
 				// 	this.propAnimation(parseInt(message.content))
@@ -517,9 +599,11 @@
                                 },
                                 success(res){
                                     console.log(res)
-                                    uni.navigateBack({
-                                        delta: 1
-                                    });
+                                    that.jieshu = res.data.data
+                                    that.zhibo = false
+                                    // uni.navigateBack({
+                                    //     delta: 1
+                                    // });
                                     // that.list= res.data.data
                                 }
                             })
diff --git a/static/image/cloneb.png b/static/image/cloneb.png
new file mode 100644
index 0000000000000000000000000000000000000000..34836e095c951e4bdbd9637109dc8c43608dccf1
GIT binary patch
literal 1259
zcmV<H1Qh#;P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000ECNkl<ZcwX(B
z*Q;Gs5XOIF0}(_-MG+NIvG;}rK?L<h)EB{$U`;}ZQDY>Ls395^WA6=(J%~zd5B7%m
zANb&-hz&&)#jc-xVV$r&IeV{t&$;{N9@d@Lz4om6zBMyzRtrg60+#}31KR-~0uKV8
zM1&Y~kz`C)0A~PO1Fr!$M#Ptf7Lu+5mH}H-uzn9*0=zQLBuLr`cpNyzSQ9=E>Z`z#
zi1^F|`~qw>V4#0UB&;1r5+v=Mz@Iz-+poath*)3({sK0u@$?@}LPWecPLYtnKM9=F
zVE3C5ajFUU8rZR+;m?VL=f{BrNxJ|Be_{sHtr2m9378Aq2{;+niCxB?@Z5AJLDH_k
z)4&NCJMGbnBjWRQiJ>MD_Urf^xHux7osJ|V@V4#vjC~&i=NbIES)kWg(lx-feX~Ko
zu0N6|nB{3Bl6C_O{<w@$A0_Z#^xCZ_AbEnP!{xx{4T_vJ9S)AOjV_XQPvDPf0sfrc
z{6CO@M8eg;iVO*V19Ku`^~PjC(jF=1bKpM!&W(t#`tALn2UNmgiK``G(*}V5BobU`
zOu0zf6L<zVI@9@k$?ZMcZ6E^)NS?41SeYT=UtnHDJUW#ONZKobKPuDj`+(j4o4R(j
z1SAp`1GfO1G<4+Ba(+ZSG!-OB+B>=Zk(vJ90cJIU_y3IqR7hBrX=@S|M8pGKk|1fH
z1pbIjKkufP|2Ah&mViXUBH;FnGLx_{BJRs|I?Q)T`vOk^Iq<DUzIGO<GftA1ly|fs
z;j)OhcNmZjeea*j+ru+@-v(yq+`g)#l?U{GkaT$}o15%#V!SdU?wSk|Bpm=e0p!5H
z1)Lud1GD{5NpR3lk`@AYXTX^R*V<lV3@r(~-Tu&wlA*x2N`f^ccn9g8j8U!=mPW*F
z!!RJ}pfvJ1@NWPYPITlaoCEqnNSY7a--3i?5#gz{wMaT7fj>C&)9b+8K^0!x&L)%t
z29Pi>?H@Mv=dyWuMBLQIC`lf1m)JS*-qvyvHldjBw_zj#tW44zz(r7#E|ah#B3xP4
ziloER$RC&?>*Z8@jRbz^95BEWE&?9Tl+9j6u8fH5Yx0WccaOZYev_<CMb`!kn>HRc
z=^oHiDCq*=k%s+6H#G@2M}(K$>qU}ldV}9D1L7rb;g9O})jmcJfj%I!0WXZITkQRq
z{sdM<gg0LtLdOD+0WNc!<ORS**2r$(8375<tP~DSdyFQ*tIbbMMvH{E23Rza3a@QA
zOsWS|!ojCZ_Jl#_4ZUVQkN6GPK4Yxc{4T1p3!Ao}JN1AH31=lw*k%~R(m&pIyDB2S
z8$n0oubp^63I*#vGkL<cLjdqjlaH@_OxKxoMnHvx(~~Fc&=Q5$5k2rep6gUPC7==x
zr=<d?jVBnq6W&jqB2UU^2<Vb!NhY|=5J=$5O@fljodzY9TL?)iw-lCC?qaCu<*=l3
zH$;lw5|dQ!rfAXI;*!ce7%BQ_tmwnhqL0TVm3u)#lJ5zXc||6HFY}U=q;jvxNh<fE
zq@;4M%1SEtvUJhc<%@nWQT&scnMYGI&*o+xP8R=kw(Q5#U7ik)gYGH0A26MX_zzl^
VvR@-{37-G}002ovPDHLkV1l&1M`-{6

literal 0
HcmV?d00001


From e4f917a9cf0d2240f2407081b99b53f8bda155ea Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 13 Aug 2020 11:36:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/release/zhibo.nvue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue
index 32821f0..5fc7918 100644
--- a/pages/release/zhibo.nvue
+++ b/pages/release/zhibo.nvue
@@ -364,7 +364,7 @@
             room:{},
             chatRoomService:{},
             danmulist:[],
-            zhibo:false,
+            zhibo:true,
             jieshu:{},
             renshumax:0
         },
@@ -578,6 +578,12 @@
                 });
             },
             closes(){
+                if(!this.zhibo){
+                    uni.switchTab({
+                        url: '/pages/index/index'
+                    });
+                    return ;
+                }
                 const token = uni.getStorageSync('token');
                 let that = this
                 console.log(that.url)
@@ -599,6 +605,7 @@
                                 },
                                 success(res){
                                     console.log(res)
+                                    that.stop()
                                     that.jieshu = res.data.data
                                     that.zhibo = false
                                     // uni.navigateBack({