Skip to content

W
wechatapp.shangjiadao.com
Commit 288a8598 authored by wangxuelai's avatar wangxuelai
Browse files
Options

''

parents e777cff6 7d9d430e
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 25 deletions
app.wxss
View file @ 288a8598
......@@ -214,7 +214,7 @@ button::after{
width: 100%;
height: 600rpx;
position: relative;
z-index: 3;
z-index: 10;
}
.videodialogmask {
position: absolute;
......
business/components/clockitem/index.wxml
View file @ 288a8598
......@@ -304,6 +304,8 @@
</view>
<view class="scoreshow">{{clock.review[1].score / 5}}</view>
</view>
<image class="activecommentflag" src="../../../images/common/activecomment.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
</view>
<view class="activeimagebox" wx:if="{{clock.review[1] && clock.review[1].method == 2}}">
<view class="activeimageitem" hover-class="none" hover-stop-propagation="false" data-type="{{activeimg.type}}" data-fid="{{activeimg.id}}" bindtap="seeactivecomment" wx:key="index" wx:for="{{clock.review[1].flags}}" wx:for-item="activeimg">
......@@ -314,7 +316,10 @@
<image class="activeimage" src="{{filter.videoPoster(activeimg.resource, 'image/resize,w_160/format,jpg/quality,q_20')}}" mode="aspectFill" lazy-load="false" binderror="" bindload=""></image>
</block>
<image class="activeimage" src="{{filter.imagify(activeimg.resource, 'image/resize,w_160/format,jpg/quality,q_20')}}" mode="aspectFill" lazy-load="false" binderror="" bindload="" wx:if="{{activeimg.type == 1}}"></image>
<view class="smallactivecommentflag">
<image class="icon" src="../../../images/common/smallactivecomment.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
</view>
</view>
</view>
<view class="score-box" wx:if="{{clock.review[1] && clock.review[1].method == 1}}">
......
business/components/clockitem/index.wxss
View file @ 288a8598
......@@ -623,6 +623,14 @@
letter-spacing: 2rpx;
}
.teacher-commnet-detail {
position: relative;
}
.activecommentflag{
position: absolute;
right: -16rpx;
/* top: 6rpx; */
width: 136rpx;
height: 52rpx;
}
.teacher-commnet-detail .teacher-avator-box{
display: flex;
......@@ -1607,7 +1615,7 @@
display: flex;
align-items: center;
line-height: 1;
margin-bottom: 28rpx;
margin-bottom: 20rpx;
}
.totalscorebox .score-title {
color: #000;
......@@ -1639,7 +1647,7 @@
font-size: 24rpx;
}
.score-box {
margin-bottom: 24rpx;
margin-bottom: 4rpx;
}
.score-temp-list-box {
display: flex;
......@@ -1649,8 +1657,7 @@
width: 50%;
display: flex;
align-items: center;
line-height: 1;
margin-bottom: 24rpx;
margin-bottom: 30rpx;
line-height: 1;
}
.score-temp-list-box .score-temp-item .score-title{
......@@ -1682,6 +1689,22 @@
overflow: hidden;
margin-right: 10rpx;
}
.activeimagebox .activeimageitem .smallactivecommentflag{
width:44rpx;
height:42rpx;
background:linear-gradient(120deg,rgba(22,179,255,1) 0%,rgba(32,222,255,1) 100%);
border-radius: 0 0 0 50%;
position: absolute;
top: 0;
right: 0;
display: flex;
align-items: center;
justify-content: center;
}
.activeimagebox .activeimageitem .smallactivecommentflag .icon{
width: 35rpx;
height: 29rpx;
}
.activeimagebox .activeimageitem .activeimage {
position: relative;
display: block;
......
business/pages/commenteditor/imagelistshow.wxss
View file @ 288a8598
......@@ -62,8 +62,8 @@
border: 2rpx solid rgba(255,255,255,1);
}
.video-play-icon-box .video-play-icon {
width: 31rpx;
height: 36rpx;
width: 20rpx;
height: 24rpx;
display: block;
}
.imageitem .sign-img {
......@@ -106,8 +106,8 @@
.hascomment {
position: absolute;
z-index: 5;
width: 138rpx;
height: 128rpx;
left: 0;
top: 0%;
width: 130rpx;
height: 120rpx;
left: 6prx;
top: 6rpx;
}
\ No newline at end of file
business/pages/commenteditor/videocomment.js
View file @ 288a8598
......@@ -694,7 +694,6 @@ Page({
t: curTimestamp
})
}
},
videoended () {
// console.log(e, '视频播放完毕');
......
business/pages/commenteditor/videocomment.wxss
View file @ 288a8598
......@@ -391,7 +391,8 @@ page{
height: 240rpx;
position: relative;
top: -20rpx;
display: block;
background: url('http://wxloss.oss-cn-hangzhou.aliyuncs.com/dakav5/2b/comment/header_bg.png?20190826') no-repeat center;
background-size: 101% 100%;
}
.success-modal .modal-box .modal-tip{
display: flex;
......
src/components/clockitemv2/index.wxml
View file @ 288a8598
......@@ -315,6 +315,7 @@
</view>
<view class="scoreshow">{{clock.review[1].score / 5}}</view>
</view>
<image class="activecommentflag" src="../../../images/common/activecomment.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
</view>
<view class="activeimagebox" wx:if="{{clock.review[1] && clock.review[1].method == 2}}">
<view class="activeimageitem" hover-class="none" hover-stop-propagation="false" data-type="{{activeimg.type}}" data-fid="{{activeimg.id}}" bindtap="seeactivecomment" wx:key="index" wx:for="{{clock.review[1].flags}}" wx:for-item="activeimg">
......@@ -328,6 +329,9 @@
<block wx:if="{{activeimg.type == 1}}">
<image class="activeimage" src="{{filter.imagify(activeimg.resource, 'image/resize,w_320/format,jpg/quality,q_50')}}" mode="aspectFill" lazy-load="false" binderror="" bindload=""></image>
</block>
<view class="smallactivecommentflag">
<image class="icon" src="../../../images/common/smallactivecomment.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
</view>
</view>
</view>
<view class="score-box" wx:if="{{clock.review[1] && clock.review[1].method == 1}}">
......
src/components/clockitemv2/index.wxss
View file @ 288a8598
......@@ -685,6 +685,16 @@
font-weight: bold;
}
/* 老师点评box */
.teacher-commnet-detail{
position: relative;
}
.activecommentflag{
position: absolute;
right: 0;
/* top: 6rpx; */
width: 136rpx;
height: 52rpx;
}
.teacher-commnet-detail .teacher-avator-box{
padding: 24rpx 0;
display: flex;
......@@ -1384,7 +1394,7 @@
display: flex;
align-items: center;
line-height: 1;
margin-bottom: 28rpx;
margin-bottom: 20rpx;
}
.totalscorebox .score-title {
color: #000;
......@@ -1426,8 +1436,7 @@
width: 50%;
display: flex;
align-items: center;
line-height: 1;
margin-bottom: 24rpx;
margin-bottom: 30rpx;
line-height: 1;
}
.score-temp-list-box .score-temp-item .score-title{
......@@ -1459,6 +1468,22 @@
overflow: hidden;
margin-right: 10rpx;
}
.activeimagebox .activeimageitem .smallactivecommentflag{
width:44rpx;
height:42rpx;
background:linear-gradient(120deg,rgba(22,179,255,1) 0%,rgba(32,222,255,1) 100%);
border-radius: 0 0 0 50%;
position: absolute;
top: 0;
right: 0;
display: flex;
align-items: center;
justify-content: center;
}
.activeimagebox .activeimageitem .smallactivecommentflag .icon{
width: 35rpx;
height: 29rpx;
}
.activeimagebox .activeimageitem .activeimage {
position: relative;
display: block;
......
src/pages/growthrecord/index.wxml
View file @ 288a8598
......@@ -113,7 +113,7 @@
</view>
</view>
</view>
<view class="chart-box">
<view class="chart-box" style="{{videostatus.videoShow ? 'display: none' : ''}}">
<view class="chartbox-header">综合评分成长趋势{{filterType}}</view>
<view class="chart-box-content" hover-class="none" hover-stop-propagation="false">
<canvas canvas-id="scoretrendcanvas" style="width: {{windowWidth}}px; height: 150px;" hidden="{{filterType == 1}}"></canvas>
......
src/pages/interactcommentplay/index.js
View file @ 288a8598
......@@ -355,16 +355,28 @@ Page({
} else { // 如果当前不是播放状态 则该干嘛干嘛
}
},
play: function(type) {
videoprogress (e) {
},
videoplay () {
},
videopause () {
},
videowaiting () {
},
play: function(from) {
let that = this;
let drawTrail = [];
this.data.startPlaytimeStamp = new Date().getTime();
this.innerAudioContext.src = audioorigin(this.data.audioInfo.src);
this.innerAudioContext.play();
this.innerAudioContext.onCanplay(function(e) {
console.log(e);
console.log('可以播放')
})
// wx.showLoading('录音加载中....')
// this.innerAudioContext.onCanplay(function(e) {
// wx.showToast({
// title: '可以播放'
// })
// console.log(e);
// console.log('可以播放')
// })
this.innerAudioContext.obeyMuteSwitch = false;
this.resetAudiosPlayStatus();
clearInterval(this.data.voiceInterval);
......@@ -520,6 +532,7 @@ Page({
})
clearInterval(this.data.voiceInterval);
clearInterval(this.secondinterval);
clearInterval(this.playTimeOut);
}
}, 1000);
this.secondinterval = setInterval(() => {
......
src/pages/interactcommentplay/index.wxml
View file @ 288a8598
......@@ -3,10 +3,12 @@
<view class="back-btn" bindtap="goBack" style="top:{{statusBarHeight+6}}px">
<image class="icon" src="{{imageRoot}}2c/websiteindex/vback.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" bindload="" binderror=""></image>
</view>
<!-- transformOssVideofyM3u8 -->
<!-- transformOssVideofy -->
<block wx:if="{{type == 2}}">
<video
class="videobox"
src="{{filter.transformOssVideofyM3u8(src)}}"
src="{{filter.transformOssVideofy(src)}}"
style="height: {{videoheight}}px;"
initial-time="0"
autoplay="{{videoInitStatus.autoplay}}"
......@@ -20,6 +22,10 @@
vslide-gesture="{{videoInitStatus.vslideGesture}}"
controls="{{videoInitStatus.controls}}"
id="video"
bindprogress="videoprogress"
bindplay="videoplay"
bindpause="videopause"
bindwaiting="videowaiting"
>
</video>
</block>
......
src/pages/interactcommentplay/index.wxss
View file @ 288a8598
......@@ -208,7 +208,7 @@
position: absolute;
left: 24rpx;
top: 50rpx;
z-index: 99;
z-index: 10000;
}
.back-btn image {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment