diff --git a/components/DateRangePicker/DateRangePicker.vue b/components/DateRangePicker/DateRangePicker.vue index 1c2c7ce..c5e3882 100644 --- a/components/DateRangePicker/DateRangePicker.vue +++ b/components/DateRangePicker/DateRangePicker.vue @@ -3,9 +3,12 @@ - 选择日期范围 + 查看可预约日期 + + + 请选择入住日期 + {{ ` 共计${minBookingDays}天 ` }} - @@ -14,7 +17,7 @@ - + {{ day }} @@ -496,7 +499,7 @@ export default { .month-nav { display: flex; align-items: center; - justify-content: space-between; + justify-content: space-evenly; margin-bottom: 20rpx; padding: 0 20rpx; diff --git a/pkg_product/views/groupBuyDetails.vue b/pkg_product/views/groupBuyDetails.vue index 0e0e7c6..fc75047 100644 --- a/pkg_product/views/groupBuyDetails.vue +++ b/pkg_product/views/groupBuyDetails.vue @@ -78,7 +78,12 @@ - + + + + + + {{ c.title }} - 套餐亮点 + + 预定必读 + + @@ -307,13 +315,13 @@ export default { contactService() { uni.showModal({ title: '商家电话', - content: this.detail.phone || '暂无电话', + content: this.detail.merPhone || '暂无电话', confirmText: '立即拨打', cancelText: '取消', success: (res) => { - if (res.confirm && this.detail.phone) { + if (res.confirm && this.detail.merPhone) { uni.makePhoneCall({ - phoneNumber: this.detail.phone, + phoneNumber: this.detail.merPhone, fail: () => { uni.showToast({ title: '拨打电话失败', @@ -692,4 +700,17 @@ export default { .table-cell:last-child { border-right: 0; } +.title-wrap{ + position: relative; + &::after{ + content: ''; + position: absolute; + bottom: 4rpx; + left: 0; + width: 6rpx; + height: 80%; + border-radius: 10rpx; + background: #CE4852; + } +} \ No newline at end of file diff --git a/pkg_product/views/housekeeperDetail.vue b/pkg_product/views/housekeeperDetail.vue index 46b8408..79bc753 100644 --- a/pkg_product/views/housekeeperDetail.vue +++ b/pkg_product/views/housekeeperDetail.vue @@ -49,7 +49,7 @@ {{ record.intro }} - + 金牌管家 / 服务保障 @@ -60,9 +60,11 @@ TA能帮你 - - - 设计行程 + + + + + {{ item.serviceName }} @@ -275,6 +277,9 @@ export default { height: 88rpx; background: #FADE9F; border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; } .icon-grid{ display: grid; @@ -306,4 +311,17 @@ export default { align-items: center; justify-content: center; } +.title-wrap{ + position: relative; + &::after{ + content: ''; + position: absolute; + bottom: 0; + left: 0; + width: 6rpx; + height: 80%; + border-radius: 10rpx; + background: #CE4852; + } +} \ No newline at end of file diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue index 42dd88f..47d17a8 100644 --- a/pkg_product/views/sojoumStore.vue +++ b/pkg_product/views/sojoumStore.vue @@ -1306,12 +1306,13 @@ export default { right: 0; margin: auto; text-align: center; + background: rgba(0,0,0,0.3); } .gg{ border-radius: 120rpx; background: #FADE9F; padding: 6rpx 5rpx; color: #333; - translate: 0% -10%; + margin-top: -28rpx; } \ No newline at end of file diff --git a/pkg_product/views/submitOrder.vue b/pkg_product/views/submitOrder.vue index 96e2657..03bcc44 100644 --- a/pkg_product/views/submitOrder.vue +++ b/pkg_product/views/submitOrder.vue @@ -203,7 +203,25 @@ export default { return `${y}-${m}-${day}` }, contactMerchant() { - uni.showToast({ title: '已为您接入管家', icon: 'none' }) + uni.showModal({ + title: '商家电话', + content: this.form.merPhone || '暂无电话', + confirmText: '立即拨打', + cancelText: '取消', + success: (res) => { + if (res.confirm && this.detail.merPhone) { + uni.makePhoneCall({ + phoneNumber: this.detail.merPhone, + fail: () => { + uni.showToast({ + title: '拨打电话失败', + icon: 'none' + }) + } + }) + } + } + }) }, submitOrder() { if (!this.form.name || !this.form.phone) {