diff --git a/pagesB/CommodityOrder/CommodityOrder.vue b/pagesB/CommodityOrder/CommodityOrder.vue index bd7067d..4cab753 100644 --- a/pagesB/CommodityOrder/CommodityOrder.vue +++ b/pagesB/CommodityOrder/CommodityOrder.vue @@ -168,6 +168,7 @@ methods: { //点击tabs tabschange(index) { + console.log(this.tabslist) this.tabscurrent = index; this.orderStatus = this.tabslist[index].orderStatus this.goodsOrderinfo(); @@ -376,4 +377,4 @@ \ No newline at end of file + diff --git a/pagesB/ServiceDetails/ServiceDetails.vue b/pagesB/ServiceDetails/ServiceDetails.vue index 772fc65..b348358 100644 --- a/pagesB/ServiceDetails/ServiceDetails.vue +++ b/pagesB/ServiceDetails/ServiceDetails.vue @@ -88,7 +88,7 @@ 立即评价 - 去支付 diff --git a/pagesB/appointmenttime/appointmenttime.scss b/pagesB/appointmenttime/appointmenttime.scss index 0c7873f..168d514 100644 --- a/pagesB/appointmenttime/appointmenttime.scss +++ b/pagesB/appointmenttime/appointmenttime.scss @@ -1,8 +1,8 @@ .app { - font-size: 34rpx; - padding-top: 10rpx; - height: 100%; - -webkit-overflow-scrolling: touch; + ::v-deep .u-checkbox__icon-wrap--checked.data-v-532d01c7{ + background:#26A888 !important; + border: 1rpx solid #26A888 !important; + } .mask { .Agreement { width: 100%; @@ -115,17 +115,18 @@ border-radius: 5rpx; font-size: 28rpx; line-height: 86rpx; - border: 2rpx solid #DADADA; + border: 2rpx solid #26A888; } .timeitemtap{ width: 21%; margin: 0 2% 20rpx; height: 86rpx; - border: 2rpx solid #F44B2F; + border: 2rpx solid #26A888; border-radius: 5rpx; font-size: 28rpx; - color: #F44B2F; + color: #26A888; line-height: 86rpx; + background: #E6F8F3; } } } @@ -146,7 +147,7 @@ } .Soonerorlaterclass{ font-size: 36rpx; - color: #F44B2F; + color: #26A888; width: 200rpx; height: 50rpx; } @@ -382,4 +383,4 @@ text-align: center; line-height: 96rpx; } - } \ No newline at end of file + } diff --git a/pagesB/appointmenttime/appointmenttime.vue b/pagesB/appointmenttime/appointmenttime.vue index 5114fa9..5fac0a7 100644 --- a/pagesB/appointmenttime/appointmenttime.vue +++ b/pagesB/appointmenttime/appointmenttime.vue @@ -17,7 +17,7 @@ 上门时间: 请您选择希望护理员到达的时间 - + diff --git a/pagesB/confirmation/confirmation.vue b/pagesB/confirmation/confirmation.vue index 6fe65ee..ab2dfc1 100644 --- a/pagesB/confirmation/confirmation.vue +++ b/pagesB/confirmation/confirmation.vue @@ -15,7 +15,7 @@ {{item.week}} @@ -339,7 +339,7 @@ .submit { width: 186rpx; height: 70rpx; - background: #F44B2F; + background: #26A888; color: #FFFFFF; border-radius: 30rpx; line-height: 70rpx; @@ -384,7 +384,7 @@ } .submits { - background: #F44B2F; + background: #26A888; width: 501rpx; height: 71rpx; line-height: 71rpx; diff --git a/pagesB/medicine/medicine.scss b/pagesB/medicine/medicine.scss index 2373ae3..f63ac11 100644 --- a/pagesB/medicine/medicine.scss +++ b/pagesB/medicine/medicine.scss @@ -111,7 +111,7 @@ .actives { width: 80%; - color: red; + color: #26A888; font-size: 34rpx; overflow: hidden; text-overflow: ellipsis; @@ -208,7 +208,7 @@ right: 30rpx; width: 125rpx; height: 52rpx; - background: #F44B2F; + background: #26A888; border-radius: 26rpx; color: #fff; line-height: 52rpx; diff --git a/pagesB/nursestation/nursestation.scss b/pagesB/nursestation/nursestation.scss index be545df..05f4632 100644 --- a/pagesB/nursestation/nursestation.scss +++ b/pagesB/nursestation/nursestation.scss @@ -19,7 +19,7 @@ height: 100%; width: 100%; } - + .mask { .information { width: 70%; @@ -30,7 +30,7 @@ text-align: center; color: #FFFFFF; position: relative; - + .determine, .cancel { width: 200rpx; @@ -41,23 +41,23 @@ position: absolute; top: 74%; } - + .determine { background: #26A888; right: 36rpx; } - + .cancel { background: #C5BFBF; left: 36rpx; } - + .title { font-size: 42rpx; margin-top: 40rpx; color: #000000; } - + image { width: 100rpx; height: 100rpx; @@ -111,7 +111,7 @@ height: 52rpx; border-radius: 26rpx; color: #ffffff; - background: #F44B2F; + background: #26A888; text-align: center; line-height: 52rpx; position: absolute; @@ -119,7 +119,7 @@ right:5%; } .price { - height: 52rpx; + height: 52rpx; color: #F44B2F; line-height: 52rpx; font-size: 36rpx; @@ -157,7 +157,7 @@ -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; - white-space:normal; + white-space:normal; word-break:break-all; } .pingfen { @@ -184,7 +184,7 @@ border-radius: 4rpx; } &.active { - color: #2979ff; + color: #26A888; &::after { content: ''; width: 50%; diff --git a/pagesB/nursestation/nursestation.vue b/pagesB/nursestation/nursestation.vue index 393c70a..26c4899 100644 --- a/pagesB/nursestation/nursestation.vue +++ b/pagesB/nursestation/nursestation.vue @@ -77,7 +77,7 @@ {{item.name}} - +