更新版本

jiaoyu_mp/pages.json

@@ -142,6 +142,13 @@
 			{
 				"navigationBarTitleText" : "优惠卷"
 			}
+		},
+		{
+			"path" : "pages/course/index",
+			"style" : 
+			{
+				"navigationBarTitleText" : "上课"
+			}
 		}
 	],
 	
@@ -247,10 +254,10 @@
 			"selectedIconPath": "static/tabbar/score_active.png",
 			"text": "积分"
 		},{
-			"pagePath": "pages/score/clockin",
+			"pagePath": "pages/course/index",
 			"iconPath": "static/tabbar/clockin.png",
 			"selectedIconPath": "static/tabbar/clockin_active.png",
-			"text": "签到"
+			"text": "上课"
 		},{
 			"pagePath": "pages/car/index",
 			"iconPath": "static/icon/car.png",

jiaoyu_mp/pages/course/index.vue

@@ -0,0 +1,224 @@
+<template>
+	<view class="course_layout">
+		<view class="course_list">
+			<view class="course_item">
+				<view class="course_title">
+					<view class="left">
+					</view>
+					<view class="right">
+						<view class="title">
+							少儿架子鼓进阶课程
+						</view>
+						<view class="skill">
+							进阶难点-技巧点拨
+						</view>
+						<view class="course_option">
+							<view class="course_num">
+								总计两个科目
+							</view>
+							<view class="course_num">
+								总计10课堂
+							</view>
+						</view>
+						<view class="course_remain">
+							<view class="remain_class">
+								剩余5堂课
+							</view>
+							<view class="price">
+								￥100
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="btn_title">
+					<view class="title">
+						上课地址：深圳市龙华区民治街道和平路3号
+					</view>
+					<view class="btn">
+						<navigator url="/pagesA/course/reservation">
+							<view class="course_make_btn">
+								预约上课
+							</view>
+						</navigator>
+						<navigator url="/pagesA/course/usercourse">
+							<view class="user_course_btn">
+								我的预约
+							</view>
+						</navigator>
+					</view>
+				</view>
+			</view>
+			<view class="course_item">
+				<view class="course_title">
+					<view class="left">
+					</view>
+					<view class="right">
+						<view class="title">
+							少儿架子鼓进阶课程
+						</view>
+						<view class="skill">
+							进阶难点-技巧点拨
+						</view>
+						<view class="course_option">
+							<view class="course_num">
+								总计两个科目
+							</view>
+							<view class="course_num">
+								总计10课堂
+							</view>
+						</view>
+						<view class="course_remain">
+							<view class="remain_class">
+								剩余5堂课
+							</view>
+							<view class="price">
+								￥100
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="btn_title">
+					<view class="title">
+						上课地址：深圳市龙华区民治街道和平路3号
+					</view>
+					<view class="btn">
+						<view class="course_make_btn">
+							预约上课
+						</view>
+						<view class="user_course_btn">
+							我的预约
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="to_bottom">---到底啦---</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="less">
+.course_layout{
+	width: 690rpx;
+	margin: 30rpx auto;
+	.course_list{
+		display: block;
+		width: 690rpx;
+		.course_item{
+			width:690rpx;
+			display: block;
+			background-color: #fafafa;
+			padding: 1rpx 0rpx;
+			margin: 20rpx 0rpx;
+			.course_title{
+				display: flex;
+				width: 660rpx;
+				margin: 20rpx auto;
+				.left{
+					width: 240rpx;
+					background-color: aqua;
+					border-radius: 20rpx;
+				}
+				.right{
+					font-size: 24rpx;
+					margin-left: 20rpx;
+					.title{
+						font-size: 36rpx;
+					}
+					.skill{
+						padding: 5rpx;
+						margin: 10rpx 10rpx 10rpx 0rpx;
+						color: #c9c9c9;
+					}
+					.course_option{
+						display: flex;
+						justify-content: space-between;
+						flex-wrap: wrap;
+						width: 420rpx;
+						justify-content: ;
+						.course_num{
+							display: inline-flex;
+							justify-content: center;
+							width: 180rpx;
+							border: 2rpx solid #3985ff;
+							border-radius: 15rpx;
+							margin: 5rpx;
+							padding: 5rpx;
+							color: #3985ff;
+						}
+					}
+					.course_remain{
+							display: flex;
+							justify-content: space-between;
+							flex-wrap: wrap;
+							width: 420rpx;
+							margin-top: 30rpx;
+						.remain_class{
+							display: inline-flex;
+							justify-content: center;
+							width: 180rpx;
+							margin: 5rpx;
+							padding: 5rpx;
+							background-color: #3985ff;
+							border-radius: 15rpx;
+							color: #ffffff;
+						}
+						.price{
+							width: 180rpx;
+							margin: 5rpx;
+							padding: 5rpx;
+							text-align: right;
+							font-size: 30rpx;
+						}
+					}
+				}
+			}
+			.btn_title{
+				.title{
+					margin-left: 20rpx;
+				}
+				.btn{
+					
+					display: flex;
+					width: 690rpx;
+					margin: 20rpx 0rpx;
+					justify-content: space-between;
+					.course_make_btn{
+						width: 300rpx;
+						height: 60rpx;
+						line-height: 60rpx;
+						text-align: center;
+						padding: 10rpx;
+						background-color: #1fbe7e;
+						color: #ffffff;
+						border-radius: 20rpx;
+					}
+					.user_course_btn{
+						width: 300rpx;
+						height: 60rpx;
+						line-height: 60rpx;
+						text-align: center;
+						padding: 10rpx;
+						background-color: #1fbe7e;
+						color: #ffffff;
+						border-radius: 20rpx;
+					}
+				}
+				
+			}
+		}
+	}
+}
+</style>

jiaoyu_mp/pages/user/index.vue

@@ -80,7 +80,7 @@
 					</view>
 					<view class="navigator_title">优惠卷</view>
 				</navigator>
-				<navigator class="navigator_item" url="/pages/orders/index" >
+				<navigator class="navigator_item" url="/pages/score/clockin" >
 					<view class="navigator_image_order">
 						<image class="navigator_image" src="../../static/user_icon/user_clockin_icon.png" mode=""></image>
 					</view>

jiaoyu_mp/pagesA/course/usercourse.vue

@@ -300,10 +300,10 @@
 			padding:30rpx;
 		}
 		.cancel_btn{
-			border: 2rpx solid #d3d3d3;
+			border-top: 2rpx solid #d3d3d3;
 			display: flex;
 			justify-content: space-between;
-			padding-top: 10rpx;
+			padding-top: 20rpx;
 			height: 130rpx;
 			.btn_1{
 				display: inline-flex;

jiaoyu_mp/unpackage/dist/dev/mp-weixin/app.js

@@ -25,6 +25,7 @@ if (!Math) {
   "./pages/orders/completion.js";
   "./pages/webview/index.js";
   "./pages/coupon/order_coupon.js";
+  "./pages/course/index.js";
   "./pagesA/search/index.js";
   "./pagesA/course/index.js";
   "./pagesA/course/reservation.js";

jiaoyu_mp/unpackage/dist/dev/mp-weixin/app.json

@@ -19,7 +19,8 @@
     "pages/score/orders",
     "pages/orders/completion",
     "pages/webview/index",
-    "pages/coupon/order_coupon"
+    "pages/coupon/order_coupon",
+    "pages/course/index"
   ],
   "subPackages": [
     {
@@ -64,10 +65,10 @@
         "text": "积分"
       },
       {
-        "pagePath": "pages/score/clockin",
+        "pagePath": "pages/course/index",
         "iconPath": "static/tabbar/clockin.png",
         "selectedIconPath": "static/tabbar/clockin_active.png",
-        "text": "签到"
+        "text": "上课"
       },
       {
         "pagePath": "pages/car/index",

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

@@ -0,0 +1,13 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const _sfc_main = {
+  data() {
+    return {};
+  },
+  methods: {}
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {};
+}
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+wx.createPage(MiniProgramPage);

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

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "上课",
+  "usingComponents": {}
+}

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

@@ -0,0 +1 @@
+<view class="course_layout"><view class="course_list"><view class="course_item"><view class="course_title"><view class="left"></view><view class="right"><view class="title"> 少儿架子鼓进阶课程 </view><view class="skill"> 进阶难点-技巧点拨 </view><view class="course_option"><view class="course_num"> 总计两个科目 </view><view class="course_num"> 总计10课堂 </view></view><view class="course_remain"><view class="remain_class"> 剩余5堂课 </view><view class="price"> ￥100 </view></view></view></view><view class="btn_title"><view class="title"> 上课地址：深圳市龙华区民治街道和平路3号 </view><view class="btn"><navigator url="/pagesA/course/reservation"><view class="course_make_btn"> 预约上课 </view></navigator><navigator url="/pagesA/course/usercourse"><view class="user_course_btn"> 我的预约 </view></navigator></view></view></view><view class="course_item"><view class="course_title"><view class="left"></view><view class="right"><view class="title"> 少儿架子鼓进阶课程 </view><view class="skill"> 进阶难点-技巧点拨 </view><view class="course_option"><view class="course_num"> 总计两个科目 </view><view class="course_num"> 总计10课堂 </view></view><view class="course_remain"><view class="remain_class"> 剩余5堂课 </view><view class="price"> ￥100 </view></view></view></view><view class="btn_title"><view class="title"> 上课地址：深圳市龙华区民治街道和平路3号 </view><view class="btn"><view class="course_make_btn"> 预约上课 </view><view class="user_course_btn"> 我的预约 </view></view></view></view></view><view class="to_bottom">---到底啦---</view></view>

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

@@ -0,0 +1,107 @@
+.course_layout {
+  width: 690rpx;
+  margin: 30rpx auto;
+}
+.course_layout .course_list {
+  display: block;
+  width: 690rpx;
+}
+.course_layout .course_list .course_item {
+  width: 690rpx;
+  display: block;
+  background-color: #fafafa;
+  padding: 1rpx 0rpx;
+  margin: 20rpx 0rpx;
+}
+.course_layout .course_list .course_item .course_title {
+  display: flex;
+  width: 660rpx;
+  margin: 20rpx auto;
+}
+.course_layout .course_list .course_item .course_title .left {
+  width: 240rpx;
+  background-color: aqua;
+  border-radius: 20rpx;
+}
+.course_layout .course_list .course_item .course_title .right {
+  font-size: 24rpx;
+  margin-left: 20rpx;
+}
+.course_layout .course_list .course_item .course_title .right .title {
+  font-size: 36rpx;
+}
+.course_layout .course_list .course_item .course_title .right .skill {
+  padding: 5rpx;
+  margin: 10rpx 10rpx 10rpx 0rpx;
+  color: #c9c9c9;
+}
+.course_layout .course_list .course_item .course_title .right .course_option {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  width: 420rpx;
+  justify-content: ;
+}
+.course_layout .course_list .course_item .course_title .right .course_option .course_num {
+  display: inline-flex;
+  justify-content: center;
+  width: 180rpx;
+  border: 2rpx solid #3985ff;
+  border-radius: 15rpx;
+  margin: 5rpx;
+  padding: 5rpx;
+  color: #3985ff;
+}
+.course_layout .course_list .course_item .course_title .right .course_remain {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  width: 420rpx;
+  margin-top: 30rpx;
+}
+.course_layout .course_list .course_item .course_title .right .course_remain .remain_class {
+  display: inline-flex;
+  justify-content: center;
+  width: 180rpx;
+  margin: 5rpx;
+  padding: 5rpx;
+  background-color: #3985ff;
+  border-radius: 15rpx;
+  color: #ffffff;
+}
+.course_layout .course_list .course_item .course_title .right .course_remain .price {
+  width: 180rpx;
+  margin: 5rpx;
+  padding: 5rpx;
+  text-align: right;
+  font-size: 30rpx;
+}
+.course_layout .course_list .course_item .btn_title .title {
+  margin-left: 20rpx;
+}
+.course_layout .course_list .course_item .btn_title .btn {
+  display: flex;
+  width: 690rpx;
+  margin: 20rpx 0rpx;
+  justify-content: space-between;
+}
+.course_layout .course_list .course_item .btn_title .btn .course_make_btn {
+  width: 300rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  text-align: center;
+  padding: 10rpx;
+  background-color: #1fbe7e;
+  color: #ffffff;
+  border-radius: 20rpx;
+}
+.course_layout .course_list .course_item .btn_title .btn .user_course_btn {
+  width: 300rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  text-align: center;
+  padding: 10rpx;
+  background-color: #1fbe7e;
+  color: #ffffff;
+  border-radius: 20rpx;
+}

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

@@ -117,10 +117,10 @@
   padding: 30rpx;
 }
 .cancel_layout .cancel_btn {
-  border: 2rpx solid #d3d3d3;
+  border-top: 2rpx solid #d3d3d3;
   display: flex;
   justify-content: space-between;
-  padding-top: 10rpx;
+  padding-top: 20rpx;
   height: 130rpx;
 }
 .cancel_layout .cancel_btn .btn_1 {

jiaoyu_mp/unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -9,14 +9,14 @@
       "list": [
         {
           "name": "pagesA/course/index",
-          "pathName": "pagesA/course/reservation",
+          "pathName": "pages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
           "name": "pages/product/index",
-          "pathName": "pagesA/search/index",
+          "pathName": "pagesA/course/reservation",
           "query": "",
           "launchMode": "default",
           "scene": null