Commit 07c17fe4 authored by wangxuelai's avatar wangxuelai

'

parents d60245c1 8642aeeb
......@@ -251,7 +251,7 @@ Page({
if (!target.dataset.info) {
shareObj = {
title: this.data.params.title,
path: `/src/pages/themeindex/index?tid=${this.data.tid}&id=${this.data.id}`
path: `/src/pages/calendarthemeindex/index?tid=${this.data.tid}&id=${this.data.id}`
}
posterLog({
poster_type: 2,
......
......@@ -464,6 +464,7 @@
</view>
<go-top wx:if="{{backTopValue}}"></go-top>
<view class="footer-box" hover-class="none" hover-stop-propagation="false">
<button open-type='share'></button>
<view class="btn" hover-class="none" hover-stop-propagation="false">转发给学员打卡</view>
</view>
</view>
......
......@@ -615,4 +615,12 @@
font-weight:bold;
color:rgba(101,184,244,1);
border-right: 1rpx solid rgba(0,0,0,.1);
}
\ No newline at end of file
}
.footer-box button{
width: 100%;
height: 100%;
opacity: 0;
position: absolute;
left: 0;
top: 0;
}
\ No newline at end of file
......@@ -445,6 +445,7 @@
</view>
<go-top wx:if="{{backTopValue}}"></go-top>
<view class="footer-box" hover-class="none" hover-stop-propagation="false">
<button open-type='share'></button>
<view class="btn" hover-class="none" hover-stop-propagation="false">转发给学员打卡</view>
</view>
</view>
......
......@@ -524,4 +524,12 @@
color:rgba(255,255,255,1);
line-height:68rpx;
text-align: center;
}
.footer-box button{
width: 100%;
height: 100%;
opacity: 0;
position: absolute;
left: 0;
top: 0;
}
\ No newline at end of file
......@@ -936,7 +936,7 @@
"id": 127,
"name": "c端日历作业",
"pathName": "src/pages/calendarthemeindex/index",
"query": "id=52&tid=189",
"query": "id=1&tid=2",
"scene": null
},
{
......
This diff is collapsed.
This diff is collapsed.
......@@ -1087,6 +1087,8 @@
font-weight:bold;
color:rgba(0,0,0,1);
margin: 120rpx auto;
background: url('https://cdn.img.shangjiadao.cn/source/images/dakav3/2c/themeindex/btnbg.png?20190509') no-repeat center;
background-size: 100% 100%;
}
.add-class-box .text{
font-size:26rpx;
......
......@@ -176,16 +176,17 @@ Page({
} = options;
// const {id, tid} = options;
// let pagefrom = 'businesstheme';
console.log(clockdate)
this.setData({
id,
tid,
clockdate,
activeDay:{
activeDay:clockdate?{
year:clockdate.split('-')[0],
month:Number(clockdate.split('-')[1]),
day:Number(clockdate.split('-')[2]),
isSelect:true
},
}:"",
pagefrom: pagefrom ? pagefrom : ''
}, () => {
this.getWeeksDay(new Date());
......@@ -489,13 +490,14 @@ Page({
} = res;
if (code == 200) {
const rest_dates= data.calendar_set.rest_dates.split(',');
const clockDates = data.calendar_clock_instant.concat(data.calendar_clock_supplement)
// enableArea([data.start_time.split(' ')[0], data.end_time.split(' ')[0]]);
this.getWeeksDay(new Date(res.datetime),rest_dates,clockDates);
this.getBetweenDateStr(data.calendar_set.start_time.split(' ')[0], data.calendar_set.end_time.split(' ')[0],rest_dates,clockDates);
this.setData({
mycalendar: data,
joinedDate:data.joined_at.split(' ')[0].replace(/-/g,'. '),
joinedDate:data.joined_at?data.joined_at.split(' ')[0].replace(/-/g,'. '):'',
clockTimeText:data.start_time.split(' ')[0].replace(/-/g,'. ')+'-'+data.end_time.split(' ')[0].replace(/-/g,'. ')
})
}
......
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