修改

pages/appointment/personal/studentAppointmentInfo.vue

@@ -23,7 +23,7 @@
 	}
 	.stuinfo_List{
 		width:100%;
-		height:43px;
+		height:50px;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
@@ -54,7 +54,7 @@
 		margin:20px 0 10px 0;
 	}
 	.orderInfoBtn{
-		width:90%;
+		width:93%;
 		height:40px;
 		border-radius: 4px;
 		background-color: #40766E;
@@ -62,8 +62,11 @@
 		text-align: center;
 		line-height: 40px;
 		position: absolute;
-		bottom:10px;
-		margin-left:20px;
+		bottom:20px;
+		margin-left:15px;
+	}
+	.teacherName{
+		margin-left:5px;
 	}
 </style>
 <template>
@@ -81,7 +84,7 @@
 					</view>
 					<view class="stuinfo_List">
 						<view class="stuinfo_Title">上课老师</view>
-						<view class="stuinfo_Title stuinfo_RightCon">
+						<view class="stuinfo_Title stuinfo_RightCon" style="display: flex;align-items: center;">
 							<image mode="aspectFill" :src="dataList.TeacherLogo" style="width: 25px; height: 25px;border-radius: 50%;" ></image>
 							<text class="teacherName">{{dataList.TeacherName}}</text>
 						</view>
@@ -96,23 +99,26 @@
 					</view>
 					<view class="stuinfo_List">
 						<view class="stuinfo_Title">上课状态</view>
-						<view class="stuinfo_Title stuinfo_RightCon">{{dataList.OrderStatusName}}</view>
+						<view class="stuinfo_Title stuinfo_RightCon">
+							<text :style="{'color':dataList.OrderStaus==1?'#12D9B0':''}">{{dataList.OrderStatusName}}</text>
+						</view>
 					</view>
 					<view class="stuinfo_List" v-if="dataList.OrderStaus==1">
 						<view class="stuinfo_Title">花费点数</view>
-						<view class="stuinfo_Title stuinfo_RightCon">56点</view>
+						<view class="stuinfo_Title stuinfo_RightCon" :style="{'color':dataList.OrderStaus==1?'#F96729':''}">{{dataList.TotalPointNum}}点</view>
 					</view>
 				</view>
 				<view class="orderInfo_List">
 					<view class="stu_OrderRoom">房间信息</view>
 					<view class="stuinfo_platInfo">
-						<text>平台名称：抖音；房间号589；入场码888</text>
+						<text v-if="dataList.RoomInfo">{{dataList.RoomInfo}}</text>
 					</view>
 				</view>
-				<view class="orderInfoBtn" v-if="dataList.OrderStaus==1">
-					支付 56点
+				<view class="orderInfoBtn" v-if="dataList.OrderStaus==1" @click="goPayClass">
+					支付 {{dataList.TotalPointNum}}点
 				</view>
 			</view>
+		<u-modal v-model="show" :content="content" :show-cancel-button='true' @confirm='queren'></u-modal>			
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='gbAuth'></auth>
 	</view>
 </template>
@@ -134,7 +140,20 @@
 				},
 				//内容数据
 				dataList: {},
-				showAuth:false
+				show:false,
+				content:'',
+				showAuth:false,
+				paymsg:{
+					ID:0,
+					CourseId:0,
+					StudyDate:'',
+					StudyDuration:'',
+					TotalStudyDuration:'',
+					DurationUnit:'',
+					OrderStaus:'',
+					TotalPointNum:'',
+					BasePointNum:''
+				},
 			};
 		},
 		created() {
@@ -195,6 +214,30 @@
 					}
 				);	
 			},
+			//去支付
+			goPayClass(){
+				this.show= true;
+				this.content= '确定花费'+this.dataList.TotalPointNum+'点数支付吗？';
+				this.paymsg.ID = this.dataList.ID;
+				this.paymsg.CourseId = this.dataList.CourseId;
+				this.paymsg.StudyDate = this.dataList.StudyDateStr;
+				this.paymsg.StudyDuration = this.dataList.StudyDuration;
+				this.paymsg.TotalStudyDuration = this.dataList.TotalStudyDuration;
+				this.paymsg.DurationUnit = this.dataList.DurationUnit;
+				this.paymsg.OrderStaus = this.dataList.OrderStaus;
+				this.paymsg.TotalPointNum = this.dataList.TotalPointNum;
+				this.paymsg.BasePointNum = this.dataList.BasePointNum;
+			},
+			queren(){
+				this.request2({
+						url: '/api/AppletPoint/GetSetTeacherCourseOrder',
+						data: this.paymsg
+					},
+					res => {
+						
+					}
+				);
+			},
 		},
 	};
 </script>

pages/appointment/personal/studentAppointmentList.vue

@@ -29,7 +29,7 @@
 		overflow: hidden;
 		text-overflow:ellipsis;
 		white-space: nowrap;
-		margin:-5px 0 0 30px;
+		margin:-5px 0 0 20px;
 	}
 	.stu_InfoBtn{
 		width:70px;
@@ -41,26 +41,38 @@
 		line-height: 25px;
 		font-size:12px;
 	}
