diff --git a/service-uniapp-client/components/base/m-navbar.vue b/service-uniapp-client/components/base/m-navbar.vue index 88c79ae..ebc84e4 100644 --- a/service-uniapp-client/components/base/m-navbar.vue +++ b/service-uniapp-client/components/base/m-navbar.vue @@ -29,11 +29,11 @@ top: 0; width: 100%; height: 90rpx; - background: linear-gradient(to right, #4899a6, #6fc6ad); + background: linear-gradient(to right, #ecb978, #ffe6ed); + color: #6e3009; display: flex; justify-content: center; align-items: center; - color: #fff; font-size: 26rpx; z-index: 9999; .leftClick{ diff --git a/service-uniapp-client/components/technicianList.vue b/service-uniapp-client/components/technicianList.vue index e3b49a7..85f281c 100644 --- a/service-uniapp-client/components/technicianList.vue +++ b/service-uniapp-client/components/technicianList.vue @@ -148,10 +148,10 @@ bottom: -13rpx; width: 70%; height: 40rpx; - background: #60C285; border-radius: 10rpx; - color: white; transform: translate(-50%); + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; .desc { font-size: 18rpx; @@ -215,11 +215,11 @@ .appointed-time { width: 48%; - background: #E7FDF7; height: 40rpx; border-radius: 22.5rpx; font-size: 20rpx; - color: #5DB9A3; + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; .capsule { display: flex; @@ -232,9 +232,9 @@ justify-content: center; width: 50%; height: 100%; - color: white; border-radius: 20rpx; - background: #52CFB0; + background: #6e3009; + color: #fff; } .today { @@ -308,8 +308,8 @@ height: 60rpx; width: 180rpx; border-radius: 40rpx; - color: white; - background: linear-gradient(170deg, #53CEAC, #5AC796); + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; } .notAvailable { @@ -332,8 +332,8 @@ height: 20px; line-height: 20px; font-size: 12px; - background-color: #E7FDF7; border-radius: 20px; + background-color: #E7FDF7; color: #98D6C7; } diff --git a/service-uniapp-client/pages/index/center.vue b/service-uniapp-client/pages/index/center.vue index 4354c5b..ea8f04d 100644 --- a/service-uniapp-client/pages/index/center.vue +++ b/service-uniapp-client/pages/index/center.vue @@ -29,7 +29,9 @@ - + 账号余额 @@ -272,7 +274,8 @@ .banner { width: 100%; height: calc(392rpx -160rpx); - background: linear-gradient(to top right, #4899a6, #6fc6ad); + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; } .head-div { @@ -287,7 +290,6 @@ font-family: PingFang SC, PingFang SC-Bold; font-weight: 700; text-align: left; - color: #fff; line-height: 42rpx; } @@ -297,7 +299,6 @@ font-family: PingFang SC, PingFang SC-Regular; font-weight: 400; text-align: left; - color: #fff; line-height: 28px; margin-top: 10rpx; } @@ -387,20 +388,19 @@ width: 200rpx; height: 58rpx; line-height: 58rpx; - background: linear-gradient(182deg, #ffffff 2%, #a6fce3 88%); border-radius: 30rpx; - box-shadow: 0 6rpx 12rpx 0 rgba(129, 209, 186, 0.66); font-size: 28rpx; font-family: PingFang SC, PingFang SC-Bold; font-weight: 700; text-align: center; - color: #3fc791; position: absolute; top: 72rpx; right: 52rpx; z-index: 1; + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; } .cart { diff --git a/service-uniapp-client/pages/index/index.vue b/service-uniapp-client/pages/index/index.vue index 7ea5b54..583b5e1 100644 --- a/service-uniapp-client/pages/index/index.vue +++ b/service-uniapp-client/pages/index/index.vue @@ -285,8 +285,9 @@ .home-top { height: 400rpx; // height: 350rpx; - background: linear-gradient(38deg, #4899A6, #60BDA2); + background: $uni-bg-color; padding-top: 60rpx; + // color: $uni-color; } .search { @@ -364,12 +365,12 @@ .right-area { .search-button { - background: #60BDA2; + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; height: 60rpx; width: 130rpx; font-size: 26rpx; border-radius: 35rpx; - color: white; display: flex; align-items: center; @@ -523,8 +524,8 @@ height: 60rpx; width: 170rpx; border-radius: 40rpx; - color: white; - background: linear-gradient(170deg, #53CEAC, #5AC796); + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; } } } diff --git a/service-uniapp-client/pages/index/order.vue b/service-uniapp-client/pages/index/order.vue index 2eca4cb..bca04d4 100644 --- a/service-uniapp-client/pages/index/order.vue +++ b/service-uniapp-client/pages/index/order.vue @@ -3,7 +3,7 @@ - @@ -223,7 +223,7 @@ .service {} .status { - color: var(--van-primary-color); + color: #6e3009; font-size: 26rpx; font-weight: 600; } @@ -245,12 +245,12 @@ } .tag { - color: var(--van-primary-color); + color: #6e3009; font-size: 24rpx; text-align: center; width: 100%; - background-color: #e7fdf7; - border: 1px solid var(--van-primary-color); + background-color: #ecb978; + border: 1px solid #6e3009; border-radius: 8rpx; padding: 2rpx 0; } @@ -287,8 +287,8 @@ } .b2 { - background: linear-gradient(178deg, #4FD3BC, #60C285); - color: #fff; + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; } view { diff --git a/service-uniapp-client/pages/index/technician.vue b/service-uniapp-client/pages/index/technician.vue index 26787f3..4e4331a 100644 --- a/service-uniapp-client/pages/index/technician.vue +++ b/service-uniapp-client/pages/index/technician.vue @@ -153,7 +153,8 @@ } .technician-top { - background: linear-gradient(38deg, #4899A6, #60BDA2); + background: #ecb978; + color: #6e3009; } .technician-bottm { @@ -162,7 +163,7 @@ font-size: 28rpx; height: 110rpx; align-items: center; - color: #fff; + color: #6e3009; } .technician-search { @@ -243,13 +244,12 @@ .right-area { .search-button { - background: #60BDA2; height: 60rpx; width: 130rpx; font-size: 26rpx; border-radius: 35rpx; - color: white; - + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; display: flex; align-items: center; justify-content: center; @@ -260,8 +260,8 @@ } .technician-search-button { - background-color: #60BDA2; - color: #fff; + background: linear-gradient(178deg, #ffe6ed, #ecb978); + color: #6e3009; font-size: 26rpx; padding: 2rpx 24rpx; border-radius: 40rpx; diff --git a/service-uniapp-client/pages/mine/coupon.vue b/service-uniapp-client/pages/mine/coupon.vue index d3545c6..5e93cc5 100644 --- a/service-uniapp-client/pages/mine/coupon.vue +++ b/service-uniapp-client/pages/mine/coupon.vue @@ -2,12 +2,11 @@ - + - + {{ getStatus(msgOrder.state) }} @@ -16,7 +16,9 @@ - @@ -397,7 +399,7 @@ \ No newline at end of file diff --git a/service-uniapp-technician/static/ms/1120.jpg b/service-uniapp-technician/static/ms/1120.jpg new file mode 100644 index 0000000..52cff65 Binary files /dev/null and b/service-uniapp-technician/static/ms/1120.jpg differ diff --git a/service-uniapp-technician/static/ms/tx1.png b/service-uniapp-technician/static/ms/tx1.png new file mode 100644 index 0000000..44b5a39 Binary files /dev/null and b/service-uniapp-technician/static/ms/tx1.png differ