Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_wechat
Overview
Overview
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
pseer
gxpt_wechat
Commits
90ab08af
Commit
90ab08af
authored
Nov 18, 2023
by
zhangzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
细节优化
parent
101c0816
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
7 deletions
+10
-7
index.config.js
config/index.config.js
+1
-1
pages.json
pages.json
+8
-2
order.vue
pages/order/order.vue
+1
-4
No files found.
config/index.config.js
View file @
90ab08af
...
@@ -14,7 +14,7 @@ const CONFIG = {
...
@@ -14,7 +14,7 @@ const CONFIG = {
// 生产环境配置
// 生产环境配置
production
:
{
production
:
{
assetsPath
:
'https://www.coujio.com/wechat_static'
,
// 静态资源路径
assetsPath
:
'https://www.coujio.com/wechat_static'
,
// 静态资源路径
baseUrl
:
'http://www.coujio.com/front-api'
,
// 后台接口请求地址
baseUrl
:
'http
s
://www.coujio.com/front-api'
,
// 后台接口请求地址
hostUrl
:
'https://www.coujio.com/prod-api'
,
// H5地址(前端运行地址)
hostUrl
:
'https://www.coujio.com/prod-api'
,
// H5地址(前端运行地址)
websocketUrl
:
''
,
// websocket服务端地址
websocketUrl
:
''
,
// websocket服务端地址
weixinAppId
:
''
,
// 微信公众号appid
weixinAppId
:
''
,
// 微信公众号appid
...
...
pages.json
View file @
90ab08af
...
@@ -140,8 +140,14 @@
...
@@ -140,8 +140,14 @@
"path"
:
"pages/setUserInfo/index"
,
"path"
:
"pages/setUserInfo/index"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"资料修改"
,
"navigationBarTitleText"
:
"资料修改"
,
"enablePullDownRefresh"
:
false
,
"enablePullDownRefresh"
:
false
"navigationStyle"
:
"custom"
}
},
{
"path"
:
"pages/payRecord/index"
,
"style"
:
{
"navigationBarTitleText"
:
"消费记录"
,
"enablePullDownRefresh"
:
false
}
}
}
}
...
...
pages/order/order.vue
View file @
90ab08af
...
@@ -549,18 +549,15 @@
...
@@ -549,18 +549,15 @@
if
(
end
<
start
)
{
if
(
end
<
start
)
{
end
+=
24
end
+=
24
}
}
// 重新将数据还原到元数据
// 重新将数据还原到元数据
this
.
intervalList
=
[
this
.
intervalList
=
[
...
this
.
dateIntervalList
...
this
.
dateIntervalList
]
]
for
(
start
;
start
<=
end
;
start
++
)
{
for
(
start
;
start
<=
end
;
start
++
)
{
// 在时间小时段内,在被占用的情况下,新增订单的开始分钟时间需要占用结束时间后,结束分钟时间需在时间占用开始前
// 在时间小时段内,在被占用的情况下,新增订单的开始分钟时间需要占用结束时间后,结束分钟时间需在时间占用开始前
if
(
this
.
dateIntervalList
[
start
].
status
===
1
if
(
this
.
dateIntervalList
[
start
].
status
===
1
&&
startM
<
moment
(
this
.
dateIntervalList
[
start
].
endHoldTime
).
format
(
"mm"
)
&&
startM
<
moment
(
this
.
dateIntervalList
[
start
].
endHoldTime
).
format
(
"mm"
)
&&
endM
>
moment
(
this
.
dateIntervalList
[
start
].
startHoldTime
).
format
(
"mm"
)
&&
endM
>
=
moment
(
this
.
dateIntervalList
[
start
].
startHoldTime
).
format
(
"mm"
)
)
{
)
{
// 表示时间点被占用,无法选择
// 表示时间点被占用,无法选择
this
.
useDateStatus
=
false
this
.
useDateStatus
=
false
...
...
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