diff --git a/app.json b/app.json index 2ce557d..09b761e 100644 --- a/app.json +++ b/app.json @@ -1,11 +1,11 @@ { "pages": [ + "pages/projectModule/projectDetail/projectDetail", + "pages/projectModule/projectList/projectList", "pages/loginModule/pwdLogin/pwdLogin", "pages/loginModule/register/register", "pages/projectModule/applyCode/applyCode", "pages/projectModule/userProject/userProject", - "pages/projectModule/projectDetail/projectDetail", - "pages/projectModule/projectList/projectList", "pages/loginModule/forgetPwd/forgetPwd", "pages/jiedan/jiedan", "pages/logain/logain", @@ -40,23 +40,11 @@ "backgroundColor": "#ffffff", "list": [ { - "pagePath": "pages/jiedan/jiedan", + "pagePath": "pages/projectModule/projectList/projectList", "text": "接单", "iconPath": "/image/renwu.png", "selectedIconPath": "/image/jiedanhou.png" }, - { - "pagePath": "pages/shop/shop", - "text": "商城", - "iconPath": "/image/renwu.png", - "selectedIconPath": "/image/jiedanhou.png" - }, - { - "pagePath": "pages/find/find", - "text": "招聘", - "iconPath": "/image/renwu.png", - "selectedIconPath": "/image/jiedanhou.png" - }, { "pagePath": "pages/mypage/mypage", "text": "我的", diff --git a/pages/projectModule/projectDetail/projectDetail.js b/pages/projectModule/projectDetail/projectDetail.js index fe5fba4..ffc1b49 100644 --- a/pages/projectModule/projectDetail/projectDetail.js +++ b/pages/projectModule/projectDetail/projectDetail.js @@ -1,4 +1,3 @@ -// pages/projectModule/projectDetail/projectDetail.js Page({ /** @@ -8,6 +7,11 @@ Page({ items: [null, null, null], items_1: [null, null, null], items_2: [null, null, null], + activeTab: 0 + }, + switchTab(e) { + const idx = +e.currentTarget.dataset.index; + this.setData({ activeTab: idx }); }, /** diff --git a/pages/projectModule/projectDetail/projectDetail.wxml b/pages/projectModule/projectDetail/projectDetail.wxml index 84f3900..6dfe5e0 100644 --- a/pages/projectModule/projectDetail/projectDetail.wxml +++ b/pages/projectModule/projectDetail/projectDetail.wxml @@ -26,16 +26,21 @@ - 项目详情 - 我的推广码 + 项目详情 + 我的推广码 - - + + - - + + - + - + 结算说明 @@ -111,7 +116,8 @@ /> - + { + if (res.data.code === 1) { + // 渲染项目数据 + this.setData({ items: res.data.data }); + } else { + wx.showToast({ + title: res.data.message || '获取项目列表失败', + icon: 'none' + }); + } + }, + fail: () => { + wx.showToast({ title: '网络错误,请重试', icon: 'none' }); + } + }); }, - /** - * 生命周期函数--监听页面初次渲染完成 + * 点击“参与推广” */ - onReady() { - + gotoPromotion(e) { + // 从 dataset 拿到 data-id + const projectId = e.currentTarget.dataset.id; + // 带上 id 跳转到详情页(路径按你的项目结构调整) + wx.navigateTo({ + url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}` + }); }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file +}); diff --git a/pages/projectModule/projectList/projectList.wxml b/pages/projectModule/projectList/projectList.wxml index 506d95c..5322e10 100644 --- a/pages/projectModule/projectList/projectList.wxml +++ b/pages/projectModule/projectList/projectList.wxml @@ -1,115 +1,62 @@ - - - - 美团省钱包 - - 不限制推广方式、不限美团新老用户,要求美团闪购新用户或... - - - 结算明细 + + + + + + + + + + + + + + + + + + + {{item.projectName}} + + + 结算T+{{item.projectSettlementCycle}} + + + 最高价 + ¥{{item.projectPrice}} + + + + 正在推广 + {{item.currentPromotionCount}}人 + - - 最高价 - ¥7 + + 参与推广 - - - - 项目详情 - 我的推广码 - - - - - - - - - - - 项目通知 - - - - - 最新 - - 美团省钱包-春季活动价格上调通知~ - - - - - - - 项目政策 - - - - 结算标准 - 结算价 - - - - 3.6元购买30元券包 - 0.30 - - - - - - - 结算说明 - - - - - 项目说明 - - - - - 项目说明 - - - - - - - \ No newline at end of file + diff --git a/pages/projectModule/projectList/projectList.wxss b/pages/projectModule/projectList/projectList.wxss index a25fc75..dcc8272 100644 --- a/pages/projectModule/projectList/projectList.wxss +++ b/pages/projectModule/projectList/projectList.wxss @@ -1,252 +1,139 @@ -.ml-13 { - margin-left: 24.38rpx; -} -.mt-7 { - margin-top: 13.13rpx; -} -.mt-35 { - margin-top: 65.63rpx; -} -.mt-13 { - margin-top: 24.38rpx; -} -.mt-15 { - margin-top: 28.13rpx; -} -.mt-21 { - margin-top: 39.38rpx; -} +/* pages/projectModule/projectList/projectList.wxss */ + +/* 页面整体 */ .page { - padding: 74.92rpx 32.81rpx 201.56rpx 33.75rpx; + padding-bottom: 70rpx; background-color: #ffffff; width: 100%; overflow-y: auto; - overflow-x: hidden; + height: 100vh; +} + +/* 轮播图容器 */ +.swiper { + width: 100vw; + height: 48vw; +} + +/* 轮播图图片 */ +.swiper-image { + width: 100%; height: 100%; } -.image { - width: 123.75rpx; - height: 123.75rpx; + +/* 列表容器 */ +.list { + padding: 0 26.25rpx; } -.group_1 { - margin-right: 2.81rpx; -} -.font { - font-size: 28.13rpx; - font-family: SourceHanSansCN; - line-height: 26.04rpx; - color: #000000; -} -.text { - font-size: 30rpx; - line-height: 27.75rpx; -} -.font_2 { - font-size: 26.25rpx; - font-family: SourceHanSansCN; - color: #666666; -} -.text_2 { - font-size: 24.38rpx; - line-height: 30rpx; -} -.section { - padding: 13.13rpx 7.71rpx 11.25rpx 9.38rpx; - background-color: #a5d63f; - border-radius: 9.38rpx; - height: 54.38rpx; -} -.image_2 { - width: 30rpx; - height: 30rpx; -} -.text_3 { - color: #ffffff; - font-size: 24.38rpx; - font-family: SourceHanSansCN; - line-height: 22.72rpx; -} -.group { - line-height: 22.69rpx; -} -.text_4 { - font-size: 24.38rpx; - line-height: 22.69rpx; -} -.font_3 { - font-size: 26.25rpx; - font-family: Times New Roman; - line-height: 18.09rpx; - color: #d43030; -} -.text_5 { - color: #ff2b2b; - line-height: 19.29rpx; -} -.group_2 { - padding-left: 100.24rpx; - padding-right: 82.2rpx; -} -.group_3 { - padding-bottom: 26.42rpx; -} -.text_6 { - font-size: 30rpx; - line-height: 27.66rpx; -} -.text_7 { - font-size: 30rpx; - line-height: 28.01rpx; -} -.group_4 { - padding: 0 21.64rpx; -} -.section_2 { - background-color: #000000; - width: 73.35rpx; - height: 5.63rpx; -} -.view { - margin-right: 16.88rpx; -} -.group_5 { - padding-top: 38.44rpx; -} -.section_3 { - padding: 32.68rpx 25.2rpx 31.07rpx 28.93rpx; - background-image: linear-gradient(180deg, #ff8d1a -75.6%, #ff8d1a00 42.2%); + +/* 列表项 */ +.list-item { + padding: 30rpx 18.75rpx; + background-color: #ffffff; border-radius: 18.75rpx; - border: solid 1.88rpx #ffbd7a; + box-shadow: 0rpx 0rpx 11.25rpx #00000040; } -.image_3 { - width: 45rpx; - height: 43.13rpx; -} -.text_8 { - line-height: 25.88rpx; -} -.list-item_1 { - padding: 7.07rpx 0 5.94rpx; -} -.list-item_1:first-child { +.list-item:first-child { margin-top: 0; } -.text-wrapper { - padding: 9.56rpx 0 7.14rpx; - background-color: #ff5733; - border-radius: 37.5rpx; - width: 75rpx; + +/* 项目缩略图 */ +.image_2 { + border-radius: 18.75rpx; + width: 127.5rpx; + height: 127.5rpx; } -.pos { - position: absolute; - left: 1.88rpx; - top: 50%; - transform: translateY(-50%); -} -.font_4 { - font-size: 22.5rpx; + +/* 项目名称 */ +.font { + font-size: 30rpx; font-family: SourceHanSansCN; - line-height: 22.59rpx; - color: #ffffff; + line-height: 27.75rpx; + color: #000000; } -.text_9 { - line-height: 20.79rpx; + +/* 结算周期背景 */ +.text-wrapper { + padding: 7.5rpx 0; + background-color: #ffebeb; + border-radius: 9.38rpx; + width: 112.5rpx; } + +/* 结算周期文字 */ +.font_2 { + font-size: 22.5rpx; + font-family: AlibabaPuHuiTi; + line-height: 19.93rpx; + color: #ff3f3f; +} + +/* 行高调整 */ +.text { + line-height: 20.94rpx; +} + +/* 最高价标签 */ +.font_4 { + font-size: 26.25rpx; + font-family: SourceHanSansCN; + line-height: 24.43rpx; + color: #00000080; +} + +/* 最高价金额 */ .font_5 { font-size: 26.25rpx; font-family: SourceHanSansCN; - line-height: 26.04rpx; - color: #000000; + line-height: 19.93rpx; + color: #e33c64; } -.text_10 { - line-height: 24.49rpx; -} -.section_4 { - padding: 42.06rpx 27.07rpx 30.13rpx 30.81rpx; - background-image: linear-gradient(180deg, #ff8d1a -75.6%, #ff8d1a00 23.5%); - border-radius: 24.77rpx; - border: solid 1.88rpx #ffbd7a; -} -.image_4 { - width: 43.13rpx; - height: 43.13rpx; -} -.section_5 { - margin-right: 6.81rpx; - padding: 22.11rpx 80.4rpx 17.29rpx; - background-color: #ebebeb; - border-radius: 9.38rpx 9.38rpx 0rpx 0rpx; - border: solid 1.88rpx #e6e6e6; -} -.text_11 { - margin-right: 8.89rpx; - line-height: 26.25rpx; -} -.group_7 { - margin-right: 6.81rpx; -} -.section_6 { - padding: 21.24rpx 37.18rpx 21.79rpx; - background-color: #ffffff; - border: solid 1.88rpx #d1d1d1; + +/* 价格前缀间距 */ +.text_3 { + margin-left: 3.75rpx; } + +/* 推广人数标签 */ .font_6 { font-size: 26.25rpx; - font-family: Times New Roman; - line-height: 22.59rpx; - color: #636363; + font-family: SourceHanSansCN; + line-height: 24.43rpx; + color: #e33c64; } -.text_12 { + +/* 推广人数行高 */ +.text_4 { + line-height: 23.96rpx; +} + +/* 参与推广按钮背景 */ +.text-wrapper_2 { + padding: 18.75rpx 0; + background-color: #a5d63f; + border-radius: 9.38rpx; + width: 129.38rpx; + height: 58.13rpx; +} + +/* 参与推广文字 */ +.font_3 { + font-size: 26.25rpx; + font-family: SourceHanSansCN; + line-height: 24.43rpx; + color: #ffffff; +} + +/* 参与推广文字行高 */ +.text_2 { font-size: 24.38rpx; + line-height: 22.8rpx; } -.text_13 { - margin-right: 71.21rpx; + +/* 间距 */ +.mt-17 { + margin-top: 31.88rpx; } -.section_7 { - padding: 40.86rpx 41.12rpx 46.99rpx; - background-image: linear-gradient(180deg, #ff800099 -75.6%, #ff8d1a00 72.6%); - border-radius: 41.18rpx; - border: solid 1.88rpx #ffbd7a; +.mt-20 { + margin-top: 20rpx; } -.text_15 { - margin-left: 50.55rpx; - line-height: 26.21rpx; -} -.section_8 { - margin-right: 2.14rpx; - margin-top: 35.92rpx; - background-color: #ffffff00; - height: 538.13rpx; - border: solid 1.88rpx #000000; -} -.view_2 { - margin-top: 35.94rpx; -} -.image_5 { - width: 52.5rpx; - height: 52.5rpx; -} -.pos_4 { - position: absolute; - left: 34.69rpx; - top: 29.06rpx; -} -.section_9 { - padding: 41.04rpx 41.12rpx 46.99rpx; - background-image: linear-gradient(180deg, #ff800099 -75.6%, #ff8d1a00 72.6%); - border-radius: 41.18rpx; - border: solid 1.88rpx #ffbd7a; -} -.text_1 { - margin-left: 50.49rpx; -} -.pos_5 { - position: absolute; - left: 34.69rpx; - top: 29.06rpx; -} -.pos_6 { - position: absolute; - left: 34.69rpx; - top: 29.06rpx; -} \ No newline at end of file