diff --git a/app.json b/app.json index c5a75da..6eb63ca 100644 --- a/app.json +++ b/app.json @@ -36,7 +36,8 @@ "pages/recruit/writeList/writeList", "pages/recruit/dailyList/dailyList", "pages/water/index", - "pages/recruit/expressTrack/expressTrack" + "pages/recruit/expressTrack/expressTrack", + "pages/recruit/unveil/unveil" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/recruit/beifen.wxml b/pages/recruit/index-备份.wxml similarity index 88% rename from pages/recruit/beifen.wxml rename to pages/recruit/index-备份.wxml index 3977593..8a65ec1 100644 --- a/pages/recruit/beifen.wxml +++ b/pages/recruit/index-备份.wxml @@ -176,74 +176,74 @@ - + 衰老度分析 - + 抬头纹：{{skinData.params.senility.forehead_wrinkle.before}} 抬头纹：{{skinData.params.senility.forehead_wrinkle.after}} - + 鱼尾纹：{{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}} @@ -255,14 +255,14 @@ 眼部分析 - + 眼袋：{{skinData.params.eye_bag.eye_pouch.before}} 眼袋：{{skinData.params.eye_bag.eye_pouch.after}} - + 黑眼圈：{{skinData.params.black_eye.dark_circle.before}} 黑眼圈：{{skinData.params.black_eye.dark_circle.after}} @@ -274,14 +274,14 @@ 敏感度分析 - - 敏感区域面积：{{skinData.params.sensitiveness.sensitivity.sensitivity_area.before}}% + + 敏感区域面积：{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.before}}% - 敏感区域面积：{{skinData.params.sensitiveness.sensitivity.sensitivity_area.after}}% - + 敏感区域面积：{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.after}}% + - + 敏感程度：{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.before}} 敏感程度：{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.after}} @@ -293,28 +293,28 @@ 毛孔分析 - + 额头毛孔数：{{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}} @@ -324,7 +324,7 @@ - + 黑头分析 黑头数：{{skinData.params.blackhead.blackhead_count.before}} @@ -338,28 +338,28 @@ 色素分析 - + 闭口粉刺：{{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}} @@ -367,13 +367,8 @@ - - - - 请您继续使用我们的产品哦~ - @@ -407,7 +402,7 @@ 关注公众号 - + 请关注”水感应“公众号以便收到活动通知 diff --git a/pages/recruit/index.wxml b/pages/recruit/index.wxml index 8a65ec1..6ee48c6 100644 --- a/pages/recruit/index.wxml +++ b/pages/recruit/index.wxml @@ -48,6 +48,9 @@ + + 申请体验官详细流程 > + @@ -176,74 +179,74 @@ - + - + 衰老度分析 - + 抬头纹：{{skinData.params.senility.forehead_wrinkle.before}} 抬头纹：{{skinData.params.senility.forehead_wrinkle.after}} - + 鱼尾纹：{{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}} @@ -253,16 +256,16 @@ - + 眼部分析 - + 眼袋：{{skinData.params.eye_bag.eye_pouch.before}} 眼袋：{{skinData.params.eye_bag.eye_pouch.after}} - + 黑眼圈：{{skinData.params.black_eye.dark_circle.before}} 黑眼圈：{{skinData.params.black_eye.dark_circle.after}} @@ -272,16 +275,16 @@ - + 敏感度分析 - - 敏感区域面积：{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.before}}% + + 敏感区域面积：{{skinData.params.sensitiveness.sensitivity.sensitivity_area.before}}% - 敏感区域面积：{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.after}}% - + 敏感区域面积：{{skinData.params.sensitiveness.sensitivity.sensitivity_area.after}}% + - + 敏感程度：{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.before}} 敏感程度：{{skinData.params.sensitiveness.sensitivity.sensitivity_intensity.after}} @@ -291,30 +294,30 @@ - + 毛孔分析 - + 额头毛孔数：{{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}} @@ -324,7 +327,7 @@ - + 黑头分析 黑头数：{{skinData.params.blackhead.blackhead_count.before}} @@ -336,30 +339,30 @@ - + 色素分析 - + 闭口粉刺：{{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}} @@ -367,8 +370,13 @@ - + + + + 请您继续使用我们的产品哦~ + + @@ -402,8 +410,9 @@ 关注公众号 - + 请关注”水感应“公众号以便收到活动通知 + 请截图保存二维码识别关注 diff --git a/pages/recruit/index.wxss b/pages/recruit/index.wxss index acb9ef2..92d4a39 100644 --- a/pages/recruit/index.wxss +++ b/pages/recruit/index.wxss @@ -47,6 +47,22 @@ width: 100%; } +.recruit-unveil { + text-align: center; + margin-top: 30rpx; +} + +.recruit-unveil-go { + display: inline-block; + background-color: #ffde49; + border-radius: 80rpx; + line-height: 78rpx; + padding: 0 30rpx; + font-weight: 600; + font-size: 28rpx; + color: #3a2f00; +} + .recruit-white { background-color: white; border-radius: 40rpx; @@ -319,6 +335,12 @@ padding-bottom: 30rpx; } +.weChat-tips { + font-size: 26rpx; + color: #c6501e; + padding-bottom: 30rpx; +} + .weChat-text text { display: block; } @@ -342,12 +364,15 @@ position: relative; padding: 0 15rpx; margin: 0 15rpx; + width: 30rpx; + text-align: center; } .clockInTitle-day text { + width: 100%; font-size: 44rpx; position: absolute; - left: -14rpx; + left: 0; top: -20rpx; font-style: italic; font-weight: 600; @@ -780,7 +805,8 @@ } .recruit-data-img { - width: 50%; + width: 55%; + margin-bottom: 30rpx; } .recruit-data-text { diff --git a/pages/recruit/referto/referto.js b/pages/recruit/referto/referto.js index a61573e..7aa78ef 100644 --- a/pages/recruit/referto/referto.js +++ b/pages/recruit/referto/referto.js @@ -10,6 +10,7 @@ Page({ typesArr : [], typesIndex : 0, refertoStatus: false, + checkStatus : false, // 市级选择 cityArr : [], @@ -151,7 +152,7 @@ Page({ }) wx.$api.recruit.recruitAdd(data).then(res => { this.setData({ - refertoStatus: true + checkStatus: true }) }).catch(() =>{ this.setData({ @@ -170,5 +171,15 @@ Page({ wx.switchTab({ url: '/pages/recruit/index' }) + }, + + /** + * 申请体验官成功后，弹出 + */ + checkTap() { + this.setData({ + refertoStatus: true, + checkStatus: false + }) } }) \ No newline at end of file diff --git a/pages/recruit/referto/referto.wxml b/pages/recruit/referto/referto.wxml index 77f8fe1..e71903a 100644 --- a/pages/recruit/referto/referto.wxml +++ b/pages/recruit/referto/referto.wxml @@ -10,12 +10,13 @@ activity
- - + + {{ typesArr[typesIndex].name }} + {{ typesArr[typesIndex].remark }} @@ -62,4 +63,17 @@ + + + + + + + + + 恭喜您，申请成功 + 水漾肌肤天然滋润，足量使用，效果更佳！ + 知道了 + + \ No newline at end of file diff --git a/pages/recruit/referto/referto.wxss b/pages/recruit/referto/referto.wxss index b76d140..1d14dac 100644 --- a/pages/recruit/referto/referto.wxss +++ b/pages/recruit/referto/referto.wxss @@ -128,6 +128,30 @@ page { color: #ee291b; } +.picker-text { + color: #ee291b; + font-size: 26rpx; + margin-top: 20rpx; +} + +.picker-remark picker { + position: relative; + width: 100%; + background-color: #f9fcff; + padding: 30rpx 80rpx 30rpx 30rpx; + box-sizing: border-box; + margin-top: 30rpx; +} + +.picker-remark image { + width: 44rpx; + height: 44rpx; + position: absolute; + right: 20rpx; + top: calc(50% - 22rpx); +} + + .site-input input, .site-input picker { width: 100%; @@ -253,4 +277,78 @@ page { width: 68rpx; display: block; margin: 0 auto; +} + +/* 申请成功弹出 */ +.checkEject { + position: fixed; + width: 100vw; + height: 100vh; + left: 0; + top: 0; + background-color: rgba(0, 0, 0, .6); + z-index: 1000; + display: none; +} + +.checkEject.active { + display: block; +} + +.checkCont { + -webkit-box-orient: vertical; + -webkit-box-pack: center; + position: fixed; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 10000; + box-sizing: border-box; + text-align: center; + display: none; +} + +.checkCont.active { + display: -webkit-box; +} + +.checkCont-img, +.checkCont-name { + position: absolute; + width: 80%; + left: 10%; + top: 30%; +} + +.checkCont-name { + z-index: 9; + padding: 120rpx 140rpx; + box-sizing: border-box; +} + +.checkCont-name image { + width: 70%; +} + +.checkCont-text { + margin-top: 20rpx; +} + +.checkCont-text-title { + font-weight: 600; + font-size: 34rpx; +} + +.checkCont-text-tips { + color: #666666; + line-height: 44rpx; + margin: 25rpx 0; +} + +.checkCont-text-go { + background-color: #ff4751; + color: #fff; + border-radius: 80rpx; + line-height: 74rpx; } \ No newline at end of file diff --git a/pages/recruit/unveil/unveil.js b/pages/recruit/unveil/unveil.js new file mode 100644 index 0000000..e50f861 --- /dev/null +++ b/pages/recruit/unveil/unveil.js @@ -0,0 +1,28 @@ + /* + * 手太欠 + * 愿这世界都如故事里一样 美好而动人~ + */ + +Page({ + + /** + * 页面的初始数据 + */ + data: { + barHeight : getApp().globalData.barHeight, // 状态栏高度 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + // 返回上一页 + returnGo() { + wx.navigateBack({ + delta: 1 + }) + }, +}) \ No newline at end of file diff --git a/pages/recruit/unveil/unveil.json b/pages/recruit/unveil/unveil.json new file mode 100644 index 0000000..f7efdab --- /dev/null +++ b/pages/recruit/unveil/unveil.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationStyle": "custom" + } \ No newline at end of file diff --git a/pages/recruit/unveil/unveil.wxml b/pages/recruit/unveil/unveil.wxml new file mode 100644 index 0000000..3c90fd9 --- /dev/null +++ b/pages/recruit/unveil/unveil.wxml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pages/recruit/unveil/unveil.wxss b/pages/recruit/unveil/unveil.wxss new file mode 100644 index 0000000..786ed67 --- /dev/null +++ b/pages/recruit/unveil/unveil.wxss @@ -0,0 +1,26 @@ +/* 返回上一页 */ +.navigation{ + position: fixed; + top: 0; + left: 0; + z-index: 99; + width: 100%; + height: 90rpx; + background-color: transparent; + transition: .2s; +} + +.navigation.active { + background-color: transparent; +} + +.navigation-arrow { + width: 44rpx; + height: 44rpx; + margin: 20rpx 15rpx 0 20rpx; +} + +.img { + width: 100%; + display: block; +} \ No newline at end of file diff --git a/pages/recruit/writeList/writeList.json b/pages/recruit/writeList/writeList.json index 51ff580..1a34d5c 100644 --- a/pages/recruit/writeList/writeList.json +++ b/pages/recruit/writeList/writeList.json @@ -1,4 +1,4 @@ { "usingComponents": {}, - "navigationBarTitleText": "体验官" + "navigationBarTitleText": "体验心得" } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index d077ba2..cc1f820 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -95,5 +95,5 @@ ] } }, - "libVersion": "2.32.3" + "libVersion": "2.33.0" } \ No newline at end of file