Commit 90ab08af by zhangzhen

细节优化

parent 101c0816
......@@ -14,7 +14,7 @@ const CONFIG = {
// 生产环境配置
production: {
assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径
baseUrl: 'http://www.coujio.com/front-api', // 后台接口请求地址
baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址
hostUrl: 'https://www.coujio.com/prod-api', // H5地址(前端运行地址)
websocketUrl: '', // websocket服务端地址
weixinAppId: '', // 微信公众号appid
......
......@@ -140,8 +140,14 @@
"path": "pages/setUserInfo/index",
"style": {
"navigationBarTitleText": "资料修改",
"enablePullDownRefresh" : false,
"navigationStyle": "custom"
"enablePullDownRefresh" : false
}
},
{
"path": "pages/payRecord/index",
"style": {
"navigationBarTitleText": "消费记录",
"enablePullDownRefresh" : false
}
}
......
......@@ -549,18 +549,15 @@
if (end < start) {
end += 24
}
// 重新将数据还原到元数据
this.intervalList = [
...this.dateIntervalList
]
for (start; start <= end; start++) {
// 在时间小时段内,在被占用的情况下,新增订单的开始分钟时间需要占用结束时间后,结束分钟时间需在时间占用开始前
if (this.dateIntervalList[start].status === 1
&& 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment