Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

* 'master' of http://47.98.226.240:3000/twt/wxThird:
  服务顾问列表调整
  服务专家列表布局调整

pages/user/expertServices.vue

@@ -7,9 +7,7 @@
 					我的服务顾问
 				</view>
 				<view class="ad-con-box">
-					<view class="ad-con-box-l">
-						<image :src="usersAvatarStr" mode="aspectFit" class="ad-icon-mine"></image>
-					</view>
+					<image :src="usersAvatarStr" mode="aspectFit" class="ad-icon-mine"></image>
 					<view class="ad-con-box-r">
 						<view class="ad-name">{{users.name}}</view>
 						<view class="ad-years">{{userYears}}</view>
@@ -24,13 +22,9 @@
 		</view>
 		<!-- 服务顾问list -->
 		<view class="ad-list" v-for="(item,index) in queryManagerList" :key="item.id" @click="goDetail(item)">
-			<view>
-				<image :src="item.avatar ? item.avatar : '../../static/timg/pic_def_ava@2x.png'" class="ad-list-img"></image>
-			</view>
-			<view class="ad-list-r">
-				<view class="ad-name">{{item.name}}</view>
-				<view class="ad-years">{{item.year ? ('从业年限:' + item.Years + '年') : '从业年限：未知'}}</view>
-
+			<image :src="item.avatar ? item.avatar : '../../static/timg/pic_def_ava@2x.png'" class="ad-list-img"></image>
+			<view class="ad-name ad-list-r">
+				<text>{{item.name}}</text>
 			</view>
 
 			<view class="address-arrow">
@@ -80,7 +74,7 @@
 					this.queryManagerList = res.data.userlist
 					this.users = res.data.users
 					
-					// console.log('服务顾问列表===', res);
+					console.log('服务顾问列表===', res);
 				})
 			},
 
@@ -113,7 +107,6 @@
 		background-color: #FF0000;
 		padding: 20rpx 24rpx;
 	}
-
 	.ad-box {
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
@@ -121,11 +114,10 @@
 
 	.ad-con-box {
 		display: flex;
-		padding-bottom: 10rpx;
+		padding-bottom: 20rpx;
 		margin-top: 30rpx;
 		margin-left: 30rpx;
 	}
-
 	.ad-sec-tit {
 		font-size: 24rpx;
 		color: #666;
@@ -139,15 +131,17 @@
 		border-radius: 50rpx;
 	}
 
-	.ad-con-box-r {
-		margin-left: 30rpx;
+	.ad-con-box-r {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		margin-left: 30rpx;
 	}
 
 	.ad-name {
 		font-size: 30rpx;
-		font-weight: 400;
+		font-weight: bold;
 		color: #333333;
-		margin-top: 6rpx;
 	}
 
 	.ad-years {
@@ -205,11 +199,14 @@
 		height: 100%;
 	}
 
-	.ad-list-r {
-		padding-left: 20rpx;
-		flex: 1;
+	.ad-list-r {
+		display: flex;
+		flex: 1;		
+	}
+	.ad-list-r text{
+		margin: auto 20rpx;
+		/* background-color: green; */
 	}
-
 	.noMore {
 		text-align: center;
 		line-height: 50rpx;