Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/appointment/personal/studentAppointmentInfo.vue

@@ -47,8 +47,8 @@
 	.stuinfo_platInfo{
 		width:100%;
 		height:96px;
-		background-color: #E2CC9D;
-		color:#BBA16B;
+		background-color: #F8F5EA;
+		color:#B7A266;
 		padding:10px;
 		border-radius: 9px;
 		margin:20px 0 10px 0;
@@ -108,7 +108,7 @@
 						<view class="stuinfo_Title stuinfo_RightCon" :style="{'color':dataList.OrderStaus==1?'#F96729':''}">{{dataList.TotalPointNum}}点</view>
 					</view>
 				</view>
-				<view class="orderInfo_List">
+				<view class="orderInfo_List" v-if="dataList.RoomInfo">
 					<view class="stu_OrderRoom">房间信息</view>
 					<view class="stuinfo_platInfo">
 						<text v-if="dataList.RoomInfo">{{dataList.RoomInfo}}</text>

pages/appointment/personal/studentAppointmentList.vue

@@ -30,6 +30,7 @@
 		text-overflow:ellipsis;
 		white-space: nowrap;
 		margin:-5px 0 0 20px;
+		font-weight: bold;
 	}
 	.stu_InfoBtn{
 		width:70px;
@@ -59,17 +60,18 @@
 	}
 	.stu_tookie{
 		font-size:12px;
+		margin-top:2px;
 	}
 	.stu_plateList{
 		width:100%;
 		height:35px;
-		background-color: #E2CC9D;
+		background-color: #F8F5EA;
 		border-radius: 2px;
-		color:#BBA16B;
+		color:#B7A266;
 		padding-left:10px;
 		font-size:12px;
 		line-height: 35px;
-		margin-bottom:15px;
+		margin:10px 0;
 	}
 	.stu_Dian{
 		color:gray;
@@ -108,7 +110,7 @@
 						<text v-if="item.OrderStaus==3" style="color:#BBA16B;">待上课</text>
 						<text v-if="item.OrderStaus==4" style="color:#969696;">完成</text>
 					</view>	
-					<view style="display: flex;align-items: center;margin:13px 0;">
+					<view style="display: flex;align-items: center;margin-top:13px;">
 						<view style="display:flex;align-items: center;">
 							<image mode="aspectFill" :src="item.TeacherLogo" style="width: 28px; height: 28px;border-radius: 50%;" ></image>
 							<text class="teacherName">{{item.TeacherName}}</text>
@@ -120,7 +122,7 @@
 						</view>
 						<!-- <view style="font-size: 12px;">{{item.OrderStatusName}}</view> -->
 					</view>
-					<view class="stu_plateList" :style="{'color:#969696':item.OrderStaus==4}">
+					<view class="stu_plateList" v-if="item.RoomInfo" :style="{'color:#969696':item.OrderStaus==4}">
 						<text v-if="item.RoomInfo">{{item.RoomInfo}}</text>
 					</view>
 				</view>