Commit 37216dce authored by lvtz's avatar lvtz

fix

parents 3916a309 3f7e3d84
......@@ -1286,6 +1286,7 @@ Page({
this.setData({
weeksArr: _weeksArr
})
this.getNumberData();
this.clockListGet(this.data.oneSmallSort, "init");
},
// 选择查看日期
......
......@@ -132,7 +132,7 @@
</view>
<view class="static-box">
<text class="" selectable="false" space="false" decode="false">共{{item.subject_count}}个关卡</text>
<text class="" selectable="false" space="false" decode="false">{{item.clock_people}}人参与</text>
<text class="" selectable="false" space="false" decode="false">{{item.clock_student_count}}人参与</text>
<text class="" selectable="false" space="false" decode="false">已闯{{item.unlock_clock_count}}关</text>
</view>
<view class="operatebox" data-theme="{{item}}" catchtap="copytheme" data-btn="copybtn" data-id="{{item.id}}" data-status="{{item.status}}" data-index="{{index}}" data-listIndex="{{listIndex}}">
......
......@@ -564,53 +564,6 @@ Page({
})
},
onTabItemTap(item) {},
getCircleDetail(id) {
circleDetail({
class_id: id
}).then((res) => {
if (res.code == 200) {
let content = [];
try {
content = JSON.parse(res.data.content);
} catch (e) {
content = []
}
if (res.code == 40000) {
if (res.msg) {
wx.showModal({
title: '提示',
content: '班级已被删除,点击确定返回机构首页',
showCancel: false,
confirmText: "确定",
success(r) {
if (r.confirm) {
wx.reLaunch({
url: `/src/pages/shopindex/index?mid=${res.data.member_id}`
})
}
}
})
// return;
}
}
res.data.content = content;
this.queryActivtySchoolInfo(res.data.school_id);
this.setData({
circleInfo: res.data
}, () => {
})
const visitor = LocalStorage.getItem('visitor');
if (this.data.pageScene) {
activityLog({
type:26,
open_id: visitor && visitor.openid,
school_id: res.data.school_id,
remark: ''
})
}
}
})
},
positionGet(id, callBack) {
wx.createSelectorQuery().select(`#${id}`).boundingClientRect(function (rect) {
callBack(rect)
......@@ -1362,6 +1315,7 @@ Page({
const schoolInfo = this.data.schoolInfo;
const date = dateDetail(this.data.datetime);
const clockDetail = this.data.selfClockDetail;
const moreTheme = this.data.moreTheme;
let qrcode = '';
wx.showLoading({
title: '日签生成中...'
......@@ -1496,7 +1450,7 @@ Page({
},
{ // 打卡详情
type: 'text',
content: `在〔${circleInfo.title && circleInfo.title.length > 15 ? circleInfo.title.substr(0,15) + '...' : circleInfo.title || ''}〕完成打卡`,
content: `在〔${moreTheme.title}〕完成打卡`,
fontSize: 24,
color: '#4F4F4F',
textAlign: 'left',
......@@ -1663,7 +1617,7 @@ Page({
},
{ // 打卡详情
type: 'text',
content: `在〔${circleInfo.title && circleInfo.title.length > 15 ? circleInfo.title.substr(0,15) + '...' : circleInfo.title || ''}〕完成打卡`,
content: `在〔${moreTheme.title}〕完成打卡`,
fontSize: 24,
color: '#4F4F4F',
textAlign: 'left',
......
......@@ -287,19 +287,9 @@ Page({
? {}
: {
code: this.data.sessionCode,
encryptData: this.data.encryptedData,
encryptData: this.data.encryptData,
iv: this.data.iv
};
console.log(
"参数",
Object.assign(mobileParams, {
subject_source_id: this.data.tid,
subject_source_type: 3,
secret: this.data.secret || "",
content: this.data.waitSbumitContent,
name: this.data.name || ""
})
);
subjectStudentSign(
Object.assign(mobileParams, {
subject_source_id: this.data.tid,
......
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