Commit fd7cbbf9 authored by lvtz's avatar lvtz

fix

parents a5973130 cf843675
...@@ -53,7 +53,7 @@ Component({ ...@@ -53,7 +53,7 @@ Component({
} }
let shareObj = { let shareObj = {
title: `${info.school_student.nickname}的打卡详情`, title: `${info.school_student.nickname}的打卡详情`,
path: `/src/pages/clockdetail/newindex?id=${info.class_id}&tid=${tid}&cid=${info.id}&w=${app.globalData.currentSchoolStudentId}` path: `/src/pages/clockdetail/newindex?tid=${tid}&cid=${info.id}&w=${app.globalData.currentSchoolStudentId}`
} }
app.setSharerLog({ app.setSharerLog({
...@@ -64,7 +64,6 @@ Component({ ...@@ -64,7 +64,6 @@ Component({
query: `id=${info.class_id}&tid=${tid}&cid=${info.id}&w=${app.globalData.currentSchoolStudentId}` query: `id=${info.class_id}&tid=${tid}&cid=${info.id}&w=${app.globalData.currentSchoolStudentId}`
}) })
}); });
console.log(shareObj)
return { return {
title: shareObj.title, title: shareObj.title,
path: shareObj.path, path: shareObj.path,
......
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</view> </view>
<view class="setting-item" bindtap="toEdit"> <view class="setting-item" bindtap="toEdit">
<view class="left"> <view class="left">
<view class="item-label">作业打卡设置</view> <view class="item-label">日历打卡设置</view>
<view class="item-desc">作业内容、作业要求、参与打卡方式等设置</view> <view class="item-desc">作业内容、作业要求、参与打卡方式等设置</view>
</view> </view>
<view class="right"> <view class="right">
......
{ {
"navigationBarTitleText": "作业打卡", "navigationBarTitleText": "闯关打卡",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"usingComponents": { "usingComponents": {
"sjd-media-show": "../../../components/sjdmediashow", "sjd-media-show": "../../../components/sjdmediashow",
......
...@@ -100,6 +100,9 @@ Page({ ...@@ -100,6 +100,9 @@ Page({
// params: JSON.parse(decodeURIComponent(detail)), // params: JSON.parse(decodeURIComponent(detail)),
}) })
if (this.data.id > 0) { if (this.data.id > 0) {
wx.setNavigationBarTitle({
title: '编辑关卡内容'
})
this.unlockSubjectDetail(); this.unlockSubjectDetail();
} }
}, },
......
...@@ -196,16 +196,21 @@ Page({ ...@@ -196,16 +196,21 @@ Page({
from, from,
target target
} = option; } = option;
console.log({
from,
target
});
let shareObj = { let shareObj = {
} }
if (target.dataset.type == 'share_clock') {
this.newShare.onShareAppMessage()
return
}
if (from == 'menu') { if (from == 'menu') {
shareObj = this.data.shareObj; shareObj = this.data.shareObj;
} else if (from == 'button') { } else if (from == 'button') {
if (target.dataset && target.dataset.type == 'share_clock') {
this.newShare.onShareAppMessage()
return
}
if (!target.dataset.info) { if (!target.dataset.info) {
shareObj = { shareObj = {
title: `邀请您提交「${this.data.params.title}」作业`, title: `邀请您提交「${this.data.params.title}」作业`,
...@@ -284,11 +289,11 @@ Page({ ...@@ -284,11 +289,11 @@ Page({
hadClockTotal: Number(data.record_count || 0), hadClockTotal: Number(data.record_count || 0),
initShareObj: { initShareObj: {
title: `邀请您提交「${data.title}」作业`, title: `邀请您提交「${data.title}」作业`,
path: `/src/pages/themeindex/landpage?tid=${this.data.tid}` path: `/src/pages/themeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}`
}, },
shareObj: { shareObj: {
title: `邀请您提交「${data.title}」作业`, title: `邀请您提交「${data.title}」作业`,
path: `/src/pages/themeindex/landpage?tid=${this.data.tid}` path: `/src/pages/themeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}`
} }
}) })
this.setData({ this.setData({
......
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