diff --git a/pages/projectModule/projectDetail/projectDetail.js b/pages/projectModule/projectDetail/projectDetail.js index 5fe232a..3d48f82 100644 --- a/pages/projectModule/projectDetail/projectDetail.js +++ b/pages/projectModule/projectDetail/projectDetail.js @@ -16,13 +16,9 @@ Page({ onLoad(options) { // console.log('---->',options); const id = options.id; - const promotionCode = options.promotionCode; - this.setData({ id,promotionCode }); - if (promotionCode) { // 切换到‘我的推广码状态’ - this.setData({ - activeTab: 1 - }) - } + const isPromo = options.isPromo; + console.log(isPromo) + this.setData({ id ,activeTab: Number(isPromo) }); }, // 每次页面展示都刷新(含navigateBack返回时) diff --git a/pages/projectModule/projectList/projectList.js b/pages/projectModule/projectList/projectList.js index a3bcdc6..0421ab9 100644 --- a/pages/projectModule/projectList/projectList.js +++ b/pages/projectModule/projectList/projectList.js @@ -59,7 +59,7 @@ Page({ const projectId = e.currentTarget.dataset.id; // 带上 id 跳转到详情页(路径按你的项目结构调整) wx.navigateTo({ - url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}` + url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&isPromo=0` }); }, }); diff --git a/pages/projectModule/projectList/projectList.wxss b/pages/projectModule/projectList/projectList.wxss index 0018e5d..69fceef 100644 --- a/pages/projectModule/projectList/projectList.wxss +++ b/pages/projectModule/projectList/projectList.wxss @@ -53,7 +53,7 @@ /* 结算周期背景 */ .text-wrapper { - padding: 7.5rpx 0; + padding: 10.5rpx 0; background-color: #ffebeb; border-radius: 9.38rpx; width: 112.5rpx; diff --git a/pages/projectModule/userProject/userProject.js b/pages/projectModule/userProject/userProject.js index 3facebb..f4b21f3 100644 --- a/pages/projectModule/userProject/userProject.js +++ b/pages/projectModule/userProject/userProject.js @@ -9,7 +9,6 @@ Page({ data: { userProjectList: [], - promotionCode: true, }, /** @@ -32,7 +31,7 @@ Page({ // 获取项目列表 getProgram() { wx.request({ - url: baseUrl + '/project/query/card', + url: baseUrl + '/project/get/running', method: 'POST', header: { Authorization: wx.getStorageSync('token') @@ -52,12 +51,17 @@ Page({ gotoProjectDetail(e){ // 获取data-id中的值 const projectId = e.currentTarget.dataset.id; - const promotionCode = this.data.promotionCode; - wx.navigateTo({ - url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&promotionCode=${promotionCode}`, + url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&isPromo=0`, }) }, + // 子元素点击事件,阻止冒泡 + stopEventPropagation(e) { + const projectId = e.currentTarget.dataset.id; + wx.navigateTo({ + url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&isPromo=1`, + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/projectModule/userProject/userProject.wxml b/pages/projectModule/userProject/userProject.wxml index 594ec5d..64d3435 100644 --- a/pages/projectModule/userProject/userProject.wxml +++ b/pages/projectModule/userProject/userProject.wxml @@ -1,6 +1,6 @@ - + - + 推广码 - +