Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
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
李俊赕
self-support
Commits
3b7f1e29
Commit
3b7f1e29
authored
Jul 10, 2021
by
Facius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预约报备bug修复
parent
3b230076
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
6 deletions
+15
-6
.env.js
.env.js
+1
-1
appoint-time.vue
src/components/appoint/appoint-time.vue
+3
-0
feedback.vue
src/pages/order/feedback.vue
+11
-5
No files found.
.env.js
View file @
3b7f1e29
(
function
()
{
let
NODE_ENV
=
'test'
;
// dev:开发环境 | test:测试环境 | prod:生产环境
let
ENV_VAR
=
null
;
let
VERSION_NUMBER
=
'1.3.1
3
'
;
//版本号
let
VERSION_NUMBER
=
'1.3.1
2
'
;
//版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
if
(
process
.
env
.
NODE_ENV
===
"development"
)
{
if
(
NODE_ENV
===
'dev'
)
{
...
...
src/components/appoint/appoint-time.vue
View file @
3b7f1e29
...
...
@@ -143,6 +143,9 @@
this
.
initAppointRange
()
this
.
currentDayIndex
=
index
this
.
$emit
(
'date-change'
,
data
)
if
(
this
.
appointRange
)
{
this
.
$emit
(
'time-change'
,
{
item
:{
pkey
:
this
.
appointRange
,
name
:
this
.
appointRangeText
}})
}
},
timeChange
(
item
,
index
,
list
)
{
let
data
=
{
...
...
src/pages/order/feedback.vue
View file @
3b7f1e29
...
...
@@ -251,7 +251,7 @@ export default {
self
.
showRemark
=
true
;
if
(
self
.
dateList
&&
self
.
timeList
)
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
if
(
self
.
dateItem
if
(
self
.
dateItem
&&
self
.
dateItem
.
timeRange
&&
self
.
dateItem
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
||
item
.
isEnd
)
{
item
.
disabled
=
true
;
}
else
{
...
...
@@ -326,7 +326,7 @@ export default {
self
.
dateItem
=
data
.
item
if
(
self
.
trace
.
reasonType
==
'改约'
)
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
if
(
data
.
item
.
pkey
.
indexOf
(
item
.
pkey
)
>
-
1
)
{
if
(
data
.
item
.
timeRange
&&
data
.
item
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
||
item
.
isEnd
)
{
item
.
disabled
=
true
;
}
else
{
item
.
disabled
=
false
;
...
...
@@ -360,11 +360,17 @@ export default {
let
params
=
this
.
$u
.
deepClone
(
self
.
trace
);
if
(
self
.
trace
.
reasonType
!=
'改约'
)
{
if
(
self
.
timeItem
&&
self
.
timeItem
.
pkey
&&
self
.
traceDate
){
let
traceDate
=
self
.
moment
(
self
.
traceDate
);
let
timeArr
=
self
.
timeItem
.
pkey
.
split
(
"_"
)
let
hours
=
timeArr
&&
timeArr
.
length
&&
timeArr
.
pop
()
let
traceDateTime
=
traceDate
.
clone
().
add
(
Number
(
hours
),
'hours'
);
params
.
nextTraceDatetime
=
traceDateTime
.
unix
()
*
1000
if
(
self
.
timeItem
.
pkey
==
'appointment_range_24'
)
{
let
traceDateTime
=
traceDate
.
clone
().
add
(
23
,
'hours'
).
add
(
59
,
'minutes'
)
params
.
nextTraceDatetime
=
traceDateTime
.
unix
()
*
1000
}
else
{
let
hours
=
timeArr
&&
timeArr
.
length
&&
timeArr
.
pop
()
let
traceDateTime
=
traceDate
.
clone
().
add
(
Number
(
hours
),
'hours'
);
params
.
nextTraceDatetime
=
traceDateTime
.
unix
()
*
1000
}
}
}
else
{
params
.
appointmentDatetime
=
self
.
traceDate
...
...
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