Compare commits
13 Commits
cmx
...
e4f917a9cf
| Author | SHA1 | Date | |
|---|---|---|---|
e4f917a9cf
|
|||
|
06092fb183
|
|||
| 5b2745051e | |||
| f58cc207c4 | |||
|
192bd462d4
|
|||
| efde545104 | |||
|
b1e5b24319
|
|||
| 2ea72995a9 | |||
| 5500dc9f73 | |||
|
d97b749a0a
|
|||
|
cf76518bc9
|
|||
|
8d7e4b2ce4
|
|||
| 7bfce17816 |
File diff suppressed because one or more lines are too long
@@ -80,7 +80,7 @@
|
||||
<!-- 已发货 -->
|
||||
<view class="pushtimeline" v-if="type == 2">
|
||||
<view class="timelinetitle">物流信息</view>
|
||||
<view class="timelineid">订单单号: {{ info.order_sn }}</view>
|
||||
<view class="timelineid">订单单号:{{ info.order_sn }}</view>
|
||||
<view class="timelinebox" v-for="list in info.express_list">
|
||||
<view class="timelinecontent">{{list.content}}</view>
|
||||
<view class="timelinetime">{{list.kd_time}}</view>
|
||||
@@ -463,6 +463,7 @@ export default {
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
background-color: #ffffff;
|
||||
border-bottom: 2rpx solid #ececec;
|
||||
}
|
||||
.refunds-user {
|
||||
padding: 25rpx 30rpx;
|
||||
|
||||
@@ -113,10 +113,7 @@
|
||||
font-size: 26rpx;
|
||||
color: #666666;
|
||||
height: 30rpx;
|
||||
height: 30rpx;
|
||||
overflow:hidden; //超出的文本隐藏
|
||||
text-overflow:ellipsis; //用省略号显示
|
||||
white-space:nowrap; //不换行
|
||||
line-height: 30rpx;
|
||||
}
|
||||
.times{
|
||||
position: absolute;
|
||||
|
||||
@@ -312,7 +312,7 @@
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.chatInterface .top{
|
||||
font-size: 24rpx;
|
||||
font-size: 20rpx;
|
||||
height: 90rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -322,7 +322,7 @@
|
||||
color: blue;
|
||||
}
|
||||
.chatInterface .top .description{
|
||||
text-decoration: underline;
|
||||
/* text-decoration: underline; */
|
||||
}
|
||||
|
||||
.chatInterface .message-item{
|
||||
|
||||
@@ -80,13 +80,13 @@
|
||||
</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-popup v-model="show" mode="center" border-radius="14">
|
||||
<view class="text">创建属于你的标签吧</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-toast ref="uToast" />
|
||||
</view>
|
||||
@@ -338,7 +338,7 @@ export default {
|
||||
#release {
|
||||
width: 690rpx;
|
||||
margin: 0 auto;
|
||||
|
||||
padding-bottom:20rpx;
|
||||
.form-view {
|
||||
background: #cdc7c8;
|
||||
border-radius: 6rpx;
|
||||
@@ -460,6 +460,28 @@ export default {
|
||||
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,
|
||||
.uni-textarea-compute {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<!-- tosign页面 -->
|
||||
<view>
|
||||
<view class="tosign" style="padding-bottom:180rpx">
|
||||
<view class="tosign" style="">
|
||||
<image class="images" src="../../static/image/login/login(2).png"></image>
|
||||
<view class="backes"></view>
|
||||
<!-- z自定义导航卡 -->
|
||||
@@ -147,6 +147,7 @@
|
||||
live_id: res.data.live_id
|
||||
}
|
||||
})
|
||||
this.tiaozhuan = true
|
||||
})
|
||||
},
|
||||
init(){
|
||||
@@ -508,11 +509,11 @@
|
||||
}
|
||||
|
||||
.button-uview {
|
||||
position: fixed;
|
||||
bottom: 40rpx;
|
||||
left: 0;
|
||||
right: 0;
|
||||
margin: auto;
|
||||
z-index: 10;
|
||||
// position: fixed;
|
||||
// bottom: 40rpx;
|
||||
// left: 0;
|
||||
// right: 0;
|
||||
margin: 20rpx auto;
|
||||
// z-index: 10;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view id="release">
|
||||
<view id="release" >
|
||||
<u-form :model="form" ref="uForm">
|
||||
<u-form-item label="标题" label-position="right"><u-input v-model="form.name" placeholder="请输入标题" /></u-form-item>
|
||||
<view class="titles">封面</view>
|
||||
@@ -25,7 +25,7 @@
|
||||
<view>
|
||||
<view class="titles">标签</view>
|
||||
<view class="form-view active" @click="show_add()">+ 新建标签</view>
|
||||
<view :class="['form-view', item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
|
||||
<view :class="['form-view',item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
|
||||
{{ item.name }}
|
||||
</view>
|
||||
</view>
|
||||
@@ -40,7 +40,14 @@
|
||||
<view class="listes_shoping" v-for="(item, index) in list" :key="index">
|
||||
<view>
|
||||
<u-checkbox-group>
|
||||
<u-checkbox shape="circle" size="40" active-color="#FF780F" v-model="item.checked" :name="index" @change="checkboxChange"></u-checkbox>
|
||||
<u-checkbox
|
||||
shape="circle"
|
||||
size="40"
|
||||
active-color="#FF780F"
|
||||
v-model="item.checked"
|
||||
:name="index"
|
||||
@change="checkboxChange"
|
||||
></u-checkbox>
|
||||
</u-checkbox-group>
|
||||
</view>
|
||||
<view><image :src="item.goods_image" mode="widthFix"></image></view>
|
||||
@@ -64,88 +71,19 @@
|
||||
</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-popup v-model="show" mode="center" border-radius="14" :closeable="true">
|
||||
<view class="text">创建属于你的标签吧</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-toast ref="uToast" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
let COS = require('../../common/cos-wx-sdk-v5.js');
|
||||
// 上传文件
|
||||
const upload_file_server = (_this, filepath) => {
|
||||
// 腾讯云配置
|
||||
let cosConfig = {
|
||||
Bucket: 'dmmall-1300406074', //replace with yours
|
||||
Region: 'ap-shanghai', //replace with yours
|
||||
SecretId: 'AKIDjDPJhni9gTzEB9iGNWQ3PTVGjv74q7EL', //replace with yours
|
||||
SecretKey: 'ye3SZOvAQO5X5LK3Vy933h6G86h4mqpG' //replace with yours
|
||||
};
|
||||
// 获取本地文件
|
||||
let filePath = filepath;
|
||||
// 自定义文件名以及路径
|
||||
let time = new Date();
|
||||
var y = time.getFullYear();
|
||||
var m = time.getMonth() + 1;
|
||||
m = m < 10 ? '0' + m : m;
|
||||
var d = time.getDate();
|
||||
d = d < 10 ? '0' + d : d;
|
||||
let str = y + m + d;
|
||||
let Key = 'video/' + str + '/' + filePath.substr(filePath.lastIndexOf('/') + 1);
|
||||
// 初始化凭证
|
||||
var cos = new COS({
|
||||
SecretId: cosConfig.SecretId,
|
||||
SecretKey: cosConfig.SecretKey
|
||||
});
|
||||
//上传文件
|
||||
cos.postObject(
|
||||
{
|
||||
Bucket: cosConfig.Bucket,
|
||||
Region: cosConfig.Region,
|
||||
Key: Key,
|
||||
StorgeClass: 'STANDARD', //存储方式
|
||||
FilePath: filePath
|
||||
},
|
||||
(err, data) => {
|
||||
console.log(err, data, 12345);
|
||||
if (err == null) {
|
||||
if (data.statusCode == 200) {
|
||||
_this.videopath = 'https://dmmall-1300406074.cos.ap-shanghai.myqcloud.com/' + Key;
|
||||
uni.hideLoading();
|
||||
_this.videostate = true;
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: '上传失败！',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
);
|
||||
};
|
||||
// 选择图片(通用)
|
||||
const cImage = _this => {
|
||||
uni.chooseVideo({
|
||||
count: 1,
|
||||
sourceType: ['camera', 'album'],
|
||||
success: function(res) {
|
||||
uni.showLoading({
|
||||
title: '上传中'
|
||||
});
|
||||
const tempFilePaths = res.tempFilePath;
|
||||
console.log(tempFilePaths);
|
||||
upload_file_server(_this, tempFilePaths);
|
||||
}
|
||||
});
|
||||
};
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@@ -176,7 +114,7 @@ export default {
|
||||
tagcontent: '', //新建标签名字
|
||||
selectvideo: '', //视频名字
|
||||
videostate: false, //视频状态
|
||||
progress: 0
|
||||
progress:0
|
||||
};
|
||||
},
|
||||
onLoad() {
|
||||
@@ -220,11 +158,11 @@ export default {
|
||||
title: res.message,
|
||||
type: 'success'
|
||||
});
|
||||
setTimeout(function() {
|
||||
setTimeout(function(){
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
}, 1000);
|
||||
delta:1
|
||||
})
|
||||
},1000)
|
||||
}
|
||||
});
|
||||
},
|
||||
@@ -298,7 +236,48 @@ export default {
|
||||
},
|
||||
// 上传视频
|
||||
uploadvideo() {
|
||||
cImage(this);
|
||||
let url = this.action;
|
||||
let that = this;
|
||||
uni.showLoading({
|
||||
title:'上传中'+that.progress+'%'
|
||||
})
|
||||
uni.chooseVideo({
|
||||
count: 1,
|
||||
sourceType: ['camera', 'album'],
|
||||
success: function(res) {
|
||||
that.src = res.tempFilePath;
|
||||
const tempFilePaths = res.tempFilePath;
|
||||
const uploadTask = uni.uploadFile({
|
||||
url: url, //仅为示例，非真实的接口地址
|
||||
filePath: tempFilePaths,
|
||||
name: 'article_video',
|
||||
formData: {
|
||||
name: 'article_video'
|
||||
},
|
||||
header: {
|
||||
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
|
||||
},
|
||||
success: uploadFileRes => {
|
||||
console.log(uploadFileRes);
|
||||
let obj = JSON.parse(uploadFileRes.data);
|
||||
that.videopath = obj.data.url;
|
||||
that.selectvideo = obj.data.key;
|
||||
uni.hideLoading()
|
||||
that.videostate = true;
|
||||
},
|
||||
fail: function(error) {
|
||||
console.log(error);
|
||||
}
|
||||
});
|
||||
uploadTask.onProgressUpdate((res) => {
|
||||
console.log("上传进度",res.progress)
|
||||
that.progress = res.progress
|
||||
// 测试条件，取消上传任务。
|
||||
if (res.progress == 100) {
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
// 新建标签
|
||||
show_add() {
|
||||
@@ -312,13 +291,13 @@ export default {
|
||||
// 选中某个复选框时，由checkbox时触发
|
||||
checkboxChange(e) {
|
||||
let that = this;
|
||||
let num = Number(e.name);
|
||||
let num =Number(e.name)
|
||||
if (e.value == true) {
|
||||
that.pushes(that.list[num].goods_id);
|
||||
that.list[num].checked = true;
|
||||
that.list[num].checked=true
|
||||
} else {
|
||||
that.delarr(that.list[num].goods_id);
|
||||
that.list[num].checked = false;
|
||||
that.list[num].checked=false
|
||||
}
|
||||
},
|
||||
// 删除直播商品
|
||||
@@ -351,6 +330,7 @@ export default {
|
||||
#release {
|
||||
width: 690rpx;
|
||||
margin: 0 auto;
|
||||
padding-bottom:20rpx;
|
||||
.titles_border,
|
||||
.uni-textarea-compute {
|
||||
border: 1px #bababa solid !important;
|
||||
@@ -477,7 +457,7 @@ export default {
|
||||
-webkit-line-clamp: 2;
|
||||
}
|
||||
.form-view {
|
||||
background: #cdc7c8;
|
||||
background: #CDC7C8;
|
||||
border-radius: 6rpx;
|
||||
margin-right: 20rpx;
|
||||
font-size: 24rpx;
|
||||
@@ -487,7 +467,7 @@ export default {
|
||||
color: #fff;
|
||||
}
|
||||
.active {
|
||||
background: #ff780f;
|
||||
background: #FF780F;
|
||||
}
|
||||
.titles {
|
||||
font-size: 30rpx;
|
||||
@@ -519,7 +499,20 @@ export default {
|
||||
.custom-style {
|
||||
background: rgba(255, 120, 15, 1) !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;
|
||||
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;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<div class="head">
|
||||
<div style="flex-direction: row;align-items:center">
|
||||
<text class="title">全部商品</text>
|
||||
<text class="num">2件</text>
|
||||
<text class="num">{{list.length}}件</text>
|
||||
</div>
|
||||
<!-- <div class="add">
|
||||
<text style="font-size:28rpx;color: #fff;text-align:center">添加/管理商品</text>
|
||||
@@ -35,21 +35,21 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="user">
|
||||
<div v-if="zhibo" class="user">
|
||||
</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>
|
||||
<div class="userinfo">
|
||||
<text class="username">{{info.member_name}}</text>
|
||||
<text class="username" style="font-size:20rpx">{{time}} | sadasdas</text>
|
||||
</div>
|
||||
</div>
|
||||
<image class="closeimg" src="../../static/image/close.png" @click="closes"></image>
|
||||
<image class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
|
||||
<image 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小时后方可继续开播。请大家注意休息/避免空播。
|
||||
<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" 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">德铭阳光在线绿色直播，请遵循相关法律法规，警察叔叔24小时巡查哦。为了保障直播系统稳定，现将全局开放防主播沉迷功能。主播积累直播16小时将自动下播休息2小时后方可继续开播。请大家注意休息/避免空播。
|
||||
</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>
|
||||
|
||||
</div>
|
||||
@@ -59,12 +59,12 @@
|
||||
<text class="menutitle">直播工具</text>
|
||||
<view class="menutool">
|
||||
<view class="menutoolitem" @click="switchCamera">
|
||||
<image class="menutoolitemimg"></image>
|
||||
<image src="../../static/images/fanzhuan.png" class="menutoolitemimg"></image>
|
||||
<text class="menutoolitemtitle">翻转</text>
|
||||
</view>
|
||||
<picker @change="bindPickerChange" :value="meiyan" :range="[1,2,3,4,5,6,7,8,9]">
|
||||
<view class="menutoolitem">
|
||||
<image class="menutoolitemimg"></image>
|
||||
<image src="../../static/images/meiyan.png" class="menutoolitemimg"></image>
|
||||
<text class="menutoolitemtitle">美颜</text>
|
||||
</view>
|
||||
</picker>
|
||||
@@ -72,6 +72,27 @@
|
||||
</view>
|
||||
</view>
|
||||
</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="pause">暂停推流</button>
|
||||
<button class="btn" @click="resume">resume</button>
|
||||
@@ -84,6 +105,57 @@
|
||||
</div>
|
||||
</template>
|
||||
<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{
|
||||
width: 65rpx;
|
||||
height: 65rpx;
|
||||
@@ -104,6 +176,7 @@
|
||||
right: 31rpx;
|
||||
width: 31rpx;
|
||||
height: 31rpx;
|
||||
z-index:99999;
|
||||
}
|
||||
.username{
|
||||
font-size: 24rpx;
|
||||
@@ -290,7 +363,10 @@
|
||||
time:'00:00:00',
|
||||
room:{},
|
||||
chatRoomService:{},
|
||||
danmulist:[]
|
||||
danmulist:[],
|
||||
zhibo:true,
|
||||
jieshu:{},
|
||||
renshumax:0
|
||||
},
|
||||
onLaunch: function() {
|
||||
console.log('App Launch');
|
||||
@@ -393,6 +469,7 @@
|
||||
that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
|
||||
//获取当前聊天室数据
|
||||
that.room = that.chatRoomService.room;
|
||||
that.chatRoomService.whenOnlineUserChange = that.renqu
|
||||
}
|
||||
})
|
||||
let shi = 0;
|
||||
@@ -474,6 +551,11 @@
|
||||
|
||||
},
|
||||
methods: {
|
||||
renqu(res){
|
||||
if(this.room.onlineUsers.users.length > this.renqu){
|
||||
this.renqu = this.room.onlineUsers.users.length
|
||||
}
|
||||
},
|
||||
whenNewMessage (message) {//新消息监听
|
||||
// if(message.type == this.room.MessageType.PROP){
|
||||
// this.propAnimation(parseInt(message.content))
|
||||
@@ -496,6 +578,12 @@
|
||||
});
|
||||
},
|
||||
closes(){
|
||||
if(!this.zhibo){
|
||||
uni.switchTab({
|
||||
url: '/pages/index/index'
|
||||
});
|
||||
return ;
|
||||
}
|
||||
const token = uni.getStorageSync('token');
|
||||
let that = this
|
||||
console.log(that.url)
|
||||
@@ -517,9 +605,12 @@
|
||||
},
|
||||
success(res){
|
||||
console.log(res)
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
that.stop()
|
||||
that.jieshu = res.data.data
|
||||
that.zhibo = false
|
||||
// uni.navigateBack({
|
||||
// delta: 1
|
||||
// });
|
||||
// that.list= res.data.data
|
||||
}
|
||||
})
|
||||
@@ -630,6 +721,7 @@
|
||||
arr.push(this.list[i].goods_id)
|
||||
}
|
||||
}
|
||||
console.log(arr.join(','))
|
||||
let that = this
|
||||
uni.request({
|
||||
url:"https://dmmall.sdbairui.com/storeapi/Streaming/updateGoods",
|
||||
|
||||
BIN
static/image/cloneb.png
Normal file
BIN
static/image/cloneb.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
static/images/fanzhuan.png
Normal file
BIN
static/images/fanzhuan.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 463 B After Width: | Height: | Size: 6.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 932 B After Width: | Height: | Size: 3.1 KiB |
BIN
static/images/meiyan.png
Normal file
BIN
static/images/meiyan.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 620 B After Width: | Height: | Size: 8.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 472 B After Width: | Height: | Size: 8.0 KiB |
@@ -299,7 +299,8 @@ IMService.prototype.initialIMListeners = function () {
|
||||
friend.text = message.type != "text" ? "其他消息" : message.payload.text
|
||||
let time = new Date(message.timestamp)
|
||||
friend.date = message.timestamp
|
||||
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
|
||||
friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
|
||||
|
||||
console.log(that.friends)
|
||||
that.friendsarr = []
|
||||
for(let i in that.friends){
|
||||
@@ -325,7 +326,8 @@ IMService.prototype.initialIMListeners = function () {
|
||||
friend.text = message.type != "text" ? "其他消息" : message.payload.text
|
||||
let time = new Date(message.timestamp)
|
||||
friend.date = message.timestamp
|
||||
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
|
||||
friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
|
||||
|
||||
console.log(this.friends)
|
||||
that.friendsarr = []
|
||||
for(let i in this.friends){
|
||||
@@ -424,7 +426,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
|
||||
friend.text = message
|
||||
let time = new Date()
|
||||
friend.date = time.getTime()
|
||||
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
|
||||
friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
|
||||
|
||||
console.log(that.friends)
|
||||
that.friendsarr = []
|
||||
for(let i in that.friends){
|
||||
@@ -448,7 +451,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
|
||||
friend.text = message
|
||||
let time = new Date()
|
||||
friend.date = time.getTime()
|
||||
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
|
||||
friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
|
||||
|
||||
console.log(this.friends)
|
||||
that.friendsarr = []
|
||||
for(let i in this.friends){
|
||||
|
||||
Reference in New Issue
Block a user