Commit 1e2a1309 authored by lvtz's avatar lvtz

fix

parents b84127d3 8b96cfc4
......@@ -102,13 +102,13 @@ Component({
}
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}`,
url: `/business/pages/commenteditor/index?tid=${this.data.clock.subject_id}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`,
})
return;
}
if(imageArr.length == 0){
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}`,
url: `/business/pages/commenteditor/index?tid=${this.data.clock.subject_id}&cid=${this.data.clock.id}&sid=${this.data.clock.school_id}`,
})
return;
}
......
......@@ -207,7 +207,7 @@ Component({
const customerId = LocalStorage.getItem('visitor') && LocalStorage.getItem('visitor').studentId;
const that = this;
wx.navigateTo({
url: `/src/pages/commenteditor/index?id=${that.data.cid}&ptype=2&&tid=${that.data.tid}&cid=${that.data.clock.id}&eid=${dataset.eid}&roottype=${dataset.roottype}`,
url: `/src/pages/commenteditor/index?ptype=2&&tid=${that.data.tid}&cid=${that.data.clock.id}&eid=${dataset.eid}&roottype=${dataset.roottype}`,
})
},
delEvaluate (params) {
......
......@@ -42,6 +42,7 @@ import {
Page({
// mixins: [require('../../../mixins/myMins/audioCallback')],
data: {
modeId: 0,
text: "This is page data.",
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion,
......@@ -200,7 +201,7 @@ Page({
},
goModifyScoreTemp () {
wx.navigateTo({
url: `/business/pages/commenteditor/modifyscoretemp?tid=${this.data.tid}`,
url: `/business/pages/commenteditor/modifyscoretemp?tid=${this.data.subjectType == 3 ? this.data.modeId : this.data.tid}&subjecttype=${this.data.subjectType}`,
})
},
onLoad: function (options) { // Do some initialize when page load.
......@@ -216,8 +217,7 @@ Page({
})
wx.hideShareMenu()
this.commentDetailGet();
this.memberComment();
this.privateMemberComment();
// this.shortWordsShow();
},
onReady: function () { // Do something when page ready.
......@@ -308,7 +308,8 @@ Page({
onTabItemTap(item) {},
subjectReviewTemplate () {
subjectReviewTemplate({
subject_id: this.data.tid
subject_id: this.data.subjectType == 3 ? this.data.modeId : this.data.tid,
subject_type: this.data.subjectType
}).then((res) => {
const {code, data} = res;
if (code == 200) {
......@@ -369,11 +370,15 @@ Page({
data.filterImage = data.video_parse.filter(ele => ele.type == 'image');
data.filtervideo = data.video_parse.filter(ele => ele.type == 'video');
data.audio_parse = JSON.parse(data.audio);
this.setData({
commentDetail: data,
subjectType: data.subject.subject_type,
modeId: data.unlock_mode_id || 0
})
this.getImgInfo(data.filterImage);
this.memberComment();
this.privateMemberComment();
}
}).catch(() => {
wx.hideLoading();
......
......@@ -32,6 +32,8 @@ Page({
data: {
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion,
tid: 0,
subjecttype: 1,
templates: {
// 'tmp_1': '智力分',
// 'tmp_2': '课堂表现',
......@@ -42,9 +44,11 @@ Page({
onLoad: function (options) { // Do some initialize when page load.
const {
tid,
subjecttype,
} = options;
this.setData({
tid,
subjecttype
})
wx.hideShareMenu()
this.subjectReviewTemplate();
......@@ -78,6 +82,7 @@ Page({
})
subjectReviewTemplate({
subject_id: this.data.tid,
subject_type: this.data.subjecttype,
}).then((res) => {
const {code , data} = res;
wx.hideLoading()
......
......@@ -11,7 +11,7 @@
<view class="themeitetitle">{{item.title}}</view>
<view class="staticbox">
<view class="staticitem">已打卡人数: {{item.clock_people}}人</view>
<view class="staticitem" wx:if="{{item.clock_people > 0}}">待点评: <text class="em">{{item.review_clock_record_count}}</text></view>
<view class="staticitem" wx:if="{{item.clock_people > 0}}">待点评: <text class="em">{{item.clock_count - item.review_clock_record_count}}</text></view>
<view class="staticitem" wx:else="{{item.review_clock_record_count > 0}}">待点评: 无</view>
</view>
</block>
......
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