diff --git a/api/model/index.js b/api/model/index.js
index 2f24522..9cc4aa3 100644
--- a/api/model/index.js
+++ b/api/model/index.js
@@ -8,7 +8,31 @@ const api = {
url: '/index_common/getBanner',
method: 'GET',
},
-
+ // 获取首页活动列表带分页
+ activityPageList: {
+ url: '/index_common/getActivityPageList',
+ method: 'GET',
+ },
+ // 活动详情
+ activityInfo: {
+ url: '/index_common/getActivityInfo',
+ method: 'GET',
+ },
+ // 我的收藏
+ collectPageList: {
+ url: '/index_common/getCollectPageList',
+ method: 'GET',
+ },
+ // 旅行列表
+ travelPageList: {
+ url: '/index_common/getTravelPageList',
+ method: 'GET',
+ },
+ // 旅行详情
+ travelInfo: {
+ url: '/index_common/getTravelInfo',
+ method: 'GET',
+ },
}
export default api
\ No newline at end of file
diff --git a/components/active/active-item.vue b/components/active/active-item.vue
index 8e4a68f..c633c2a 100644
--- a/components/active/active-item.vue
+++ b/components/active/active-item.vue
@@ -3,17 +3,17 @@
- ![]()
+ ![]()
{{item.title}}
- {{item.time}}
+ {{item.startTime}}
{{item.address}}
20/40
- 立即报名
+ 立即报名
@@ -51,9 +51,9 @@
url: '/pages_order/orderDetails'
})
},
- toDetail() {
+ toDetail({ id }) {
uni.navigateTo({
- url:'/pages_order/huodong-detail'
+ url:`/pages_order/huodong-detail?activityId=${id}`
})
}
}
@@ -137,10 +137,10 @@
}
.price {
-
display: flex;
align-items: center;
justify-content: space-between;
+ padding-top: 25rpx;
.num-box {
font-size: 27rpx;
color: #fff;
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 9385187..658340b 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -10,8 +10,6 @@
:inactiveStyle="{color: '#999', transform: 'scale(1)'}"
itemStyle="padding-left: 15px; padding-right: 15px; height: 44px;">
-
-
@@ -114,11 +112,6 @@
}
},
methods: {
- travelList() {
- uni.navigateTo({
- url: '/pages_my/travelList'
- })
- },
activeList() {
uni.navigateTo({
url: '/pages_my/activeList'
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 02b029e..64db541 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -40,7 +40,7 @@
-
+
旅行
@@ -92,6 +92,12 @@
},
data() {
return {
+ params:{
+ title:'',
+ pageNo:1,
+ pageSize:10
+ },
+ totalPage:0,
bgColor:'transparent',
navTitle:'',
keyword:'',
@@ -101,26 +107,7 @@
{ id: 1, name: '往期活动' },
],
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号',
- },
- {
- 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号',
- },
- ]
+ cardListData: []
}
},
onPageScroll(e) {
@@ -132,10 +119,24 @@
this.navTitle = ''
}
},
+ onReachBottom() {
+ if(this.params.pageNo >= this.totalPage) return
+ this.params.pageNo ++
+ this.getActivityPageList()
+ },
onLoad() {
this.getBanner()
+ this.getActivityPageList()
},
methods:{
+ getActivityPageList() {
+ this.$api('activityPageList',this.params,res=>{
+ if(res.code == 200) {
+ this.totalPage = res.result.pages
+ this.cardListData = [...this.cardListData,...res.result.records]
+ }
+ })
+ },
getBanner() {
this.$api('banner',res=>{
if(res.code == 200) {
@@ -145,7 +146,12 @@
},
tabs(val) {
console.log(val);
- }
+ },
+ travelList() {
+ uni.navigateTo({
+ url: '/pages_my/travelList'
+ })
+ },
}
}
diff --git a/pages_my/collection.vue b/pages_my/collection.vue
index 96760da..617d1af 100644
--- a/pages_my/collection.vue
+++ b/pages_my/collection.vue
@@ -1,26 +1,26 @@
-
+
-
+
-
+
- 夏日去撒野旅游计划～
- 2024.10.28 10:00
- 成都市东丽湖露营地32号
+ {{item.title}}
+ {{item.startTime}}
+ {{item.address}}
12/30
-
+
-
+
@@ -59,16 +59,41 @@
},
data() {
return {
+ params:{
+ pageNo:1,
+ pageSize:10
+ },
+ totalPage: '',
+ cardListData: []
}
},
+ onReachBottom() {
+ if(this.params.pageNo >= this.totalPage) return
+ this.params.pageNo ++
+ this.collectPageList()
+ },
+ onLoad() {
+ this.collectPageList()
+ },
methods: {
+ collectPageList() {
+ this.$api('collectPageList',this.params, res=> {
+ if(res.code == 200) {
+ this.totalPage = res.result.pages
+ this.cardListData = [...this.cardListData,...res.result.records]
+ }
+ })
+ },
+ toDetail({ id }) {
+ uni.navigateTo({
+ url:`/pages_order/huodong-detail?activityId=${id}`
+ })
+ }
}
}