diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index d331fb0..3002d58 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -2103,7 +2103,8 @@
justify-content: space-between;
border-bottom: 1px solid #E5E5E5;
padding-bottom: 15px;
- margin-bottom: 7px;
+ margin-bottom: 15px;
+ margin-top: 5px;
}
.mian-top{
width: 100%;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5e6b69f..7e8eff1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -120,7 +120,7 @@
style="justify-content: space-evenly;text-align: center;">
{{ currentWholeIncome ? currentWholeIncome : 0 }}
- 当前业绩
+ 当前业绩
@@ -425,6 +425,18 @@
今日服务
+
+
+
+ 服务倒计时
+
+
+
+
@@ -444,18 +456,7 @@
-
-
-
- 服务倒计时
-
-
-
-
+
-
+
-
@@ -67,41 +67,41 @@
(订单已超时)
- 待服务
+ 待服务
已完成待评价
- 已完成
- 服务中
- 技师出发
- 技师到达
- 确认接单
+ 已完成
+ 服务中
+ 技师出发
+ 技师到达
+ 确认接单
- 预约时间:{{ item.serveTime }}
+ 预约时间:{{ item.serveTime }}
拒单审核中...
-
+
-
-
+
+
{{ item.title }}
-
- 实收:¥{{ item.artificerMoneyTotal
+
+ 实收:¥{{ item.artificerMoneyTotal
}}
- {{ item.address }}
+ {{ item.address }}
@@ -114,7 +114,7 @@
@click="goNav('/my/order/pay?id=' + item.ordersId + '&isTrue=1')">查看详情 -->
更多
-
+
联系客服
- 服务倒计时
+ 服务倒计时
@@ -242,11 +242,11 @@
}, {
activityImageProps: {
src: '../../static/images/order_02.png',
- style: 'width: 26px;height: 26px;',
+ style: 'width: 30px;height: 30px;',
},
noactivityImageProps: {
src: '../../static/images/order_022.png',
- style: 'width: 26px;height: 26px;',
+ style: 'width: 30px;height: 30px;',
},
activityTitleTextProps: {
class: 'activityTitleTextProps',
@@ -259,11 +259,11 @@
}, {
activityImageProps: {
src: '../../static/images/order_03.png',
- style: 'width: 26px;height: 26px;',
+ style: 'width: 30px;height: 30px;',
},
noactivityImageProps: {
src: '../../static/images/order_033.png',
- style: 'width: 26px;height: 26px;',
+ style: 'width: 30px;height: 30px;',
},
activityTitleTextProps: {
class: 'activityTitleTextProps',
@@ -276,11 +276,11 @@
}, {
activityImageProps: {
src: '../../static/images/order_04.png',
- style: 'width: 26px;height: 26px;',
+ style: 'width: 30px;height: 30px;',
},
noactivityImageProps: {
src: '../../static/images/order_044.png',
- style: 'width: 26px;height: 26px;',
+ style: 'width: 28px;height: 30px;',
},
activityTitleTextProps: {
class: 'activityTitleTextProps',
@@ -872,6 +872,11 @@
flex-direction: row;
align-items: center;
}
+ .order-status{
+ width: 90%;
+ display: flex;
+ flex-direction: row;
+ }
.showBtn{
justify-content: space-between;
}
@@ -885,11 +890,12 @@
}
/deep/.text-xl{
- font-size: 15px;
+ font-size: 34rpx;
+ color: #fe9130;
}
.flex-sub{
text-align: right;
- font-size: 13px;
+ font-size: 28rpx;
}
.top-title{
width: 95%;
@@ -1004,10 +1010,10 @@
background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
border-radius: 24rpx;
margin: 10px auto 0px auto;
- align-items: end;
display: flex;
flex-direction: row;
justify-content: space-between;
+ padding:30rpx;
}
.content{
width: 100%;
@@ -1018,7 +1024,7 @@
display: flex;
flex-direction: column;
align-items: center;
- padding: 30px 0px;
+ padding: 10px 0px;
}
.u-tabs {
@@ -1031,7 +1037,7 @@
}
/deep/.u-scroll-view {
- padding: 10px 16px !important;
+ padding: 10px 0px !important;
}
/deep/.u-tab-item {
@@ -1054,7 +1060,7 @@
}
/deep/.activityTitleTextProps {
- color: #096f4b;
+ color: #019c88;
font-size: 14px;
}
@@ -1094,7 +1100,7 @@
width: 100%;
height: 1rpx;
border: 1rpx solid #f8f8f8;
- margin-top: 20rpx;
+ margin-bottom: 20rpx;
}
.pintuan_syrs {
@@ -1125,4 +1131,22 @@
margin-right: 8rpx;
}
}
+ .head-port{
+ width: 110rpx;
+ height: 110rpx;
+ border-radius: 50%;
+ border: 1px #d6f2ee solid;
+ }
+ /deep/.radius {
+ border-radius: 20rpx;
+ }
+ .progress-status{
+ color: #019c88;
+ font-weight: bold;
+ font-size: 30rpx;
+ }
+ .order-details{
+ font-size: 34rpx;
+
+ }
\ No newline at end of file
diff --git a/static/images/order_01.png b/static/images/order_01.png
index 2dec70e..b52b6eb 100644
Binary files a/static/images/order_01.png and b/static/images/order_01.png differ
diff --git a/static/images/order_011.png b/static/images/order_011.png
index 7fdc04b..1915fd9 100644
Binary files a/static/images/order_011.png and b/static/images/order_011.png differ
diff --git a/static/images/order_02.png b/static/images/order_02.png
index eb606b6..77790a9 100644
Binary files a/static/images/order_02.png and b/static/images/order_02.png differ
diff --git a/static/images/order_022.png b/static/images/order_022.png
index 9b7bffb..67e2145 100644
Binary files a/static/images/order_022.png and b/static/images/order_022.png differ
diff --git a/static/images/order_03.png b/static/images/order_03.png
index 672fc04..0eb1fbd 100644
Binary files a/static/images/order_03.png and b/static/images/order_03.png differ
diff --git a/static/images/order_033.png b/static/images/order_033.png
index a046e2b..cc3e816 100644
Binary files a/static/images/order_033.png and b/static/images/order_033.png differ
diff --git a/static/images/order_04.png b/static/images/order_04.png
index 7b9a7c2..c476328 100644
Binary files a/static/images/order_04.png and b/static/images/order_04.png differ
diff --git a/static/images/order_044.png b/static/images/order_044.png
index b9fa0dc..51218ce 100644
Binary files a/static/images/order_044.png and b/static/images/order_044.png differ