版本更新

jiaoyu_mp/pages/course/index.vue

@@ -4,7 +4,7 @@
 			<view class="course_item" v-for="(item,index) in productList" :key="index">
 				<view class="course_title">
 					<view class="left">
-						<image src="../../static/logo2.jpg"></image>
+						<image :src="item.image"></image>
 					</view>
 					<view class="right">
 						<view class="title">
@@ -42,7 +42,7 @@
 						上课地址：{{item.address}}
 					</view>
 					<view class="btn">
-						<navigator :url="`/pagesA/course/reservation?orders_product_id=${item.orders_product_id}course_id=${item.course_id}`">
+						<navigator :url="`/pagesA/course/reservation?orders_product_id=${item.orders_product_id}&course_id=${item.course_id}`">
 							<view class="course_make_btn">
 								预约上课
 							</view>
@@ -95,6 +95,7 @@
 				if( re.code == 'success' ){
 					if(re.data.last_page <= this.requestParam.page ) this.isLast = true;
 					this.productList = re.data.data;
+					console.log(this.productList);
 				}
 			});
 		},
@@ -131,7 +132,6 @@
 						width: 200rpx;
 						height: 200rpx;
 						border-radius: 20rpx;
-						border: 2rpx solid;
 					}
 				}
 				.right{

jiaoyu_mp/pages/product/index.vue

@@ -362,6 +362,7 @@
 			createOrder(){
 				// 不可预约
 				if( !this.$checkAccess.alertCity() ) return;
+				
 				// 如果有SKU，但是没有选择
 				if( this.productInfo.product_sku.length && !this.sku_id ){
 					uni.showToast({

jiaoyu_mp/pagesA/course/reservation.vue

@@ -37,7 +37,6 @@
 							</view>
 						</view>
 					</scroll-view>
-
 			    </view>
 		</view>
 <!-- 		<view class="">
@@ -225,7 +224,7 @@
 		onLoad(e) {
 			//接受url参数
 			let {orders_product_id,course_id} = e
-			
+			console.log(e);
 			this.orders_product_id = orders_product_id
 			this.course_id = course_id
 		},

jiaoyu_mp/pagesA/course/usercourse.vue

@@ -18,15 +18,15 @@
 								{{item.teacher_name}}
 								<!-- 王老师 -->
 							</view>
-							<view class="btn_1"  @click="cancelPopup(index)" v-if="!item.status" >
+							<view class="btn_1"  @click="cancelPopup(index)" v-if="item.status == 1" >
 								取消预约
 							</view>
-							<view class="btn_2" v-if="item.status">
+							<view class="btn_2" v-if="item.status == 2">
 								已取消
 							</view>
-<!-- 							<view class="btn_3" v-if="false">
+							<view class="btn_3" v-if="item.status == 3">
 								已完成
-							</view> -->
+							</view>
 						</view>
 						<view class="subtilte">
 							{{item.course_name}}
@@ -48,6 +48,7 @@
 					</view>
 					<view class="time">
 							{{timeStamp(item.start_time *1000).date+' '+timeStamp(item.start_time *1000).hour}}
+							
 						<!-- 2024--10-24周三上午10:30 -->
 					</view>
 				</view>
@@ -181,6 +182,15 @@
 							title:`${res.msg}`,
 							icon:"none"
 						})
+						//取消成功之后更新一下按钮的状态
+						this.$http.request('api/course/reservation_list',this.requestParam.page).then((re)=>{
+							// 成功结果
+							if( re.code == 'success' ){
+								if(re.data.last_page <= this.requestParam.page ) this.isLast = true;
+								this.productList = re.data.data;
+							}
+						});
+
 					}else{
 						uni.showToast({
 							title:`${res.msg}`,
@@ -247,12 +257,10 @@
 				display: flex;
 				.course_prc{
 					width: 164rpx;
-					 
 					image{
 						width: 164rpx;
 						height: 164rpx;
 						border-radius: 20rpx;
-						border: 2rpx solid;
 					}
 				}
 				.title{
@@ -285,6 +293,16 @@
 							background-color: #d3d3d3;
 							border-radius: 40rpx;
 						}
+						.btn_3{
+							display: inline-flex;
+							justify-content: center;
+							align-items: center;
+							width: 200rpx;
+							padding: 10rpx;
+							color: #FFFFFF;
+							background-color: #d3d3d3;
+							border-radius: 40rpx;
+						}
 					}
 					.subtilte{
 						padding: 5rpx 5rpx 5rpx 0rpx;

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

@@ -1,6 +1,5 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
-const common_assets = require("../../common/assets.js");
 const _sfc_main = {
   data() {
     return {
@@ -30,6 +29,7 @@ const _sfc_main = {
         if (re.data.last_page <= this.requestParam.page)
           this.isLast = true;
         this.productList = re.data.data;
+        console.log(this.productList);
       }
     });
   },
@@ -39,17 +39,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
     a: common_vendor.f($data.productList, (item, index, i0) => {
       return {
-        a: common_vendor.t(item.course_name),
-        b: common_vendor.t(item.desc),
-        c: common_vendor.t(item.course_number),
-        d: common_vendor.t(item.reservation_number),
-        e: common_vendor.t(item.price_total),
-        f: common_vendor.t(item.address),
-        g: `/pagesA/course/reservation?orders_product_id=${item.orders_product_id}course_id=${item.course_id}`,
-        h: index
+        a: item.image,
+        b: common_vendor.t(item.course_name),
+        c: common_vendor.t(item.desc),
+        d: common_vendor.t(item.course_number),
+        e: common_vendor.t(item.reservation_number),
+        f: common_vendor.t(item.price_total),
+        g: common_vendor.t(item.address),
+        h: `/pagesA/course/reservation?orders_product_id=${item.orders_product_id}&course_id=${item.course_id}`,
+        i: index
       };
-    }),
-    b: common_assets._imports_0$2
+    })
   };
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);

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="h" class="course_item"><view class="course_title"><view class="left"><image src="{{b}}"></image></view><view class="right"><view class="title">{{item.a}} </view><view class="skill">{{item.b}} </view><view class="course_option"><view class="course_num"> 课程数量：{{item.c}}</view><view class="remain_class"> 预约人数：{{item.d}}</view></view><view class="course_remain"><view class="remain_class"></view><view class="price"> ￥{{item.e}} </view></view></view></view><view class="btn_title"><view class="title"> 上课地址：{{item.f}}</view><view class="btn"><navigator url="{{item.g}}"><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"> 上课地址：{{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>

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

@@ -26,7 +26,6 @@
   width: 200rpx;
   height: 200rpx;
   border-radius: 20rpx;
-  border: 2rpx solid;
 }
 .course_layout .course_list .course_item .course_title .right {
   font-size: 24rpx;

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

@@ -185,6 +185,7 @@ const _sfc_main = {
   },
   onLoad(e) {
     let { orders_product_id, course_id } = e;
+    console.log(e);
     this.orders_product_id = orders_product_id;
     this.course_id = course_id;
   },

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

@@ -97,6 +97,13 @@ const _sfc_main = {
             title: `${res.msg}`,
             icon: "none"
           });
