Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
wechatapp.shangjiadao.com
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxuelai
wechatapp.shangjiadao.com
Commits
07c17fe4
Commit
07c17fe4
authored
May 10, 2019
by
wangxuelai
Browse files
Options
Browse Files
Download
Plain Diff
'
parents
d60245c1
8642aeeb
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
236 additions
and
71 deletions
+236
-71
index.js
business/pages/calendarthemeindex/index.js
+1
-1
index.wxml
business/pages/calendarthemeindex/index.wxml
+1
-0
index.wxss
business/pages/calendarthemeindex/index.wxss
+9
-1
index.wxml
business/pages/themeindex/index.wxml
+1
-0
index.wxss
business/pages/themeindex/index.wxss
+8
-0
project.config.json
project.config.json
+1
-1
index.js
src/pages/calendarthemeindex/index.js
+126
-17
index.wxml
src/pages/calendarthemeindex/index.wxml
+82
-48
index.wxss
src/pages/calendarthemeindex/index.wxss
+2
-0
index.js
src/pages/mycalendart/index.js
+5
-3
No files found.
business/pages/calendarthemeindex/index.js
View file @
07c17fe4
...
...
@@ -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/
calendar
themeindex/index?tid=
${
this
.
data
.
tid
}
&id=
${
this
.
data
.
id
}
`
}
posterLog
({
poster_type
:
2
,
...
...
business/pages/calendarthemeindex/index.wxml
View file @
07c17fe4
...
...
@@ -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>
...
...
business/pages/calendarthemeindex/index.wxss
View file @
07c17fe4
...
...
@@ -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
business/pages/themeindex/index.wxml
View file @
07c17fe4
...
...
@@ -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>
...
...
business/pages/themeindex/index.wxss
View file @
07c17fe4
...
...
@@ -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
project.config.json
View file @
07c17fe4
...
...
@@ -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
},
{
...
...
src/pages/calendarthemeindex/index.js
View file @
07c17fe4
This diff is collapsed.
Click to expand it.
src/pages/calendarthemeindex/index.wxml
View file @
07c17fe4
This diff is collapsed.
Click to expand it.
src/pages/calendarthemeindex/index.wxss
View file @
07c17fe4
...
...
@@ -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;
...
...
src/pages/mycalendart/index.js
View file @
07c17fe4
...
...
@@ -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
,
'. '
)
})
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment