更新

api/api.js

@@ -5,7 +5,7 @@ import utils from '../utils/utils.js'
 let limit = {}
 let debounce = {}
 
-const models = ['login', 'index', 'vip', 'info']
+const models = ['login', 'index', 'vip', 'info', 'order']
 
 const config = {
 	// 示例

api/model/index.js

@@ -33,6 +33,11 @@ const api = {
 		url: '/index_common/getTravelInfo',
 		method: 'GET', 
 	},
+    // 悦动时刻信息
+    getYueDong: {
+		url: '/index_common/getYueDong',
+		method: 'GET', 
+	},
 }
 
 export default api

api/model/order.js

@@ -0,0 +1,37 @@
+
+
+// 订单相关接口
+const api = {
+    // 获取订单列表数据带分页
+	orderPageList: {
+		url: '/order_common/getOrderPageList',
+		method: 'GET', 
+	},
+    // 取消订单活动
+    cancelOrder: {
+		url: '/order_common/cancelOrder',
+		method: 'POST', 
+	},
+    // 订单活动评价
+    evaluate: {
+		url: '/order_common/evaluate',
+		method: 'POST', 
+	},
+    // 根据订单标识查询订单信息
+    orderInfo: {
+		url: '/order_common/getOrderInfo',
+		method: 'GET', 
+	},
+    // 订单开具发票
+    evaluate: {
+		url: '/order_common/invoice',
+		method: 'POST', 
+	},
+    // 订单活动签到
+    signIn: {
+		url: '/order_common/signIn',
+		method: 'POST', 
+	},
+}
+
+export default api

components/active/active-item.vue

@@ -12,7 +12,7 @@
 						<view class="address">{{item.address}}</view>
 					</view>
 					<view class="price">
-						<view class="num-box">20/40</view>
+						<view class="num-box">{{item.num}}/{{item.sum}}</view>
 						<view class="btn-box" @click="toDetail(item)">立即报名</view>
 					</view>
 				</view>

components/cart/CardList.vue

@@ -12,10 +12,10 @@
                 <view class="right">
                     <view class="detailed">
                         <view class="title">{{item.title}}</view>
-                        <view class="date">{{item.time}}</view>
+                        <view class="date">{{item.startTime}}</view>
                         <view class="address">{{item.address}}</view>
                     </view>
-                    <view class="price"><text>总计</text>¥{{item.totalPrice}}</view>
+                    <view class="price"><text>总计</text>¥{{item.price}}</view>
                 </view>
             </view>
             <view class="button-sp-area" v-if="Array.isArray(item.btnObj) && item.btnObj.length > 0">

pages/index/cart.vue

@@ -33,6 +33,11 @@
 		},
 		data() {
 			return {
+                params:{
+                    state:0,
+					pageNo:1,
+					pageSize:10
+				},
 				tabList: [{
 						id: 0,
 						name: '全部'
@@ -51,74 +56,94 @@
 					},
 				],
 				lineBg: require('@/static/image/cart/tabIcon.png'),
-				cardListData: [{
-						imgUrl: 'https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg',
-						orderTime: '2024.08.23 12:00',
-						state: 'U',
-						stateText: '待参加',
-						title: '夏日去撒野旅游计划～',
-						time: '2024.10.28 10:00',
-						address: '成都市东丽湖露营地32号',
-						totalPrice: '298.00',
-						btnObj: [{
-								id: '0',
-								btnTitle: '取消活动',
-								color: '#AFAFAF',
-								bgColor: '#34312E'
-							},
-							{
-								id: '1',
-								btnTitle: '活动签到',
-								color: '#FF4546',
-								bgColor: '#492623'
-							}
-						]
-					},
-					{
-						imgUrl: 'https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg',
-						orderTime: '2024.08.23 12:00',
-						state: 'S',
-						stateText: '已完成',
-						title: '夏日去撒野旅游计划～',
-						time: '2024.10.28 10:00',
-						address: '成都市东丽湖露营地32号',
-						totalPrice: '298.00',
-						btnObj: [{
-								id: '2',
-								btnTitle: '活动评价',
-								color: '#FF4546',
-								bgColor: '#492623'
-							},
-							{
-								id: '3',
-								btnTitle: '开具发票',
-								color: '#FFB245',
-								bgColor: '#49361D'
-							}
-						]
-					},
-					{
-						imgUrl: 'https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg',
-						orderTime: '2024.08.23 12:00',
-						state: 'F',
-						stateText: '已完成',
-						title: '夏日去撒野旅游计划～',
-						time: '2024.10.28 10:00',
-						address: '成都市东丽湖露营地32号',
-						totalPrice: '298.00',
-						btnObj: []
-					}
-				]
+				// cardListData: [{
+				// 		imgUrl: 'https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg',
+				// 		orderTime: '2024.08.23 12:00',
+				// 		state: 'U',
+				// 		stateText: '待参加',
+				// 		title: '夏日去撒野旅游计划～',
+				// 		time: '2024.10.28 10:00',
+				// 		address: '成都市东丽湖露营地32号',
+				// 		totalPrice: '298.00',
+				// 		btnObj: [{
+				// 				id: '0',
+				// 				btnTitle: '取消活动',
+				// 				color: '#AFAFAF',
+				// 				bgColor: '#34312E'
+				// 			},
+				// 			{
+				// 				id: '1',
+				// 				btnTitle: '活动签到',
+				// 				color: '#FF4546',
+				// 				bgColor: '#492623'
+				// 			}
+				// 		]
+				// 	},
+				// 	{
+				// 		imgUrl: 'https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg',
+				// 		orderTime: '2024.08.23 12:00',
+				// 		state: 'S',
+				// 		stateText: '已完成',
+				// 		title: '夏日去撒野旅游计划～',
+				// 		time: '2024.10.28 10:00',
+				// 		address: '成都市东丽湖露营地32号',
+				// 		totalPrice: '298.00',
+				// 		btnObj: [{
+				// 				id: '2',
+				// 				btnTitle: '活动评价',
+				// 				color: '#FF4546',
+				// 				bgColor: '#492623'
+				// 			},
+				// 			{
+				// 				id: '3',
+				// 				btnTitle: '开具发票',
+				// 				color: '#FFB245',
+				// 				bgColor: '#49361D'
+				// 			}
+				// 		]
+				// 	},
+				// 	{
+				// 		imgUrl: 'https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg',
+				// 		orderTime: '2024.08.23 12:00',
+				// 		state: 'F',
+				// 		stateText: '已完成',
+				// 		title: '夏日去撒野旅游计划～',
+				// 		time: '2024.10.28 10:00',
+				// 		address: '成都市东丽湖露营地32号',
+				// 		totalPrice: '298.00',
+				// 		btnObj: []
+				// 	}
+				// ]
+                totalPage:0,
+                cardListData: []
 			}
 		},
+        onReachBottom() {
+			if(this.params.pageNo >= this.totalPage) return
+			this.params.pageNo ++
+			this.getOrderPageList()
+		},
+        onLoad() {
+            this.getOrderPageList()
+        },
 		methods: {
 			activeList() {
 				uni.navigateTo({
 					url: '/pages_my/activeList'
 				})
 			},
+            getOrderPageList() {
+                this.$api('orderPageList',this.params,res=>{
+					if(res.code == 200) {
+						this.totalPage = res.result.pages
+						this.cardListData = [...this.cardListData,...res.result.records]
+					}
+				})
+            },
 			tabs(val) {
 				console.log(val);
+                this.params.state = val.id
+                this.getOrderPageList()
 			},
 			toOrderDetails(val) {
 				uni.navigateTo({

pages/index/index.vue

@@ -20,7 +20,7 @@
 			<view class="ydsk-box">
 				<view class="ydsk-box-title">悦动时刻</view>
 				<view class="ydsk-box-gird">
-					<view class="gird-l">
+					<view class="gird-l" @click="skip('')">
 						<view class="left-box">
 							<view class="title-box">
 								<view>活动签到</view>
@@ -31,7 +31,7 @@
 						<image class="hdqd-img" src="@/static/image/home/hdqd-img.png" mode="widthFix"></image>
 					</view>
 					<view class="gird-r">
-						<view class="hd-box">
+						<view class="hd-box" @click="skip('activeList')">
 							<view class="left-box">
 								<view class="title-box">
 									活动
@@ -40,7 +40,7 @@
 							</view>
 							<image class="hdqd-img" src="@/static/image/home/hd-img.png" mode="widthFix"></image>
 						</view>
-						<view class="hd-box lx-box" @click="travelList">
+						<view class="hd-box lx-box" @click="skip('travelList')">
 							<view class="left-box">
 								<view class="title-box">
 									旅行
@@ -93,7 +93,7 @@
 		data() {
 			return {
 				params:{
-					title:'',
+					title:0,
 					pageNo:1,
 					pageSize:10
 				},
@@ -145,11 +145,13 @@
 				})
 			},
 			tabs(val) {
-				console.log(val);
+                this.cardListData = []
+                this.params.title = val.id
+                this.getActivityPageList()
 			},
-            travelList() {
+            skip(val) {
 				uni.navigateTo({
-					url: '/pages_my/travelList'
+					url: `/pages_my/${val}`
 				})
 			},
 		}

pages_order/huodong-detail.vue

@@ -47,7 +47,7 @@
 				<view class="title-box">注意事项</view>
 				<view class="value-box">
 					<view class="lv-msg-box">
-						当金黄的落叶轻柔地铺满了小城的每个角落，我们知道，最温柔的季节已悄然而至。在这个收获的季节里，我们诚挚邀请您加入我们的秋日私旅
+                        {{ activityDetails.precautions}}
 					</view>
 				</view>
 			</view>