Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
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
viitto
mallapp
Commits
888b7948
Commit
888b7948
authored
Feb 03, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
9fd577df
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
13 deletions
+71
-13
appointment.vue
pages/appointment/appointment.vue
+13
-2
appointmentList.vue
pages/appointment/appointmentList.vue
+2
-2
confirmAppointment.vue
pages/appointment/confirmAppointment.vue
+56
-9
No files found.
pages/appointment/appointment.vue
View file @
888b7948
...
...
@@ -180,15 +180,18 @@
</view>
</view>
<view
style=
"width: 100%;height: 100px;"
></view>
<view
style=
"width: 100%;height: 100%;background: #000000;opacity: 0.3;position: absolute;left: 0;top: 0;"
v-if=
"screenshow==true && subscribeList.length > 0"
@
touchstart=
"screenshow=false"
></view>
</view>
</scroll-view>
<view
style=
"width: 100%;height: 100%;background: #000000;opacity: 0.
4;position: absolute;left: 0;top: 0;"
v-if=
"screenshow==true
"
@
touchstart=
"screenshow=false"
></view>
<view
style=
"width: 100%;height: 100%;background: #000000;opacity: 0.
3;position: absolute;left: 0;top: 0;"
v-if=
"screenshow==true && subscribeList.length == 0
"
@
touchstart=
"screenshow=false"
></view>
</view>
</view>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
"gbAuth"
></auth>
<tabbars
v-if=
"showtabbars==true"
></tabbars>
</view>
</
template
>
...
...
@@ -196,10 +199,12 @@
import
zzxCalendar
from
'./components/zzx-calendar/zzx-calendar.vue'
import
auth
from
'@/components/auth/index.vue'
;
import
{
gegerateDates
,
dateEqual
,
formatDate
}
from
'./components/zzx-calendar/generateDates.js'
;
import
tabbars
from
'@/components/tabbar/index'
;
export
default
{
components
:{
zzxCalendar
,
auth
auth
,
tabbars
},
data
(){
...
...
@@ -208,6 +213,7 @@ import {gegerateDates, dateEqual,formatDate} from './components/zzx-calendar/gen
mainColor
:
""
,
secondary
:
''
,
showAuth
:
false
,
showtabbars
:
true
,
list
:
[{
name
:
'综合排序'
},
{
...
...
@@ -240,6 +246,11 @@ import {gegerateDates, dateEqual,formatDate} from './components/zzx-calendar/gen
this
.
msg
.
CourseClassId
=
options
.
CourseClassId
this
.
current
=
1
}
if
(
options
&&
options
.
showtabbars
){
//判断是否显示标题栏
if
(
options
.
showtabbars
==
1
){
this
.
showtabbars
=
false
}
}
this
.
msg
.
SelectStartTime
=
formatDate
(
new
Date
(),
'yyyy-MM-dd'
),
this
.
msg
.
SelectEndTime
=
formatDate
(
new
Date
(),
'yyyy-MM-dd'
),
uni
.
setNavigationBarTitle
({
...
...
pages/appointment/appointmentList.vue
View file @
888b7948
...
...
@@ -29,7 +29,7 @@
},
data
(){
return
{
pageTitle
:
'约课
1
'
,
pageTitle
:
'约课'
,
mainColor
:
''
,
secondary
:
''
,
showAuth
:
false
,
...
...
@@ -92,7 +92,7 @@
},
goappointment
(
item
){
uni
.
navigateTo
({
url
:
'/pages/appointment/appointment?CourseClassId='
+
item
.
ID
url
:
'/pages/appointment/appointment?CourseClassId='
+
item
.
ID
+
'&showtabbars=1'
});
}
...
...
pages/appointment/confirmAppointment.vue
View file @
888b7948
...
...
@@ -22,12 +22,15 @@
width
:
100%
;
height
:
100px
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
justify-content
:
center
;
padding
:
23px
;
position
:
absolute
;
position
:
fixed
;
left
:
0
;
bottom
:
0
;
background
:
#F3F5F7
;
}
.bottoms-box
{
width
:
100%
;
...
...
@@ -41,6 +44,24 @@
align-items
:
center
;
justify-content
:
center
;
}
.olist
{
width
:
100%
;
display
:
flex
;
flex-direction
:
row
;
flex-wrap
:
wrap
;
}
.olist-item
{
height
:
20px
;
padding
:
0
8px
;
border-radius
:
3px
;
margin-right
:
5px
;
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
font-size
:
12px
;
color
:
#FFF
;
margin-top
:
5px
;
}
</
style
>
<
template
>
<view
class=
"confirmAppointment"
>
...
...
@@ -52,7 +73,7 @@
</view>
<view
class=
"top-item"
style=
"margin-top: 10px;"
>
<text>
上课时间
</text>
<text
class=
"t-item-r"
>
{{
data
.
StudyDateStr
}}
</text>
<text
class=
"t-item-r"
>
{{
data
.
StudyDateStr
}}
{{
data
.
StudyStartDate
}}
-
{{
data
.
StudyEndDate
}}
</text>
</view>
<view
class=
"top-item"
>
<text>
上课老师
</text>
...
...
@@ -78,7 +99,7 @@
<text
class=
"t-item-r"
>
{{
data
.
MinDuration
}}{{
data
.
DurationUnitName
}}
</text>
</view>
</view>
<view
class=
"box-top"
style=
"margin-top: 15px;"
>
<view
class=
"box-top"
style=
"margin-top: 15px;"
v-if=
" data.StudentNumType==1"
>
<view
class=
"top-item"
>
<text>
预约课节
</text>
<input
class=
"uni-input "
type=
"number"
v-model=
"classDay"
style=
'text-align: right;'
placeholder=
"输入课节"
@
blur=
'totalsc'
/>
...
...
@@ -89,18 +110,24 @@
<text
class=
"t-item-r"
v-else
>
{{
addMsg
.
StudyDate
}}
</text>
</view>
</view>
<view
class=
"box-top"
style=
"margin-top: 15px;"
v-if=
"
orderList.length>0
"
>
<view
class=
"box-top"
style=
"margin-top: 15px;"
v-if=
"
data.orderList.length>0 && data.StudentNumType==1
"
>
<view
class=
"row-c"
>
<view
style=
"font-size: 14px;color: #111111;font-weight: bold;"
>
已预约的时间段
</view>
<view
style=
"font-size: 14px;color: #111111;font-weight: bold;"
>
已预约的时间段
<
text
style=
"font-size: 11px;color: #666666;"
>
(下列的时间段不能预约)
</text><
/view>
</view>
<view
class=
""
></view>
<view
class=
"olist"
>
<view
class=
"olist-item"
v-for=
"(item,index) in data.orderList"
:key=
'index'
:style=
"
{background:mainColor}">
{{
item
.
StartStudyDate
}}
-
{{
item
.
EndStudyDate
}}
</view>
</view>
</view>
</view>
<view
style=
"width: 100%;height: 130px;"
></view>
<view
class=
"bottoms"
>
<view
class=
"bottoms-box"
@
click=
"xiadan"
>
支付
{{
addMsg
.
TotalPointNum
}}
点
</view>
<view
style=
"font-size: 11px;color: #666666;"
>
*需要订阅了才能预约下单
</view>
</view>
<u-picker
mode=
"time"
v-model=
"show"
:params=
"params"
@
confirm =
'confirm'
></u-picker>
</view>
...
...
@@ -169,6 +196,9 @@
this
.
classDay
=
cday
this
.
ifvalue
=
cday
this
.
totalsc
()
if
(
this
.
data
.
StudentNumType
==
2
){
this
.
addMsg
.
StudyDate
=
this
.
data
.
StudyStartDate
}
}
);
...
...
@@ -192,23 +222,39 @@
data
:
this
.
addMsg
},
res
=>
{
},
failed
=>
{
this
.
addMsg
.
StudyDate
=
''
}
);
},
xiadan
(){
let
that
=
this
;
if
(
that
.
addMsg
.
TotalPointNum
==
''
){
if
(
that
.
addMsg
.
StudyDate
==
''
){
uni
.
showToast
({
title
:
'请选择预约时间'
,
icon
:
'none'
})
return
}
that
.
addMsg
.
StudyDate
=
that
.
data
.
StudyDateStr
+
' '
+
that
.
addMsg
.
StudyDate
+
':00'
uni
.
requestSubscribeMessage
({
tmplIds
:
that
.
data
.
template_message_list
,
success
(
res
)
{
that
.
request2
({
//提交订单
url
:
'/api/AppletPoint/GetSetTeacherCourseOrder'
,
data
:
that
.
addMsg
},
res
=>
{
uni
.
showToast
({
title
:
res
.
message
,
icon
:
'none'
})
uni
.
redirectTo
({
//下单成功跳入订单列表
url
:
"/pages/appointment/personal/studentAppointmentList"
,
});
}
);
},
fail
(
err
){
uni
.
showToast
({
...
...
@@ -232,6 +278,7 @@
}
.confirmAppointment
.box
{
padding
:
0
15px
;
}
.box-top
{
background
:
#FFFFFF
;
...
...
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