Commit efb5925d authored by wangxuelai's avatar wangxuelai

'最新代码提交'

parent a6f8248c
......@@ -321,7 +321,8 @@
"imagecomment",
"videocomment",
"modifyscoretemp",
"taggedpicture"
"taggedpicture",
"imagelistshow"
]
},
{
......
......@@ -96,12 +96,21 @@ Component({
dataset
} = e.currentTarget;
const cid = dataset.cid;
if (this.data.clock.review && this.data.clock.review[1] && this.data.clock.review[1].method == 2) {
wx.navigateTo({
url: `/business/pages/commenteditor/imagelistshow?id=${this.data.clock.class_id}&tid=${this.data.clock.subject_id}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`,
})
return;
}
if (this.data.clock.review && this.data.clock.review[1] && this.data.clock.review[1].method == 1) {
wx.navigateTo({
url: `/business/pages/commenteditor/index?id=${this.data.clock.class_id}&tid=${this.data.clock.subject_id}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`,
})
return;
}
this.triggerEvent('goCommentEditor', {
clock: this.data.clock
})
// wx.navigateTo({
// url: `/business/pages/commenteditor/index?id=${this.data.cid}&tid=${this.data.tid}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`
// })
},
openLocation(e) {
wxOpenLocation({
......
......@@ -284,9 +284,37 @@
<view class="title-box">
<image class="iconimg" src="{{imageRoot}}2c/clockitem/teacherd.png?{{imageVersion}}" ></image>老师点评:
</view>
<view class="totalscorebox" wx:if="{{clock.review[1] && clock.review[1].method == 1}}">
<view class="score-title">综合得分</view>
<view class="score-title-dot">:</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 0}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 1)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 1, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 1}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 2)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 2, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 2}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 3)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 3, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 3}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 4)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 4, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 4}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 5)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 5, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scoreshow">{{clock.review[1].score / 5}}</view>
</view>
</view>
<view class="activeimagebox" wx:if="{{clock.review[1] && clock.review[1].method == 2}}">
<view class="activeimageitem" hover-class="none" hover-stop-propagation="false" wx:key="index" wx:for="{{clock.review[1].flags}}" wx:for-item="activeimg">
<view class="video-play-icon-box" wx:if="{{activeimg.type == 2}}">
<image class="video-play-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}" mode="widthFix"></image>
</view>
<image class="activeimage" src="{{filter.videoPoster(activeimg.resource)}}" mode="aspectFill" lazy-load="false" binderror="" bindload=""></image>
</view>
</view>
<view class="score-box">
<view class="totalscorebox">
<view class="score-box" wx:if="{{clock.review[1] && clock.review[1].method == 1}}">
<view class="totalscorebox" >
<view class="score-title">综合得分</view>
<view class="score-title-dot">:</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 0}}">
......
......@@ -630,6 +630,10 @@
justify-content: flex-start;
align-items: center;
}
.teacher-commnet-detail .teacher-avator-box .totalscorebox{
margin-bottom: 0;
margin-left: 46rpx;
}
.teacher-commnet-detail .teacher-avator-box .teacher-avator{
display: block;
width: 48rpx;
......@@ -963,7 +967,7 @@
padding-bottom: 24rpx;
display: flex;
align-items: center;
justify-content: space-between;
/* justify-content: space-between; */
}
.teacher-commnet-detail .teacher-avator-box .title-box{
font-size:24rpx;
......@@ -1664,5 +1668,35 @@
font-size: 24rpx;
}
/* 老师点评分数样式 */
/*互动点评图片展示样式*/
.activeimagebox {
display: flex;
align-items: center;
flex-wrap: wrap;
}
.activeimagebox .activeimageitem {
position: relative;
width: 120rpx;
height: 120rpx;
border-radius: 10rpx;
overflow: hidden;
margin-right: 10rpx;
}
.activeimagebox .activeimageitem .activeimage {
position: relative;
display: block;
width: 120rpx;
height: 120rpx;
}
.activeimageitem .video-play-icon-box {
width: 50rpx;
height: 50rpx;
border: 2rpx solid #fff;
}
.activeimageitem .video-play-icon-box .video-play-icon {
width: 16rpx;
height: 18rpx;
display: block;
}
/*互动点评图片展示样式*/
@import "../../../style/radio.wxss";
\ No newline at end of file
......@@ -60,7 +60,13 @@ Component({
})
},
interactionmode () {
const that = this;
wx.navigateTo({
url: `/business/pages/commenteditor/imagelistshow?id=${this.data.classid}&tid=${this.data.tid}&cid=${this.data.cid}&sid=${this.data.sid}`,
success () {
that.triggerEvent('hideChooseTypeDia')
}
})
},
}
})
/*
time: 2018-11-1
author: wxl
*/
var app = getApp();
import {
constants
} from '../../../constants/index.js';
import {
clockDetail,
} from '../../../service/business/commenteditor.js';
import {
getRandomFilename,
audioorigin,
matchBlacklist,
LocalStorage
} from '../../../utilities/index.js';
Page({
data: {
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion,
commentDetail: {},
videoArray: [],
selectedObj: {},
},
onLoad: function (options) { // Do some initialize when page load.
const {
id,
tid,
cid,
sid
} = options;
this.setData({
id,
tid,
cid,
sid
})
this.commentDetailGet();
wx.hideShareMenu()
},
onReady: function () { // Do something when page ready.
wx.hideShareMenu()
},
onShow: function () { // Do something when page show.
},
onHide: function () { // Do something when page hide.
},
onUnload: function () { // Do something when page close.
},
onPullDownRefresh: function () { // Do something when pull down.
},
onReachBottom: function () { // Do something when page reach bottom.
},
commentDetailGet() {
wx.showLoading({
title: '数据加载中'
})
clockDetail({
record_id: this.data.cid,
school_id:this.data.sid
}).then((res) => {
const {
code,
data
} = res;
wx.hideLoading();
if (code == 200) {
data.video_parse = JSON.parse(data.video);
this.setData({
videoArray: data.video_parse,
})
}
}).catch(() => {
wx.hideLoading();
})
},
chooseimg (e) {
const { src, type } = e.currentTarget.dataset;
if (src == this.data.selectedObj.src) {
this.setData({
selectedObj: {
}
})
return;
}
this.setData({
selectedObj: {
src,
type,
}
})
},
gocomment (e) {
if (!this.data.selectedObj.src) {
wx.showToast({
title: '请选择您要点评的图片或视频',
duration: 1500,
icon: 'none',
})
return;
};
if (this.data.selectedObj.type == 'video') {
wx.navigateTo({
url: `/business/pages/commenteditor/videocomment?id=${this.data.id}&tid=${this.data.tid}&cid=${this.data.cid}&sid=${this.data.sid}&src=${encodeURIComponent(this.data.selectedObj.src)}`,
})
} else if (this.data.selectedObj.type == 'image') {
}
}
})
\ No newline at end of file
{
"navigationBarTitleText": "请选择点评的作业"
}
\ No newline at end of file
<wxs src="../../../filter/index.wxs" module="filter" />
<view class="container">
<view class="headertooltip mb24">选择需要点评的图片或视频(暂时只支持一张)</view>
<view class="imagebox">
<view class="imageitembox {{index%2==1 ? 'even' : ''}} {{index%2==0 ? 'odd' : ''}}" wx:for="{{videoArray}}" wx:for-item="imageitem" wx:key="index">
<view class="imageitem" data-src="{{imageitem.src}}" data-type="{{imageitem.type}}" bindtap="chooseimg">
<view class="imageuncheck" hidden="{{selectedObj.src == imageitem.src}}"></view>
<image class="imageischeck" hidden="{{selectedObj.src != imageitem.src}}" src="{{imageRoot}}2b/commenteditor/checked.png?{{imageVersion}}"></image>
<block wx:if="{{imageitem.type == 'image'}}">
<image class="sign-img" mode="aspectFill" src="{{filter.imagify(imageitem.src, 'image/resize,w_320/format,jpg/quality,q_50')}}"></image>
</block>
<block wx:if="{{imageitem.type == 'video'}}">
<view class="video-play-icon-box">
<image class="video-play-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}" mode="widthFix"></image>
</view>
<image class="sign-img" mode="aspectFill" src="{{filter.videoPoster(imageitem.src, 'image/resize,w_640/format,jpg/quality,q_50')}}"></image>
</block>
</view>
</view>
</view>
<view class="surebtn" bindtap="gocomment">选好了,去点评</view>
</view>
\ No newline at end of file
.container {
position: relative;
padding-bottom: 100rpx;
}
.headertooltip {
height: 36px;
line-height: 36px;
background-color: rgba(255,209,70,0.1);
border-top: 1px solid rgba(255,209,70,1);
border-bottom: 1px solid rgba(255,209,70,1);
color: #FFC000;
font-size: 13px;
padding-left: 32rpx;
letter-spacing: 2rpx;
}
.imagebox {
display: flex;
flex-wrap: wrap;
}
.imageitembox {
width: 50%;
height: 460rpx;
margin-bottom: 10rpx;
}
.imageitembox.odd {
display: flex;
justify-content: flex-end;
}
.imageitembox.even {
display: flex;
justify-content: flex-start;
}
.imageitembox.odd .imageitem {
margin-right: 6rpx;
}
.imageitembox.even .imageitem {
margin-left: 6rpx;
}
.imageitem {
width: 346rpx;
height: 460rpx;
border-radius: 10rpx;
overflow: hidden;
position: relative;
}
.video-play-icon-box {
width: 100rpx;
height: 100rpx;
border-radius: 50%;
background-color: rgba(0,0,0,0.5);
position: absolute;
left: 50%;
top: 50%;
z-index: 1;
display: flex;
align-items: center;
justify-content: center;
transform:translate(-50%, -50%);
border: 2rpx solid rgba(255,255,255,1);
}
.video-play-icon-box .video-play-icon {
width: 31rpx;
height: 36rpx;
display: block;
}
.imageitem .sign-img {
width: 346rpx;
height: 460rpx;
}
.imageischeck {
position: absolute;
width: 34rpx;
height: 34rpx;
border-radius: 4rpx;
right: 10rpx;
top: 10rpx;
z-index: 2;
}
.imageuncheck {
position: absolute;
border: 4rpx solid rgba(255,255,255,1);
width: 34rpx;
height: 34rpx;
border-radius: 4rpx;
right: 10rpx;
top: 10rpx;
z-index: 2;
}
.surebtn {
height: 46px;
line-height: 46px;
color: #fff;
text-align: center;
background-color: #65B8F4;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
font-size: 13px;
letter-spacing: 2rpx;
z-index: 3;
}
\ No newline at end of file
......@@ -4,7 +4,6 @@ import {
LocalStorage
} from '../../../utilities/index.js';
import {
clockDetail,
commentActivePost,
} from '../../../service/business/commenteditor.js';
import {
......@@ -24,6 +23,11 @@ import {
} from '../../../utilities/wxApi.js';
Page({
data: {
id: 0,
tid: 0,
cid: 0,
sid: 0,
src: '',
localImageRoot: '../../../images/',
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion,
......@@ -59,7 +63,7 @@ Page({
medalSelectArr: [],
allScore:[[1,2],[3,4],[5,6],[7,8],[9,10]],
scorenum: 0,
scorenum: 2.5,
flowernum: 0,
maxflower: 10,
......@@ -130,6 +134,20 @@ Page({
},
onLoad: function (options) {
var self = this;
const {
id,
tid,
cid,
sid,
src,
} = options;
this.setData({
id,
tid,
cid,
sid,
src: decodeURIComponent(src),
})
this.innerAudioContext = wx.createInnerAudioContext(); // 当前页面唯一的一个音频容器
// self.device = wx.getSystemInfoSync()
self.device = app.globalData.myDevice;
......@@ -627,25 +645,28 @@ Page({
const {
formId
} = e.detail;
this.data.drawTrail.forEach(ele => {
console.log( ele.timestamp, ' ele.timestamp');
console.log( this.data.startRecordTimestamp, 'this.data.startRecordTimestamp');
const drawTrail = JSON.parse(JSON.stringify(this.data.drawTrail))
drawTrail.forEach(ele => {
ele.timestamp = ele.timestamp - this.data.startRecordTimestamp;
});
let _content = {
audio: JSON.stringify(this.data.audioInfo),
drawTrail: this.data.drawTrail,
audio: this.data.audioInfo,
drawTrail: drawTrail,
}
LocalStorage.setItem("drawtrail", _content);
const medals = drawTrail.filter(ele => ele.type == 'medal').map(ele => ele.id).join(',');
const params = {
record_id: this.data.cid,
resource: this.data.src,
content: JSON.stringify(_content),
score: this.data.scorenum * 10,
honor: medals,
type: 2,
}
this.commentPost(params);
},
commentPost(params, formId) {
commentPost(params) {
let that = this;
commentActivePost(Object.assign(params, {
record_id: this.data.cid,
resource: 1,
score: that.data.scorenum*10
})).then((res) => {
commentActivePost(params).then((res) => {
that.setData({
submitting: false
})
......@@ -655,10 +676,6 @@ Page({
code
} = res;
if (code == 200) {
formIdCreate({
formId
})
let pages = getCurrentPages();
let currPage = null; //当前页面
let prevPage = null; //上一个页面
......@@ -726,5 +743,5 @@ Page({
},
touchend () {
// console.log('触摸结束')
}
},
})
\ No newline at end of file
......@@ -2,7 +2,6 @@
"navigationBarTitleText": "标记图片",
"navigationBarBackgroundColor": "#313131",
"navigationBarTextStyle": "white",
"navigationStyle": "custom",
"disableScroll": true,
"usingComponents": {
"sound-recording": "../../../components/soundrecording",
......
<wxs src="../../../filter/index.wxs" module="filter" />
<view class="container" catchtap="closeModal" >
<view class="" style="position: absolute; z-index: 100; color:#fff; top: 20px" bindtap="play" hover-class="none" hover-stop-propagation="false">
播放按钮
</view>
<view class="common-dialog" wx:if="{{showAuthSettingDia}}">
<view class="dialog-box" >
<view class="warn-text" >
......@@ -18,7 +15,7 @@
<view class="imageView">
<video
class="videobox"
src="https://media.shangjiadao.cn/mp4/clock-test/consumer/111/2019-09-24/d233e4bd8aafaca9212e7b186576605e.mp4"
src="{{filter.ossVideofy(src)}}"
style="height: {{videoheight}};"
initial-time="0"
autoplay="{{videoInitStatus.autoplay}}"
......
......@@ -377,7 +377,7 @@ const apis = {
reviewDel: `${api}member/reviews`,
activeReviewDel: `${api}member/active/reviews`,
subjectReviewTemplate: `${api}member/subject_review_template`, // 点评打分模板
tempApplyAllClass: `${api}member/subject_review_template/apply_all_class`
tempApplyAllClass: `${api}member/subject_review_template/apply_all_class`,
},
evaluateEditor: {
evaluatePost: `${api}member/comment`
......
......@@ -377,7 +377,7 @@ module.exports = {
bulletTimeCompare: bulletTimeCompare,
actionFilter: actionFilter,
jsonParse: jsonParse,
teacherAct: teacherAct,
teacherAct: teacherAct,
videoPoster: videoPoster,
voiceTimeFormat: voiceTimeFormat,
inputMaxlengthResolve: inputMaxlengthResolve,
......
......@@ -133,6 +133,15 @@ function tempApplyAllClass(data) {
errorresolve: 1,
})
}
function activeReviewsMake(data) {
return wxRequest({
role: '2b',
url: apis.business.commentEditor.activeReviewsMake,
data,
method: 'POST',
errorresolve: 1,
})
}
export {
clockDetail,
commentPost,
......@@ -148,4 +157,5 @@ export {
subjectReviewTemplate,
subjectReviewTemplateUpdate,
tempApplyAllClass,
activeReviewsMake,
}
\ No newline at end of file
......@@ -295,18 +295,36 @@
<view class="title-box">
<image class="iconimg" src="{{imageRoot}}2c/clockitem/teacherd.png?{{imageVersion}}" ></image>老师点评:
</view>
<!-- <view class="teacher-star-box">
<view class="name">打分: </view>
<image class="star-icon" wx:if="{{clock.review[1].score >= 10}}" src="{{imageRoot}}2c/common/staractive.png?{{imageVersion}}" ></image>
<image class="star-icon" wx:if="{{clock.review[1].score >= 20}}" src="{{imageRoot}}2c/common/staractive.png?{{imageVersion}}" ></image>
<image class="star-icon" wx:if="{{clock.review[1].score >= 30}}" src="{{imageRoot}}2c/common/staractive.png?{{imageVersion}}" ></image>
<image class="star-icon" wx:if="{{clock.review[1].score >= 40}}" src="{{imageRoot}}2c/common/staractive.png?{{imageVersion}}" ></image>
<image class="star-icon" wx:if="{{clock.review[1].score >= 50}}" src="{{imageRoot}}2c/common/staractive.png?{{imageVersion}}" ></image>
<view class="count">{{clock.review[1].score/5}}分</view>
</view> -->
<view class="totalscorebox" wx:if="{{clock.review[1] && clock.review[1].method == 2}}">
<view class="score-title">综合得分</view>
<view class="score-title-dot">:</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 0}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 1)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 1, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 1}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 2)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 2, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 2}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 3)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 3, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 3}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 4)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 4, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 4}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 5)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 5, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scoreshow">{{clock.review[1].score / 5}}</view>
</view>
</view>
<view class="activeimagebox" wx:if="{{clock.review[1] && clock.review[1].method == 2}}">
<view class="activeimageitem" hover-class="none" hover-stop-propagation="false" wx:key="index" wx:for="{{clock.review[1].flags}}" wx:for-item="activeimg">
<view class="video-play-icon-box" wx:if="{{activeimg.type == 2}}">
<image class="video-play-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}" mode="widthFix"></image>
</view>
<image class="activeimage" src="{{filter.videoPoster(activeimg.resource)}}" mode="aspectFill" lazy-load="false" binderror="" bindload=""></image>
</view>
</view>
<!-- <view class="teacher-commnet-text" data-eid="{{clock.review[1].id}}" wx:if="{{clock.review[1].content != ''}}" data-type="open"> -->
<view class="score-box">
<view class="score-box" wx:if="{{clock.review[1] && clock.review[1].method == 1}}">
<view class="totalscorebox">
<view class="score-title">综合得分</view>
<view class="score-title-dot">:</view>
......
......@@ -684,7 +684,7 @@
padding: 24rpx 0;
display: flex;
align-items: center;
justify-content: space-between;
/* justify-content: space-between; */
}
.teacher-commnet-detail .teacher-avator-box .title-box{
font-size:24rpx;
......@@ -1438,4 +1438,39 @@
color: rgba(84,84,84,1);
font-size: 24rpx;
}
/* 老师点评分数样式 */
\ No newline at end of file
/* 老师点评分数样式 */
/*互动点评图片展示样式*/
.activeimagebox {
display: flex;
align-items: center;
flex-wrap: wrap;
}
.activeimagebox .activeimageitem {
position: relative;
width: 120rpx;
height: 120rpx;
border-radius: 10rpx;
overflow: hidden;
margin-right: 10rpx;
}
.activeimagebox .activeimageitem .activeimage {
position: relative;
display: block;
width: 120rpx;
height: 120rpx;
}
.activeimageitem .video-play-icon-box {
width: 50rpx;
height: 50rpx;
border: 2rpx solid #fff;
}
.activeimageitem .video-play-icon-box .video-play-icon {
width: 16rpx;
height: 18rpx;
display: block;
}
.teacher-commnet-detail .teacher-avator-box .totalscorebox{
margin-bottom: 0;
margin-left: 46rpx;
}
/*互动点评图片展示样式*/
\ No newline at end of file
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