diff --git a/api/interfaces/recruit.js b/api/interfaces/recruit.js index 179c9cd..7a60a74 100644 --- a/api/interfaces/recruit.js +++ b/api/interfaces/recruit.js @@ -56,6 +56,11 @@ const skinDiff = (data) => req({ data: data }) +// 打卡列表用户信息 +const signUser = (experience_id) => req({ + url : "experiences/sign_user/" + experience_id, +}) + export default ({ index, Enroll, @@ -64,5 +69,6 @@ export default ({ signCalendar, signLabor, signList, - skinDiff + skinDiff, + signUser }) \ No newline at end of file diff --git a/api/request.js b/api/request.js index 950802d..72fcf21 100644 --- a/api/request.js +++ b/api/request.js @@ -12,8 +12,8 @@ import {updToken} from './updateToken' // wx6bd4fcc040bfa025 水感应 正式appid // wx9ae0c63d0c58caeb 测试appid 三猿 // wx3056ec23196eaf02 水感应 测试 -// const api = "https://api.shui.shuiganying.com/api/" // 正式环境 -const api = "https://shuitest.shuiganying.com/api/" // 测试环境 +const api = "https://api.shui.shuiganying.com/api/" // 正式环境 +// const api = "https://shuitest.shuiganying.com/api/" // 测试环境 const header = { "Accept" : "application/json" } diff --git a/pages/recruit/index.js b/pages/recruit/index.js index 62f8936..18313df 100644 --- a/pages/recruit/index.js +++ b/pages/recruit/index.js @@ -18,13 +18,13 @@ Page({ signDayNumber : '', //累计打卡天数 signDayCount : '', //总打卡天数 signWaterNumber: '', //总打卡给水滴 + skinData : '', //体验对比分析 }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - console.log(options) if(options.invite != undefined) { getApp().globalData.inviteText = options.invite } @@ -64,24 +64,21 @@ Page({ recruitData: res.data }) - // 0可以申请 1需要面检测 5签收-查看物流 6打卡 7第二次面 - if(res.data.can.status == 6) { - // 获取日历 - this.signInfo(); + // 0可以申请 1需要面检测 5签收-查看物流 6打卡 7第二次面 8完成 + // if(res.data.can.status == 6 || res.data.can.status == 7 || res.data.can.status == 8) { + // // 获取日历 + // this.signInfo(); - // 显示打卡数据 - this.setData({ - type : 'clockIn' - }) - } + // // 显示打卡数据 + // this.setData({ + // type : 'clockIn' + // }) + // } - // if(res.data.can.status == 7) { + // if(res.data.can.status == 8) { // // 获取两次报告对比 // this.skinInfo(); // } - - // 获取两次报告对比 - this.skinInfo(); }).catch(err => {}) }, @@ -141,6 +138,7 @@ Page({ iv : e.iv, encryptedData: e.encryptedData }).then(res => { + console.log('rrrr') // subscribe == 0未关注公众号 if (res.data.subscribe == 0) { this.setData({ @@ -204,7 +202,7 @@ Page({ * 签到弹出 */ tapPop() { - if(!this.data.canSign) { + if(this.data.canSign) { wx.navigateTo({ url: './signWrite/signWrite?experienceId=' + this.data.recruitData.experience_id + '&signDayNumber=' + this.data.signDayNumber }) @@ -216,7 +214,10 @@ Page({ */ skinInfo() { wx.$api.recruit.skinDiff().then(res => { - console.log(res) + console.log(res.data) + this.setData({ + skinData: res.data + }) }).catch(err => {}) }, diff --git a/pages/recruit/index.wxml b/pages/recruit/index.wxml index 5f68954..bd3f7cb 100644 --- a/pages/recruit/index.wxml +++ b/pages/recruit/index.wxml @@ -1,4 +1,7 @@ + + + @@ -45,7 +48,7 @@ - + @@ -149,33 +152,202 @@ - + VS - + + 衰老度分析 - 抬头纹:10处 - 抬头纹:10处 + 抬头纹:{{skinData.params.senility.forehead_wrinkle.before}} + + 抬头纹:{{skinData.params.senility.forehead_wrinkle.after}} + + - 鱼尾纹:8处 - 鱼尾纹:2处 + 鱼尾纹:{{skinData.params.senility.crows_feet.before}} + + 鱼尾纹:{{skinData.params.senility.crows_feet.after}} + + + + + 眉间纹:{{skinData.params.senility.glabella_wrinkle.before}} + + 眉间纹:{{skinData.params.senility.glabella_wrinkle.after}} + + + + + 法令纹:{{skinData.params.senility.nasolabial_fold.before}} + + 法令纹:{{skinData.params.senility.nasolabial_fold.after}} + + + + + 额头区域细纹:{{skinData.params.senility.fine_line.forehead_count.before}} + + 额头区域细纹:{{skinData.params.senility.fine_line.forehead_count.after}} + + + + + 左眼部区域细纹:{{skinData.params.senility.fine_line.left_undereye_count.before}} + + 左眼部区域细纹:{{skinData.params.senility.fine_line.left_undereye_count.after}} + + + + + 右眼部区域细纹:{{skinData.params.senility.fine_line.right_undereye_count.before}} + + 右眼部区域细纹:{{skinData.params.senility.fine_line.right_undereye_count.after}} + + + + + 额头区域深纹:{{skinData.params.senility.wrinkle_count.forehead_count.before}} + + 额头区域深纹:{{skinData.params.senility.wrinkle_count.forehead_count.after}} + + + + + 左眼部区域深纹:{{skinData.params.senility.wrinkle_count.left_undereye_count.before}} + + 左眼部区域深纹:{{skinData.params.senility.wrinkle_count.left_undereye_count.after}} + + + + + 右眼部区域深纹:{{skinData.params.senility.wrinkle_count.right_undereye_count.before}} + + 右眼部区域深纹:{{skinData.params.senility.wrinkle_count.right_undereye_count.after}} + + + + - 衰老度分析 + 眼部分析 - 抬头纹:10处 - 抬头纹:10处 + 眼袋:{{skinData.params.eye_bag.eye_pouch.before}} + + 眼袋:{{skinData.params.eye_bag.eye_pouch.after}} + + - 鱼尾纹:8处 - 鱼尾纹:2处 + 黑眼圈:{{skinData.params.black_eye.dark_circle.before}} + + 黑眼圈:{{skinData.params.black_eye.dark_circle.after}} + + + + + + 敏感度分析 + + 敏感区域面积:{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.before}}% + + 敏感区域面积:{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.after}}% + + + + + 敏感程度:{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.before}} + + 敏感程度:{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.after}} + + + + + + + + 毛孔分析 + + 额头毛孔数:{{skinData.params.pore.enlarged_pore_count.forehead_count.before}} + + 额头毛孔数:{{skinData.params.pore.enlarged_pore_count.forehead_count.after}} + + + + + 下巴毛孔数:{{skinData.params.pore.enlarged_pore_count.chin_count.before}} + + 下巴毛孔数:{{skinData.params.pore.enlarged_pore_count.chin_count.after}} + + + + + 左脸颊毛孔数:{{skinData.params.pore.enlarged_pore_count.left_cheek_count.before}} + + 左脸颊毛孔数:{{skinData.params.pore.enlarged_pore_count.left_cheek_count.after}} + + + + + 右脸颊毛孔数:{{skinData.params.pore.enlarged_pore_count.right_cheek_count.before}} + + 右脸颊毛孔数:{{skinData.params.pore.enlarged_pore_count.right_cheek_count.after}} + + + + + + + + 黑头分析 + + 黑头数:{{skinData.params.blackhead.blackhead_count.before}} + + 黑头数:{{skinData.params.blackhead.blackhead_count.after}} + + + + + + + + 色素分析 + + 闭口粉刺:{{skinData.params.pigment.closed_comedones.rectangle.before}} + + 闭口粉刺:{{skinData.params.pigment.closed_comedones.rectangle.after}} + + + + + 痤疮:{{skinData.params.pigment.acne.rectangle.before}} + + 痤疮:{{skinData.params.pigment.acne.rectangle.after}} + + + + + 色斑:{{skinData.params.pigment.brown_spot.rectangle.before}} + + 色斑:{{skinData.params.pigment.brown_spot.rectangle.after}} + + + + + 痣:{{skinData.params.pigment.mole.rectangle.before}} + + 痣:{{skinData.params.pigment.mole.rectangle.after}} + + + + + @@ -187,15 +359,13 @@ 日常分享 - + 体验心得 - - diff --git a/pages/recruit/index.wxss b/pages/recruit/index.wxss index c8e758c..855cbeb 100644 --- a/pages/recruit/index.wxss +++ b/pages/recruit/index.wxss @@ -39,7 +39,7 @@ .recruit-border { border: 4rpx solid #000000; border-radius: 50rpx; - padding: 40rpx; + padding: 40rpx 30rpx; box-sizing: border-box; } @@ -484,10 +484,11 @@ padding: 10rpx; box-sizing: border-box; width: 140rpx; - height: 140rpx; + height: 180rpx; } .recruit-photo-img image { + border-radius: 20rpx; width: 100%; height: 100%; } @@ -505,7 +506,7 @@ background-color: #ffffff; border-radius: 30rpx; overflow: hidden; - padding: 0 40rpx 30rpx; + padding: 0 25rpx 30rpx; position: relative; } @@ -541,10 +542,10 @@ width: 50%; display: inline-block; line-height: 80rpx; - font-size: 26rpx; + font-size: 24rpx; color: #999999; position: relative; - padding-left: 20rpx; + padding-left: 15rpx; box-sizing: border-box; } @@ -564,9 +565,8 @@ } .recruit-list-label image { - width: 28rpx; + width: 22rpx; vertical-align: -4rpx; - margin-left: 10rpx; } .day { diff --git a/pages/recruit/referto/referto.js b/pages/recruit/referto/referto.js index 5b2d46e..a61573e 100644 --- a/pages/recruit/referto/referto.js +++ b/pages/recruit/referto/referto.js @@ -5,11 +5,11 @@ Page({ * 页面的初始数据 */ data: { + paySuccess : false, experienceId: '', typesArr : [], typesIndex : 0, refertoStatus: false, - paySuccess : false, // 兑换成功显示 // 市级选择 cityArr : [], @@ -31,18 +31,12 @@ Page({ }) // 获取申请前置接口 this.recruitInfo(options.id); - - this.setData({ - paySuccess: true - }) }, /** * 生命周期函数--监听页面显示 */ - onShow() { - - }, + onShow() { }, /** * 申请前置接口 @@ -62,6 +56,7 @@ Page({ this.setData({ typesArr : [{experience_type_id: null, name: "请选择体验内容"}, ...res.data.types], cityArr : [...areas, ...res.data.areas], + paySuccess : false }) // 获取区级列表 diff --git a/pages/recruit/referto/referto.wxml b/pages/recruit/referto/referto.wxml index 49588e0..e02be5c 100644 --- a/pages/recruit/referto/referto.wxml +++ b/pages/recruit/referto/referto.wxml @@ -1,7 +1,9 @@ - + + + 活动报名 @@ -53,15 +55,9 @@ - 去面部检测 > - - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/recruit/writeList/writeList.js b/pages/recruit/writeList/writeList.js index cfb4099..dfc64e9 100644 --- a/pages/recruit/writeList/writeList.js +++ b/pages/recruit/writeList/writeList.js @@ -9,6 +9,7 @@ Page({ * 页面的初始数据 */ data: { + userData : '', //打卡列表用户信息 listsArr : [], // 订单列表 page : {}, // 分页信息 lodingStats : false,// 加载状态 @@ -18,20 +19,33 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - + // 获取打卡列表用户信息 + this.userInfo(options.experienceId) }, onShow() { + + // 获取订单列表 this.listInfo() }, + /** + * 打卡列表用户信息 + */ + userInfo(id) { + wx.$api.recruit.signUser(id).then(res => { + this.setData({ + userData: res.data + }) + }).catch(err => {}) + }, + /** * 订单列表 */ listInfo(page) { wx.$api.recruit.signList({page : page || 1}).then(res => { - console.log(res) let listArr = this.data.listsArr, newData = [] if(page == 1 || page == undefined) listArr = [] diff --git a/pages/recruit/writeList/writeList.wxml b/pages/recruit/writeList/writeList.wxml index 639a03c..e0c5193 100644 --- a/pages/recruit/writeList/writeList.wxml +++ b/pages/recruit/writeList/writeList.wxml @@ -3,22 +3,34 @@ - - - - - #使用心得##第{{item.day_number}}天# - {{item.describe}} - - - - + + + + + + + #使用心得##第{{item.day_number}}天# + {{item.describe}} + + + + + - - - #产品建议# - {{item.suggest}} + + #产品建议# + {{item.suggest}} + diff --git a/pages/recruit/writeList/writeList.wxss b/pages/recruit/writeList/writeList.wxss index c08f9aa..80d9d23 100644 --- a/pages/recruit/writeList/writeList.wxss +++ b/pages/recruit/writeList/writeList.wxss @@ -7,6 +7,61 @@ box-sizing: border-box; } +.user-info { + background-image: linear-gradient(to bottom, #5491f4, #85b2fc); + border-radius: 50rpx 50rpx 0 0; + padding: 30rpx 30rpx 50rpx; + box-sizing: border-box; +} + +.user-white { + background-color: #ffffff; + border-radius: 50rpx 50rpx 0 0; + padding: 30rpx; + box-sizing: border-box; + position: relative; + display: flex; +} + +.user-head { + width: 110rpx; + height: 110rpx; + border: 4rpx solid #5390f4; + border-radius: 50%; +} + +.user-cont { + padding-left: 30rpx; + box-sizing: border-box; +} + +.user-name { + margin: 5rpx 0 20rpx; + font-size: 34rpx; +} + +.user-tips { + background-color: #e6efff; + color: #5390f4; + font-size: 24rpx; + line-height: 44rpx; + padding: 0 15rpx; + border-radius: 10rpx; +} + +.user-go { + position: absolute; + right: 30rpx; + top: 50rpx; + background-color: #ffcb57; + color: #ffffff; + box-shadow: 0 10rpx 0 #ffb000; + line-height: 68rpx; + font-size: 28rpx; + padding: 0 30rpx; + border-radius: 80rpx; +} + .recruit-block { background-color: #5390f4; border-radius: 50rpx; @@ -15,6 +70,10 @@ margin-bottom: 30rpx; } +.recruit-block:first-child { + margin-top: -50rpx; +} + .recruit-border { border: 4rpx solid #000000; border-radius: 50rpx; diff --git a/pages/report/detail/detail.wxml b/pages/report/detail/detail.wxml index c4d33a6..8d1d08c 100644 --- a/pages/report/detail/detail.wxml +++ b/pages/report/detail/detail.wxml @@ -379,7 +379,7 @@ - + 回到体验官 diff --git a/project.config.json b/project.config.json index 80b5f41..bfdbf9f 100644 --- a/project.config.json +++ b/project.config.json @@ -45,7 +45,7 @@ }, "compileType": "miniprogram", "libVersion": "2.17.0", - "appid": "wx3056ec23196eaf02", + "appid": "wx6bd4fcc040bfa025", "projectname": "miniprogram-92", "condition": {}, "editorSetting": { diff --git a/project.private.config.json b/project.private.config.json index 3910f25..ae43c06 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -77,6 +77,13 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "", + "pathName": "pages/recruit/referto/referto", + "query": "id=1", + "launchMode": "default", + "scene": null } ] }