diff --git a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml b/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml index 4c2e7e7..99642af 100644 --- a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml +++ b/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml @@ -7,25 +7,25 @@ - + - + 1、请对准镜头，闭眼拍照 - + - + 2、请摘下眼镜，撩起刘海 - + - + 3、保持脸部垂直，切勿距离过远过近 @@ -37,13 +37,13 @@ - + 1、脸部置于画面中央，请勿距离过远或过近 - + 2、脸部保持平视摄像头 diff --git a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss b/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss index a2b1eba..f098f26 100644 --- a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss +++ b/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss @@ -16,7 +16,7 @@ page { .content .work { text-align: center; - padding: 60rpx 0 30rpx 0; + padding: 50rpx 0 30rpx 0; font-size: 36rpx; } diff --git a/packageB/pages/AI-test-skin/success_result/acne/acne.wxml b/packageB/pages/AI-test-skin/success_result/acne/acne.wxml index 5a8bdd7..d437250 100644 --- a/packageB/pages/AI-test-skin/success_result/acne/acne.wxml +++ b/packageB/pages/AI-test-skin/success_result/acne/acne.wxml @@ -14,7 +14,7 @@ - + 程度情况 @@ -23,7 +23,7 @@ - + 痤疮个数 @@ -32,28 +32,28 @@ - + 囊肿 健康 - + 丘疹 健康 - + 粉刺 健康 - + 痘印 健康 diff --git a/packageB/pages/AI-test-skin/success_result/blackhead/blackhead.wxml b/packageB/pages/AI-test-skin/success_result/blackhead/blackhead.wxml index 32e8bdf..90855ec 100644 --- a/packageB/pages/AI-test-skin/success_result/blackhead/blackhead.wxml +++ b/packageB/pages/AI-test-skin/success_result/blackhead/blackhead.wxml @@ -13,7 +13,7 @@ - + 程度情况 @@ -22,7 +22,7 @@ - + 粗大区域 diff --git a/packageB/pages/AI-test-skin/success_result/dark/dark.wxml b/packageB/pages/AI-test-skin/success_result/dark/dark.wxml index b3d8cd3..226e52c 100644 --- a/packageB/pages/AI-test-skin/success_result/dark/dark.wxml +++ b/packageB/pages/AI-test-skin/success_result/dark/dark.wxml @@ -13,7 +13,7 @@ - + 程度情况 @@ -23,7 +23,7 @@ - + 黑眼圈类型 @@ -32,23 +32,44 @@ - - - - - - - 色素性-中度 + + + - - - 血管性-轻度 + + + + 色素性-中度 + + + + 血管性-轻度 + + + + 阴影型-无 + - - - 阴影型-无 + + + + - + + + + 色素性-中度 + + + + 血管性-轻度 + + + + 阴影型-无 + + + 明显可见毛孔或内含小于毛孔大小角栓 diff --git a/packageB/pages/AI-test-skin/success_result/pore/pore.wxml b/packageB/pages/AI-test-skin/success_result/pore/pore.wxml index f23de41..e8a7114 100644 --- a/packageB/pages/AI-test-skin/success_result/pore/pore.wxml +++ b/packageB/pages/AI-test-skin/success_result/pore/pore.wxml @@ -22,7 +22,7 @@ - + 粗大区域 diff --git a/packageB/pages/AI-test-skin/success_result/sensitive/sensitive.wxml b/packageB/pages/AI-test-skin/success_result/sensitive/sensitive.wxml index fd0f31e..b5af813 100644 --- a/packageB/pages/AI-test-skin/success_result/sensitive/sensitive.wxml +++ b/packageB/pages/AI-test-skin/success_result/sensitive/sensitive.wxml @@ -1,8 +1,8 @@ - + - #01 + #07 敏感度 @@ -13,7 +13,7 @@ - + 程度情况 @@ -22,7 +22,7 @@ - + 敏感度得分 diff --git a/packageB/pages/AI-test-skin/success_result/speckle/speckle.wxml b/packageB/pages/AI-test-skin/success_result/speckle/speckle.wxml index 8e5e31a..8073949 100644 --- a/packageB/pages/AI-test-skin/success_result/speckle/speckle.wxml +++ b/packageB/pages/AI-test-skin/success_result/speckle/speckle.wxml @@ -13,7 +13,7 @@ - + 程度情况 @@ -22,7 +22,7 @@ - + 色斑个数 diff --git a/packageB/pages/AI-test-skin/success_result/success_result.js b/packageB/pages/AI-test-skin/success_result/success_result.js index a15fbc4..ea1f8a6 100644 --- a/packageB/pages/AI-test-skin/success_result/success_result.js +++ b/packageB/pages/AI-test-skin/success_result/success_result.js @@ -1,7 +1,7 @@ /* * @Author: abson * @Date: 2022-02-16 15:36:47 - * @LastEditTime: 2022-02-21 16:07:09 + * @LastEditTime: 2022-02-22 16:16:59 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js @@ -24,15 +24,15 @@ Page({ * 页面的初始数据 */ data: { - tab: [{ id: 'zong_he', name: '综合肤质' }, { id: 'mao_kong', name: '毛孔' }, { id: 'hei_tou', name: '黑头' }, { id: 'se_ban', name: '色斑' }, { id: 'zhou_wen', name: '皱纹' }, { id: 'hei_yan_quan', name: '黑眼圈' }, { id: 'cuo_chuang', name: '痤疮' }, { id: 'ming_gan_ji', name: '敏感度' }], + tab: [{ id: 'zong_he', name: '综合肤质' }, { id: 'mao_kong', name: '毛孔' }, { id: 'hei_tou', name: '黑头' }, { id: 'se_ban', name: '色斑' }, { id: 'zhou_wen', name: '皱纹' }, { id: 'hei_yan_quan', name: '黑眼圈' }, { id: 'cuo_chuang', name: '痤疮' }, { id: 'min_gan_du', name: '敏感度' }], currentIndex: 0, tab_id: 'zong_he', iurl: setting.imghost, showDialog: false, yanjing: true, //显示皮肤问题 img_scale: true, //问题标注放大图片 - img_scale_icon:true, - show_problem:1, //问题标注显示问题 + img_scale_icon: true, + show_problem: 1, //问题标注显示问题 }, @@ -40,76 +40,77 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - var th=this; - //初始化一下，获取商品的价格 - this.init(); - //var face_result=getApp().globalData.face_result; - //var face_data=face_result.face_list[0]; - this.data.id=options.id; + var th = this; + //初始化一下，获取商品的价格 + this.init(); + //var face_result=getApp().globalData.face_result; + //var face_data=face_result.face_list[0]; + this.data.id = options.id; //计算图片要显示的大小 th.data.cWidth = wx.getSystemInfoSync().windowWidth; th.data.cHeight = wx.getSystemInfoSync().windowHeight; - th.data.face_height=th.data.cHeight*0.8*0.8; - - this.get_data(function (json,img) { - //-- 数据先存着 -- - var face_data=th.data.face_data=json.face_list[0]; - //痤疮数 - var acne_num=face_data.acnespotmole.acne_num; - //色斑数 - var speckle_num=face_data.acnespotmole.speckle_num; - //皱纹数 - var wrinkle_num=face_data.wrinkle.wrinkle_num; - //黑头数 - var blackhead_num=face_data.blackheadpore.blackhead_num; - //毛孔数 - var pore_num=face_data.blackheadpore.pore_num; - //黑眼圈的严重程度 - var dark_type=face_data.eyesattr.dark_circle_left_type.length>0?face_data.eyesattr.dark_circle_left_type[0]:-1; - var dark_type1=face_data.eyesattr.dark_circle_right_type.length>0?face_data.eyesattr.dark_circle_right_type[0]:-1; - if(dark_type1>dark_type){ - dark_type=dark_type1; - } - var skin_sensitive_check= parseInt(face_data.skinquality.skin_sensitive_check[0]); - var skin_dryoil_check=face_data.skinquality.skin_dryoil_check; - - var location=face_data.location; - th.data.bili=th.data.face_height/(location.height+location.height/2.3); - - th.setData({ - acne_num:acne_num, - speckle_num:speckle_num, - wrinkle_num:wrinkle_num, - blackhead_num:blackhead_num, - pore_num:pore_num, - dark_type:dark_type, - skin_sensitive_check:skin_sensitive_check, - skin_dryoil_check:skin_dryoil_check, - face_img:img, - m_top:(location.top-location.height/2.5)*th.data.bili, - m_left:(location.left-location.width/7)*th.data.bili, - bili:th.data.bili - }) - //-- 调用毛孔的推荐函数 -- - if(pore_num>0) - pore.get_goods(th,setting.stoid); - //-- 调用黑头的推荐函数 -- - if(blackhead_num>0) - blackhead.get_goods(th,setting.stoid); - //-- 调用色斑的推荐函数 -- - if(speckle_num>0) - speckle.get_goods(th,setting.stoid); - //-- 调用皱纹的推荐函数 -- - if(wrinkle_num>0) - wrinkle.get_goods(th,setting.stoid); - //-- 黑眼圈 -- - if(dark_type>-1) - dark.get_goods(th,setting.stoid); - //-- 黑眼圈 -- - if(acne_num>-0) - acne.get_goods(th,setting.stoid); - }) + th.data.face_height = th.data.cHeight * 0.8 * 0.8; + + this.get_data(function (json, json1, img) { + //-- 数据先存着 -- + var face_data = th.data.face_data = json.face_list[0]; + var sex = json1.face_list[0].gender.type; + //痤疮数 + var acne_num = face_data.acnespotmole.acne_num; + //色斑数 + var speckle_num = face_data.acnespotmole.speckle_num; + //皱纹数 + var wrinkle_num = face_data.wrinkle.wrinkle_num; + //黑头数 + var blackhead_num = face_data.blackheadpore.blackhead_num; + //毛孔数 + var pore_num = face_data.blackheadpore.pore_num; + //黑眼圈的严重程度 + var dark_type = face_data.eyesattr.dark_circle_left_type.length > 0 ? face_data.eyesattr.dark_circle_left_type[0] : -1; + var dark_type1 = face_data.eyesattr.dark_circle_right_type.length > 0 ? face_data.eyesattr.dark_circle_right_type[0] : -1; + if (dark_type1 > dark_type) { + dark_type = dark_type1; + } + var skin_sensitive_check = parseInt(face_data.skinquality.skin_sensitive_check[0]); + var skin_dryoil_check = face_data.skinquality.skin_dryoil_check; + + var location = face_data.location; + th.data.bili = th.data.face_height / (location.height + location.height / 2.3); + + th.setData({ + acne_num: acne_num, + speckle_num: speckle_num, + wrinkle_num: wrinkle_num, + blackhead_num: blackhead_num, + pore_num: pore_num, + dark_type: dark_type, + skin_sensitive_check: skin_sensitive_check, + skin_dryoil_check: skin_dryoil_check, + face_img: img, + m_top: (location.top - location.height / 2.5) * th.data.bili, + m_left: (location.left - location.width / 7) * th.data.bili, + bili: th.data.bili + }) + //-- 调用毛孔的推荐函数 -- + if (pore_num > 0) + pore.get_goods(th, setting.stoid); + //-- 调用黑头的推荐函数 -- + if (blackhead_num > 0) + blackhead.get_goods(th, setting.stoid); + //-- 调用色斑的推荐函数 -- + if (speckle_num > 0) + speckle.get_goods(th, setting.stoid); + //-- 调用皱纹的推荐函数 -- + if (wrinkle_num > 0) + wrinkle.get_goods(th, setting.stoid); + //-- 黑眼圈 -- + if (dark_type > -1) + dark.get_goods(th, setting.stoid); + //-- 黑眼圈 -- + if (acne_num > -0) + acne.get_goods(th, setting.stoid); + }) }, //-- 初始等级卡 -- @@ -164,27 +165,52 @@ Page({ }) }, //-- 获取json数据 -- - get_data:function (func) { - var url="/api/weshop/face/storeSkinface/get/"+setting.stoid+"/"+this.data.id; - getApp().request.promiseGet(url, {}).then(res=>{ - if(res.data.code==0){ - var json=JSON.parse(res.data.data.resultjson); - func(json,res.data.data.img) - }else{ - getApp().showWarning("获取数据失败"); - } - }) + get_data: function (func) { + var url = "/api/weshop/face/storeSkinface/get/" + setting.stoid + "/" + this.data.id; + getApp().request.promiseGet(url, {}).then(res => { + if (res.data.code == 0) { + console.log(res, 'dsffffff'); + var json = JSON.parse(res.data.data.resultjson); + var json1 = JSON.parse(res.data.data.detectjson); + func(json, json1, res.data.data.img) + } else { + getApp().showWarning("获取数据失败"); + } + }) }, /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () {}, + onReady: function () { + // let heightRecords = []; + // setTimeout(() => { + // for (let i = 0; i < this.data.tab.length; i++) { + // let item = this.data.tab[i]; + // let id = `#${item.id}`; + // let query = wx.createSelectorQuery(); + // query.select(id).boundingClientRect(rect => { + // console.log(rect, i); + // heightRecords[i] = rect.height; + // }).exec() + // } + // this.setData({ + // heightRecords, + // }) + // }, 1000) + + }, + binddragend(e) { + console.log(e); + this.setData({ + scrollTop: e.detail.scrollTop, + }) + }, /** * 生命周期函数--监听页面显示 */ - onShow: function () {}, + onShow: function () { }, clickTab(e) { let { index, tab_id } = e.currentTarget.dataset; @@ -201,7 +227,7 @@ Page({ click_fangda() { this.setData({ img_scale: !this.data.img_scale, - img_scale_icon:!this.data.yanjing, + img_scale_icon: !this.data.yanjing, }) }, @@ -219,39 +245,39 @@ Page({ }, show_dailog(e) { - var type=parseInt(e.currentTarget.dataset.type); + var type = parseInt(e.currentTarget.dataset.type); this.setData({ - showDialog: true,show_type:type + showDialog: true, show_type: type }) - switch (type){ - case 1: //毛孔 - var pore_list=this.data.face_data.blackheadpore.circles[0].pore; - this.setData({pore_list:pore_list}); - break; + switch (type) { + case 1: //毛孔 + var pore_list = this.data.face_data.blackheadpore.circles[0].pore; + this.setData({ pore_list: pore_list }); + break; case 2://色斑 - var speckle_list=this.data.face_data.acnespotmole.speckle_list; - this.setData({speckle_list:speckle_list}); + var speckle_list = this.data.face_data.acnespotmole.speckle_list; + this.setData({ speckle_list: speckle_list }); + break; + case 3://皱纹 + var wrinkle_list = this.data.face_data.wrinkle.wrinkle_data; + this.setData({ wrinkle_list: wrinkle_list }); break; - case 3://皱纹 - var wrinkle_list=this.data.face_data.wrinkle.wrinkle_data; - this.setData({wrinkle_list:wrinkle_list}); - break; case 4://黑头 - var blackhead_list=this.data.face_data.blackheadpore.circles[0].blackhead; - this.setData({blackhead_list:blackhead_list}); + var blackhead_list = this.data.face_data.blackheadpore.circles[0].blackhead; + this.setData({ blackhead_list: blackhead_list }); break; case 5://黑眼圈 - var arr=this.data.face_data.eyesattr.dark_circle_left[0]; - var arr2=this.data.face_data.eyesattr.dark_circle_right[0]; - var arr3=[...arr,...arr2]; - this.setData({dark_list:arr3}); + var arr = this.data.face_data.eyesattr.dark_circle_left[0]; + var arr2 = this.data.face_data.eyesattr.dark_circle_right[0]; + var arr3 = [...arr, ...arr2]; + this.setData({ dark_list: arr3 }); break; case 6://痤疮 - var acne_list=this.data.face_data.acnespotmole.acne_list; - this.setData({acne_list:acne_list}); + var acne_list = this.data.face_data.acnespotmole.acne_list; + this.setData({ acne_list: acne_list }); break; - default: - break + default: + break } }, @@ -290,8 +316,8 @@ Page({ }, //商品页面跳转 - go_url:function (e) { - var url=e.currentTarget.dataset.url; + go_url: function (e) { + var url = e.currentTarget.dataset.url; getApp().goto(url); }, @@ -337,16 +363,16 @@ Page({ //图片加载的时候，计算图片的像素大小 face_img_load: function (e) { - var th=this; + var th = this; var imgwidth = e.detail.width; var imgheight = e.detail.height; - var w= th.data.cWidth*0.8; + var w = th.data.cWidth * 0.8; this.setData({ - iwidth:imgwidth*th.data.bili, - iheight:imgheight*th.data.bili, - bili1:w/imgwidth //图片放大时候的比例 + iwidth: imgwidth * th.data.bili, + iheight: imgheight * th.data.bili, + bili1: w / imgwidth //图片放大时候的比例 }) }, }) \ No newline at end of file diff --git a/packageB/pages/AI-test-skin/success_result/success_result.json b/packageB/pages/AI-test-skin/success_result/success_result.json index a9c180d..6f9de82 100644 --- a/packageB/pages/AI-test-skin/success_result/success_result.json +++ b/packageB/pages/AI-test-skin/success_result/success_result.json @@ -1,4 +1,7 @@ { - "usingComponents": {}, + "usingComponents": { + "vant-tabs":"../../../components/vant_ui/tabs", + "vant-tab":"../../../components/vant_ui/tab" + }, "navigationBarTitleText": "测肤报告" } \ No newline at end of file diff --git a/packageB/pages/AI-test-skin/success_result/success_result.wxml b/packageB/pages/AI-test-skin/success_result/success_result.wxml index 4ba7faf..b3c4103 100644 --- a/packageB/pages/AI-test-skin/success_result/success_result.wxml +++ b/packageB/pages/AI-test-skin/success_result/success_result.wxml @@ -2,16 +2,16 @@ - - - {{item.name}} + + + {{item.name}} + - - + - - + + 毛孔 {{pore_num}} @@ -19,7 +19,8 @@ 黑眼圈 {{s_filter.get_dark_type(dark_type)}} - + + 黑头 {{blackhead_num}} @@ -43,12 +44,12 @@ - - + + 待确定 @@ -57,10 +58,9 @@ 油性区 - 你的油性的身份骨科大夫地方官梵蒂冈反对烦得很东方红风格和的发挥 + 你的皮肤总体油脂过剩，容易引发皮肤问题。日常可使用一些具有控油，补水功效产品，帮助调理肌肤 - @@ -68,7 +68,7 @@ - + @@ -107,9 +107,8 @@ - - + + @@ -196,7 +195,7 @@ - + @@ -252,4 +251,4 @@ - + \ No newline at end of file diff --git a/packageB/pages/AI-test-skin/success_result/success_result.wxss b/packageB/pages/AI-test-skin/success_result/success_result.wxss index 35af249..6fa8469 100644 --- a/packageB/pages/AI-test-skin/success_result/success_result.wxss +++ b/packageB/pages/AI-test-skin/success_result/success_result.wxss @@ -48,6 +48,7 @@ page { display: flex; align-items: center; margin-top: 50rpx; + justify-content: center; /* justify-content: space-evenly; */ } diff --git a/packageB/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml b/packageB/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml index 4662f1e..3fe0ff1 100644 --- a/packageB/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml +++ b/packageB/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml @@ -13,7 +13,7 @@ - + 程度情况 @@ -30,7 +30,8 @@ - + +