diff --git a/h5/common/WeeklyCalendar.vue b/h5/common/WeeklyCalendar.vue index c0c8fb0..cb384b4 100644 --- a/h5/common/WeeklyCalendar.vue +++ b/h5/common/WeeklyCalendar.vue @@ -20,7 +20,7 @@ - {{item.time.substring(0, 5)}} + {{item.time.substring(0, 5)}} @@ -170,11 +170,6 @@ /* background-color: #239EA3; */ color: #008F96 !important; } - .selectedtime{ - background-color: #239EA3; - color: #fff !important; - } - .zhou_title { font-size: 28rpx; margin-top: 6rpx; @@ -226,37 +221,32 @@ } .timelist { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - justify-content: flex-start; - } - - .timelist::after { - content: ''; - flex: auto; - /* 或者 flex: 1; */ + display: grid; + grid-template-columns: repeat(6, 1fr); + grid-row-gap: 30px; + column-gap: 0; + margin-top: 30px; } .time { - font-size: 28rpx; - + width: 100%; + height: 30px; + line-height: 30px; text-align: center; - margin-top: 40rpx; - border-radius: 14rpx; - padding: 10rpx 16rpx; - flex: 0 0 calc(16.3% - 32rpx); - /* 假设一行有4个项目,减去想要的间隔 */ - - /* 设置右侧边距 */ - color: #008F96; - + border-radius: 7px; + font-size: 15px; + color: #239ea3; + font-weight: 600; + box-sizing: border-box; } - .time:nth-child(6n) { - margin-right: 0; + .selectedtime { + background-color: #239ea3; + color: #fff !important; } - .used{ - color:#B5B5B6; + + .used { + color: #a5a5a5; + font-weight: normal; } \ No newline at end of file diff --git a/h5/config.js b/h5/config.js index f98386b..0343f3d 100644 --- a/h5/config.js +++ b/h5/config.js @@ -1,7 +1,7 @@ const app_type = 'gzh' //const base_url = "https://api.hainan2024.sa0.online" //开发环境 -const base_url="https://tj-h5.hnxdfe.com" //正式环境 -//const base_url="http://124.225.137.54:39081" //测试环境 +//const base_url="https://tj-h5.hnxdfe.com" //正式环境 +const base_url="http://124.225.137.54:39081" //测试环境 const config = { api_map_url: base_url + '/api/ApiMap/h5', base_assets_url: base_url,