diff --git a/common/js/mixin.js b/common/js/mixin.js index 6587d44..30a7290 100644 --- a/common/js/mixin.js +++ b/common/js/mixin.js @@ -105,7 +105,7 @@ export default{ if(beforePage && beforePage.route){ uni.navigateBack(); }else{ - uni.switchTab({url:'/pages/index/index'}); + uni.reLaunch({url:'/pages/index/index/index'}); } } } diff --git a/components/index-nav/index-nav.vue b/components/index-nav/index-nav.vue index 0c1e101..106d364 100644 --- a/components/index-nav/index-nav.vue +++ b/components/index-nav/index-nav.vue @@ -50,7 +50,7 @@ export default { image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png', name: '会员服务' },{ - link: '/pages/index/eventRegistration/eventRegistration', + link: '/pages/index/activity/hot', image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png', name: '活动报名' },{ diff --git a/pages.json b/pages.json index e514120..0100418 100644 --- a/pages.json +++ b/pages.json @@ -797,12 +797,26 @@ } }, { - "path" : "pages/index/eventRegistration/eventRegistration", + "path" : "pages/index/activity/hot", "style" : { "navigationBarTitleText": "热门活动", "navigationStyle": "custom" } }, + { + "path" : "pages/index/activity/detail", + "style" : { + "navigationBarTitleText": "活动详情", + "navigationStyle": "custom" + } + }, + { + "path" : "pages/index/activity/confirm", + "style" : { + "navigationBarTitleText": "确认报名", + "navigationStyle": "custom" + } + }, { "path" : "pages/user/member/code", "style" : { diff --git a/pages/index/activity/confirm.vue b/pages/index/activity/confirm.vue new file mode 100644 index 0000000..2971151 --- /dev/null +++ b/pages/index/activity/confirm.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/pages/index/activity/detail.vue b/pages/index/activity/detail.vue new file mode 100644 index 0000000..8420a56 --- /dev/null +++ b/pages/index/activity/detail.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/pages/index/eventRegistration/eventRegistration.vue b/pages/index/activity/hot.vue similarity index 98% rename from pages/index/eventRegistration/eventRegistration.vue rename to pages/index/activity/hot.vue index fc84776..f07d13a 100644 --- a/pages/index/eventRegistration/eventRegistration.vue +++ b/pages/index/activity/hot.vue @@ -8,7 +8,7 @@ - +