+          this.$http.request("api/course/reservation_list", this.requestParam.page).then((re) => {
+            if (re.code == "success") {
+              if (re.data.last_page <= this.requestParam.page)
+                this.isLast = true;
+              this.productList = re.data.data;
+            }
+          });
         } else {
           common_vendor.index.showToast({
             title: `${res.msg}`,
@@ -145,16 +152,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       return common_vendor.e({
         a: item.teacher_pic,
         b: common_vendor.t(item.teacher_name),
-        c: !item.status
-      }, !item.status ? {
+        c: item.status == 1
+      }, item.status == 1 ? {
         d: common_vendor.o(($event) => $options.cancelPopup(index), index)
       } : {}, {
-        e: item.status
-      }, item.status ? {} : {}, {
-        f: common_vendor.t(item.course_name),
-        g: common_vendor.t(item.course_address),
-        h: common_vendor.t($options.timeStamp(item.start_time * 1e3).date + " " + $options.timeStamp(item.start_time * 1e3).hour),
-        i: index
+        e: item.status == 2
+      }, item.status == 2 ? {} : {}, {
+        f: item.status == 3
+      }, item.status == 3 ? {} : {}, {
+        g: common_vendor.t(item.course_name),
+        h: common_vendor.t(item.course_address),
+        i: common_vendor.t($options.timeStamp(item.start_time * 1e3).date + " " + $options.timeStamp(item.start_time * 1e3).hour),
+        j: index
       });
     }),
     b: common_vendor.o(($event) => $options.closeCancel()),

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="i" 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><view class="subtilte">{{item.f}}</view><view class="course_arrt"><view class="text"> 上课地址： </view><view class="attr">{{item.g}} </view></view></view></view><view class="classTime"><view class="text"> 上课时间 </view><view class="time">{{item.h}} </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>
+<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>

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

@@ -32,7 +32,6 @@
   width: 164rpx;
   height: 164rpx;
   border-radius: 20rpx;
-  border: 2rpx solid;
 }
 .course_list .course_item .course_title .title {
   flex: 1;
@@ -66,6 +65,16 @@
   background-color: #d3d3d3;
   border-radius: 40rpx;
 }
+.course_list .course_item .course_title .title .title_text .btn_3 {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  width: 200rpx;
+  padding: 10rpx;
+  color: #FFFFFF;
+  background-color: #d3d3d3;
+  border-radius: 40rpx;
+}
 .course_list .course_item .course_title .title .subtilte {
   padding: 5rpx 5rpx 5rpx 0rpx;
   font-size: 26rpx;

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

@@ -3,20 +3,20 @@
   "projectname": "开邻智数",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   },
   "condition": {
     "miniprogram": {
       "list": [
         {
-          "name": "pagesA/course/index",
-          "pathName": "pagesA/course/reservation",
+          "name": "pages/product/index",
+          "pathName": "pages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/product/index",
+          "name": "pagesA/course/index",
           "pathName": "pagesA/course/reservation",
           "query": "",
           "launchMode": "default",