页面布局调整

jiaoyu_mp/pages/course/index.vue

@@ -39,7 +39,12 @@
 				</view>
 				<view class="btn_title">
 					<view class="title">
-						上课地址：{{item.address}}
+						<view class="title_text">
+							上课地址：
+						</view>
+						<view class="title_addr">
+							{{item.address}}
+						</view>
 					</view>
 					<view class="btn">
 						<navigator :url="`/pagesA/course/reservation?orders_product_id=${item.orders_product_id}&course_id=${item.course_id}`">
@@ -123,14 +128,13 @@
 				width: 660rpx;
 				margin: 20rpx auto;
 				.left{
-					width: 200rpx;
-					// height: 200rpx;
-					// background-color: aqua;
-					// border: 2rpx solid;
+					width: 250rpx;
+					height: 230rpx;
+					overflow: hidden;
 					border-radius: 20rpx;
 					image{
-						width: 200rpx;
-						height: 200rpx;
+						width: 100%;
+						height: 100%;
 						border-radius: 20rpx;
 					}
 				}
@@ -139,8 +143,10 @@
 					margin-left: 20rpx;
 					.title{
 						font-size: 36rpx;
+						font-weight: bold;
 					}
 					.skill{
+						font-size: 30rpx;
 						padding: 5rpx;
 						margin: 10rpx 10rpx 10rpx 0rpx;
 						color: #c9c9c9;
@@ -156,9 +162,9 @@
 							justify-content: center;
 							width: 180rpx;
 							border: 2rpx solid #3985ff;
-							border-radius: 15rpx;
+							border-radius: 10rpx;
 							margin: 5rpx;
-							padding: 5rpx;
+							padding: 10rpx 5rpx;
 							color: #3985ff;
 						}
 						.remain_class{
@@ -166,9 +172,9 @@
 							justify-content: center;
 							width: 180rpx;
 							margin: 5rpx;
-							padding: 5rpx;
+							padding: 10rpx 5rpx;
 							background-color: #3985ff;
-							border-radius: 15rpx;
+							border-radius: 10rpx;
 							color: #ffffff;
 						}
 					}
@@ -177,7 +183,8 @@
 							justify-content: space-between;
 							flex-wrap: wrap;
 							width: 420rpx;
-							margin-top: 30rpx;
+							// margin-top: 20rpx;
+							padding-top: 10rpx;
 						// .remain_class{
 						// 	display: inline-flex;
 						// 	justify-content: center;
@@ -194,6 +201,7 @@
 							padding: 5rpx;
 							text-align: right;
 							font-size: 30rpx;
+							color: red;
 						}
 					}
 				}
@@ -201,32 +209,39 @@
 			.btn_title{
 				.title{
 					margin-left: 20rpx;
+					font-size: 30rpx;
+					display: flex;
+					.title_text{
+						width: 150rpx;
+					}
+					.title_addr{
+						flex: 1;
+					}
 				}
 				.btn{
-					
 					display: flex;
 					width: 690rpx;
 					margin: 20rpx 0rpx;
 					justify-content: space-between;
 					.course_make_btn{
-						width: 300rpx;
+						width: 315rpx;
 						height: 60rpx;
 						line-height: 60rpx;
 						text-align: center;
 						padding: 10rpx;
 						background-color: #1fbe7e;
 						color: #ffffff;
-						border-radius: 20rpx;
+						border-radius: 10rpx;
 					}
 					.user_course_btn{
-						width: 300rpx;
+						width: 315rpx;
 						height: 60rpx;
 						line-height: 60rpx;
 						text-align: center;
 						padding: 10rpx;
 						background-color: #1fbe7e;
 						color: #ffffff;
-						border-radius: 20rpx;
+						border-radius: 10rpx;
 					}
 				}
 				

jiaoyu_mp/pages/index/index.vue

@@ -34,6 +34,7 @@
 						<view class="product_title">
 							<view class="product_text">
 								<text>{{item.name}}</text>
+
 							</view>
 							<view class="time">
 								<text>{{item.spec}}</text>
@@ -44,7 +45,7 @@
 								<span style="font-size: 26rpx;">￥</span><text >{{item.price}}</text>
 							</view>
 							<view class="product_order_but">
-								<button>立即购买</button>
+								立即购买
 							</view>
 						</view>
 					</view>
@@ -58,7 +59,7 @@
 					<text>搜索</text>
 				</view>
 				<uni-icons type="search" size="20" class="icon"></uni-icons>
-				<view class="search_btn">
+				<view class="search_btn" @click.stop="onChange()">
 					<uni-icons type="notification" size="30" ></uni-icons>
 				</view>
 			</navigator>
@@ -167,6 +168,8 @@
 			});
 		},
 		methods: {
+			onChange(){
+			},
 			searchChange(e){
 				// 如果没有搜索词
 				if( !this.requestParam.name ){
@@ -220,7 +223,7 @@
 		position: fixed;
 		margin: 0rpx auto;
 		padding: 20rpx 0rpx;
-		background-color: #FFFFFF;
+		// background-color: #FFFFFF;
 		.search_box{
 			width: 590rpx;
 			height: 60rpx;
@@ -233,12 +236,13 @@
 				display: block;
 				font-size: 24rpx;
 				position: relative;
-				border-top-left-radius: 40rpx;
-				border-bottom-left-radius: 40rpx;
+				// border-top-left-radius: 40rpx;
+				// border-bottom-left-radius: 40rpx;
+				border-radius: 40rpx;
 				padding-left: 20rpx;
 				margin-left: 35rpx;
 				background-color: #FFFFFF;
-				 border: 2rpx solid #dddddd;
+				 border: 2rpx solid #ffffff;
 				text{
 					width: 120rpx;
 					height: 60rpx;
@@ -256,7 +260,7 @@
 			}
 			.search_btn{
 				top: 0rpx;
-				z-index: 9;
+				z-index: 999;
 				left: 660rpx;
 				color: #FFFFFF;
 				position: absolute;
@@ -310,10 +314,13 @@
 				border-radius: 20rpx;
 				.product_left{
 					float: left;
+					width: 200rpx;
+					height: 180rpx;
+					overflow: hidden;
+					margin: 20rpx 20rpx;
 					.product_image{
-						margin: 20rpx 20rpx;
-						width: 224rpx;
-						height: 200rpx;
+						width: 100%;
+						height: 100%;
 						border-radius: 20rpx;
 					}
 				}
@@ -322,42 +329,41 @@
 					width: 380rpx;
 					margin: 20rpx 20rpx;
 					.product_title{
-						line-height: 1.5;
 						.product_text{
-							font-size: 30rpx;
+							font-size: 36rpx;
 							font-weight: 600;
 						}
 						.time{
 							font-size: 24rpx;
+							padding: 15rpx 0rpx;
 						}
 					}
 					.stock_price{
-						color: #dddddd;
-						height: 100rpx;
+						height: 80rpx;
 						font-size: 20rpx;
 						overflow: hidden;
-						line-height: 30rpx;
-						 padding: 0rpx 10rpx;
-						margin-top: 40rpx;
+						width: 410rpx;
+						//  border: 2rpx solid;
 						.product_price{
 							float: left;
 							color: red;
-							font-size: 50rpx;
+							font-size: 40rpx;
 							font-weight: 600;
-							line-height: 100rpx;
+							padding: 10rpx 0rpx;
+							//  border: 2rpx solid;
 						}
 						.product_order_but{	
 							float: right;
-							button{
-								width: 166rpx;
-								height: 64rpx;
-								font-size: 26rpx;
-								font-weight: 600;
-								margin: 20rpx 0rpx;
-								background-color: #1fbe7e;
-								border-radius: 40rpx;
-								color: #FFFFFF;
-							}
+							width: 166rpx;
+							height: 60rpx;
+							font-size: 26rpx;
+							font-weight: 600;
+							background-color: #1fbe7e;
+							border-radius: 40rpx;
+							text-align: center;
+							line-height: 60rpx;
+							color: #FFFFFF;
+							
 						}
 					}
 				}

jiaoyu_mp/pages/product/index.vue

@@ -615,13 +615,7 @@
 					}
 				});
 			},
