theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbx #44

Merged
theluyuan merged 2 commits from xbx into master 2020-08-13 03:37:40 +00:00
Conversation 0 Commits 2 Files Changed 5 +152 -24
5 changed files with 152 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pages/release/index.vue
View File

@ -80,13 +80,13 @@
</view> </view>
</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-form>
<!-- 添加标签的按钮 --> <!-- 添加标签的按钮 -->
<u-popup v-model="show" mode="center" border-radius="14"> <u-popup v-model="show" mode="center" border-radius="14">
<view class="text">创建属于你的标签吧</view> <view class="text">创建属于你的标签吧</view>
<view class="u-inputes"><u-input v-model="tagcontent" /></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-popup>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
</view> </view>
@ -338,7 +338,7 @@ export default {
#release { #release {
width: 690rpx; width: 690rpx;
margin: 0 auto; margin: 0 auto;
padding-bottom:20rpx;
.form-view { .form-view {
background: #cdc7c8; background: #cdc7c8;
border-radius: 6rpx; border-radius: 6rpx;
@ -460,6 +460,28 @@ export default {
color: #333; 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, .titles_border,
.uni-textarea-compute { .uni-textarea-compute {

15
pages/release/tosign.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<!-- tosign页面 --> <!-- tosign页面 -->
<view> <view>
<view class="tosign" style="padding-bottom:180rpx"> <view class="tosign" style="">
<image class="images" src="../../static/image/login/login(2).png"></image> <image class="images" src="../../static/image/login/login(2).png"></image>
<view class="backes"></view> <view class="backes"></view>
<!-- z自定义导航卡 --> <!-- z自定义导航卡 -->
@ -147,6 +147,7 @@
live_id: res.data.live_id live_id: res.data.live_id
} }
}) })
this.tiaozhuan = true
}) })
}, },
init(){ init(){
@ -508,11 +509,11 @@
} }
.button-uview { .button-uview {
position: fixed; // position: fixed;
bottom: 40rpx; // bottom: 40rpx;
left: 0; // left: 0;
right: 0; // right: 0;
margin: auto; margin: 20rpx auto;
z-index: 10; // z-index: 10;
} }
</style> </style>

18
pages/release/video.vue
View File

@ -71,13 +71,13 @@
</view> </view>
</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-form>
<!-- 添加标签的按钮 --> <!-- 添加标签的按钮 -->
<u-popup v-model="show" mode="center" border-radius="14" :closeable="true"> <u-popup v-model="show" mode="center" border-radius="14" :closeable="true">
<view class="text">创建属于你的标签吧</view> <view class="text">创建属于你的标签吧</view>
<view class="u-inputes"><u-input v-model="tagcontent" /></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-popup>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
</view> </view>
@ -330,6 +330,7 @@ export default {
#release { #release {
width: 690rpx; width: 690rpx;
margin: 0 auto; margin: 0 auto;
padding-bottom:20rpx;
.titles_border, .titles_border,
.uni-textarea-compute { .uni-textarea-compute {
border: 1px #bababa solid !important; border: 1px #bababa solid !important;
@ -498,7 +499,20 @@ export default {
.custom-style { .custom-style {
background: rgba(255, 120, 15, 1) !important; background: rgba(255, 120, 15, 1) !important;
color: #fff !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; 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 { .custom-style-button {
background: rgba(255, 120, 15, 1) !important; background: rgba(255, 120, 15, 1) !important;

113
pages/release/zhibo.nvue
View File

@ -35,21 +35,21 @@
</div> </div>
</div> </div>
<div class="user"> <div v-if="zhibo" class="user">
</div> </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> <image class="userhead" :src="info.member_avatar"></image>
<div class="userinfo"> <div class="userinfo">
<text class="username">{{info.member_name}}</text> <text class="username">{{info.member_name}}</text>
<text class="username" style="font-size:20rpx">{{time}} | sadasdas</text> <text class="username" style="font-size:20rpx">{{time}} | sadasdas</text>
</div> </div>
</div> </div>
<image class="closeimg" src="../../static/image/close.png" @click="closes"></image> <image v-if="zhibo" class="closeimg" src="../../static/image/close.png" @click="closes"></image>
<image class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image> <image v-if="zhibo" class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
<image class="shoptapimg" @click="xianshi" src="../../static/image/shop.png"></image> <image v-if="zhibo" 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小时后方可继续开播。请大家注意休息/避免空播。 <text v-if="zhibo" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx">德铭阳光在线绿色直播，请遵循相关法律法规，警察叔叔24小时巡查哦。为了保障直播系统稳定，现将全局开放防主播沉迷功能。主播积累直播16小时将自动下播休息2小时后方可继续开播。请大家注意休息/避免空播。
</text> </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> <text class="danmuitem" v-for="(i,j) in danmulist" :key="j">{{i.senderNickname}}:{{i.content}}</text>
</div> </div>
@ -72,6 +72,27 @@
</view> </view>
</view> </view>
</div> </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="start">开始推流1</button>
<button class="btn" @click="pause">暂停推流</button> <button class="btn" @click="pause">暂停推流</button>
<button class="btn" @click="resume">resume</button> <button class="btn" @click="resume">resume</button>
@ -84,6 +105,57 @@
</div> </div>
</template> </template>
<style lang="scss" scoped> <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{ .shoptapimg{
width: 65rpx; width: 65rpx;
height: 65rpx; height: 65rpx;
@ -104,6 +176,7 @@
right: 31rpx; right: 31rpx;
width: 31rpx; width: 31rpx;
height: 31rpx; height: 31rpx;
z-index:99999;
} }
.username{ .username{
font-size: 24rpx; font-size: 24rpx;
@ -290,7 +363,10 @@
time:'00:00:00', time:'00:00:00',
room:{}, room:{},
chatRoomService:{}, chatRoomService:{},
danmulist:[] danmulist:[],
zhibo:true,
jieshu:{},
renshumax:0
}, },
onLaunch: function() { onLaunch: function() {
console.log('App Launch'); console.log('App Launch');
@ -393,6 +469,7 @@
that.chatRoomService.initialWhenNewMessage(that.whenNewMessage); that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
//获取当前聊天室数据 //获取当前聊天室数据
that.room = that.chatRoomService.room; that.room = that.chatRoomService.room;
that.chatRoomService.whenOnlineUserChange = that.renqu
} }
}) })
let shi = 0; let shi = 0;
@ -474,6 +551,11 @@
}, },
methods: { methods: {
renqu(res){
if(this.room.onlineUsers.users.length > this.renqu){
this.renqu = this.room.onlineUsers.users.length
}
},
whenNewMessage (message) {//新消息监听 whenNewMessage (message) {//新消息监听
// if(message.type == this.room.MessageType.PROP){ // if(message.type == this.room.MessageType.PROP){
// this.propAnimation(parseInt(message.content)) // this.propAnimation(parseInt(message.content))
@ -496,6 +578,12 @@
}); });
}, },
closes(){ closes(){
if(!this.zhibo){
uni.switchTab({
url: '/pages/index/index'
});
return ;
}
const token = uni.getStorageSync('token'); const token = uni.getStorageSync('token');
let that = this let that = this
console.log(that.url) console.log(that.url)
@ -517,9 +605,12 @@
}, },
success(res){ success(res){
console.log(res) console.log(res)
uni.navigateBack({ that.stop()
delta: 1 that.jieshu = res.data.data
}); that.zhibo = false
// uni.navigateBack({
// delta: 1
// });
// that.list= res.data.data // that.list= res.data.data
} }
}) })

BIN
static/image/cloneb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB