Commit 2a853778 authored by lvtz's avatar lvtz

fix

parent cc29dbbe
......@@ -119,7 +119,8 @@ Page({
show: false,
status: false,
pushStatus: 2 //1待发布 2已发布 3已结束
}
},
needRefresh: false
},
onLoad: function(options) {
const { tid, sid } = options;
......@@ -132,9 +133,8 @@ Page({
},
onReady: function() {},
onShow: function() {
if (this.data.showRefresh && this.data.needRefresh) {
if (this.data.needRefresh) {
this.initPage();
this.data.showRefresh = false;
this.data.needRefresh = false;
}
},
......@@ -174,8 +174,9 @@ Page({
} else if (from == "button") {
if (!target.dataset.info) {
shareObj = {
title: this.data.params.title,
path: `/src/pages/calendarthemeindex/index?tid=${this.data.tid}`
title: `邀请您参加${this.data.params.title}打卡`,
imageUrl: imagify(this.data.params.land_content.cover),
path: `/src/pages/calendarthemeindex/landpage?tid=${this.data.tid}`
};
posterLog({
poster_type: 2,
......@@ -198,6 +199,7 @@ Page({
return {
title: shareObj.title,
path: shareObj.path,
imageUrl: shareObj.imageUrl,
success: res => {
if (res.errMsg == "shareAppMessage:ok") {
this.data.shareObj = this.data.initShareObj;
......@@ -270,7 +272,8 @@ Page({
themeDetail({
id: this.data.tid,
school_id: this.data.sid,
calendar_date: nowDay
calendar_date: nowDay,
extra: 'land_content'
})
.then(res => {
const { code, data } = res;
......@@ -305,10 +308,12 @@ Page({
hadClockTotal: Number(data.record_count || 0),
initShareObj: {
title: `邀请您参加${data.title}打卡`,
imageUrl: imagify(data.land_content.cover),
path: `/src/pages/calendarthemeindex/index?tid=${this.data.tid}&id=${data.class_id}`
},
shareObj: {
title: `邀请您参加${data.title}打卡`,
imageUrl: imagify(data.land_content.cover),
path: `/src/pages/calendarthemeindex/index?tid=${this.data.tid}&id=${data.class_id}`
}
});
......@@ -324,8 +329,11 @@ Page({
noCommentTotal: Number(data.not_review_count || 0),
"remindTips.pushStatus": data.subject_status
});
// TODO班级信息 好像不需要
// if(this.data.id){
// this.getCircleDetail();
// }
this.getCircleDetail();
const startD = data.calendar_set.start_time.split(" ")[0];
const endD = data.calendar_set.end_time.split(" ")[0];
if (this.numberDate(startD) == this.numberDate(endD)) {
......@@ -381,7 +389,6 @@ Page({
.catch(err => {});
},
onPageScroll: function(e) {
// Do something when page scroll
let that = this;
let scrollTop = e.scrollTop;
let backTopValue = scrollTop > 800 ? true : false;
......@@ -397,7 +404,6 @@ Page({
school_id: this.data.sid
}).then(res => {
if (res.code == 200) {
this.getSchoolDetail(res.data.school_id);
if (res.data.deleted_at) {
wx.showModal({
title: "提示",
......@@ -416,6 +422,7 @@ Page({
this.setData({
circleInfo: res.data
});
this.getSchoolDetail(res.data.school_id);
}
});
},
......@@ -1311,15 +1318,10 @@ Page({
page: 1,
hasmore: true
});
this.setData(
{
weeksArr: _weeksArr
},
() => {
this.clockListGet(this.data.oneSmallSort, "init");
this.getNumberData();
}
);
this.setData({
weeksArr: _weeksArr
})
this.clockListGet(this.data.oneSmallSort, "init");
},
// 选择查看日期
selectday(e) {
......
......@@ -121,6 +121,7 @@
data-index="{{index}}"
bind:showcommenteditor="showcommenteditor"
bind:goCommentEditor="goCommentEditor"
bind:goClickShare="goClickShare"
>
</clock-item>
</view>
......
......@@ -63,7 +63,6 @@
</view>
</view>
</view> -->
<view class="greybox"></view>
<view class="shift-box">
<view class="small-sort-item" data-onesmallsort="1" bindtap="onesmallsortselect">
<view class="inner-box {{oneSmallSort == 1 ? 'active' : ''}} ">全部 {{circleAllTotal}}</view>
......
......@@ -71,10 +71,6 @@
margin-right: 5rpx;
vertical-align: middle;
}
.greybox {
height: 24rpx;
background-color: #f2f2f2;
}
.shift-box {
display: flex;
......
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