uopdate about conflict
This commit is contained in:
@@ -156,6 +156,10 @@ export default {
|
||||
this.getcarlist();
|
||||
// 所有订单
|
||||
this.getallorder(0);
|
||||
const user = uni.getStorageSync('userinfo');
|
||||
console.log(user)
|
||||
this.imService.login(user.userId,user.member_avatar,"")
|
||||
this.imService.connectIM()
|
||||
// 订单状态: 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
|
||||
},
|
||||
onShow() {
|
||||
|
||||
@@ -99,10 +99,11 @@ export default {
|
||||
return
|
||||
}
|
||||
// 清除本地存储才可以正常登陆(具体原因没有仔细检查)
|
||||
uni.clearStorage();
|
||||
// uni.clearStorage();
|
||||
// 账号登录1达人0商家
|
||||
if(this.state==1){
|
||||
this.$u.api.login({ member_name: this.zhanghaoA, member_password: this.mimaA }).then(res => {
|
||||
console.log(JSON.stringify(res))
|
||||
if (res.errCode != 0) {
|
||||
// 恢复按钮可点击状态
|
||||
this.clickstate=false
|
||||
@@ -122,6 +123,7 @@ export default {
|
||||
});
|
||||
}else{
|
||||
this.$u.api.shoplogin({ member_name: this.zhanghao, member_password: this.mima }).then(res => {
|
||||
console.log(JSON.stringify(res))
|
||||
if (res.errCode != 0) {
|
||||
// 恢复按钮可点击状态
|
||||
this.clickstate=false
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
<template>
|
||||
<!-- login页面 -->
|
||||
<view>
|
||||
<view class="border_serach">
|
||||
<view :style="{'height':swiperHeight + 'px'}">
|
||||
<!-- <view class="border_serach">
|
||||
<view class="u-search">
|
||||
<u-search :show-action="false" input-align="left" shape="round" placeholder="搜索" v-model="keyword"></u-search>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- 消息列表 -->
|
||||
<view class="massage_list" v-for="(item,index) in list" :key="index">
|
||||
<u-empty text="并没有什么消息" mode="message" v-if="Object.keys(list).length == 0" style="margin: auto"></u-empty>
|
||||
<view class="massage_list" v-for="(item,index) in list" :key="index" @click="gochat(item)">
|
||||
<view class="images">
|
||||
<image :src="item.url" ></image>
|
||||
<image :src="item.avatar" ></image>
|
||||
</view>
|
||||
<view class="names">{{item.name}}</view>
|
||||
<view class="content">{{item.content}}</view>
|
||||
<view class="content u-line-1">{{item.text}}</view>
|
||||
<view class="times">{{item.time}}</view>
|
||||
<view class="tishi" v-if="item.unReadMessage"></view>
|
||||
</view>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
@@ -23,37 +25,53 @@
|
||||
data() {
|
||||
return {
|
||||
keyword: '搜索',
|
||||
list: [{
|
||||
name: '瘦瘦',
|
||||
content: "木糖少女小紫薯西装领连衣裙夏季新款女装装领连衣裙夏季装领连衣裙夏季装领连衣裙夏季夏收腰格子格纹裙子",
|
||||
url: '../../static/image/tosign/tosigin(5).png',
|
||||
id : '1',
|
||||
time : '10:15'
|
||||
},
|
||||
{
|
||||
name: '瘦瘦',
|
||||
content: "木糖少女小紫薯西装领连衣裙夏季新款女装装领连衣裙夏季装领连衣裙夏季装领连衣裙夏季夏收腰格子格纹裙子",
|
||||
url: '../../static/image/tosign/tosigin(5).png',
|
||||
id : '1',
|
||||
time : '10:15'
|
||||
},
|
||||
{
|
||||
name: '瘦瘦',
|
||||
content: "木糖少女小紫薯西装领连衣裙夏季新款女装装领连衣裙夏季装领连衣裙夏季装领连衣裙夏季夏收腰格子格纹裙子",
|
||||
url: '../../static/image/tosign/tosigin(5).png',
|
||||
id : '1',
|
||||
time : '10:15'
|
||||
},
|
||||
list: [
|
||||
|
||||
],
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
|
||||
gochat(id){
|
||||
console.log(id)
|
||||
this.$u.route({
|
||||
url:"/pages/messages/privateChat",
|
||||
params:{
|
||||
id:JSON.stringify(id)
|
||||
}
|
||||
|
||||
})
|
||||
},
|
||||
onFriendListChange(onlineFriends) {
|
||||
//todo:比较垃圾的处理方式,因为Uniapp的基于MAP的双向绑定在H5端不稳定,H5端偶尔会抽风
|
||||
// 下边这一行删掉,有时候页面可以更新,有时候不行,大家有优雅的方式,也欢迎跟我们沟通
|
||||
console.log(onlineFriends,121212)
|
||||
this.information_dl = onlineFriends;
|
||||
|
||||
this.$forceUpdate();
|
||||
},
|
||||
},
|
||||
onShow(){
|
||||
// this.list = this.imService.friends;
|
||||
this.imService.onFriendListChange=this.onFriendListChange;
|
||||
},
|
||||
onLoad(){
|
||||
const res = uni.getSystemInfoSync();
|
||||
this.swiperHeight = res.windowHeight;
|
||||
this.list = this.imService.friends;
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.tishi{
|
||||
position: absolute;
|
||||
bottom: 30rpx;
|
||||
right: 30rpx;
|
||||
width: 12rpx;
|
||||
height: 12rpx;
|
||||
border-radius: 50%;
|
||||
background-color: #FF0000;
|
||||
}
|
||||
.u-search{
|
||||
width: 690rpx;
|
||||
margin: 0 auto;
|
||||
@@ -67,6 +85,7 @@
|
||||
position: relative;
|
||||
border-bottom: 1px #ECECEC solid;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
zoom: 1;
|
||||
.images{
|
||||
width: 84rpx;
|
||||
|
||||
615
pages/messages/privateChat.vue
Normal file
615
pages/messages/privateChat.vue
Normal file
@@ -0,0 +1,615 @@
|
||||
<template>
|
||||
<div class="chatInterface">
|
||||
<div class="chat-scroll-container">
|
||||
<scroll-view ref="myScroll" scroll-y="true" class="scroll-view" :scroll-into-view="contentPosition">
|
||||
<div :class="[allHistoryLoaded ? 'top gray' : 'top']" @click="loadMoreHistoryMessage">
|
||||
<span class="description">{{allHistoryLoaded ? '已经没有更多的历史消息' : '点击加载更多历史消息'}}</span>
|
||||
</div>
|
||||
<!--已经收到的消息-->
|
||||
<div v-for="(message, key) in messages || []"
|
||||
:id="'message_' + message.timestamp"
|
||||
:key="message.timestamp"
|
||||
class = "message-item"
|
||||
:class="{'self' : message.senderId == (currentUser && currentUser.uuid)}">
|
||||
<div :class="friend.online ? 'avatar' : 'avatar offline-gray'"
|
||||
v-if="message.senderId != (currentUser && currentUser.uuid)">
|
||||
<image :src="friend.avatar" ></image>
|
||||
</div>
|
||||
<div class="avatar" v-else>
|
||||
<image :src="currentUser.avatar"></image>
|
||||
</div>
|
||||
<div class="content">
|
||||
<span class="text-content" v-if="message.type =='text'">{{message.payload.text}}</span>
|
||||
<image class="image-content" v-if="message.type == 'image'" :src="message.payload.url" :data-url="message.payload.url" @click="showImageFullScreen" mode="widthFix" @load="scrollToBottom"></image>
|
||||
<div class="video-snapshot" v-if="message.type == 'video'" :data-url="message.payload.video.url" @click="playVideo">
|
||||
<image :src="message.payload.thumbnail.url" mode="aspectFit" @load="scrollToBottom"></image>
|
||||
<div class="video-play-icon"></div>
|
||||
</div>
|
||||
<GoEasyAudioPlayer v-if="message.type =='audio'" :src="message.payload.url" :duration="message.payload.duration" />
|
||||
</div>
|
||||
</div>
|
||||
<!--发送中的消息-->
|
||||
<div v-for="(message, index) in pendingMessages || []"
|
||||
:key="index"
|
||||
:id="'pendingMessage_' + index"
|
||||
class = "message-item"
|
||||
:class="{'self' : message.senderId == (currentUser && currentUser.uuid)}">
|
||||
<div :class="friend.online ? 'avatar' : 'avatar offline-gray'"
|
||||
v-if="message.senderId != (currentUser && currentUser.uuid)">
|
||||
<image :src="friend.avatar"></image>
|
||||
</div>
|
||||
<div class="avatar" v-else>
|
||||
<image :src="currentUser.avatar"></image>
|
||||
</div>
|
||||
<div class="content">
|
||||
<b class="pending"></b>
|
||||
<span class="text-content" v-if="message.type =='text'">{{message.payload.text}}</span>
|
||||
<image class="image-content" v-if="message.type == 'image'" :src="message.payload.url" mode="widthFix" @load="scrollToBottom"></image>
|
||||
<div v-if="message.type == 'video'" class="video-snapshot">
|
||||
<image :src="message.payload.thumbnail.url" mode="aspectFit" @load="scrollToBottom"></image>
|
||||
<div class="video-play-icon"></div>
|
||||
</div>
|
||||
<GoEasyAudioPlayer v-if="message.type =='audio'" :src="message.payload.url" :duration="message.payload.duration" />
|
||||
</div>
|
||||
</div>
|
||||
</scroll-view>
|
||||
</div>
|
||||
<div class="action-box" v-if="!video.visible">
|
||||
<div class="action-top">
|
||||
<div :class="[audio.visible ? 'record-icon record-open':'record-icon']" @click="switchAudioKeyboard"></div>
|
||||
<div class="record-input" @longpress="onRecordStart" @touchend="onRecordEnd" v-if="audio.visible" >{{audio.recording ? '松开发送' : '按住录音'}}</div>
|
||||
<div class="message-input" v-else>
|
||||
<input type="text" placeholder="发送消息" v-model="content">
|
||||
</div>
|
||||
<div class="file-icon img-video" @click="sendImage"></div>
|
||||
<div class="file-icon" @click="sendVideo"></div>
|
||||
<span class="send-message-btn" @click="sendMessage">发送</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="record-loading" v-if="audio.recording"></div>
|
||||
<video style="width:100%;height: 100%" :src="video.url" v-if="video.visible" id="videoPlayer" autoplay="true" @fullscreenchange="onVideoFullScreenChange" @play="onVideoPlayStart"></video>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import GoEasyAudioPlayer from "../../components/GoEasyAudioPlayer/GoEasyAudioPlayer";
|
||||
const recorderManager = uni.getRecorderManager();
|
||||
export default {
|
||||
name: "privateChat",
|
||||
components : {
|
||||
GoEasyAudioPlayer,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
//聊天文本框
|
||||
content: '',
|
||||
friend: null,
|
||||
currentUser: null,
|
||||
//已经接收到的消息
|
||||
messages: [],
|
||||
//正在发送中的消息
|
||||
pendingMessages : [],
|
||||
//已经加载完所有历史消息
|
||||
allHistoryLoaded: false,
|
||||
|
||||
contentPosition : '',
|
||||
|
||||
audio : {
|
||||
//语音录音中
|
||||
recording : false,
|
||||
//录音按钮展示
|
||||
visible : false
|
||||
},
|
||||
video : {
|
||||
visible : false,
|
||||
url : '',
|
||||
context : null
|
||||
}
|
||||
}
|
||||
},
|
||||
watch : {
|
||||
//每当新增了发送中的消息,都滑动到底部
|
||||
pendingMessages(){
|
||||
this.scrollToBottom()
|
||||
}
|
||||
},
|
||||
onReady () {
|
||||
this.video.context = uni.createVideoContext('videoPlayer');
|
||||
},
|
||||
onLoad(options) {
|
||||
if(!this.imService.currentUser){
|
||||
uni.navigateTo({
|
||||
url : '../login/login'
|
||||
});
|
||||
}
|
||||
//对话数据
|
||||
this.friend = JSON.parse(options.id);
|
||||
this.currentUser = this.imService.currentUser;
|
||||
let privateMessages = this.imService.getPrivateMessages(this.friend.uuid);
|
||||
this.messages = privateMessages.sentMessages;
|
||||
this.pendingMessages = privateMessages.pendingMessages;
|
||||
|
||||
uni.setNavigationBarTitle({
|
||||
title : this.friend.name
|
||||
});
|
||||
setTimeout(() => {
|
||||
uni.setNavigationBarColor({
|
||||
backgroundColor : '#FF780F',
|
||||
frontColor : '#333333'
|
||||
});
|
||||
}, 10);
|
||||
|
||||
this.initialListeners();
|
||||
|
||||
//每次进入聊天页面,总是滚动到底部
|
||||
this.scrollToBottom()
|
||||
|
||||
},
|
||||
onUnload() {
|
||||
//退出聊天页面之前,清空页面传入的监听器
|
||||
this.imService.onNewPrivateMessageReceive = (friendId, message)=> {};
|
||||
this.imService.onPrivateHistoryLoad = (friendId, messages) =>{};
|
||||
//将未读消息数清零
|
||||
this.imService.resetFriendUnReadMessage(this.friend);
|
||||
},
|
||||
methods: {
|
||||
initialListeners () {
|
||||
//传入监听器,收到一条私聊消息总是滚到到页面底部
|
||||
this.imService.onNewPrivateMessageReceive = (friendId, message)=> {
|
||||
if (friendId == this.friend.uuid) {
|
||||
//收到新消息,是滚动到最底部
|
||||
this.scrollToBottom()
|
||||
}
|
||||
};
|
||||
|
||||
//传入监听器,完成一次私聊历史加载时,如果加载结果为空,显示没有更多消息
|
||||
this.imService.onPrivateHistoryLoad = (friendId, messages) =>{
|
||||
if (messages.length == 0) {
|
||||
//灰色,就不能点击了
|
||||
this.allHistoryLoaded = true
|
||||
}
|
||||
};
|
||||
// 录音监听器
|
||||
this.initRecorderListeners();
|
||||
},
|
||||
initRecorderListeners(){
|
||||
var self = this;
|
||||
// 监听录音开始
|
||||
recorderManager.onStart(function(){
|
||||
self.audio.recording = true;
|
||||
});
|
||||
|
||||
//录音结束后,发送
|
||||
recorderManager.onStop(function(res){
|
||||
self.audio.recording = false;
|
||||
self.imService.sendPrivateAudioMessage(self.friend.uuid, res)
|
||||
});
|
||||
|
||||
// 监听录音报错
|
||||
recorderManager.onError(function(res){
|
||||
console.log("录音报错:",res);
|
||||
})
|
||||
},
|
||||
sendMessage() {//发送消息
|
||||
if (this.content.trim() != '') {
|
||||
this.imService.sendPrivateTextMessage(this.friend.uuid, this.content);
|
||||
let that = this
|
||||
setTimeout(function(){
|
||||
that.scrollToBottom();
|
||||
},500)
|
||||
}
|
||||
this.content = "";
|
||||
},
|
||||
loadMoreHistoryMessage() {//历史消息
|
||||
let lastMessageTimeStamp = Date.now();
|
||||
let lastMessage = this.messages[0];
|
||||
if (lastMessage) {
|
||||
lastMessageTimeStamp = lastMessage.timestamp;
|
||||
}
|
||||
this.imService.loadPrivateHistoryMessage(this.friend.uuid, lastMessageTimeStamp);
|
||||
},
|
||||
onRecordStart () {
|
||||
try{
|
||||
recorderManager.start();
|
||||
}catch(e){
|
||||
console.log("e:",e);
|
||||
uni.showModal({
|
||||
title: '录音错误',
|
||||
content : '请在app和小程序端体验录音,Uni官方明确H5不支持getRecorderManager, 详情查看Uni官方文档'
|
||||
});
|
||||
}
|
||||
},
|
||||
onRecordEnd () {
|
||||
try{
|
||||
recorderManager.stop();
|
||||
}catch(e){
|
||||
console.log("e:",e);
|
||||
uni.showModal({
|
||||
title: '录音错误',
|
||||
content : '请在app和小程序端体验录音,Uni官方明确H5不支持getRecorderManager, 详情查看Uni官方文档'
|
||||
});
|
||||
}
|
||||
},
|
||||
sendVideo () {//发送文件
|
||||
uni.chooseVideo({
|
||||
success : (res) => {
|
||||
console.log(res)
|
||||
this.imService.sendPrivateVideoMessage(this.friend.uuid, res)
|
||||
}
|
||||
})
|
||||
},
|
||||
sendImage() {
|
||||
uni.chooseImage({
|
||||
count :1,
|
||||
success :(res) => {
|
||||
console.log(res)
|
||||
this.imService.sendPrivateImageMessage(this.friend.uuid,res);
|
||||
}
|
||||
})
|
||||
},
|
||||
showImageFullScreen (e) {
|
||||
var imagesUrl = [e.currentTarget.dataset.url];
|
||||
uni.previewImage({
|
||||
urls: imagesUrl
|
||||
});
|
||||
},
|
||||
//语音录制按钮和键盘输入的切换
|
||||
switchAudioKeyboard() {
|
||||
this.audio.visible = !this.audio.visible;
|
||||
},
|
||||
playVideo (e) {
|
||||
this.video.visible = true;
|
||||
this.video.url =e.currentTarget.dataset.url;
|
||||
},
|
||||
onVideoPlayStart () {
|
||||
this.video.context.requestFullScreen({
|
||||
direction : 0
|
||||
});
|
||||
},
|
||||
onVideoFullScreenChange (e) {
|
||||
//当退出全屏播放时,隐藏播放器
|
||||
if(this.video.visible && !e.detail.fullScreen){
|
||||
this.video.visible = false;
|
||||
this.video.context.stop();
|
||||
}
|
||||
},
|
||||
scrollToBottom () {
|
||||
this.$nextTick(() => {
|
||||
if(this.messages && this.messages.length !=0){
|
||||
this.contentPosition = 'message_' + (this.messages[this.messages.length-1].timestamp || '');
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style >
|
||||
page {
|
||||
height: 100%;;
|
||||
}
|
||||
uni-page-body, uni-page-refresh {
|
||||
height: 100%;;
|
||||
}
|
||||
.chatInterface{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
.chatInterface .chat-scroll-container{
|
||||
overflow: hidden;
|
||||
padding-left: 20rpx;
|
||||
padding-right: 20rpx;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex: 1;
|
||||
}
|
||||
.chatInterface .scroll-view{
|
||||
flex: 1;
|
||||
overflow: auto;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.chatInterface .top{
|
||||
font-size: 24rpx;
|
||||
height: 90rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
color: blue;
|
||||
}
|
||||
.chatInterface .top .description{
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.chatInterface .message-item{
|
||||
/* max-height: 400rpx; */
|
||||
margin-top: 40rpx;
|
||||
overflow: hidden;
|
||||
}
|
||||
.chatInterface .avatar{
|
||||
width: 80rpx;
|
||||
height: 80rpx;
|
||||
margin-right:20rpx ;
|
||||
}
|
||||
.chatInterface .message-item.self .avatar{
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
.chatInterface .message-item .avatar image{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.chatInterface .content{
|
||||
font-size: 34rpx;
|
||||
line-height: 44rpx;
|
||||
/* max-height: 400rpx; */
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: right;
|
||||
}
|
||||
.chatInterface .content .image-content{
|
||||
padding: 16rpx;
|
||||
border-radius: 12rpx;
|
||||
width: 300rpx;
|
||||
height: 300rpx;
|
||||
}
|
||||
.chatInterface .content .text-content{
|
||||
padding: 16rpx;
|
||||
border-radius: 12rpx;
|
||||
max-width: 520rpx;
|
||||
}
|
||||
.chatInterface .content .pending{
|
||||
background: url("../../static/images/pending.gif") no-repeat center;
|
||||
background-size: 30rpx;
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
margin-right: 10rpx;
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.chatInterface .action-box{
|
||||
display: flex;
|
||||
height: 80rpx;
|
||||
padding-top: 20rpx;
|
||||
padding-bottom: 20rpx;
|
||||
backdrop-filter: blur(0.27rpx);
|
||||
width: 100%;
|
||||
}
|
||||
.chatInterface .action-top{
|
||||
display: flex;
|
||||
padding-top: 20rpx;
|
||||
padding-bottom: 20rpx;
|
||||
backdrop-filter: blur(0.27rem);
|
||||
height: 80rpx;
|
||||
width: 100%;
|
||||
}
|
||||
.chatInterface .record-icon{
|
||||
font-size: 32rpx;
|
||||
width: 80rpx;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
text-align: center;
|
||||
background: url("../../static/images/record-appearance-icon.png") no-repeat center;
|
||||
background-size: 50%;
|
||||
-webkit-tap-highlight-color:rgba(0,0,0,0);
|
||||
}
|
||||
.chatInterface .action-top .file-icon{
|
||||
background: url("../../static/images/vedio.png") no-repeat center;
|
||||
background-size: 70%;
|
||||
color: #9D9D9D;
|
||||
position: relative;
|
||||
width:80rpx;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
-webkit-tap-highlight-color:rgba(0,0,0,0);
|
||||
}
|
||||
.chatInterface .record-icon.record-open{
|
||||
background: url("../../static/images/jianpan.png") no-repeat center;
|
||||
background-size: 70%;
|
||||
-webkit-tap-highlight-color:rgba(0,0,0,0);
|
||||
}
|
||||
.chatInterface .action-top .img-video{
|
||||
background: url("../../static/images/file.png") no-repeat center;
|
||||
background-size: 74%;
|
||||
}
|
||||
.chatInterface .record-input{
|
||||
width: 480rpx;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
border-radius: 12rpx;
|
||||
font-size: 28rpx;
|
||||
background: #cccccc;
|
||||
color: #ffffff;
|
||||
text-align: center;
|
||||
}
|
||||
.chatInterface .message-input{
|
||||
border-radius: 12rpx;
|
||||
}
|
||||
.chatInterface .message-input input{
|
||||
width: 440rpx;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
padding-left: 20rpx;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
.chatInterface .send-message-btn{
|
||||
font-size: 32rpx;
|
||||
width: 80rpx;
|
||||
line-height: 80rpx;
|
||||
}
|
||||
.record-loading{
|
||||
position: absolute;
|
||||
top:50%;
|
||||
left: 50%;
|
||||
width: 300rpx;
|
||||
height: 300rpx;
|
||||
margin: -150rpx -150rpx;
|
||||
background: #262628;
|
||||
background: url("../../static/images/recording-loading.gif") no-repeat center;
|
||||
background-size: 100%;
|
||||
border-radius: 40rpx;
|
||||
}
|
||||
.chatInterface .img-layer{
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: #000000;
|
||||
z-index: 9999;
|
||||
padding: 6rpx;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
.chatInterface .img-layer uni-image {
|
||||
height: 100%!important;
|
||||
}
|
||||
.chatInterface .img-layer {
|
||||
height: 100%!important;
|
||||
width: 100%!important;
|
||||
}
|
||||
|
||||
|
||||
.chatInterface .content .file-content .file-info{
|
||||
height: 0.5rem;
|
||||
width: 1.5rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 0 0.1rem;
|
||||
}
|
||||
.chatInterface .content .file-content .file-info .title{
|
||||
height: 0.3rem;
|
||||
line-height: 0.3rem;
|
||||
overflow: hidden;
|
||||
font-size: 0.16rem;
|
||||
padding: 0;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
word-break: break-all;
|
||||
color: #262628;
|
||||
text-align: left;
|
||||
}
|
||||
.chatInterface .content .file-content .file-info .size{
|
||||
font-size: 0.14rem;
|
||||
height: 0.2rem;
|
||||
line-height: 0.2rem;
|
||||
padding: 0;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
word-break: break-all;
|
||||
color: #999999;
|
||||
text-align: left;
|
||||
}
|
||||
.chatInterface .video-snapshot{
|
||||
position: relative;
|
||||
height: 300rpx;
|
||||
max-width: 400rpx;
|
||||
background: #000000;
|
||||
}
|
||||
.chatInterface .video-snapshot image{
|
||||
max-height: 300rpx;
|
||||
max-width: 400rpx;
|
||||
}
|
||||
.chatInterface .video-snapshot video{
|
||||
max-height: 300rpx;
|
||||
max-width: 400rpx;
|
||||
}
|
||||
|
||||
.video-snapshot .video-play-icon{
|
||||
position: absolute;
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
border-radius: 20rpx;
|
||||
background:url("../../static/images/play.png") no-repeat center;
|
||||
background-size: 100%;
|
||||
top:50%;
|
||||
left: 50%;
|
||||
margin:-20rpx;
|
||||
}
|
||||
.chatInterface .avatar{
|
||||
overflow: hidden;
|
||||
float: left;
|
||||
}
|
||||
.chatInterface .avatar img{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: block;
|
||||
}
|
||||
.chatInterface .content{
|
||||
float: left;
|
||||
overflow: hidden;
|
||||
}
|
||||
.chatInterface .content span{
|
||||
font-family: Source Han Sans CN;
|
||||
letter-spacing: -0.41px;
|
||||
color: #262628;
|
||||
background: #efefef;
|
||||
display: inline-block;
|
||||
word-break: break-all;
|
||||
}
|
||||
.chatInterface .message-item.self{
|
||||
margin-right: 0;
|
||||
}
|
||||
.chatInterface .message-item.self .avatar{
|
||||
margin-right: 0;
|
||||
float: right;
|
||||
}
|
||||
.chatInterface .message-item.self .content{
|
||||
text-align: right;
|
||||
float: right;
|
||||
}
|
||||
.chatInterface .message-item.self .content span{
|
||||
color: #ffffff;
|
||||
background:#FF780F;
|
||||
word-break: break-all;
|
||||
text-align: left;
|
||||
max-width: 520rpx;
|
||||
}
|
||||
.chatInterface .action-box{
|
||||
background: #FAFAFA;
|
||||
display: flex;
|
||||
align-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
.chatInterface .message-input{
|
||||
background: #efefef;
|
||||
border: 0;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.chatInterface .send-message-btn{
|
||||
flex-grow: 1;
|
||||
text-align: center;
|
||||
color: #95949A;
|
||||
}
|
||||
|
||||
.chatInterface .member-layer{
|
||||
width:100%;
|
||||
height: 100%;
|
||||
background: #FFFFFF;
|
||||
top: 0;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
}
|
||||
.member-layer .member{
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.chatInterface .group-icon{
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.chatInterface .gray{
|
||||
color: gray!important;
|
||||
text-decoration: none!important;
|
||||
}
|
||||
|
||||
</style>
|
||||
@@ -3,10 +3,10 @@
|
||||
<view class="title">我的商品</view>
|
||||
<u-checkbox-group>
|
||||
<view class="list">
|
||||
<shopItem @xuanzhong="xuanzhong" class="items" v-for="(i,j) in list" :key="j" :image="i.goods_image" :title="i.goods_name" :price="i.goods_marketprice" :num="i.goods_salenum" :sid="i.goods_id" ref="shop"></shopItem>
|
||||
<shopItem @xuanzhong="xuanzhong" :wxuanzhong="sele.indexOf(i.goods_id + '') > -1" class="items" v-for="(i,j) in list" :key="j" :image="i.goods_image" :title="i.goods_name" :price="i.goods_marketprice" :num="i.goods_salenum" :sid="i.goods_id" ref="shop"></shopItem>
|
||||
</view>
|
||||
</u-checkbox-group>
|
||||
<view class="jiaru" @click="jiaru">加入售货袋</view>
|
||||
<view class="jiaru" @click="jiaru" :style="{'background-color': sele.length > 0 ? 'rgba(255, 120, 15, 1' : ''}">加入售货袋</view>
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
@@ -45,6 +45,11 @@ export default {
|
||||
}
|
||||
},
|
||||
onLoad(){
|
||||
this.sele = uni.getStorageSync("gouwudai").split(',')
|
||||
if(this.sele[0] == ""){
|
||||
this.sele = []
|
||||
}
|
||||
console.log(this.sele[0])
|
||||
this.$u.api.getStoreGoodsList().then((res)=>{
|
||||
this.list = res.data.list
|
||||
})
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<template>
|
||||
<!-- tosign页面 -->
|
||||
<view>
|
||||
<view class="tosign">
|
||||
<view class="tosign" style="padding-bottom:180rpx">
|
||||
<image class="images" src="../../static/image/login/login(2).png"></image>
|
||||
<view class="backes"></view>
|
||||
<!-- z自定义导航卡 -->
|
||||
<u-navbar title="" class="content" :background="background" :is-back="false" :border-bottom="false">
|
||||
<!-- <image src="../../static/image/tosign/tosigin(4).png"></image> -->
|
||||
<image src="../../static/image/tosign/tosigin(1).png"></image>
|
||||
<image src="../../static/image/tosign/tosigin(1).png" @click="fanhui"></image>
|
||||
</u-navbar>
|
||||
|
||||
<view id="content_tosign">
|
||||
@@ -21,18 +21,19 @@
|
||||
</u-form-item>
|
||||
<view class="values"><text>{{20 - form.text.length}}</text>/20</view>
|
||||
<u-form-item label-position="right" >
|
||||
<u-input v-model="form.values" placeholder="我的售货袋" @click="navto('selectshop')"/>
|
||||
<u-input :disabled="true" v-model="form.values" placeholder="我的售货袋" @click="navto('selectshop')"/>
|
||||
<view class="rightes" @click="navto('selectshop')">售货袋</view>
|
||||
</u-form-item>
|
||||
</u-form>
|
||||
<!-- 标签的引入 -->
|
||||
<tap_tosign :fileListes="fileListes" @chuangjian="chuangjian" @qiehuan="qiehuan"></tap_tosign>
|
||||
<view class="titles">直播封面图</view>
|
||||
<u-upload :form-data="{'name':'article_cover'}" action='https://dmmall.sdbairui.com/storeapi/Upload/uploadFile' name="article_cover" :header="{'Authorization' : 'Bearer' + ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" del-color="#ececec" upload-text="上传" del-bg-color="#fff"></u-upload>
|
||||
<u-upload :form-data="{'name':'article_cover'}" action='https://dmmall.sdbairui.com/storeapi/Upload/uploadFile' name="article_cover" :header="{'Authorization' : 'Bearer' + ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" @on-success="sccg" del-color="#ececec" upload-text="上传" del-bg-color="#fff" :before-upload="shangchuan"></u-upload>
|
||||
</view>
|
||||
<view class="button-uview">
|
||||
<u-button @click="kaibo">{{relerest}}</u-button>
|
||||
<u-button :hair-line="false" @click="kaibo">{{relerest}}</u-button>
|
||||
</view>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -65,6 +66,20 @@
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
fanhui(){
|
||||
this.$u.route({
|
||||
type:"back",
|
||||
delta:1
|
||||
})
|
||||
},
|
||||
shangchuan(){
|
||||
uni.showLoading({
|
||||
title: '上传中'
|
||||
});
|
||||
},
|
||||
tupian(){
|
||||
uni.hideLoading()
|
||||
},
|
||||
// 选中某个复选框时,由checkbox时触发
|
||||
checkboxChange(e) {
|
||||
//console.log(e);
|
||||
@@ -108,6 +123,12 @@
|
||||
cover_img:this.image
|
||||
}).then((res)=>{
|
||||
console.log(res)
|
||||
if(res.errCode == 1){
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
type: 'error'
|
||||
});
|
||||
}
|
||||
this.$u.route({
|
||||
url:"/pages/release/zhibo",
|
||||
params:{
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<template>
|
||||
<div>
|
||||
<live-pusher id='livePusher' ref="livePusher" class="livePusher" :url="url"
|
||||
mode="SD" :muted="false" :enable-camera="true" :auto-focus="true" :beauty="meiyan + 1" whiteness="2"
|
||||
mode="FHD" :muted="false" :enable-camera="true" :auto-focus="true" :beauty="meiyan + 1" whiteness="0"
|
||||
aspect="9:16" @statechange="statechange" @netstatus="netstatus" @error = "error"
|
||||
:style="{'height':height + 'px'}"
|
||||
></live-pusher>
|
||||
<div class="bottom" :style="{'height':height + 'px'}" v-if="show" @click="show = false">
|
||||
<div class="bottom" :style="{'height':height }" v-if="show" @click="show = false">
|
||||
<div class="tanchuceng" @click="zuzhi">
|
||||
<div class="head">
|
||||
<div style="flex-direction: row;align-items:center">
|
||||
@@ -231,6 +231,8 @@
|
||||
overflow: hidden;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 750rpx;
|
||||
height: 335rpx;
|
||||
}
|
||||
.menutitle{
|
||||
font-size: 30rpx;
|
||||
@@ -290,22 +292,61 @@
|
||||
chatRoomService:{},
|
||||
danmulist:[]
|
||||
},
|
||||
onReady() {
|
||||
// 注意:需要在onReady中 或 onLoad 延时
|
||||
this.context = uni.createLivePusherContext("livePusher", this);
|
||||
onLaunch: function() {
|
||||
console.log('App Launch');
|
||||
},
|
||||
onShow: function() {
|
||||
this.stop()
|
||||
this.startPreview()
|
||||
let that = this
|
||||
uni.getSystemInfo({
|
||||
success(a){
|
||||
console.log(a.windowHeight)
|
||||
that.height = a.windowHeight
|
||||
// that.start()
|
||||
|
||||
}
|
||||
this.start()
|
||||
},
|
||||
onHide: function() {
|
||||
console.log('App Hide');
|
||||
},
|
||||
//模拟onshow生命周期
|
||||
created() {
|
||||
//监听当前窗口显示
|
||||
currentWebview.addEventListener('show',e=>{
|
||||
console.log('search show');
|
||||
this.startPreview()
|
||||
this.start()
|
||||
})
|
||||
},
|
||||
|
||||
//摧毁之前的声明周期
|
||||
beforeDestroy() {
|
||||
//移除监听事件
|
||||
console.log(123)
|
||||
currentWebview.removeEventListener('show',e=>{})
|
||||
},
|
||||
onReady() {
|
||||
// 注意:需要在onReady中 或 onLoad 延时
|
||||
let that = this
|
||||
setTimeout(()=>{
|
||||
uni.getSystemInfo({
|
||||
success(a){
|
||||
console.log(a.windowHeight,1212)
|
||||
that.height = a.windowHeight
|
||||
// that.start()
|
||||
setTimeout(()=>{
|
||||
that.context = uni.createLivePusherContext("livePusher", that);
|
||||
that.startPreview()
|
||||
|
||||
|
||||
|
||||
},500)
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
},500)
|
||||
|
||||
},
|
||||
|
||||
onLoad(a){
|
||||
console.log(getApp().globalData.im)
|
||||
|
||||
this.url = a.url.replace("*","&")
|
||||
let that = this
|
||||
const token = uni.getStorageSync('token');
|
||||
@@ -336,7 +377,7 @@
|
||||
console.log(uni.getStorageSync('userinfo'),123)
|
||||
//当前用户
|
||||
var currentUser = {
|
||||
id : res.data.data.memberInfo.member_id + "",
|
||||
id : Date.parse(new Date()) + "",
|
||||
nickname : res.data.data.memberInfo.member_nickname + "",
|
||||
avatar: res.data.data.memberInfo.member_avatar
|
||||
};
|
||||
@@ -345,11 +386,11 @@
|
||||
id : a.id + "",
|
||||
name : a.id + ""
|
||||
};
|
||||
console.log(room)
|
||||
that.chatRoomService = getApp().globalData.im
|
||||
console.log(room,currentUser)
|
||||
//构造chatRoomService
|
||||
that.chatRoomService = new ChatRoomService(room, currentUser);
|
||||
that.chatRoomService.subscribeRoomMessage(room,currentUser)
|
||||
that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
|
||||
that.chatRoomService.connectGoEasyIM();
|
||||
//获取当前聊天室数据
|
||||
that.room = that.chatRoomService.room;
|
||||
}
|
||||
@@ -490,6 +531,7 @@
|
||||
},
|
||||
statechange(e) {
|
||||
console.log("statechange:" + JSON.stringify(e));
|
||||
console.log(e)
|
||||
},
|
||||
netstatus(e) {
|
||||
// console.log("netstatus:" + JSON.stringify(e));
|
||||
@@ -498,6 +540,7 @@
|
||||
console.log("error:" + JSON.stringify(e));
|
||||
},
|
||||
start: function() {
|
||||
console.log("开始")
|
||||
console.log(this.url)
|
||||
this.context.start({
|
||||
success: (a) => {
|
||||
|
||||
Reference in New Issue
Block a user