+	.stu_delBtn{
+		width:45px;
+		height:25px;
+		margin-left:10px;
+		border-radius: 6px;
+		border:1px solid red;
+		color:red;
+		text-align: center;
+		line-height: 25px;
+		font-size: 12px;
+	}
 	.teacherName{
 		color:#111111;
 		font-size:14px;
-		margin-left:3px;
+		margin-left:5px;
 	}
 	.stu_tookie{
 		font-size:12px;
 	}
 	.stu_plateList{
 		width:100%;
-		height:32px;
+		height:35px;
 		background-color: #E2CC9D;
 		border-radius: 2px;
 		color:#BBA16B;
 		padding-left:10px;
 		font-size:12px;
-		line-height: 32px;
+		line-height: 35px;
 		margin-bottom:15px;
 	}
 	.stu_Dian{
+		color:gray;
 		margin:-6px 10px 0 10px;
 	}
 	.stu_StutasImg{
@@ -88,25 +100,28 @@
 					<image v-if="item.OrderStaus==4" src="../../../static/images/ywc.png" class="stu_StutasImg"></image>
 					<view class="student_Title">
 						<view class="student_ClassName">{{item.CourseName}}</view>
-						<view class="stu_InfoBtn" v-if="item.OrderStaus==1">去支付</view>
+						<view v-if="item.OrderStaus==1" style="display: flex;">
+							<view class="stu_InfoBtn" @click.stop="goPayClass(item)">去支付</view>
+							<view class="stu_delBtn" @click.stop="delOrder(item)">删除</view>
+						</view>
 						<text v-if="item.OrderStaus==2" style="color:#4699FC;">待确认</text>
 						<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;">
-							<image mode="aspectFill" :src="item.TeacherLogo" style="width: 25px; height: 25px;border-radius: 50%;" ></image>
+							<image mode="aspectFill" :src="item.TeacherLogo" style="width: 28px; height: 28px;border-radius: 50%;" ></image>
 							<text class="teacherName">{{item.TeacherName}}</text>
 						</view>
 						<view class="stu_tookie" style="display: flex;align-items: center;margin-left:20px;">
 							<image style="width:12px;height:12px;margin-right:3px;" src="../../../static/images/tookie.png" alt=""></image>
-							{{item.StudyDate}}({{item.StudyDuration}}{{item.DurationUnit}})
+							{{item.StudyDate}} ({{item.StudyDuration}}{{item.DurationUnitName}})
 							<text class="stu_Dian">.</text>{{item.CourseClassTypeName}}<text class="stu_Dian">.</text>
 						</view>
 						<!-- <view style="font-size: 12px;">{{item.OrderStatusName}}</view> -->
 					</view>
 					<view class="stu_plateList" :style="{'color:#969696':item.OrderStaus==4}">
-						平台名称：抖音；房间号678；入场码888
+						<text v-if="item.RoomInfo">{{item.RoomInfo}}</text>
 					</view>
 				</view>
 				<view style="padding:10px 0;">
@@ -114,6 +129,8 @@
 				</view>
 			</view>
 		</scroll-view>
+		<u-modal v-model="show" :content="content" :show-cancel-button='true' @confirm='queren'></u-modal>
+		<u-modal v-model="show2" :content="content2" :show-cancel-button='true' @confirm='queren2'></u-modal>
 		
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='gbAuth'></auth>
 	</view>
@@ -148,12 +165,30 @@
 					StartTime:'',
 					EndTime:''
 				},
+				paymsg:{
+					ID:0,
+					CourseId:0,
+					StudyDate:'',
+					StudyDuration:'',
+					TotalStudyDuration:'',
+					DurationUnit:'',
+					OrderStaus:'',
+					TotalPointNum:'',
+					BasePointNum:''
+				},
 				headData: [], //头部切换数据
 				current: 0,
 				//内容数据
 				dataList: [],
 				index: 0,
-				showAuth:false
+				showAuth:false,
+				show:false,
+				content:'',
+				show2:false,
+				content2:'',
+				delMsg:{
+				  OrderId:0
+				}
 			};
 		},
 		created() {
@@ -268,6 +303,52 @@
 					this.status = "nomore";
 				}
 			},
+			//点击支付
+			goPayClass(item){
+				this.show= true;
+				this.content= '确定花费'+item.TotalPointNum+'点数支付吗？';
+				console.log(item,'item');
+				this.paymsg.ID = item.ID;
+				this.paymsg.CourseId = item.CourseId;
+				this.paymsg.StudyDate = item.StudyDateStr;
+				this.paymsg.StudyDuration = item.StudyDuration;
+				this.paymsg.TotalStudyDuration = item.TotalStudyDuration;
+				this.paymsg.DurationUnit = item.DurationUnit;
+				this.paymsg.OrderStaus = item.OrderStaus;
+				this.paymsg.TotalPointNum = item.TotalPointNum;
+				this.paymsg.BasePointNum = item.BasePointNum;
+			},
+			queren(){
+				this.request2({
+						url: '/api/AppletPoint/GetSetTeacherCourseOrder',
+						data: this.paymsg
+					},
+					res => {
+						if(res.resultCode==1){
+							this.content = res.message;
+						}
+					}
+				);
+			},
+			//删除订单
+			delOrder(item){
+				this.show2= true;
+				this.content2= '确定删除该订单？';
+				this.delMsg.OrderId = item.ID;
+			},
+			queren2(){
+				this.request2({
+						url: '/api/AppletPoint/GetDeletePointOrderInfo',
+						data: this.delMsg
+					},
+					res => {
+						if(res.resultCode==1){
+							this.getContent(1);
+						}
+					}
+				);
+			},
+			
 			//跳转到详情
 			goDetail(item){
 				uni.navigateTo({ url: '/pages/appointment/personal/studentAppointmentInfo?OrderId='+item.ID})