Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
educationStu
Project
Project
Details
Activity
Releases
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
向伟
educationStu
Commits
a674d8c2
Commit
a674d8c2
authored
Feb 18, 2022
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2
parent
6f8db03d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
420 additions
and
107 deletions
+420
-107
otherTeacherTime.vue
src/components/subscribe/otherTeacherTime.vue
+184
-0
index.vue
src/pages/appointment/index.vue
+189
-56
mySubscribe.vue
src/pages/appointment/mySubscribe.vue
+17
-20
indexassembly.vue
src/pages/index/components/indexassembly.vue
+1
-0
index.vue
src/pages/index/index.vue
+0
-3
person.vue
src/pages/person/person.vue
+29
-22
timeTable.vue
src/pages/timetable/timeTable.vue
+0
-6
No files found.
src/components/subscribe/otherTeacherTime.vue
0 → 100644
View file @
a674d8c2
<
style
scoped
>
.popupbox
{
width
:
60vw
;
background-color
:
#FFF
;
height
:
60vh
;
box-sizing
:
border-box
;
position
:
relative
;
}
.popupbox
.title
{
height
:
100
rpx
;
color
:
#111
;
font-size
:
30
rpx
;
font-weight
:
500
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
}
.subtitle
{
color
:
#666
;
font-size
:
26
rpx
;
font-weight
:
500
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
margin-bottom
:
10
rpx
;
}
.infoBox
{
height
:
calc
(
100%
-
150
rpx
);
box-sizing
:
border-box
;
padding
:
0
20
rpx
;
overflow-y
:
auto
;
}
.infoItem
{
border-bottom
:
1px
solid
#999
;
margin-bottom
:
10
rpx
;
}
.infoRow
{
display
:
flex
;
flex-wrap
:
nowrap
;
}
.label
{
width
:
80
rpx
;
color
:
#666
;
font-size
:
26
rpx
;
white-space
:
nowrap
;
}
.value
{
font-size
:
28
rpx
;
color
:
#111
;
flex-grow
:
1
;
}
.infoRow
.subBtn
{
font-size
:
20
rpx
;
font-family
:
PingFang
SC
;
font-weight
:
500
;
color
:
#FFFFFF
;
background-color
:
#4C50E7
;
padding
:
10
rpx
20
rpx
;
border-radius
:
10
rpx
;
margin
:
10
rpx
auto
;
}
</
style
>
<
template
>
<view>
<van-popup
:show=
"showpop"
round
closeable
@
close=
"taggleShow(false)"
>
<view
class=
"popupbox"
>
<view
class=
"title"
>
提示
</view>
<view
class=
"subtitle"
>
当前时段已有预约列表,是否切换?
</view>
<view
class=
"infoBox"
>
<view
v-for=
"(info,index) in infoList"
:key=
"index"
class=
"infoItem"
>
<view
class=
"infoRow"
>
<view
class=
"label"
>
老师:
</view>
<view
class=
"value"
>
{{
info
.
TeacherName
}}
</view>
</view>
<view
class=
"infoRow"
>
<view
class=
"label"
>
教室:
</view>
<view
class=
"value"
>
{{
info
.
RoomName
}}
</view>
</view>
<view
class=
"infoRow"
>
<view
class=
"label"
>
时间:
</view>
<view
class=
"value"
>
{{
info
.
CourseSTime
}}
/
{{
info
.
CourseETime
}}
</view>
</view>
<view
class=
"infoRow"
>
<view
class=
"label"
>
学员:
</view>
<view
class=
"value"
style=
"white-space: wrap;"
>
<view
v-for=
"(item,index) in info.StuList"
:key=
"index"
style=
"display: inline-block;"
>
{{
item
.
StuName
}}
,
</view>
</view>
</view>
<view
class=
"infoRow"
>
<view
class=
"subBtn"
@
click=
"chooseTime(info)"
>
预约该时段
</view>
</view>
</view>
</view>
</view>
</van-popup>
</view>
</
template
>
<
script
>
import
{
reactive
,
toRefs
,
watch
}
from
"vue"
;
export
default
{
components
:
{
},
props
:
{
show
:
{
type
:
Boolean
,
default
:
false
},
infoList
:
{
type
:
Array
,
default
:
()
=>
[]
}
},
setup
(
props
,
ctx
)
{
let
data
=
reactive
({
showpop
:
false
,
msg
:
{
pageIndex
:
1
,
pageSize
:
10
,
StartTime
:
''
,
EntTime
:
''
,
State
:
0
,
TeacherId
:
0
,
Q_SelectNormal
:
1
,
},
})
let
methods
=
{
taggleShow
(
val
)
{
ctx
.
emit
(
"close"
,
val
)
},
chooseTime
(
item
)
{
ctx
.
emit
(
"change"
,
item
)
}
}
watch
(()
=>
props
.
show
,
(
val
)
=>
{
data
.
showpop
=
val
})
let
that
=
methods
;
return
{
...
toRefs
(
data
),
...
methods
,
};
},
}
</
script
>
src/pages/appointment/index.vue
View file @
a674d8c2
...
...
@@ -2,7 +2,7 @@
<view
class=
""
>
<Navbar>
<view
class=
"navbar"
>
<van-icon
name=
"arrow-left"
size=
"36rpx"
@
click=
"back"
/>
<van-icon
name=
"arrow-left"
size=
"36rpx"
@
click=
"back"
/>
<i
class=
"iconfont icon-calendar"
style=
"font-size: 60rpx;"
@
click=
"isShowCalendar=true"
></i>
<view
class=
"dateStr"
@
click=
"isShowCalendar=true"
>
{{
dateStr
}}
...
...
@@ -28,8 +28,10 @@
<text
class=
"teacherInfoName"
>
{{
item
.
TeacherName
}}
</text>
<text
class=
"teacherInfoBtn"
>
可报入
</text>
</view>
<view
class=
"TeacherIntro"
>
{{
item
.
TeacherIntro
||
'暂无教师介绍'
}}
<view
class=
"TeacherIntro"
v-if=
"item.TeacherIntro"
v-html=
"item.TeacherIntro"
>
</view>
<view
class=
"TeacherIntro"
v-else
>
暂无教师介绍
</view>
</view>
</view>
...
...
@@ -136,16 +138,24 @@
</view>
</view>
</view>
<view
class=
"noCourse"
v-if=
"courselist.length==0&&
basics.IsNextAppoint
"
>
<view
class=
"noCourse"
v-if=
"courselist.length==0&&
teacherList.length>0
"
>
<image
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/noCourse.png"
mode=
""
style=
"width: 166rpx;height: 166rpx;"
></image>
<view
class=
"noCourseText"
>
暂无可约课程
</view>
</view>
<view
class=
"noCourse"
v-if=
"teacherList.length==0"
>
<image
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/noCourse.png"
mode=
""
style=
"width: 166rpx;height: 166rpx;"
></image>
<view
class=
"noCourseText"
>
暂无可约老师
</view>
</view>
<van-overlay
:show=
"showlay"
:lockScroll=
"false"
>
<view
class=
"laybox"
>
<image
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/yuyuesuccess.png"
mode=
"widthFix"
style=
"width: 100%;height: 162rpx;border-radius: 24rpx 24rpx 0 0;"
></image>
<image
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/yuyuesuccess.png"
mode=
"widthFix"
style=
"width: 100%;height: 162rpx;border-radius: 24rpx 24rpx 0 0;"
></image>
<view
class=
"layboxTitle"
>
预约成功
</view>
...
...
@@ -160,6 +170,7 @@
</view>
</view>
</van-overlay>
<OtherTeacherTime
:show=
"showOtherTime"
:infoList=
"OtherTimeList"
@
close=
"closeOtherTeacherTime"
@
change=
"changeTime"
/>
</view>
</
template
>
...
...
@@ -176,9 +187,11 @@
getToday
}
from
'../../utils/date.js'
import
Navbar
from
'../../components/navbar.vue'
import
OtherTeacherTime
from
'../../components/subscribe/otherTeacherTime.vue'
export
default
{
components
:
{
Navbar
Navbar
,
OtherTeacherTime
},
props
:
[
'day'
],
setup
(
props
)
{
...
...
@@ -187,7 +200,7 @@
}
=
getCurrentInstance
()
const
data
=
reactive
({
isShowCalendar
:
false
,
showlay
:
false
,
showlay
:
false
,
date
:
"2月1号"
,
dateStr
:
""
,
year
:
""
,
...
...
@@ -203,16 +216,20 @@
courselist
:
[],
schoolName
:
""
,
roomName
:
""
,
latestTime
:
"00:00"
,
//最后预约的课时
showOtherTime
:
false
,
OtherTimeList
:[]
})
const
methods
=
{
onConfirmCalendar
(
val
)
{
data
.
isShowCalendar
=
false
this
.
getDateData
(
val
.
detail
)
data
.
msg
.
Date
=
DateFormat
(
val
.
detail
)
data
.
current
=
0
data
.
current
=
0
this
.
getTeacherList
()
console
.
log
(
86
,
data
.
msg
.
Date
)
},
// 获取日期
getDateData
(
d
)
{
let
date
=
new
Date
()
if
(
d
)
{
...
...
@@ -255,7 +272,13 @@
data
.
schoolName
=
data
.
teacherList
[
val
.
detail
.
current
].
SchoolName
data
.
roomName
=
data
.
teacherList
[
val
.
detail
.
current
].
RoomName
methods
.
courseGroup
()
data
.
courselist
.
map
(
e
=>
{
if
(
e
.
State
==
4
){
data
.
latestTime
=
e
.
StartTime
}
})
},
//获取老师列表
getTeacherList
()
{
uni
.
showLoading
({
title
:
'加载中...'
...
...
@@ -268,6 +291,12 @@
data
.
schoolName
=
data
.
teacherList
[
0
].
SchoolName
data
.
roomName
=
data
.
teacherList
[
0
].
RoomName
methods
.
courseGroup
()
data
.
courselist
.
map
(
e
=>
{
if
(
e
.
State
==
4
){
data
.
latestTime
=
e
.
StartTime
}
})
}
else
{
data
.
courselist
=
[]
}
...
...
@@ -294,26 +323,34 @@
})
data
.
courselist
=
Array
.
from
(
new
Set
(
data
.
courselist
))
},
//获取约课的基础信息
getBaseInfo
()
{
proxy
.
$request
(
"/AppletCenter/GetScrollAppointmentBaseInfo"
,
{}).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
data
.
basics
=
res
.
Data
;
const
date
=
new
Date
()
const
y
=
date
.
getFullYear
()
const
m
=
date
.
getMonth
()
+
1
const
m
=
date
.
getMonth
()
+
1
<
10
?
'0'
+
(
date
.
getMonth
()
+
1
)
:
date
.
getMonth
()
+
1
const
d
=
date
.
getDate
()
const
maxStr
=
y
+
'-'
+
m
+
'-'
+
(
d
+
res
.
Data
.
AppointDay
-
1
)
data
.
maxDateStr
=
new
Date
(
maxStr
).
getTime
()
if
(
res
.
Data
.
AdvanceDay
)
{
const
minStr
=
y
+
'-'
+
m
+
'-'
+
(
d
+
res
.
Data
.
AdvanceDay
)
const
minStr
=
y
+
'-'
+
m
+
'-'
+
((
d
+
res
.
Data
.
AdvanceDay
)
<
10
?
'0'
+
(
d
+
res
.
Data
.
AdvanceDay
)
:
(
d
+
res
.
Data
.
AdvanceDay
))
data
.
minDateStr
=
new
Date
(
minStr
).
getTime
()
this
.
getDateData
(
minStr
)
data
.
msg
.
Date
=
minStr
}
if
(
res
.
Data
.
Scroll_OpenSchool
==
1
)
{
let
schoolId
=
uni
.
getStorageInfoSync
(
'userInfo'
).
School_Id
data
.
msg
.
School_Id
=
schoolId
}
this
.
getTeacherList
()
}
})
},
//更新约课的基础信息
updateBaseInfo
()
{
proxy
.
$request
(
"/AppletCenter/GetScrollAppointmentBaseInfo"
,
{}).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
...
...
@@ -321,13 +358,14 @@
}
})
},
updateTeacherList
(){
updateTeacherList
()
{
uni
.
showLoading
({
title
:
'加载中...'
})
proxy
.
$request
(
"/AppletCenter/GetScrollAppointmentTeacherList"
,
data
.
msg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
data
.
teacherList
=
res
.
Data
;
console
.
log
(
355
,
data
.
latestTime
)
if
(
data
.
teacherList
.
length
>
0
)
{
data
.
courselist
=
data
.
teacherList
[
data
.
current
].
CourseTimeList
data
.
schoolName
=
data
.
teacherList
[
data
.
current
].
SchoolName
...
...
@@ -345,31 +383,33 @@
url
:
'/pages/appointment/mySubscribe'
,
});
},
goIndex
(){
goIndex
()
{
uni
.
switchTab
({
url
:
'/pages/index/index'
url
:
'/pages/index/index'
})
},
//选课
checkCourse
(
index
)
{
if
(
data
.
basics
.
AdvanceDay
==
1
){
const
lateTime
=
new
Date
(
getToday
()
+
' '
+
data
.
basics
.
ScrollETime
).
getTime
()
const
nowTime
=
new
Date
().
getTime
()
if
(
nowTime
>
lateTime
){
if
(
data
.
basics
.
AdvanceDay
==
1
)
{
const
lateTime
=
new
Date
(
getToday
()
+
' '
+
data
.
basics
.
ScrollETime
).
getTime
()
const
nowTime
=
new
Date
().
getTime
()
const
targetDay
=
parseInt
(
data
.
msg
.
Date
.
slice
(
-
2
))
const
curDay
=
parseInt
(
getToday
().
slice
(
-
2
))
if
(
nowTime
>
lateTime
&&
(
targetDay
-
curDay
===
1
))
{
uni
.
showToast
({
icon
:
'none'
,
title
:
`
${
data
.
basics
.
ScrollETime
}
点后不可预约明天课程`
icon
:
'none'
,
title
:
`
${
data
.
basics
.
ScrollETime
}
点后不可预约明天课程`
})
return
}
}
if
(
data
.
basics
.
AppointDate
){
const
lateDate
=
new
Date
(
data
.
basics
.
AppointDate
).
getTime
()
const
curSubDate
=
new
Date
(
data
.
msg
.
Date
).
getTime
()
console
.
log
(
curSubDate
<
lateDate
)
if
(
curSubDate
<
lateDate
){
if
(
data
.
basics
.
AppointDate
)
{
const
lateDate
=
new
Date
(
data
.
basics
.
AppointDate
).
getTime
()
const
curSubDate
=
new
Date
(
data
.
msg
.
Date
).
getTime
()
if
(
curSubDate
<
lateDate
)
{
uni
.
showToast
({
icon
:
'none'
,
title
:
`需预约
${
data
.
basics
.
AppointDate
}
之后
的日期`
icon
:
'none'
,
title
:
`不能预约
${
data
.
basics
.
AppointDate
}
之前
的日期`
})
return
}
...
...
@@ -385,10 +425,12 @@
})
return
}
else
{
console
.
log
(
428
,
ShiftSortArr
)
this
.
mapNextCourse
(
index
,
ShiftSortArr
,
RemainTime
)
}
}
else
if
(
RemainTime
==
0
)
{
this
.
subscribe
()
// this.subscribe(ShiftSortArr)
this
.
validateAppointment
(
ShiftSortArr
)
}
else
{
uni
.
showToast
({
icon
:
'none'
,
...
...
@@ -397,6 +439,7 @@
}
},
//课时不足,依次加入下一节
mapNextCourse
(
index
,
ShiftSortArr
=
[],
RemainTime
)
{
let
nexIndex
=
index
+
1
let
nexCourse
=
data
.
courselist
[
nexIndex
]
...
...
@@ -404,7 +447,9 @@
let
RemainTime2
=
RemainTime
-
nexCourse
.
Minutes
//剩余课时
ShiftSortArr
.
push
(
nexCourse
)
if
(
RemainTime2
===
0
)
{
this
.
subscribe
(
ShiftSortArr
)
// this.subscribe(ShiftSortArr)
this
.
validateAppointment
(
ShiftSortArr
)
}
else
if
(
RemainTime2
>
0
)
{
this
.
mapNextCourse
(
nexIndex
,
ShiftSortArr
,
RemainTime2
)
}
else
{
...
...
@@ -420,25 +465,26 @@
})
}
},
//预约已有学员的课
checkCourseType2
(
item
)
{
if
(
data
.
basics
.
AdvanceDay
==
1
)
{
const
lateTime
=
new
Date
(
getToday
()
+
' '
+
data
.
basics
.
ScrollETime
).
getTime
()
const
nowTime
=
new
Date
().
getTime
()
if
(
nowTime
>
lateTime
)
{
if
(
data
.
basics
.
AdvanceDay
==
1
)
{
const
lateTime
=
new
Date
(
getToday
()
+
' '
+
data
.
basics
.
ScrollETime
).
getTime
()
const
nowTime
=
new
Date
().
getTime
()
if
(
nowTime
>
lateTime
)
{
uni
.
showToast
({
icon
:
'none'
,
title
:
`
${
data
.
basics
.
ScrollETime
}
点后不可预约明天课程`
icon
:
'none'
,
title
:
`
${
data
.
basics
.
ScrollETime
}
点后不可预约明天课程`
})
return
}
}
if
(
data
.
basics
.
AppointDate
)
{
const
lateDate
=
new
Date
(
data
.
basics
.
AppointDate
).
getTime
()
const
curSubDate
=
new
Date
(
data
.
msg
.
Date
).
getTime
()
if
(
curSubDate
<
lateDate
)
{
if
(
data
.
basics
.
AppointDate
)
{
const
lateDate
=
new
Date
(
data
.
basics
.
AppointDate
).
getTime
()
const
curSubDate
=
new
Date
(
data
.
msg
.
Date
).
getTime
()
if
(
curSubDate
<
lateDate
)
{
uni
.
showToast
({
icon
:
'none'
,
title
:
`需预约
${
data
.
basics
.
AppointDate
}
之后的日期`
icon
:
'none'
,
title
:
`需预约
${
data
.
basics
.
AppointDate
}
之后的日期`
})
return
}
...
...
@@ -472,9 +518,19 @@
if
(
res
.
Code
==
1
)
{
methods
.
updateBaseInfo
()
methods
.
updateTeacherList
()
data
.
showlay
=
true
data
.
showlay
=
true
}
})
// console.log(486, res)
// if (res[data.basics.TempleteList[0]] == 'accept') {
// } else {
// uni.showToast({
// icon: 'none',
// title: "订阅失败,请重新预约"
// })
// }
},
fail
()
{
uni
.
showToast
({
...
...
@@ -484,16 +540,93 @@
}
})
},
back
(){
back
()
{
uni
.
navigateBack
({
delta
:
1
delta
:
1
});
}
},
// 验证约课时段
validateAppointment
(
ShiftSortArr
)
{
const
techerInfo
=
data
.
teacherList
[
data
.
current
]
const
msg
=
{
Date
:
data
.
msg
.
Date
,
AccountId
:
techerInfo
.
AccountId
,
TeacherId
:
techerInfo
.
TeacherId
,
ShiftSort
:
ShiftSortArr
.
map
(
e
=>
e
.
Sort
).
toString
(),
CourseId
:
data
.
basics
.
CourseId
,
ChapterNo
:
data
.
basics
.
NextAppointChapterNo
,
}
proxy
.
$request
(
"/AppletCenter/ValidateToDayAppointment"
,
msg
).
then
(
res
=>
{
if
(
res
.
Data
.
State
==
0
||
res
.
Data
.
State
==
1
)
{
this
.
subscribe
(
ShiftSortArr
)
}
else
if
(
res
.
Data
.
State
==
2
||
res
.
Data
.
State
==
3
){
console
.
log
(
'验证约课时段'
,
res
)
data
.
OtherTimeList
=
res
.
Data
.
TimeList
data
.
showOtherTime
=
true
}
})
},
// IsShowBtn(s='00:00'){
// let eArr=data.latestTime.split(':')
// let eStr=eArr[0]*3600+eArr[1]*60
// let sArr=s.split(':')
// let sStr=sArr[0]*3600+sArr[1]*60
// },
closeOtherTeacherTime
(
val
){
data
.
showOtherTime
=
val
},
//切换-预约其他老师的课
changeTime
(
item
){
const
obj
=
{
Date
:
data
.
msg
.
Date
,
AccountId
:
item
.
AccountId
,
TeacherId
:
item
.
TeacherId
,
ShiftSort
:
item
.
ShiftSort
,
CourseId
:
data
.
basics
.
CourseId
,
ChapterNo
:
data
.
basics
.
NextAppointChapterNo
,
}
uni
.
requestSubscribeMessage
({
tmplIds
:
data
.
basics
.
TempleteList
,
success
(
res
)
{
proxy
.
$request
(
"/AppletCenter/SetScrollAppointment"
,
obj
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
data
.
showOtherTime
=
false
let
findIndex
=
data
.
teacherList
.
findIndex
(
e
=>
{
return
e
.
TeacherId
==
item
.
TeacherId
})
console
.
log
(
findIndex
)
if
(
findIndex
){
data
.
current
=
findIndex
}
methods
.
updateBaseInfo
()
methods
.
updateTeacherList
()
data
.
showlay
=
true
}
})
// if (res[data.basics.TempleteList[0]] == 'accept') {
// } else {
// uni.showToast({
// icon: 'none',
// title: "订阅失败,请重新预约"
// })
// }
},
fail
()
{
uni
.
showToast
({
icon
:
'none'
,
title
:
"订阅失败,请重新预约"
})
}
})
},
}
onMounted
(()
=>
{
methods
.
getDateData
()
// methods.getTeacherList()
methods
.
getBaseInfo
()
})
return
{
...
toRefs
(
data
),
...
...
@@ -533,15 +666,12 @@
.swiper-item
{
width
:
100%
;
height
:
235
rpx
;
/* background-color: #f0fed1; */
margin
:
0
10
rpx
;
border-radius
:
20
rpx
;
display
:
flex
;
align-items
:
center
;
/* overflow: hidden; */
box-shadow
:
4
rpx
3
rpx
10
rpx
0
rpx
rgba
(
212
,
212
,
212
,
0.6
);
box-sizing
:
border-box
;
padding
:
0
40
rpx
;
}
.swiper-item
.imgBox
{
...
...
@@ -587,7 +717,6 @@
.top
{
width
:
678
rpx
;
/* height: 174rpx; */
background-color
:
#4C50E7
;
border-radius
:
24
rpx
24
rpx
0px
0px
;
margin
:
60
rpx
auto
;
...
...
@@ -775,7 +904,6 @@
align-content
:
space-around
;
box-sizing
:
border-box
;
padding
:
20
rpx
0
20
rpx
30
rpx
;
/* margin-right: 100rpx; */
position
:
relative
;
border-bottom
:
1px
solid
#E9E9E9
;
}
...
...
@@ -846,7 +974,8 @@
color
:
#111111
;
margin-top
:
10
rpx
;
}
.laybox
{
.laybox
{
width
:
462
rpx
;
height
:
607
rpx
;
background-color
:
#FFFFFF
;
...
...
@@ -855,9 +984,10 @@
top
:
50%
;
left
:
50%
;
z-index
:
9
;
transform
:
translate
(
-50%
,
-50%
);
transform
:
translate
(
-50%
,
-50%
);
}
.laybox
.layboxTitle
{
.laybox
.layboxTitle
{
font-size
:
36
rpx
;
font-family
:
PingFang
SC
;
font-weight
:
800
;
...
...
@@ -865,7 +995,8 @@
text-align
:
center
;
margin-top
:
20
rpx
;
}
.laybox
.layboxBtn1
{
.laybox
.layboxBtn1
{
width
:
292
rpx
;
height
:
80
rpx
;
background-color
:
#4C50E7
;
...
...
@@ -878,7 +1009,8 @@
font-weight
:
500
;
color
:
#FFFFFF
;
}
.laybox
.layboxBtn2
{
.laybox
.layboxBtn2
{
width
:
292
rpx
;
height
:
80
rpx
;
background-color
:
#E4E5FB
;
...
...
@@ -891,7 +1023,8 @@
font-weight
:
500
;
color
:
#4C50E7
;
}
.laybox
.layboxBtn3
{
.laybox
.layboxBtn3
{
text-align
:
center
;
font-size
:
28
rpx
;
font-family
:
PingFang
SC
;
...
...
src/pages/appointment/mySubscribe.vue
View file @
a674d8c2
...
...
@@ -240,10 +240,18 @@
</view>
<view
class=
"listItemBox3"
>
<view
class=
"label"
>
学生
教室
</view>
<view
class=
"con"
>
{{
x
.
StuName
}}
{{
x
.
RoomName
}}
</view>
</view>
<view
class=
"listItemBox3"
>
<view
class=
"label"
>
校区
</view>
<view
class=
"con"
>
{{
x
.
RoomSchoolName
}}
</view>
</view>
<view
class=
"listItemBox3"
>
...
...
@@ -375,29 +383,13 @@
EntTime
:
''
,
State
:
0
,
TeacherId
:
0
,
Q_SelectNormal
:
1
,
},
TeacherName
:
""
,
pageState
:
"more"
,
PageCount
:
0
,
timer
:
null
,
//防抖
List
:
[{
Date
:
"2020-01-01"
,
CourseTimeList
:
[{
StartTime
:
'09:00'
,
Minutes
:
90
,
EndTime
:
"12:00"
},
{
StartTime
:
'09:00'
,
Minutes
:
90
,
EndTime
:
"12:00"
}],
CourseName
:
"内部斑"
,
StuName
:
"张三"
,
ChapterNo
:
1
,
TeacherName
:
"张三"
,
StateName
:
'待确认'
,
State
:
1
,
},
],
List
:
[],
stateList
:
[],
show
:
false
,
AppointId
:
0
,
...
...
@@ -413,6 +405,11 @@
})
let
methods
=
{
getList
()
{
if
(
data
.
msg
.
State
==
0
){
data
.
msg
.
Q_SelectNormal
=
1
}
else
{
data
.
msg
.
Q_SelectNormal
=
0
}
data
.
pageState
=
"loading"
;
proxy
.
$request
(
"/AppletCenter/GetMyAppointPageList"
,
data
.
msg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
...
...
src/pages/index/components/indexassembly.vue
View file @
a674d8c2
...
...
@@ -150,6 +150,7 @@
code
})
if
(
res
&&
res
.
Data
.
phoneNumber
)
{
console
.
log
(
'dsadas'
,
res
)
data
.
obj
.
phoneNum
=
res
.
Data
.
phoneNumber
// data.obj.phoneNum = '18328620563'
data
.
obj
.
openid
=
res
.
Data
.
openid
...
...
src/pages/index/index.vue
View file @
a674d8c2
...
...
@@ -22,9 +22,6 @@
<view
class=
"scanBox"
@
click=
"scan"
>
<image
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/scan2x.png"
mode=
"aspectFit"
class=
"scanIcon"
></image>
<!--
<view
class=
"scanText"
>
签到
</view>
-->
</view>
</view>
</navbar>
...
...
src/pages/person/person.vue
View file @
a674d8c2
...
...
@@ -2,9 +2,6 @@
<view
class=
"person"
>
<view
class=
"info flex_between_center flex_nowrap"
>
<view
class=
"left flex_start_between"
>
<!--
<view
class=
"date"
>
2021年12月30日
</view>
-->
<view
class=
"name"
>
<text
v-if=
"pageData.StuName"
>
Hello,
{{
pageData
.
StuName
}}
</text><text
v-if=
"!pageData.StuName&&pageData.StuName!==''"
@
click=
"jumpPage('/pages/login/login')"
>
未登录
</text>
</view>
...
...
@@ -43,16 +40,24 @@
</view>
</view>
</view>
<view
class=
"courseInfo"
>
<view
class=
"courseInfo"
v-if=
"pageData.CourseInfo.State==2"
>
<view
class=
"title"
>
课程信息
</view>
<view
style=
"display: flex;justify-content: space-between;"
>
<!--
<view
class=
"title"
@
click=
"jumpPage(`/pages/appointment/mySubscribe`)"
>
约课记录
</view>
-->
<view
style=
"display: flex; justify-content: space-between;padding: 0 22rpx;margin-top: 30rpx;"
>
<view
style=
"margin-left: 17px;"
>
<view
style=
"font-size: 13px;font-family: PingFang SC;font-weight: bold;color: #111111;"
>
暂无课程
</view>
<view
style=
"font-size: 10px;font-family: PingFang SC;font-weight: 400;color: #888888;margin-top: 10px;"
>
购买课程后可回顾
</view>
</view>
<view>
<image
style=
"width: 234rpx;height: 226rpx;"
mode=
"aspectFit"
src=
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/studyindex_nan.png'
>
</image>
</view>
</view>
</view>
<view
class=
"courseInfo"
v-if=
"pageData.CourseInfo.State==1"
>
<view
class=
"title"
>
课程信息
</view>
<view
class=
"statistic"
>
<view
class=
"statisticItem"
>
<view
class=
"time"
>
{{
pageData
.
CourseInfo
.
TotalHours
||
0
}}
...
...
@@ -62,19 +67,16 @@
</view>
<view
class=
"statisticItem"
>
<view
class=
"time"
>
{{
pageData
.
CourseInfo
.
CompleteHours
||
0
}}
<!--
<text
class=
"unit"
>
节
</text>
-->
</view>
<view
class=
"statisticName"
>
已学课时
</view>
</view>
<view
class=
"statisticItem"
>
<view
class=
"time"
>
{{
pageData
.
CourseInfo
.
AbsenceNum
||
0
}}
<!--
<text
class=
"unit"
>
节
</text>
-->
</view>
<view
class=
"statisticName"
>
缺勤课时
</view>
</view>
<view
class=
"statisticItem"
>
<view
class=
"time"
>
{{
pageData
.
CourseInfo
.
LeaveNum
||
0
}}
<!--
<text
class=
"unit"
>
节
</text>
-->
</view>
<view
class=
"statisticName"
>
请假课时
</view>
</view>
...
...
@@ -114,14 +116,17 @@
<view
class=
"className one_line"
>
{{
pageData
.
CourseInfo
.
CourseName
}}
</view>
<view
class=
"Grade"
style=
"margin-bottom:20rpx"
>
{{
<view
class=
"Grade"
style=
"margin-bottom:20rpx"
v-if=
"pageData.CourseInfo.ClassScrollType!==2"
>
{{
pageData
.
CourseInfo
.
ClassName
}}
</view>
<view
class=
"Grade"
>
等级:
{{
pageData
.
CourseInfo
.
CourseRate
||
''
}}
</view>
<view><text
class=
"Grade"
>
状态:
</text>
<text
class=
"StatusName"
v-if=
"pageData.CourseInfo.ClassStatusName"
>
{{
pageData
.
CourseInfo
.
ClassStatusName
}}
</text>
<text
class=
"StatusName"
v-if=
"pageData.CourseInfo.TotalHours>pageData.CourseInfo.CompleteHours"
>
学习中
</text>
<text
class=
"StatusName"
v-if=
"pageData.CourseInfo.TotalHours==pageData.CourseInfo.CompleteHours"
>
已结课
</text>
</view>
</view>
</view>
...
...
@@ -182,10 +187,12 @@
pageData
:
{
AssistList
:
[]
},
yuyueNum
:
0
yuyueNum
:
0
});
const
methods
=
{
jumpPage
(
url
)
{
uni
.
navigateTo
({
url
:
url
,
});
...
...
@@ -201,20 +208,20 @@
});
},
getyuyue
()
{
const
msg
=
{
const
msg
=
{
pageIndex
:
1
,
pageSize
:
1
,
StartTime
:
''
,
EntTime
:
''
,
State
:
0
,
TeacherId
:
0
,
Q_SelectNormal
:
1
,
}
proxy
.
$request
(
"/AppletCenter/GetMyAppointPageList"
,
msg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
data
.
yuyueNum
=
res
.
Data
.
Count
data
.
yuyueNum
=
res
.
Data
.
Count
}
})
},
};
let
that
=
methods
;
...
...
src/pages/timetable/timeTable.vue
View file @
a674d8c2
...
...
@@ -5,12 +5,6 @@
<view
class=
"navbar"
>
<van-nav-bar
title=
"课表"
fixed
title-class=
"navTitle"
>
<view
slot=
"left"
class=
"chooseDate flex flex_start_center"
>
<!--
<van-icon
name=
"arrow-left"
size=
"36rpx"
style=
"margin-right: 10rpx"
@
click=
"back"
/>
-->
<view
@
click=
"showdatetime"
>
{{
currentDate
}}
</view>
</view>
</van-nav-bar>
...
...
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