From 100d4d67b9cdabe2c29e5327fa66a4be19150a64 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 17 Sep 2020 19:04:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=80=E5=88=86=E9=92=9F=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E6=96=87=E5=AD=97=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/release/zhibo.nvue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue
index 967b401..59a9338 100644
--- a/pages/release/zhibo.nvue
+++ b/pages/release/zhibo.nvue
@@ -47,7 +47,7 @@
         <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 && list.length != 0" 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">本平台提倡绿色健康直播，严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为，若有违反，将向相关部门依法追究您的法律责任。如因此给平台造成损失，有权向您全额追偿。
+        <text v-if="zhibo && fen" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx;">本平台提倡绿色健康直播，严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为，若有违反，将向相关部门依法追究您的法律责任。如因此给平台造成损失，有权向您全额追偿。
         </text>
         <div v-if="zhibo" class="danmulist">
             <text class="danmuitem" v-for="(i,j) in danmulist" :key="j">{{i.senderNickname}}:{{i.content}}</text>
@@ -375,7 +375,8 @@
             zhibo:true,
             jieshu:{},
             renshumax:0,
-            changeLiveRealtimeNumber:{}
+            changeLiveRealtimeNumber:{},
+            fen:true
         },
         onLaunch: function() {
             console.log('App Launch');
@@ -511,6 +512,9 @@
                 miao = parseInt(miao)
                 miao = miao + 1 
                 // console.log(miao)
+                if(miao > 10){
+                    that.fen = false;
+                }
                 if(miao == 60){
                     miao = 0;
                     fen +=1

From 32bcfb92e126944d6391f7bb21ce98056b62c9d7 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 17 Sep 2020 19:11:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=88=E9=99=A4=E4=BA=86=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E4=B9=8B=E5=90=8E=E7=9A=84=E6=8E=A2=E7=9F=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/release/zhibo.nvue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue
index 59a9338..000ca38 100644
--- a/pages/release/zhibo.nvue
+++ b/pages/release/zhibo.nvue
@@ -397,6 +397,7 @@
         },
         onHide: function() {
             console.log('App Hide');
+            that.chatRoomService.warrings = ()=>{};
         },
         //模拟onshow生命周期
         created() {

From c77a7a4d5bc1b55fe60b8c0485f26997c1018eb7 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 17 Sep 2020 19:18:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E6=96=AD?=
 =?UTF-8?q?=E6=B5=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue
index 000ca38..6c37614 100644
--- a/pages/release/zhibo.nvue
+++ b/pages/release/zhibo.nvue
@@ -397,7 +397,7 @@
         },
         onHide: function() {
             console.log('App Hide');
-            that.chatRoomService.warrings = ()=>{};
+            this.chatRoomService.warrings = ()=>{};
         },
         //模拟onshow生命周期
         created() {
@@ -668,6 +668,8 @@
                     });
                     return ;
                 }
+                this.chatRoomService.warrings = ()=>{};
+
                 const token = uni.getStorageSync('token');
                 let that = this
                 console.log(that.url)