-			// 客服显示
-			openAddFollow(){
-				// 返回结果
-				this.followQrcode 		= this.$checkAccess.getFollowQrcode();
-				// 有图才展示
-				if( this.followQrcode )	this.$refs.addFollow.open('center');
-			},
+
 			closeAddFollow(){
 				this.$refs.addFollow.close();
 			},
@@ -751,7 +745,7 @@
 			getStatusBarHeight(){
 				let SYSTEM_INFO = uni.getSystemInfoSync();
 				this.StatusBarHeight =  SYSTEM_INFO.statusBarHeight || 10;
-				console.log(SYSTEM_INFO.statusBarHeight);
+				// console.log(SYSTEM_INFO.statusBarHeight);
 			},
 			goBack(){
 				uni.navigateBack({
@@ -818,11 +812,13 @@
 			.product_title{
 				font-size: 30rpx;
 				line-height: 40rpx;
+				padding: 5rpx 0rpx;
 			}
 			.product_subtitle{
 				color: #999999;
 				line-height: 40rpx;
 				font-size: 24rpx;
+				padding: 5rpx 0rpx;
 			}
 		}
 		.price_stock{
@@ -830,12 +826,12 @@
 			font-size: 24rpx;
 			line-height: 30rpx;
 			overflow: hidden;
-			margin-top: 20rpx;
 			.product_price{
 				float: left;
 				color: red;
 				font-size: 38rpx;
 				line-height: 60rpx;
+				padding: 5rpx 0rpx;
 				.product_market{
 					font-size: 24rpx;
 					color: #999999;

jiaoyu_mp/pages/score/index.vue

@@ -1,29 +1,7 @@
 <template>
 	<view>
-<!-- 		<view class="product_box">
-			<view class="to_bottom" v-if="!productList.length"> -----还没有积分产品-----</view>
-			<view class="product_list" >
-				<!-- Vue3 项目部分小程序端事件延迟或调用失败 在执行事件的元素上添加 data-eventsync="true" 属性以解决此问题 
-				<view @click="toDetail(item)" data-eventsync="true" class="product_item" v-for="(item,index) in productList" :key="index" >
-					<image class="product_image" :src="item.thumb" mode=""></image>
-					<view class="product_name"><text>{{item.name}}</text></view>
-					<view class="stock_price">
-						<view class="product_price">
-							<text>{{item.score}} 积分</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="search_fixed" >
-			<view class="search_box">
-				<input class="search_input" type="text" v-model="requestParam.name" @input="searchChange" placeholder="请输入产品名称搜索" />
-				<button class="search_btn" @click.stop="searchOpen()"  data-eventsync="true"> 搜索</button>
-			</view>
-		</view>
-		<view class="to_bottom" v-if="isLast"> -----到底了-----</view>-->
 		<view class="product_box">
-			<!-- <view class="to_bottom" v-if="!productList.length"> -----还没有积分产品-----</view> -->
+			<view class="to_bottom" v-if="!productList.length"> -----还没有积分产品-----</view>
 			<view class="product_list" >
 				<!-- Vue3 项目部分小程序端事件延迟或调用失败 在执行事件的元素上添加 data-eventsync="true" 属性以解决此问题 -->
 				<view @click="toDetail(item)" data-eventsync="true" class="product_item" v-for="(item,index) in productList" :key="index" >
@@ -218,119 +196,6 @@
 </script>
 
 <style lang="less">
-	// .search_fixed{
-	// 	top: var(--window-top);
-	// 	left: 0rpx;
-	// 	width: 750rpx;
-	// 	display: block;
-	// 	position: fixed;
-	// 	margin: 0rpx auto;
-	// 	padding: 20rpx 0rpx;
-	// 	background-color: #FFFFFF;
-	// 	.search_box{
-	// 		width: 750rpx;
-	// 		height: 60rpx;
-	// 		display: block;
-	// 		position: relative;
-	// 		.search_input{
-	// 			z-index: 0;
-	// 			width: 590rpx;
-	// 			height: 56rpx;
-	// 			display: block;
-	// 			font-size: 24rpx;
-	// 			position: relative;
-	// 			border-top-left-radius: 40rpx;
-	// 			border-bottom-left-radius: 40rpx;
-	// 			padding-left: 20rpx;
-	// 			margin-left: 35rpx;
-	// 			border: 2rpx solid #dddddd;
-	// 		}
-	// 		.search_btn{
-	// 			top: 0rpx;
-	// 			z-index: 9;
-	// 			left: 610rpx;
-	// 			color: #FFFFFF;
-	// 			position: absolute;
-	// 			display: block;
-	// 			width: 120rpx;
-	// 			height: 60rpx;
-	// 			font-size: 24rpx;
-	// 			margin: 0rpx 0rpx;
-	// 			padding: 0rpx 0rpx;
-	// 			line-height: 60rpx;
-	// 			border-radius: 40rpx;
-	// 			background-color: #E03519;
-	// 		}
-	// 	}
-	// }
-	// .product_box{
-	// 	display: block;
-	// 	overflow: hidden;
-	// 	margin: 0rpx auto;
-	// 	margin-top: 120rpx;
-	// 	padding: 0rpx 35rpx;
-	// 	.product_list{
-	// 		display: block;
-	// 		overflow: hidden;
-	// 		margin: 0rpx auto;
-	// 		.product_item{
-	// 			float: left;
-	// 			width: 320rpx;
-	// 			display: block;
-	// 			overflow: hidden;
-	// 			margin: 20rpx 0rpx;
-	// 			margin-right: 20rpx;
-	// 			background-color: #FFFFFF;
-	// 			border-radius: 20rpx;
-	// 			.product_image{
-	// 				width: 320rpx;
-	// 				height: 320rpx;
-	// 			}
-	// 			.product_name{
-	// 				height: 80rpx;
-	// 				font-size: 26rpx;
-	// 				line-height: 40rpx;
-	// 				overflow: hidden;
-	// 				padding: 10rpx 10rpx;
-	// 			}
-	// 			.product_spec{
-	// 				color: #999999;
-	// 				font-size: 22rpx;
-	// 				line-height: 30rpx;
-	// 				padding: 0rpx 10rpx;
-	// 			}
-	// 			.stock_price{
-	// 				color: #dddddd;
-	// 				font-size: 20rpx;
-	// 				overflow: hidden;
-	// 				line-height: 30rpx;
-	// 				padding: 0rpx 10rpx;
-	// 				.product_price{
-	// 					float: left;
-	// 					color: red;
-	// 					font-size: 30rpx;
-	// 					line-height: 60rpx;
-	// 					.product_market{
-	// 						font-size: 24rpx;
-	// 						color: #999999;
-	// 						line-height: 30rpx;
-	// 						vertical-align: top;
-	// 						text-decoration: line-through;
-	// 					}
-	// 				}
-	// 				.product_stock{
-	// 					float: right;
-	// 					font-size: 20rpx;
-	// 					line-height: 60rpx;
-	// 				}
-	// 			}
-	// 		}
-	// 		.product_item:nth-child(even){
-	// 			margin-right: 0rpx;
-	// 		}
-	// 	}
-	// }
-	
 	.header_fixed{
 		width: 750rpx;
 		position: fixed;
@@ -409,10 +274,11 @@
 			.product_item{
 				float: left;
 				width: 320rpx;
+				height: 490rpx;
 				display: block;
 				overflow: hidden;
 				margin: 20rpx 0rpx;
-				margin-right: 20rpx;
+				margin-right: 40rpx;
 				background-color: #FFFFFF;
 				border-radius: 20rpx;
 				.product_image{
@@ -421,16 +287,22 @@
 				}
 				.product_name{
 					height: 80rpx;
-					font-size: 26rpx;
+					font-size: 30rpx;
 					line-height: 40rpx;
 					overflow: hidden;
-					padding: 10rpx 10rpx;
+					margin: 10rpx 0rpx;
+					padding: 0rpx 10rpx;
+					text-overflow: ellipsis;
 				}
 				.product_spec{
+					height: 30rpx;
 					color: #999999;
-					font-size: 22rpx;
+					font-size: 24rpx;
 					line-height: 30rpx;
 					padding: 0rpx 10rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
 				}
 				.stock_price{
 					color: #dddddd;

jiaoyu_mp/pages/score/product.vue

@@ -755,13 +755,15 @@
 			}
 			.text{
 				float: left;
-				padding-left: 8rpx;
+				padding-top: 5rpx;
+				padding-left: 6rpx;
 				text-align: center;
 				line-height: 30rpx;
 				font-size: 24rpx;
 			}
 			.shop_cat_text{
 				float: left;
+				padding-top: 5rpx;
 				text-align: center;
 				line-height: 30rpx;
 				font-size: 24rpx;

jiaoyu_mp/pagesA/course/reservation.vue

@@ -409,7 +409,7 @@
 				const m = myDate.getMonth() + 1;
 				const d = myDate.getDate();
 				const date = y + '-' + this.strFormat(m) + '-' + this.strFormat(d);
-			
+				
 				const hour = myDate.getHours()
 				const min = myDate.getMinutes()
 				const secon = myDate.getSeconds()

jiaoyu_mp/pagesA/course/usercourse.vue

@@ -1,4 +1,5 @@
 <template>
+	<page-meta :page-style="'overflow:'+(show?'hidden':'visible')"></page-meta>
 	<view >
 		<view class="course_status_list">
 			<view class="course_status_item" > 全部 </view>
@@ -37,7 +38,7 @@
 							</view>
 							<view class="attr">
 								{{item.course_address}}
-								<!-- 深圳市龙华区民治街道和平路3号 -->
+								<!-- 深圳市龙华区民治街道和平路3号平路3号平路3号平路3号 -->
 							</view>
 						</view>
 					</view>
@@ -48,13 +49,12 @@
 					</view>
 					<view class="time">
 							{{timeStamp(item.start_time *1000).date+' '+timeStamp(item.start_time *1000).hour}}
-							
 						<!-- 2024--10-24周三上午10:30 -->
 					</view>
 				</view>
 			</view>
 		</view>
-		<uni-popup ref="cancelPopup">
+		<uni-popup ref="cancelPopup" @change="popupChange">
 			<view class="cancel_layout">
 				<view class="cancel_title">
 					取消预约
@@ -81,49 +81,10 @@
 		data(){
 			
 			return{
+				//禁止滚动穿透
+				show:false,
 				//产品列表
-				productList:[
-					 {
-					        "id": 8,
-					        "uid": 3513,
-					        "schedule_id": 6,
-					        "order_id": 31,
-					        "orders_product_id": 33,
-					        "product_id": 11,
-					        "status": 0,
-					        "teacher_id": 6,
-					        "course_id": 2,
-					        "start_time": 1730888928,
-					        "end_time": 1730888928,
-					        "insert_time": 1731317292,
-					        "update_time": 1731317292,
-					        "teacher_name": "张老师",
-					        "teacher_desc": "擅长舞蹈",
-					        "teacher_pic": "../../static/logo2.jpg",
-					        "course_name": "拳击高级课",
-					        "course_address": "龙华"
-					      },
-					      {
-					        "id": 6,
-					        "uid": 3513,
-					        "schedule_id": 6,
-					        "order_id": 31,
-					        "orders_product_id": 33,
-					        "product_id": 11,
-					        "status": 0,
-					        "teacher_id": 6,
-					        "course_id": 2,
-					        "start_time": 1730888928,
-					        "end_time": 1730888928,
-					        "insert_time": 1731313905,
-					        "update_time": 1731313905,
-					        "teacher_name": "张老师",
-					        "teacher_desc": "擅长舞蹈",
-					        "teacher_pic": "../../static/logo2.jpg",
-					        "course_name": "拳击高级课",
-					        "course_address": "龙华"
-					      },
-				],
+				productList:[],
 				// 请求参数
 				requestParam:{
 					name:"",
@@ -162,6 +123,10 @@
 			});
 		},
 		methods:{
+			popupChange(e){
+				// 禁止滚动穿透
+				this.show = e.show
+			},
 			//弹出层
 			cancelPopup(index){
 				this.curIndex = index;
@@ -270,16 +235,17 @@
 						display: flex;
 						justify-content: space-between;
 						.tea_name{
-							font-size: 50rpx;
+							font-size: 40rpx;
 							font-weight: 600;
 						}
 						.btn_1{
 							display: inline-flex;
 							justify-content: center;
 							align-items: center;
-							width: 200rpx;
-							padding: 10rpx;
+							width: 160rpx;
+							padding: 15rpx 0rpx;
 							color: #00bba5;
+							font-size: 24rpx;
 							border: 2rpx solid #00bba5;
 							border-radius: 40rpx;
 						}
@@ -287,9 +253,10 @@
 							display: inline-flex;
 							justify-content: center;
 							align-items: center;
-							width: 200rpx;
-							padding: 10rpx;
+							width: 160rpx;
+							padding: 15rpx 0rpx;
 							color: #FFFFFF;
+							font-size: 24rpx;
 							background-color: #d3d3d3;
 							border-radius: 40rpx;
 						}
@@ -297,31 +264,34 @@
 							display: inline-flex;
 							justify-content: center;
 							align-items: center;
-							width: 200rpx;
-							padding: 10rpx;
+							width: 160rpx;
+							padding: 15rpx 0rpx;
 							color: #FFFFFF;
+							font-size: 24rpx;
 							background-color: #d3d3d3;
 							border-radius: 40rpx;
 						}
 					}
 					.subtilte{
-						padding: 5rpx 5rpx 5rpx 0rpx;
+						padding: 10rpx 10rpx 10rpx 0rpx;
 						font-size: 26rpx;
 					}
 					.course_arrt{
+						// width: 500rpx;
 						display: flex;
-						font-size: 24rpx;
+						font-size: 26rpx;
 						padding: 10rpx 10rpx 10rpx 0rpx;
 						.text{
-							display: inline-flex;
-							justify-content: center;
-							align-items: center;
-							width: 120rpx;
-							// border: 2rpx solid;
+							// display: inline-flex;
+							// justify-content: center;
+							// align-items: center;
+							
+							// width: 120rpx;
 						}
 						.attr{
 							// border: 2rpx solid;
 							flex: 1;
+							font-size: 24rpx;
 							flex-wrap: wrap;
 						}
 					}
@@ -329,19 +299,17 @@
 			}
 			.classTime{
 				width: 690rpx;
-				// border: 2rpx solid;
 				display: flex;
 				margin: 0rpx auto;
 				margin-top: 10rpx;
 				padding: 10rpx;
 				.text{
-					font-size: 26rpx;
-					display: inline-flex;
-					justify-content: center;
+					font-size: 32rpx;
 					width: 164rpx;
 				}
 				.time{
-					font-size: 26rpx;
+					font-size: 32rpx;
+					padding: 5rpx 0rpx;
 					font-weight: bold;
 					margin-left: 30rpx;
 				}
@@ -350,8 +318,8 @@
 	}
 	.cancel_layout{
 		background-color: #FFFFFF;
-		width: 690rpx;
-		height: 30vh;
+		width: 600rpx;
+		height: 25vh;
 		border-radius: 40rpx;
 		display: flex;
 		flex-direction: column;
@@ -361,31 +329,33 @@
 			justify-content: center;
 			align-items: center;
 			padding: 10rpx;
-			 margin: 20rpx;
+			margin: 20rpx 0rpx 0rpx 0rpx;
 			font-size: 40rpx;
 			font-weight: bold;
 			color: #000000;
+			font-size: 30rpx;
 		}
 		.cancel_text{
 			display: inline-flex;
 			justify-content: center;
 			align-items: center;
-			margin: 30rpx auto;
-			width: 576rpx;
+			margin: 20rpx auto;
+			width: 500rpx;
 			height: 50rpx;
-			padding:30rpx;
+			padding: 30rpx;
+			line-height: 50rpx;
+			font-size: 30rpx;
 		}
 		.cancel_btn{
 			border-top: 2rpx solid #d3d3d3;
 			display: flex;
 			justify-content: space-between;
-			padding-top: 20rpx;
-			height: 130rpx;
+			 padding-top: 20rpx;
+			height: 100rpx;
 			.btn_1{
 				display: inline-flex;
 				justify-content: center;
-				align-items: center;
-				height: 100rpx;
+				padding-top: 20rpx;
 				flex: 1;
 				font-size: 30rpx;
 				color: #51bf81;
@@ -393,9 +363,8 @@
 			.btn_2{
 				display: inline-flex;
 				justify-content: center;
-				align-items: center;
+				padding-top: 20rpx;
 				flex: 1;
-				height: 100rpx;
 				font-size: 30rpx;
 			}
 		}

jiaoyu_mp/pagesA/orders/userorder.vue

@@ -6,7 +6,7 @@
 			<view class="order_status_item" :class="requestParam.status==8?'active':''" @click="setStatus(8)"> 已完成 </view>
 			<view class="order_status_item" > 售后 </view>
 		</view>
-		
+		<view class="to_bottom" v-if="!orderList.length"> -----还没有订单-----</view>
 		<view class="order_list">
 			<view class="order_item" v-for="(item,index) in orderList" :key="index">
 				<view class="product_title_status">
@@ -21,17 +21,23 @@
 					<view  class="product_image">
 						<image :src="product_info.product_thumb" mode=""></image>
 					</view>
-					<view class="product_title_price">
-						<view class="title">
+					<view class="product_title">
+						<view class="name">
 							{{product_info.product_name}}
 						</view>
-						<view class="price">
-							￥{{item.price_total}}
-						</view>
-						<view class="actual_pay">
-							实付{{item.pay_total}}
+						<view class="spec">
+							{{product_info.product_spec}}
 						</view>
 					</view>
+					<view class="buy_num">
+						x{{product_info.buy_num}}
+					</view>
+				</view>
+				<view class="actual_pay">
+					￥{{item.pay_total}}
+				</view>
+				<view class="hr_like">
+					
 				</view>
 				<view class="more_title">
 					<view class="more">
@@ -46,7 +52,7 @@
 				</view>
 			</view>
 		</view>
-		
+		<view class="to_bottom" v-if="isLast"> -----到底啦-----</view>
 	</view>
 </template>
 
@@ -214,7 +220,7 @@
 		width: 750rpx;
 		.order_item{
 			width: 690rpx;
-			margin: 30rpx auto;
+			margin: 15rpx auto;
 			background-color: #FFFFFF;
 			padding-top: 1rpx;
 			.product_title_status{
@@ -222,7 +228,9 @@
 				justify-content: space-between;
 				margin: 20rpx 20rpx;
 				.title{
+					width: 180rpx;
 					font-size: 30rpx;
+					text-align: center;
 					color: #000000;
 				}
 				.status{
@@ -240,23 +248,38 @@
 						border-radius: 40rpx;
 					}
 				}
-				.product_title_price{
+				.product_title{
 					width: 500rpx;
 					margin: 20rpx 20rpx;
-					.title{
+					.name{
 						font-size: 34rpx;
+						padding: 10rpx 0rpx;
 					}
-					.price{
-						font-size: 24rpx;
-						color: red;
-					}
-					.actual_pay{
-						text-align: right;
-						padding-right: 10rpx;
+					.spec{
 						font-size: 24rpx;
+						padding: 10rpx 0rpx;
+						color: #999999;
 					}
+
 				}
+				.buy_num{
+					line-height: 160rpx;
+					font-size: 26rpx;
+					color: #999999;
+					padding-right: 20rpx;
+				}
+			}
+			.actual_pay{
+				text-align: right;
+				padding-right: 20rpx;
+				color: red;
+				font-size: 26rpx;
 			}
+			.hr_like {
+				margin-top: 10rpx;
+				 border-bottom: 2rpx solid #E4E4E4;
+				 width: 100%;
+			 }
 			.more_title{
 				width: 690rpx;
 				display: flex;

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/course/index.wxml

@@ -1 +1 @@
-<view class="course_layout"><view class="course_list"><view wx:for="{{a}}" wx:for-item="item" wx:key="i" class="course_item"><view class="course_title"><view class="left"><image src="{{item.a}}"></image></view><view class="right"><view class="title">{{item.b}} </view><view class="skill">{{item.c}} </view><view class="course_option"><view class="course_num"> 课程数量：{{item.d}}</view><view class="remain_class"> 预约人数：{{item.e}}</view></view><view class="course_remain"><view class="remain_class"></view><view class="price"> ￥{{item.f}} </view></view></view></view><view class="btn_title"><view class="title"> 上课地址：{{item.g}}</view><view class="btn"><navigator url="{{item.h}}"><view class="course_make_btn"> 预约上课 </view></navigator><navigator url="/pagesA/course/usercourse"><view class="user_course_btn"> 我的预约 </view></navigator></view></view></view></view><view class="to_bottom">---到底啦---</view></view>
+<view class="course_layout"><view class="course_list"><view wx:for="{{a}}" wx:for-item="item" wx:key="i" class="course_item"><view class="course_title"><view class="left"><image src="{{item.a}}"></image></view><view class="right"><view class="title">{{item.b}} </view><view class="skill">{{item.c}} </view><view class="course_option"><view class="course_num"> 课程数量：{{item.d}}</view><view class="remain_class"> 预约人数：{{item.e}}</view></view><view class="course_remain"><view class="remain_class"></view><view class="price"> ￥{{item.f}} </view></view></view></view><view class="btn_title"><view class="title"><view class="title_text"> 上课地址： </view><view class="title_addr">{{item.g}}</view></view><view class="btn"><navigator url="{{item.h}}"><view class="course_make_btn"> 预约上课 </view></navigator><navigator url="/pagesA/course/usercourse"><view class="user_course_btn"> 我的预约 </view></navigator></view></view></view></view><view class="to_bottom">---到底啦---</view></view>

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/course/index.wxss

@@ -19,12 +19,14 @@
   margin: 20rpx auto;
 }
 .course_layout .course_list .course_item .course_title .left {
-  width: 200rpx;
+  width: 250rpx;
+  height: 230rpx;
+  overflow: hidden;
   border-radius: 20rpx;
 }
 .course_layout .course_list .course_item .course_title .left image {
-  width: 200rpx;
-  height: 200rpx;
+  width: 100%;
+  height: 100%;
   border-radius: 20rpx;
 }
 .course_layout .course_list .course_item .course_title .right {
@@ -33,8 +35,10 @@
 }
 .course_layout .course_list .course_item .course_title .right .title {
   font-size: 36rpx;
+  font-weight: bold;
 }
 .course_layout .course_list .course_item .course_title .right .skill {
+  font-size: 30rpx;
   padding: 5rpx;
   margin: 10rpx 10rpx 10rpx 0rpx;
   color: #c9c9c9;
@@ -51,9 +55,9 @@
   justify-content: center;
   width: 180rpx;
   border: 2rpx solid #3985ff;
-  border-radius: 15rpx;
+  border-radius: 10rpx;
   margin: 5rpx;
-  padding: 5rpx;
+  padding: 10rpx 5rpx;
   color: #3985ff;
 }
 .course_layout .course_list .course_item .course_title .right .course_option .remain_class {
@@ -61,9 +65,9 @@
   justify-content: center;
   width: 180rpx;
   margin: 5rpx;
-  padding: 5rpx;
+  padding: 10rpx 5rpx;
   background-color: #3985ff;
-  border-radius: 15rpx;
+  border-radius: 10rpx;
   color: #ffffff;
 }
 .course_layout .course_list .course_item .course_title .right .course_remain {
@@ -71,7 +75,7 @@
   justify-content: space-between;
   flex-wrap: wrap;
   width: 420rpx;
-  margin-top: 30rpx;
+  padding-top: 10rpx;
 }
 .course_layout .course_list .course_item .course_title .right .course_remain .price {
   width: 180rpx;
@@ -79,9 +83,18 @@
   padding: 5rpx;
   text-align: right;
   font-size: 30rpx;
+  color: red;
 }
 .course_layout .course_list .course_item .btn_title .title {
   margin-left: 20rpx;
+  font-size: 30rpx;
+  display: flex;
+}
+.course_layout .course_list .course_item .btn_title .title .title_text {
+  width: 150rpx;
+}
+.course_layout .course_list .course_item .btn_title .title .title_addr {
+  flex: 1;
 }
 .course_layout .course_list .course_item .btn_title .btn {
   display: flex;
@@ -90,22 +103,22 @@
   justify-content: space-between;
 }
 .course_layout .course_list .course_item .btn_title .btn .course_make_btn {
-  width: 300rpx;
+  width: 315rpx;
   height: 60rpx;
   line-height: 60rpx;
   text-align: center;
   padding: 10rpx;
   background-color: #1fbe7e;
   color: #ffffff;
-  border-radius: 20rpx;
+  border-radius: 10rpx;
 }
 .course_layout .course_list .course_item .btn_title .btn .user_course_btn {
-  width: 300rpx;
+  width: 315rpx;
   height: 60rpx;
   line-height: 60rpx;
   text-align: center;
   padding: 10rpx;
   background-color: #1fbe7e;
   color: #ffffff;
-  border-radius: 20rpx;
+  border-radius: 10rpx;
 }

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -79,6 +79,8 @@ const _sfc_main = {
     });
   },
   methods: {
+    onChange() {
+    },
     searchChange(e) {
       if (!this.requestParam.name) {
         this.searchOpen();
@@ -151,7 +153,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       type: "notification",
       size: "30"
     }),
-    f: $data.isLast
+    f: common_vendor.o(($event) => $options.onChange()),
+    g: $data.isLast
   }, $data.isLast ? {} : {});
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view><view class="banner_box"><view class="banner_list"><swiper class="banner_swiper" autoplay="{{true}}"><swiper-item wx:for="{{a}}" wx:for-item="item" wx:key="c"><image src="{{item.a}}" class="image" mode="widthFix" bindtap="{{item.b}}"></image></swiper-item></swiper></view></view><view class="product_box"><view wx:if="{{b}}" class="to_bottom"> -----还没有产品啦-----</view><view class="product_list"><view wx:for="{{c}}" wx:for-item="item" wx:key="f" bindtap="{{item.e}}" data-eventsync="true" class="product_item"><view class="product_left"><image class="product_image" src="{{item.a}}" mode=""></image></view><view class="product_right"><view class="product_title"><view class="product_text"><text>{{item.b}}</text></view><view class="time"><text>{{item.c}}</text></view></view><view class="stock_price"><view class="product_price"><label style="font-size:26rpx">￥</label><text>{{item.d}}</text></view><view class="product_order_but"><button>立即购买</button></view></view></view></view></view></view><view class="search_fixed"><navigator url="/pagesA/search/index" class="search_box"><view class="search_input"><text>搜索</text></view><uni-icons wx:if="{{d}}" class="icon" u-i="406c9705-0" bind:__l="__l" u-p="{{d}}"></uni-icons><view class="search_btn"><uni-icons wx:if="{{e}}" u-i="406c9705-1" bind:__l="__l" u-p="{{e}}"></uni-icons></view></navigator></view><view wx:if="{{f}}" class="to_bottom"> -----到底啦-----</view></view>
+<view><view class="banner_box"><view class="banner_list"><swiper class="banner_swiper" autoplay="{{true}}"><swiper-item wx:for="{{a}}" wx:for-item="item" wx:key="c"><image src="{{item.a}}" class="image" mode="widthFix" bindtap="{{item.b}}"></image></swiper-item></swiper></view></view><view class="product_box"><view wx:if="{{b}}" class="to_bottom"> -----还没有产品啦-----</view><view class="product_list"><view wx:for="{{c}}" wx:for-item="item" wx:key="f" bindtap="{{item.e}}" data-eventsync="true" class="product_item"><view class="product_left"><image class="product_image" src="{{item.a}}" mode=""></image></view><view class="product_right"><view class="product_title"><view class="product_text"><text>{{item.b}}</text></view><view class="time"><text>{{item.c}}</text></view></view><view class="stock_price"><view class="product_price"><label style="font-size:26rpx">￥</label><text>{{item.d}}</text></view><view class="product_order_but"> 立即购买 </view></view></view></view></view></view><view class="search_fixed"><navigator url="/pagesA/search/index" class="search_box"><view class="search_input"><text>搜索</text></view><uni-icons wx:if="{{d}}" class="icon" u-i="406c9705-0" bind:__l="__l" u-p="{{d}}"></uni-icons><view class="search_btn" catchtap="{{f}}"><uni-icons wx:if="{{e}}" u-i="406c9705-1" bind:__l="__l" u-p="{{e}}"></uni-icons></view></navigator></view><view wx:if="{{g}}" class="to_bottom"> -----到底啦-----</view></view>

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -5,7 +5,6 @@
   position: fixed;
   margin: 0rpx auto;
   padding: 20rpx 0rpx;
-  background-color: #FFFFFF;
 }
 .search_fixed .search_box {
   width: 590rpx;
@@ -20,12 +19,11 @@
   display: block;
   font-size: 24rpx;
   position: relative;
-  border-top-left-radius: 40rpx;
-  border-bottom-left-radius: 40rpx;
+  border-radius: 40rpx;
   padding-left: 20rpx;
   margin-left: 35rpx;
   background-color: #FFFFFF;
-  border: 2rpx solid #dddddd;
+  border: 2rpx solid #ffffff;
 }
 .search_fixed .search_box .search_input text {
   width: 120rpx;
@@ -43,7 +41,7 @@
 }
 .search_fixed .search_box .search_btn {
   top: 0rpx;
-  z-index: 9;
+  z-index: 999;
   left: 660rpx;
   color: #FFFFFF;
   position: absolute;
@@ -98,11 +96,14 @@
 }
 .product_box .product_list .product_item .product_left {
   float: left;
+  width: 200rpx;
+  height: 180rpx;
+  overflow: hidden;
+  margin: 20rpx 20rpx;
 }
 .product_box .product_list .product_item .product_left .product_image {
-  margin: 20rpx 20rpx;
-  width: 224rpx;
-  height: 200rpx;
+  width: 100%;
+  height: 100%;
   border-radius: 20rpx;
 }
 .product_box .product_list .product_item .product_right {
@@ -110,43 +111,37 @@
   width: 380rpx;
   margin: 20rpx 20rpx;
 }
-.product_box .product_list .product_item .product_right .product_title {
-  line-height: 1.5;
-}
 .product_box .product_list .product_item .product_right .product_title .product_text {
-  font-size: 30rpx;
+  font-size: 36rpx;
   font-weight: 600;
 }
 .product_box .product_list .product_item .product_right .product_title .time {
   font-size: 24rpx;
+  padding: 15rpx 0rpx;
 }
 .product_box .product_list .product_item .product_right .stock_price {
-  color: #dddddd;
-  height: 100rpx;
+  height: 80rpx;
   font-size: 20rpx;
   overflow: hidden;
-  line-height: 30rpx;
-  padding: 0rpx 10rpx;
-  margin-top: 40rpx;
+  width: 410rpx;
 }
 .product_box .product_list .product_item .product_right .stock_price .product_price {
   float: left;
   color: red;
-  font-size: 50rpx;
+  font-size: 40rpx;
   font-weight: 600;
-  line-height: 100rpx;
+  padding: 10rpx 0rpx;
 }
 .product_box .product_list .product_item .product_right .stock_price .product_order_but {
   float: right;
-}
-.product_box .product_list .product_item .product_right .stock_price .product_order_but button {
   width: 166rpx;
-  height: 64rpx;
+  height: 60rpx;
   font-size: 26rpx;
   font-weight: 600;
-  margin: 20rpx 0rpx;
   background-color: #1fbe7e;
   border-radius: 40rpx;
+  text-align: center;
+  line-height: 60rpx;
   color: #FFFFFF;
 }
 .product_box .product_list .product_item:nth-child(even) {

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/product/index.js

@@ -319,12 +319,6 @@ const _sfc_main = {
         }
       });
     },
-    // 客服显示
-    openAddFollow() {
-      this.followQrcode = this.$checkAccess.getFollowQrcode();
-      if (this.followQrcode)
-        this.$refs.addFollow.open("center");
-    },
     closeAddFollow() {
       this.$refs.addFollow.close();
     },
@@ -424,7 +418,6 @@ const _sfc_main = {
     getStatusBarHeight() {
       let SYSTEM_INFO = common_vendor.index.getSystemInfoSync();
       this.StatusBarHeight = SYSTEM_INFO.statusBarHeight || 10;
-      console.log(SYSTEM_INFO.statusBarHeight);
     },
     goBack() {
       common_vendor.index.navigateBack({

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/product/index.wxss

@@ -42,24 +42,26 @@
 .product_info .product_title_info .product_title {
   font-size: 30rpx;
   line-height: 40rpx;
+  padding: 5rpx 0rpx;
 }
 .product_info .product_title_info .product_subtitle {
   color: #999999;
   line-height: 40rpx;
   font-size: 24rpx;
+  padding: 5rpx 0rpx;
 }
 .product_info .price_stock {
   color: #999999;
   font-size: 24rpx;
   line-height: 30rpx;
   overflow: hidden;
-  margin-top: 20rpx;
 }
 .product_info .price_stock .product_price {
   float: left;
   color: red;
   font-size: 38rpx;
   line-height: 60rpx;
+  padding: 5rpx 0rpx;
 }
 .product_info .price_stock .product_price .product_market {
   font-size: 24rpx;

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/index.js

@@ -120,8 +120,10 @@ if (!Math) {
   _easycom_uni_icons();
 }
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: common_vendor.f($data.productList, (item, index, i0) => {
+  return common_vendor.e({
+    a: !$data.productList.length
+  }, !$data.productList.length ? {} : {}, {
+    b: common_vendor.f($data.productList, (item, index, i0) => {
       return {
         a: item.thumb,
         b: common_vendor.t(item.name),
@@ -130,14 +132,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         e: index
       };
     }),
-    b: common_assets._imports_0$2,
-    c: common_vendor.t($data.username),
-    d: common_vendor.t($data.scoreInfo.score),
-    e: common_vendor.p({
+    c: common_assets._imports_0$2,
+    d: common_vendor.t($data.username),
+    e: common_vendor.t($data.scoreInfo.score),
+    f: common_vendor.p({
       type: "search",
       size: "20"
     })
-  };
+  });
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/index.wxml

@@ -1 +1 @@
-<view><view class="product_box"><view class="product_list"><view wx:for="{{a}}" wx:for-item="item" wx:key="e" bindtap="{{item.d}}" data-eventsync="true" class="product_item"><image class="product_image" src="{{item.a}}" mode=""></image><view class="product_name"><text>{{item.b}}</text></view><view class="stock_price"><view class="product_price"><text>{{item.c}} 积分</text></view></view></view></view></view><view class="header_fixed"><view class="user_title"><view class="user_prc"><image src="{{b}}"></image></view><view class="title"><view class="">{{c}}</view><view class="">{{d}}积分 </view></view></view><view class="search"><view class="search_box"><view class="search_input"><input type="text" placeholder="一年级系统班"/></view><view class="search_icon"><uni-icons wx:if="{{e}}" u-i="b5b70676-0" bind:__l="__l" u-p="{{e}}"></uni-icons></view></view></view><view class="course_option"><view class="option_name"> 综合 </view><view class="option_name"> 我可兑换 </view><view class="option_name"> 销量 </view><view class="option_name"> 积分 </view></view></view><view class="to_bottom"> -----到底了-----</view></view>
+<view><view class="product_box"><view wx:if="{{a}}" class="to_bottom"> -----还没有积分产品-----</view><view class="product_list"><view wx:for="{{b}}" wx:for-item="item" wx:key="e" bindtap="{{item.d}}" data-eventsync="true" class="product_item"><image class="product_image" src="{{item.a}}" mode=""></image><view class="product_name"><text>{{item.b}}</text></view><view class="stock_price"><view class="product_price"><text>{{item.c}} 积分</text></view></view></view></view></view><view class="header_fixed"><view class="user_title"><view class="user_prc"><image src="{{c}}"></image></view><view class="title"><view class="">{{d}}</view><view class="">{{e}}积分 </view></view></view><view class="search"><view class="search_box"><view class="search_input"><input type="text" placeholder="一年级系统班"/></view><view class="search_icon"><uni-icons wx:if="{{f}}" u-i="b5b70676-0" bind:__l="__l" u-p="{{f}}"></uni-icons></view></view></view><view class="course_option"><view class="option_name"> 综合 </view><view class="option_name"> 我可兑换 </view><view class="option_name"> 销量 </view><view class="option_name"> 积分 </view></view></view><view class="to_bottom"> -----到底了-----</view></view>

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/index.wxss

@@ -78,10 +78,11 @@
 .product_box .product_list .product_item {
   float: left;
   width: 320rpx;
+  height: 490rpx;
   display: block;
   overflow: hidden;
   margin: 20rpx 0rpx;
-  margin-right: 20rpx;
+  margin-right: 40rpx;
   background-color: #FFFFFF;
   border-radius: 20rpx;
 }
@@ -91,16 +92,22 @@
 }
 .product_box .product_list .product_item .product_name {
   height: 80rpx;
-  font-size: 26rpx;
+  font-size: 30rpx;
   line-height: 40rpx;
   overflow: hidden;
-  padding: 10rpx 10rpx;
+  margin: 10rpx 0rpx;
+  padding: 0rpx 10rpx;
+  text-overflow: ellipsis;
 }
 .product_box .product_list .product_item .product_spec {
+  height: 30rpx;
   color: #999999;
-  font-size: 22rpx;
+  font-size: 24rpx;
   line-height: 30rpx;
   padding: 0rpx 10rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .product_box .product_list .product_item .stock_price {
   color: #dddddd;

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/product.wxss

@@ -188,13 +188,15 @@
 }
 .order_car .to_car .text {
   float: left;
-  padding-left: 8rpx;
+  padding-top: 5rpx;
+  padding-left: 6rpx;
   text-align: center;
   line-height: 30rpx;
   font-size: 24rpx;
 }
 .order_car .to_car .shop_cat_text {
   float: left;
+  padding-top: 5rpx;
   text-align: center;
   line-height: 30rpx;
   font-size: 24rpx;

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.js

@@ -3,49 +3,10 @@ const common_vendor = require("../../common/vendor.js");
 const _sfc_main = {
   data() {
     return {
+      //禁止滚动穿透
+      show: false,
       //产品列表
-      productList: [
-        {
-          "id": 8,
-          "uid": 3513,
-          "schedule_id": 6,
-          "order_id": 31,
-          "orders_product_id": 33,
-          "product_id": 11,
-          "status": 0,
-          "teacher_id": 6,
-          "course_id": 2,
-          "start_time": 1730888928,
-          "end_time": 1730888928,
-          "insert_time": 1731317292,
-          "update_time": 1731317292,
-          "teacher_name": "张老师",
-          "teacher_desc": "擅长舞蹈",
-          "teacher_pic": "../../static/logo2.jpg",
-          "course_name": "拳击高级课",
-          "course_address": "龙华"
-        },
-        {
-          "id": 6,
-          "uid": 3513,
-          "schedule_id": 6,
-          "order_id": 31,
-          "orders_product_id": 33,
-          "product_id": 11,
-          "status": 0,
-          "teacher_id": 6,
-          "course_id": 2,
-          "start_time": 1730888928,
-          "end_time": 1730888928,
-          "insert_time": 1731313905,
-          "update_time": 1731313905,
-          "teacher_name": "张老师",
-          "teacher_desc": "擅长舞蹈",
-          "teacher_pic": "../../static/logo2.jpg",
-          "course_name": "拳击高级课",
-          "course_address": "龙华"
-        }
-      ],
+      productList: [],
       // 请求参数
       requestParam: {
         name: "",
@@ -78,6 +39,9 @@ const _sfc_main = {
     });
   },
   methods: {
+    popupChange(e) {
+      this.show = e.show;
+    },
     //弹出层
     cancelPopup(index) {
       this.curIndex = index;
@@ -148,7 +112,8 @@ if (!Math) {
 }
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: common_vendor.f($data.productList, (item, index, i0) => {
+    a: "overflow:" + ($data.show ? "hidden" : "visible"),
+    b: common_vendor.f($data.productList, (item, index, i0) => {
       return common_vendor.e({
         a: item.teacher_pic,
         b: common_vendor.t(item.teacher_name),
@@ -166,9 +131,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         j: index
       });
     }),
-    b: common_vendor.o(($event) => $options.closeCancel()),
-    c: common_vendor.o(($event) => $options.cancelCourse()),
-    d: common_vendor.sr("cancelPopup", "110bae46-0")
+    c: common_vendor.o(($event) => $options.closeCancel()),
+    d: common_vendor.o(($event) => $options.cancelCourse()),
+    e: common_vendor.sr("cancelPopup", "110bae46-0"),
+    f: common_vendor.o($options.popupChange)
   };
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.wxml

@@ -1 +1 @@
-<view><view class="course_status_list"><view class="course_status_item"> 全部 </view><view class="course_status_item"> 待上课 </view><view class="course_status_item"> 已完成 </view><view class="course_status_item"> 已取消 </view></view><view class="course_list"><view wx:for="{{a}}" wx:for-item="item" wx:key="j" class="course_item"><view class="course_title"><view class="course_prc"><image src="{{item.a}}" mode=""></image></view><view class="title"><view class="title_text"><view class="tea_name">{{item.b}} </view><view wx:if="{{item.c}}" class="btn_1" bindtap="{{item.d}}"> 取消预约 </view><view wx:if="{{item.e}}" class="btn_2"> 已取消 </view><view wx:if="{{item.f}}" class="btn_3"> 已完成 </view></view><view class="subtilte">{{item.g}}</view><view class="course_arrt"><view class="text"> 上课地址： </view><view class="attr">{{item.h}} </view></view></view></view><view class="classTime"><view class="text"> 上课时间 </view><view class="time">{{item.i}} </view></view></view></view><uni-popup class="r" u-s="{{['d']}}" u-r="cancelPopup" u-i="110bae46-0" bind:__l="__l"><view class="cancel_layout"><view class="cancel_title"> 取消预约 </view><view class="cancel_text"> 是否确认取消课程？取消后可重新更新预约 </view><view class="cancel_btn"><view class="btn_1" bindtap="{{b}}"> 在想想 </view><view class="btn_2" bindtap="{{c}}"> 确认 </view></view></view></uni-popup><view class="to_bottom"> -----到底啦-----</view></view>
+<page-meta page-style="{{a}}"></page-meta><view><view class="course_status_list"><view class="course_status_item"> 全部 </view><view class="course_status_item"> 待上课 </view><view class="course_status_item"> 已完成 </view><view class="course_status_item"> 已取消 </view></view><view class="course_list"><view wx:for="{{b}}" wx:for-item="item" wx:key="j" class="course_item"><view class="course_title"><view class="course_prc"><image src="{{item.a}}" mode=""></image></view><view class="title"><view class="title_text"><view class="tea_name">{{item.b}} </view><view wx:if="{{item.c}}" class="btn_1" bindtap="{{item.d}}"> 取消预约 </view><view wx:if="{{item.e}}" class="btn_2"> 已取消 </view><view wx:if="{{item.f}}" class="btn_3"> 已完成 </view></view><view class="subtilte">{{item.g}}</view><view class="course_arrt"><view class="text"> 上课地址： </view><view class="attr">{{item.h}} </view></view></view></view><view class="classTime"><view class="text"> 上课时间 </view><view class="time">{{item.i}} </view></view></view></view><uni-popup class="r" u-s="{{['d']}}" u-r="cancelPopup" bindchange="{{f}}" u-i="110bae46-0" bind:__l="__l"><view class="cancel_layout"><view class="cancel_title"> 取消预约 </view><view class="cancel_text"> 是否确认取消课程？取消后可重新更新预约 </view><view class="cancel_btn"><view class="btn_1" bindtap="{{c}}"> 在想想 </view><view class="btn_2" bindtap="{{d}}"> 确认 </view></view></view></uni-popup><view class="to_bottom"> -----到底啦-----</view></view>

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.wxss

@@ -42,16 +42,17 @@
   justify-content: space-between;
 }
 .course_list .course_item .course_title .title .title_text .tea_name {
-  font-size: 50rpx;
+  font-size: 40rpx;
   font-weight: 600;
 }
 .course_list .course_item .course_title .title .title_text .btn_1 {
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  width: 200rpx;
-  padding: 10rpx;
+  width: 160rpx;
+  padding: 15rpx 0rpx;
   color: #00bba5;
+  font-size: 24rpx;
   border: 2rpx solid #00bba5;
   border-radius: 40rpx;
 }
@@ -59,9 +60,10 @@
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  width: 200rpx;
-  padding: 10rpx;
+  width: 160rpx;
+  padding: 15rpx 0rpx;
   color: #FFFFFF;
+  font-size: 24rpx;
   background-color: #d3d3d3;
   border-radius: 40rpx;
 }
@@ -69,29 +71,25 @@
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  width: 200rpx;
-  padding: 10rpx;
+  width: 160rpx;
+  padding: 15rpx 0rpx;
   color: #FFFFFF;
+  font-size: 24rpx;
   background-color: #d3d3d3;
   border-radius: 40rpx;
 }
 .course_list .course_item .course_title .title .subtilte {
-  padding: 5rpx 5rpx 5rpx 0rpx;
+  padding: 10rpx 10rpx 10rpx 0rpx;
   font-size: 26rpx;
 }
 .course_list .course_item .course_title .title .course_arrt {
   display: flex;
-  font-size: 24rpx;
+  font-size: 26rpx;
   padding: 10rpx 10rpx 10rpx 0rpx;
 }
-.course_list .course_item .course_title .title .course_arrt .text {
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  width: 120rpx;
-}
 .course_list .course_item .course_title .title .course_arrt .attr {
   flex: 1;
+  font-size: 24rpx;
   flex-wrap: wrap;
 }
 .course_list .course_item .classTime {
@@ -102,20 +100,19 @@
   padding: 10rpx;
 }
 .course_list .course_item .classTime .text {
-  font-size: 26rpx;
-  display: inline-flex;
-  justify-content: center;
+  font-size: 32rpx;
   width: 164rpx;
 }
 .course_list .course_item .classTime .time {
-  font-size: 26rpx;
+  font-size: 32rpx;
+  padding: 5rpx 0rpx;
   font-weight: bold;
   margin-left: 30rpx;
 }
 .cancel_layout {
   background-color: #FFFFFF;
-  width: 690rpx;
-  height: 30vh;
+  width: 600rpx;
+  height: 25vh;
   border-radius: 40rpx;
   display: flex;
   flex-direction: column;
@@ -126,32 +123,34 @@
   justify-content: center;
   align-items: center;
   padding: 10rpx;
-  margin: 20rpx;
+  margin: 20rpx 0rpx 0rpx 0rpx;
   font-size: 40rpx;
   font-weight: bold;
   color: #000000;
+  font-size: 30rpx;
 }
 .cancel_layout .cancel_text {
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  margin: 30rpx auto;
-  width: 576rpx;
+  margin: 20rpx auto;
+  width: 500rpx;
   height: 50rpx;
   padding: 30rpx;
+  line-height: 50rpx;
+  font-size: 30rpx;
 }
 .cancel_layout .cancel_btn {
   border-top: 2rpx solid #d3d3d3;
   display: flex;
   justify-content: space-between;
   padding-top: 20rpx;
-  height: 130rpx;
+  height: 100rpx;
 }
 .cancel_layout .cancel_btn .btn_1 {
   display: inline-flex;
   justify-content: center;
-  align-items: center;
-  height: 100rpx;
+  padding-top: 20rpx;
   flex: 1;
   font-size: 30rpx;
   color: #51bf81;
@@ -159,8 +158,7 @@
 .cancel_layout .cancel_btn .btn_2 {
   display: inline-flex;
   justify-content: center;
-  align-items: center;
+  padding-top: 20rpx;
   flex: 1;
-  height: 100rpx;
   font-size: 30rpx;
 }

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/orders/userorder.js

@@ -113,14 +113,16 @@ const _sfc_main = {
   }
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
+  return common_vendor.e({
     a: common_vendor.n($data.requestParam.status == 0 ? "active" : ""),
     b: common_vendor.o(($event) => $options.setStatus(0)),
     c: common_vendor.n($data.requestParam.status == 1 ? "active" : ""),
     d: common_vendor.o(($event) => $options.setStatus(1)),
     e: common_vendor.n($data.requestParam.status == 8 ? "active" : ""),
     f: common_vendor.o(($event) => $options.setStatus(8)),
-    g: common_vendor.f($data.orderList, (item, index, i0) => {
+    g: !$data.orderList.length
+  }, !$data.orderList.length ? {} : {}, {
+    h: common_vendor.f($data.orderList, (item, index, i0) => {
       return {
         a: common_vendor.t(item.business_name),
         b: common_vendor.t(item.state),
@@ -128,15 +130,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           return {
             a: product_info.product_thumb,
             b: common_vendor.t(product_info.product_name),
-            c: product_info.item_id
+            c: common_vendor.t(product_info.product_spec),
+            d: common_vendor.t(product_info.buy_num),
+            e: product_info.item_id
           };
         }),
-        d: common_vendor.t(item.price_total),
-        e: common_vendor.t(item.pay_total),
-        f: index
+        d: common_vendor.t(item.pay_total),
+        e: index
       };
-    })
-  };
+    }),
+    i: $data.isLast
+  }, $data.isLast ? {} : {});
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/orders/userorder.wxml

@@ -1 +1 @@
-<view><view class="order_status_list"><view class="{{['order_status_item', a]}}" bindtap="{{b}}"> 全部订单 </view><view class="{{['order_status_item', c]}}" bindtap="{{d}}"> 进行中 </view><view class="{{['order_status_item', e]}}" bindtap="{{f}}"> 已完成 </view><view class="order_status_item"> 售后 </view></view><view class="order_list"><view wx:for="{{g}}" wx:for-item="item" wx:key="f" class="order_item"><view class="product_title_status"><view class="title">{{item.a}}</view><view class="status">{{item.b}}</view></view><view wx:for="{{item.c}}" wx:for-item="product_info" wx:key="c" class="product_info"><view class="product_image"><image src="{{product_info.a}}" mode=""></image></view><view class="product_title_price"><view class="title">{{product_info.b}}</view><view class="price"> ￥{{item.d}}</view><view class="actual_pay"> 实付{{item.e}}</view></view></view><view class="more_title"><view class="more"> 去上课 </view><view class="more"> 去评价 </view><view class="more"> 更多 </view></view></view></view></view>
+<view><view class="order_status_list"><view class="{{['order_status_item', a]}}" bindtap="{{b}}"> 全部订单 </view><view class="{{['order_status_item', c]}}" bindtap="{{d}}"> 进行中 </view><view class="{{['order_status_item', e]}}" bindtap="{{f}}"> 已完成 </view><view class="order_status_item"> 售后 </view></view><view wx:if="{{g}}" class="to_bottom"> -----还没有订单-----</view><view class="order_list"><view wx:for="{{h}}" wx:for-item="item" wx:key="e" class="order_item"><view class="product_title_status"><view class="title">{{item.a}}</view><view class="status">{{item.b}}</view></view><view wx:for="{{item.c}}" wx:for-item="product_info" wx:key="e" class="product_info"><view class="product_image"><image src="{{product_info.a}}" mode=""></image></view><view class="product_title"><view class="name">{{product_info.b}}</view><view class="spec">{{product_info.c}}</view></view><view class="buy_num"> x{{product_info.d}}</view></view><view class="actual_pay"> ￥{{item.d}}</view><view class="hr_like"></view><view class="more_title"><view class="more"> 去上课 </view><view class="more"> 去评价 </view><view class="more"> 更多 </view></view></view></view><view wx:if="{{i}}" class="to_bottom"> -----到底啦-----</view></view>

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/orders/userorder.wxss

@@ -20,7 +20,7 @@
 }
 .order_list .order_item {
   width: 690rpx;
-  margin: 30rpx auto;
+  margin: 15rpx auto;
   background-color: #FFFFFF;
   padding-top: 1rpx;
 }
@@ -30,7 +30,9 @@
   margin: 20rpx 20rpx;
 }
 .order_list .order_item .product_title_status .title {
+  width: 180rpx;
   font-size: 30rpx;
+  text-align: center;
   color: #000000;
 }
 .order_list .order_item .product_title_status .status {
@@ -48,21 +50,35 @@
   height: 160rpx;
   border-radius: 40rpx;
 }
-.order_list .order_item .product_info .product_title_price {
+.order_list .order_item .product_info .product_title {
   width: 500rpx;
   margin: 20rpx 20rpx;
 }
-.order_list .order_item .product_info .product_title_price .title {
+.order_list .order_item .product_info .product_title .name {
   font-size: 34rpx;
+  padding: 10rpx 0rpx;
 }
-.order_list .order_item .product_info .product_title_price .price {
+.order_list .order_item .product_info .product_title .spec {
   font-size: 24rpx;
-  color: red;
+  padding: 10rpx 0rpx;
+  color: #999999;
+}
+.order_list .order_item .product_info .buy_num {
+  line-height: 160rpx;
+  font-size: 26rpx;
+  color: #999999;
+  padding-right: 20rpx;
 }
-.order_list .order_item .product_info .product_title_price .actual_pay {
+.order_list .order_item .actual_pay {
   text-align: right;
-  padding-right: 10rpx;
-  font-size: 24rpx;
+  padding-right: 20rpx;
+  color: red;
+  font-size: 26rpx;
+}
+.order_list .order_item .hr_like {
+  margin-top: 10rpx;
+  border-bottom: 2rpx solid #E4E4E4;
+  width: 100%;
 }
 .order_list .order_item .more_title {
   width: 690rpx;