xbx #210

Merged
theluyuan merged 6 commits from xbx into master 2020-08-15 07:48:12 +00:00
Showing only changes of commit 6f0ed8e3f9 - Show all commits

View File

@ -1,6 +1,6 @@
<template> <template>
<view> <view>
<video :src="url" class="vodio" autoplay="true" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}" @error="errors> <video :src="url" class="vodio" autoplay="true" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}" @error="errors" >
</video> </video>
<view class="user" :style="{'top': top}"> <view class="user" :style="{'top': top}">
@ -418,20 +418,22 @@ export default {
} }
}) })
//当前用户 //当前用户
try { var currentUser = {}
uni.request({ if(this.$store.state.hasLogin){
url:"https://dmmall.sdbairui.com/api/Member/MemberInfo", const user = uni.getStorageSync('user_info');
method:"POST", currentUser = {
header:{ id : user.member.member_id,
'Authorization' : 'Bearer' + " " + token nickname : user.member.member_nickname,
}, avatar: user.member.member_avatar
success(res){
console.log(res,111)
var currentUser = {
id : res.data.data.MemberArray.member_mobile + "",
nickname : res.data.data.MemberArray.member_nickname,
avatar: res.data.data.MemberArray.member_avatar
}; };
}else{
const user = uni.getStorageSync('morenimg');
currentUser = {
id : new Date().getTime(),
nickname : "123",
avatar: user
};
}
var room = { var room = {
id : a.rid + "", id : a.rid + "",
@ -447,12 +449,6 @@ export default {
that.chatRoomService.initialWhenNewMessage(that.whenNewMessage); that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
this.$forceUpdate(); this.$forceUpdate();
console.log(that.room) console.log(that.room)
}
})
} catch (error) {
console.log("错误")
}
}, },
onBackPress () {//返回取消订阅 onBackPress () {//返回取消订阅