From 98c60dbcea7a7ebf54707aa2adb5255213d4af37 Mon Sep 17 00:00:00 2001 From: xiaobo <1317797578@qq.com> Date: Fri, 3 Jan 2025 00:40:40 +0800 Subject: [PATCH] 1 --- api/model/zhaomu.js | 10 ++ components/active/active-item.vue | 8 +- components/zhaomu/zhaomu-item.vue | 6 +- pages/index/cart.vue | 82 +++++++------ pages/index/center.vue | 24 ++-- pages/index/index.vue | 13 ++- pages_login/fuwutiaokuan.vue | 2 +- pages_login/loginAndRegisterAndForgetPassword.vue | 15 ++- pages_login/wxLogin.vue | 2 +- pages_my/activeList.vue | 102 ++++++++++------ pages_my/user-msg.vue | 3 + pages_my/zlx-qiandao.vue | 8 ++ pages_order/huodong-detail.vue | 95 +++++++++++++-- pages_order/lvyou-detail.vue | 134 +++++++++++++++++----- pages_zlx/zlx-form.vue | 72 +++++++++++- 15 files changed, 445 insertions(+), 131 deletions(-) diff --git a/api/model/zhaomu.js b/api/model/zhaomu.js index 53162a9..12316aa 100644 --- a/api/model/zhaomu.js +++ b/api/model/zhaomu.js @@ -10,6 +10,16 @@ const api = { url: '/shop_common/joinRecruit', method: 'POST', }, + // 主理人认证信息 + joinRecruitInfo: { + url: '/shop_common/getJoinRecruitInfo', + method: 'get', + }, + // 主理人主理的活动列表带分页 + activityMemberPageList: { + url: '/shop_common/getActivityMemberPageList', + 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 c62f7a8..55e4eb4 100644 --- a/components/active/active-item.vue +++ b/components/active/active-item.vue @@ -13,7 +13,8 @@ {{item.num}}/{{item.sum}} - 立即报名 + 立即报名 + 已结束 @@ -157,6 +158,11 @@ text-align: center; line-height: 54rpx; } + .btn-box2 { + background: #34312E; + color: #AFAFAF; + border-radius: 60rpx; + } } } } diff --git a/components/zhaomu/zhaomu-item.vue b/components/zhaomu/zhaomu-item.vue index c9b9a6d..25ce3c3 100644 --- a/components/zhaomu/zhaomu-item.vue +++ b/components/zhaomu/zhaomu-item.vue @@ -26,7 +26,7 @@ 4人参加 - + 参与招募 @@ -71,9 +71,9 @@ url: '/pages_order/orderDetails' }) }, - toZhaomu() { + toZhaomu(item) { uni.navigateTo({ - url: '/pages_order/lvyou-detail' + url: `/pages_order/lvyou-detail?travelId=${item.id}` }) } } diff --git a/pages/index/cart.vue b/pages/index/cart.vue index e7a51a9..d0c7d89 100644 --- a/pages/index/cart.vue +++ b/pages/index/cart.vue @@ -4,7 +4,7 @@ - - + @@ -34,11 +34,12 @@ Navbar }, data() { - this.orderId = ''; + this.orderId = ''; return { - status:"loading", + tabCurrent:0, + status: "loading", params: { - state: 0, + state: '', pageNo: 1, pageSize: 10 }, @@ -47,9 +48,9 @@ name: '全部' }, { - id: 0, - name: '未付款' - }, + id: 0, + name: '未付款' + }, { id: 1, name: '待参加' @@ -73,7 +74,12 @@ this.params.pageNo++ this.getOrderPageList() }, - onLoad() { + onLoad(e) { + if(uni.getStorageSync('currentState')) { + this.tabCurrent = uni.getStorageSync('currentState') + uni.removeStorageSync('currentState') + } + this.params.state = this.tabList[this.tabCurrent].id this.getOrderPageList() }, methods: { @@ -88,9 +94,9 @@ if (res.code == 200) { this.totalPage = res.result.pages this.cardListData = [...this.cardListData, ...res.result.records] - if(this.params.pageNo >= this.totalPage) { + if (this.params.pageNo >= this.totalPage) { this.status = "nomore" - }else { + } else { this.status = "loadmore" } } @@ -107,23 +113,25 @@ url: `/pages_order/orderDetails?id=${val.id}` }) }, - btnClick(item,type) {//0取消活动 1活动签到 2评价活动 3开具发票 - this.orderId = item.id; - if (type == 0) { - this.$refs.modal.open(); - } - if (type == 1) { - this.$api('signIn', {orderId: item.id}, res=> { - if (res.code == 200) { - this.cardListData = [] - this.getOrderPageList() - this.$refs.toast.show({ - type: 'success', - message: res.result - }) - } - }) - } + btnClick(item, type) { //0取消活动 1活动签到 2评价活动 3开具发票 + this.orderId = item.id; + if (type == 0) { + this.$refs.modal.open(); + } + if (type == 1) { + this.$api('signIn', { + orderId: item.id + }, res => { + if (res.code == 200) { + this.cardListData = [] + this.getOrderPageList() + this.$refs.toast.show({ + type: 'success', + message: res.result + }) + } + }) + } if (type == 2) { uni.navigateTo({ url: `/pages_order/orderEvaluation?activityId=${this.orderId}` @@ -135,14 +143,16 @@ }) } }, - confirm() { - this.$api('cancelOrder', {orderId: this.orderId}, res => { - if (res.code == 200) { - this.cardListData = []; - this.getOrderPageList(); - } - }) - } + confirm() { + this.$api('cancelOrder', { + orderId: this.orderId + }, res => { + if (res.code == 200) { + this.cardListData = []; + this.getOrderPageList(); + } + }) + } } } diff --git a/pages/index/center.vue b/pages/index/center.vue index 952cce7..d4261d4 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -28,18 +28,19 @@ + + @click="orderJump(2)"> 待参加 + @click="orderJump(3)"> 已完成 + @click="orderJump(4)"> 已取消 @@ -87,12 +88,13 @@ cellList:[ { src:require('@/static/image/center/line-1.png'), - name:'开票记录' + name:'开票记录', + url:'/pages_order/invoiceRecords' }, { src:require('@/static/image/center/line-2.png'), name:'我的收藏', - url:'/pages_my/collection' + url:'/pages_my/collection' }, { src:require('@/static/image/center/line-3.png'), @@ -100,11 +102,13 @@ }, { src:require('@/static/image/center/line-4.png'), - name:'用户协议' + name:'用户协议', + url:'/pages_login/fuwutiaokuan' }, { src:require('@/static/image/center/line-5.png'), - name:'隐私协议' + name:'隐私协议', + url:'/pages_login/yinsixieyi' }, { src:require('@/static/image/center/line-6.png'), @@ -136,6 +140,12 @@ } }, methods: { + orderJump(type) { + uni.switchTab({ + url:'/pages/index/cart' + }) + uni.setStorageSync('currentState',type) + }, clickNo(){ uni.showModal({ title: '暂未开放', diff --git a/pages/index/index.vue b/pages/index/index.vue index b941fe4..2503d21 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -165,9 +165,16 @@ this.getActivityPageList() }, skip(val) { - uni.navigateTo({ - url: `/pages_my/${val}` - }) + if(!val) { + uni.switchTab({ + url:'/pages/index/cart' + }) + uni.setStorageSync('currentState',2) + }else{ + uni.navigateTo({ + url: `/pages_my/${val}` + }) + } }, } } diff --git a/pages_login/fuwutiaokuan.vue b/pages_login/fuwutiaokuan.vue index ae82082..195b6b3 100644 --- a/pages_login/fuwutiaokuan.vue +++ b/pages_login/fuwutiaokuan.vue @@ -1,7 +1,7 @@