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

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/104
This commit is contained in:
luyuan 2020-09-17 19:44:21 +08:00
commit a6a65153ea

View File

@ -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');
@ -396,6 +397,7 @@
},
onHide: function() {
console.log('App Hide');
this.chatRoomService.warrings = ()=>{};
},
//模拟onshow生命周期
created() {
@ -511,6 +513,9 @@
miao = parseInt(miao)
miao = miao + 1
// console.log(miao)
if(miao > 10){
that.fen = false;
}
if(miao == 60){
miao = 0;
fen +=1
@ -663,6 +668,8 @@
});
return ;
}
this.chatRoomService.warrings = ()=>{};
const token = uni.getStorageSync('token');
let that = this
console.log(that.url)