diff --git a/components/VNavigationBar.vue b/components/VNavigationBar.vue index 94daa16..a2f6ae2 100644 --- a/components/VNavigationBar.vue +++ b/components/VNavigationBar.vue @@ -27,9 +27,10 @@ export default { default: '#fff' } }, - onLoad() { + mounted() { // #ifdef MP const {barHeight, barTop, menuButtonLeft} = getWXStatusHeight() + console.log('barHeight, barTop, menuButtonLeft: ',barHeight, barTop, menuButtonLeft); this.homeHeaderPaddingTop = barTop || 0 this.homeHeaderMenuHeight = barHeight this.homeHeaderMenuLeft = menuButtonLeft - 6 diff --git a/pages/message/message.vue b/pages/message/message.vue index 5b0480d..842d3b7 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -3,7 +3,7 @@ - + {{ group.date }} diff --git a/pages/rescue/rescue.vue b/pages/rescue/rescue.vue index 2ffd993..916eb84 100644 --- a/pages/rescue/rescue.vue +++ b/pages/rescue/rescue.vue @@ -82,7 +82,7 @@ - + + @@ -138,7 +148,7 @@ - + @@ -198,7 +208,7 @@ - + 车辆提醒 @@ -229,6 +239,27 @@ export default { data() { return { + busiTypeList: [{ + label: '拖车', + icon: require('@/static/icons/order/tuoche.png') + }, + { + label: '送油', + icon: require('@/static/icons/order/songyou.png') + }, + { + label: '搭电', + icon: require('@/static/icons/order/dadian.png') + }, + { + label: '换胎', + icon: require('@/static/icons/order/huantai.png') + }, + // { + // label: '扣车', + // icon: require('@/static/icons/order/tuoche.png') + // }, + ], topMenuList: [ { title: '我的订单', @@ -413,6 +444,7 @@ }) }, register() { //注册 + // #ifdef APP console.log('keepAlive', keepAlivePlugin); keepAlivePlugin.register({ channelId: this.keepLive.channelId, @@ -423,6 +455,7 @@ (res) => { console.log('保活注册', res); }); + // #endif }, deleteOrderHandle() { this.pageNum = 1 @@ -697,6 +730,9 @@ background-image: url('~@/static/images/homeOrderCard/dzf.png'); background-size: cover; background-position: center; + display: flex; + flex-direction: column; + justify-content: center; } .boxf1 { @@ -708,6 +744,9 @@ background-image: url('~@/static/images/homeOrderCard/dqc.png'); background-size: cover; background-position: center; + display: flex; + flex-direction: column; + justify-content: center; } .boxf2 { @@ -719,6 +758,9 @@ background-image: url('~@/static/images/homeOrderCard/jyz.png'); background-size: cover; background-position: center; + display: flex; + flex-direction: column; + justify-content: center; } .boxf3 { @@ -730,6 +772,9 @@ background-image: url('~@/static/images/homeOrderCard/ywc.png'); background-size: cover; background-position: center; + display: flex; + flex-direction: column; + justify-content: center; } .zi1 { @@ -979,19 +1024,76 @@ flex-wrap: wrap; } + // .xz-box { + // height: 80px; + // width: 48%; + // display: flex; + // justify-content: center; + // align-items: center; + // font-size: 16px; + // font-weight: 400; + // color: #FFFFFF; + // background-size: cover; + // background-position: center; + // margin-top: 20px; + + // } .xz-box { - height: 80px; - width: 48%; + width: 330rpx; + height: 396rpx; + background: #FFFFFF; + box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.06); + border-radius: 16rpx; display: flex; + flex-direction: column; justify-content: center; align-items: center; font-size: 16px; font-weight: 400; color: #FFFFFF; - background-size: cover; - background-position: center; - margin-top: 20px; - + margin-top: 36rpx; + transition: all ease 400ms; + overflow: hidden; + + .checkedFlagIcon { + display: none; + } + + &.checked { + box-sizing: border-box; + position: relative; + border: 2rpx solid #478AFA; + + .checkedFlag { + background-color: #478AFA; + width: 120rpx; + height: 120rpx; + position: absolute; + right: -60rpx; + bottom: -60rpx; + transform: rotate(45deg); + z-index: 1; + } + + .checkedFlagIcon { + display: inline-block; + position: absolute; + z-index: 2; + bottom: 0; + right: 0; + } + } + + .xz-box-icon { + width: 130rpx; + height: 130rpx; + margin-bottom: 26rpx; + } + + .box-wenzi { + font-size: 28rpx; + color: #000000; + } } #y1 {