Commit d95112b9 authored by lvtz's avatar lvtz

fix

parents ff3cddb7 404949b9
......@@ -131,13 +131,19 @@ Page({
from,
target
} = option;
if (target.dataset.type == 'share_clock') {
this.newShare.onShareAppMessage()
return
if (option.from == 'button') {
if (target.dataset.type == 'share_clock') {
const obj = this.newShare.onShareAppMessage()
return obj;
}
}
console.log( {
title: `${this.data.clock.school_student.nickname}的打卡详情`,
path: `/src/pages/clockdetail/newindex?tid=${this.data.tid}&cid=${this.data.clock.id}&w=0`
});
return {
title: `${this.data.clock.school_student.nickname}的打卡详情`,
path: `/src/pages/clockdetail/newindex?tid=${this.data.tid}&cid=${this.data.clock.id}`
path: `/src/pages/clockdetail/newindex?tid=${this.data.tid}&cid=${this.data.clock.id}&w=0`
}
},
clockDetail () {
......@@ -195,7 +201,7 @@ Page({
content_100: data.content.length > 100 ? data.content.substr(0,100) + '...' : data.content,
contentexpand: false
}),
id: data.class_id,
// id: data.class_id,
sid: data.school_id
})
this.newCommentIndex(data.id, function(commentRes) {
......
......@@ -2,7 +2,7 @@
<view class="container">
<btn-drag bind:btnDragEvent='goindex' tobottomDis='88' width='60' height="60" catchtouchmove="ture">
<view class="gohome gohome-b" bindtap="goindex" slot="dragcontent">
<view class="home-text" >班级</view>
<view class="home-text">工作台</view>
</view>
</btn-drag>
<view class="clock-detail-container clearfix">
......
......@@ -53,14 +53,14 @@
<view class="title">{{item.title}}</view>
</view>
<view class="static-box">
<text class="" selectable="false" space="false" decode="false">共{{item.student_total}}学员</text>
<text class="" selectable="false" space="false" decode="false">共{{item.clock_student_count}}学员</text>
</view>
<block wx:if="{{item.subject_status == 2}}">
<view class="clockstatus wait" wx:if="{{item.no_review > 0}}">
<image class="dianpinicon" wx:if="{{item.subject_status != 1}}" src="{{imageRoot}}2b/circleindex/dianpin.png?{{imageVersion}}"></image>
<text class="clockstatic" wx:if="{{item.subject_status != 1}}" selectable="false" space="false" decode="false">待点评{{item.no_review}}</text>
</view>
<view class="clockstatus success" wx:if="{{item.no_review == 0}}">
<view class="clockstatus success" wx:if="{{item.no_review == 0 && clock_record_count > 0}}">
<image class="dianpinicon" wx:if="{{item.subject_status != 1}}" src="{{imageRoot}}2b/circleindex/right.png?{{imageVersion}}"></image>
<text class="clockstatic" wx:if="{{item.subject_status != 1}}" selectable="false" space="false" decode="false">已全部点评</text>
</view>
......
......@@ -201,7 +201,6 @@ Page({
target
} = option;
let shareObj = {
}
if (from == 'menu') {
shareObj = {
......@@ -209,6 +208,10 @@ Page({
path: `/src/pages/sharemoretheme/index?tid=${this.data.mid}&sid=${this.data.sid}`
}
} else if (from == 'button') {
if (target.dataset && target.dataset.type == 'share_clock') {
shareObj = this.newShare.onShareAppMessage();
return shareObj;
}
if (!target.dataset.info) {
shareObj = {
title: this.data.params.title,
......@@ -222,7 +225,6 @@ Page({
}
}
} = option;
shareObj = {
title: `${info.school_student.nickname}的打卡详情`,
path: `/src/pages/clockdetail/newindex?tid=${info.subject_id}&cid=${info.id}`
......@@ -241,6 +243,7 @@ Page({
}
}
}
console.log(shareObj, 'shareObjshareObj');
return {
title: shareObj.title,
path: shareObj.path,
......
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