Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi

my/order/revenueDetails.vue

@@ -2652,7 +2652,7 @@
 		box-sizing: border-box;
 	}
 	.huiBtn{
-		background: #E2E2E2;
+		background: #f6f6f6;
 		color: #333333;
 	}
 	.lanBtn{
@@ -2760,17 +2760,16 @@
 	}
 	.popup-head{
 		width: 100%;
-		height: 99.38rpx;
 		background-color: rgba(21, 171, 141, 0.09);
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		padding: 0 15px;
+		padding:42rpx 20rpx;
 	}
 	.popup-content{
 		width: 100%;
-		height: 510px;
+		height: 540px;
 		background: #FFFFFF;
 		border-top-left-radius: 56rpx;
 		border-top-right-radius: 56rpx;

pages/index/index.vue

@@ -2,7 +2,7 @@
 	<!-- 技师实际收益公式：实付金额=（项目金额*会员比例-优惠卷）*分成比例*余额支付比例+车费 -->
 	<view style="padding-bottom: 17px;">
 		<view class="jishi-index">
-			<view class=" u-flex padding-lr" style="padding-top: 35px;">
+			<view class=" u-flex padding-lr" style="padding-top: 30px;">
 				<view class="u-m-r-10 back-img" 
 				:style="{'background-image':
 							technicianType=='3'?'url(../../static/grade1.png)':
@@ -1499,8 +1499,8 @@ export default {
 	.back-img{
 		background-repeat: no-repeat;
 		background-size: 100%;
-		width: 75px;
-		height: 75px;
+		width: 84px;
+		height: 84px;
 		border-radius: 50%;
 		display: flex;
 		align-items: center;
@@ -1558,7 +1558,7 @@ body {
 	}
 	.jishi-index{
 		width: 100%;
-		height: 265px;
+		height: 286px;
 		padding: 0 20px;
 		background-image: url('../../static/index/technician15.png');
 		background-repeat: no-repeat;
@@ -1612,7 +1612,7 @@ page {
 .dengjibox {
 	position: relative;
 	width: 100%;
-	height: 286rpx;
+	height: 276rpx;
 	background: linear-gradient(-45deg, #88d7c9, #1BB9A5, #88d7c9);
 	//box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(26,25,26,0.3);
 	border-radius: 20rpx 20rpx 0 0;
@@ -1972,8 +1972,8 @@ uni-switch::before {
 	width: 75%;
 }
 .head-port{
-	width: 46px;
-	height: 46px;
+	width: 55px;
+	height: 55px;
 	border-radius: 50%;
 	margin-bottom: 5px;
 }

pages/my/index.vue

@@ -2,7 +2,7 @@
 	<view class="" style="padding-bottom: 17px;">
 		<view class="headtop">
 			<view class="headbox">
-				<view class=" u-flex padding-lr" style="padding-top: 35px;">
+				<view class=" u-flex padding-lr" style="padding-top: 30px;">
 					<view class="u-m-r-10 back-img"
 						:style="{'background-image':
 								technicianType=='3'?'url(../../static/grade1.png)':
@@ -811,8 +811,8 @@
 	.back-img{
 		background-repeat: no-repeat;
 		background-size: 100%;
-		width: 75px;
-		height: 75px;
+		width: 84px;
+		height: 84px;
 		border-radius: 50%;
 		display: flex;
 		align-items: center;
@@ -832,7 +832,7 @@
 		border-radius: 20rpx;
 		color: #fff;
 		line-height: 80rpx;
-		margin-top: 46rpx;
+		margin-top: 30rpx;
 	}
 	.jishi-index-title{
 		width: 100%;
@@ -972,8 +972,8 @@
 		margin-left: 10rpx;
 	}
 	.head-port{
-		width: 46px;
-		height: 46px;
+		width: 55px;
+		height: 55px;
 		border-radius: 50%;
 		margin-bottom: 5px;
 	}

pages/order/index.vue

@@ -18,7 +18,7 @@
 				</view>
 				<view class="u-flex-1" v-if="isLogin && userName">
 					<view class="u-font-18">
-						<view class="flex align-center" style="margin-top: 8rpx;">
+						<view class="flex align-center" style="margin-top: 35rpx;">
 							<view class="margin-left-sm u-font-18" style="color: #ffffff;">{{ userName }}</view>
 							<view class="labe zhuangtai" @tap="stateSave">
 								<view v-if="isTrue">已上线</view>
@@ -63,7 +63,7 @@
 				inactive-color="#999999" :customStyle="{ 'background-color': '#050505' }" isShowImg textClass="">
 			</u-tabs>
 		<mescroll-body :sticky="true" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			style="padding: 0 16px;width: 100%;min-height: 100vh; background: #f5f5f5; margin-top: 34px;">
+			style="padding: 0 16px;width: 100%;min-height: 100vh; background: #f5f5f5; margin-top: 12px;">
 			<!-- 数据列表 -->
 			<!-- <view v-if="goods.length > 0" class="margin-sm padding-sm bg radius" v-for="(item,index) in goods"
 				:key='index' @click="clickItem(item)"> -->
@@ -85,7 +85,7 @@
 			
 					<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
 
-					<view style="color: #333;">预约时间：{{ item.serveTime }}</view>
+					<view style="color: #333;">{{ item.serveTime }}</view>
 					<view v-if="item.status == 9&& item.refusalContent" class="judan">
 						拒单审核中...
 					</view>
@@ -883,13 +883,16 @@
 	.back-img{
 		background-repeat: no-repeat;
 		background-size: 100%;
-		width: 75px;
-		height: 75px;
+		width: 84px;
+		height: 84px;
 		border-radius: 50%;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
+	/deep/.u-scroll-box{
+		margin-top: 26rpx;
+	}
 	/deep/.u-size-default{
 		margin-top: 5px !important;
 	}
@@ -1056,10 +1059,10 @@
 	.u-tabs {
 		padding: 16px;
 		width: 90%;
-		height: 199rpx;
+		height: 220rpx;
 		// background: #F7F7F7 !important;
-		border-radius: 21rpx;
-		margin: -126px auto 8px auto;
+		border-radius: 21rpx 21rpx 0 0;
+		margin: -113px auto 8px auto;
 		position: relative;
 	}
 
@@ -1126,13 +1129,12 @@
 		width: 100%;
 		height: 1rpx;
 		border: 1rpx solid #f8f8f8;
-		margin-bottom: 20rpx;
 	}
 
 	.pintuan_syrs {
 		color: #999999;
 		font-size: 20upx;
-		margin: 20rpx 20rpx 0rpx;
+		margin: 15rpx;
 		display: flex;
 		padding-right: 18upx;
 	}
@@ -1158,8 +1160,8 @@
 		}
 	}
 	.head-port{
-		width: 46px;
-		height: 46px;
+		width: 55px;
+		height: 55px;
 		border-radius: 50%;
 		margin-bottom: 5px;
 	}
@@ -1170,6 +1172,7 @@
 		color: #019c88;
 		font-weight: bold;
 		font-size: 30rpx;
+		margin-top: -5rpx;
 	}
 	.order-details{
 		font-size: 32rpx;