diff --git a/pages/index/index.vue b/pages/index/index.vue index 4a795ad..303c045 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1553,17 +1553,18 @@ page { border-radius: 15px 15px 0 0; padding: 0 30rpx; height: 60rpx; - margin-top: 8rpx; + margin-top: 12rpx; justify-content: space-between; } .wztext { - width: 80px; + width: 200rpx; overflow: hidden; //text-overflow: ellipsis; white-space: nowrap; } + .dengjibox { position: relative; width: 100%; diff --git a/pages/order/index.vue b/pages/order/index.vue index 84a6e5d..5acc3ee 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -5,16 +5,16 @@ - - + + - - - - {{ userName }} + + + + {{ userName }} 已上线 已离线 @@ -52,23 +52,23 @@ --> + + - - + style="padding: 0 16px;width: 100%;min-height: 100vh; background: #f5f5f5;"> - (订单已超时) 待服务 - 已完成待评价 + 已完成待评价 已完成 服务中 @@ -85,7 +85,7 @@ - + @@ -96,15 +96,16 @@ {{ item.title }} - - 实收:¥{{ item.artificerMoneyTotal - }} - - {{ item.address }} - + + ¥{{ item.artificerMoneyTotal + }} + + {{ item.address }} + + @@ -873,7 +874,6 @@ align-items: center; } .order-status{ - width: 90%; display: flex; flex-direction: row; } @@ -894,8 +894,10 @@ color: #fe9130; } .flex-sub{ - text-align: right; + width: 95%; + text-align: left; font-size: 28rpx; + margin-top: 8rpx; } .top-title{ width: 95%; @@ -1007,33 +1009,18 @@ .ding-view{ width: 95%; height: 290rpx; - background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88); - border-radius: 24rpx; - margin: 10px auto 0px auto; display: flex; flex-direction: row; justify-content: space-between; padding:30rpx; } - .content{ - width: 100%; - min-height: 100vh; - background-image: url('../../static/index/swim.jpg'); - background-repeat: no-repeat; - background-size: 100% 100%; - display: flex; - flex-direction: column; - align-items: center; - padding: 10px 0px; - } - .u-tabs { padding: 16px; width: 90%; height: 199rpx; // background: #F7F7F7 !important; border-radius: 21rpx; - margin: -70px auto 10px auto; + margin: -126px auto 8px auto; } /deep/.u-scroll-view { @@ -1050,7 +1037,6 @@ /deep/.u-tab-bar { display: none !important; } - .sticky-tabs { width: 100%; z-index: 990; @@ -1150,4 +1136,26 @@ font-weight: bold; } + .jishi-index-title{ + width: 100%; + text-align: center; + font-weight: bold; + font-size: 33rpx; + color: #FFFFFF; + padding-top: 20px; + } + .jishi-index{ + width: 100%; + height: 230px; + padding: 0 20px; + background:url('../../static/index/technician15.png'); + background-repeat: no-repeat; + background-size: 100%; + } + .padding-order{ + padding: 10rpx 20rpx; + } + .text-cut{ + width: 95%; + } \ No newline at end of file