diff --git a/packageD/pages/AI-test-skin/success_result/dark/dark.wxml b/packageD/pages/AI-test-skin/success_result/dark/dark.wxml index 1f1964d..3e92d71 100644 --- a/packageD/pages/AI-test-skin/success_result/dark/dark.wxml +++ b/packageD/pages/AI-test-skin/success_result/dark/dark.wxml @@ -58,15 +58,15 @@ - 色素性-中度 + 色素性 - 血管性-轻度 + 血管性 - 阴影型-无 + 阴影型 diff --git a/packageD/pages/AI-test-skin/success_result/iconfont.ttf b/packageD/pages/AI-test-skin/success_result/iconfont.ttf new file mode 100644 index 0000000..a968fcd --- /dev/null +++ b/packageD/pages/AI-test-skin/success_result/iconfont.ttf diff --git a/packageD/pages/AI-test-skin/success_result/s_filter.wxs b/packageD/pages/AI-test-skin/success_result/s_filter.wxs index 48091bb..ffeb466 100644 --- a/packageD/pages/AI-test-skin/success_result/s_filter.wxs +++ b/packageD/pages/AI-test-skin/success_result/s_filter.wxs @@ -5,6 +5,7 @@ var get_dark_type = function(column) { case 1:return "中度"; case 2:return "重度"; } + return "无" } //跳转的接口 @@ -112,7 +113,6 @@ var get_card_price=function(goods,all_card,type){ var get_nai_shou=function(type){ - switch(type){ case 0:return '耐受'; case 1:return '中性'; @@ -121,6 +121,24 @@ var get_nai_shou=function(type){ return ''; } +//获取样式 +var get_dryoil_check = function(column) { + switch(column){ + case 0:return "干性"; + case 1:return "中性"; + case 2:return "油性"; + case 3:return "混合型"; + } + return "无" +} + +//是否包含 +var is_has= function(num,arr){ + if(arr.indexOf(num)!=-1){ + return true; + } + return false; +} module.exports = { get_dark_type: get_dark_type, @@ -129,5 +147,7 @@ module.exports = { dryoil_check:dryoil_check, is_has_rank:is_has_rank, get_card_price:get_card_price, - get_nai_shou:get_nai_shou + get_nai_shou:get_nai_shou, + get_dryoil_check:get_dryoil_check, + is_has:is_has } diff --git a/packageD/pages/AI-test-skin/success_result/success_result.js b/packageD/pages/AI-test-skin/success_result/success_result.js index 9c64c62..50720bc 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.js +++ b/packageD/pages/AI-test-skin/success_result/success_result.js @@ -25,8 +25,8 @@ 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: 'min_gan_du', name: '敏感度' }], - zhouwen_arr: [{ id: 1, name: '全部皱纹' }, { id: 2, name: '泪沟' }, { id: 3, name: '法令纹' }, { id: 4, name: '口角纹' }, { id: 5, name: '眼部皱纹' }, { id: 6, name: '鱼尾纹' }, { id: 7, name: '抬头皱纹' }, { id: 8, name: '眉间纹' }], - cuochuang_arr: [{ id: 1, name: '全部痤疮' }, { id: 2, name: '痘印' }, { id: 3, name: '囊肿' }, { id: 4, name: '丘疹' }, { id: 5, name: '粉刺' }], + zhouwen_arr: [{ id: 1, name: '全部皱纹' }, { id: 2, name: '抬头纹' }, { id: 3, name: '川字纹' }, { id: 4, name: '眼周细纹' }, { id: 5, name: '鱼尾纹' }, { id: 6, name: '法令纹' }, { id: 7, name: '口周纹' }], + cuochuang_arr: [{ id: 1, name: '全部痤疮' }, { id: 2, name: '粉刺 ' }, { id: 3, name: '痘印 ' }, { id: 4, name: '脓包' }, { id: 5, name: '结节'}], heitanquan_arr: [{ id: 1, name: '综合情况' }, { id: 2, name: '左眼' }, { id: 3, name: '右眼' }], currentIndex: 0, scroll_index: 0, @@ -40,6 +40,21 @@ Page({ img_scale_icon: true, show_problem: 1, //问题标注显示问题 img_scale: 1, //缩放问题 + sex:'', + is_esys_show:0, //是不是显示眼睛 + scroll_id:1, //初始为1 + + wrinkle_num1:0, //抬头纹 + wrinkle_num2:0, //川字纹 + wrinkle_num3:0, //眼周细纹 + wrinkle_num4:0, //鱼尾纹 + wrinkle_num5:0, //法令纹 + wrinkle_num6:0, //口周纹 + + acne_num1:0, //粉刺 + acne_num2:0, //痘印 + acne_num3:0, //脓包 + acne_num4:0, //结节 }, /** @@ -57,12 +72,14 @@ Page({ //计算图片要显示的大小 th.data.cWidth = wx.getSystemInfoSync().windowWidth; th.data.cHeight = wx.getSystemInfoSync().windowHeight; - th.data.face_height = th.data.cHeight * 0.8 * 0.8; + th.data.face_height = th.data.cHeight * 0.8 * 0.75; + var bi1= (th.data.cHeight * 0.8 * 0.8)/(th.data.cWidth*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 face_data1 = th.data.face_data1 = json1.face_list[0]; + var sex = face_data1.gender.type; //痤疮数 var acne_num = face_data.acnespotmole.acne_num; //色斑数 @@ -76,6 +93,9 @@ Page({ //黑眼圈的严重程度 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; + + var dk_type1=dark_type; + var dk_type2=dark_type1; if (dark_type1 > dark_type) { dark_type = dark_type1; } @@ -83,22 +103,114 @@ Page({ 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); + var bili = th.data.face_height / (location.height + location.height / 2.3); + + //获取眼睛的画图比例 + var eye_data1=face_data1.landmark150.eye_left_corner_right; + var eye_data2=face_data1.landmark150.eye_left_corner_left; + var eye_data3=face_data1.landmark150.eye_right_corner_left; + + var hei1=Math.abs(eye_data1.x-eye_data2.x); + var bili_eye = th.data.face_height /(2*hei1*bi1); + var eye_top=eye_data1.y-hei1*3/4 + var eye_left1=eye_data1.x-hei1/2; + var eye_left2=eye_data3.x-hei1-hei1/2; + + var skin_dryoil_check_type=0;//干性 + var skin_dryoil_check_arr=[] + for(let i in skin_dryoil_check){ + let item=skin_dryoil_check[i]; + if(item!='1' && skin_dryoil_check_arr.indexOf(item)==-1){ + skin_dryoil_check_arr.push(item); + } + } + //皮肤干油性的判断 + if(skin_dryoil_check_arr.length==0) skin_dryoil_check_type=1; + else if(skin_dryoil_check_arr.length==1) skin_dryoil_check_type=parseInt(skin_dryoil_check_arr[0]); + else skin_dryoil_check_type=3; + + var wrinkle_types=face_data.wrinkle.wrinkle_types; + var w_arr=wrinkle_types.filter(function (e) { + return e==1; + }) + th.data.wrinkle_num1=w_arr.length; + + //皱纹的数量的统计 + w_arr=wrinkle_types.filter(function (e) { + return e==2; + }) + th.data.wrinkle_num2=w_arr.length; + w_arr=wrinkle_types.filter(function (e) { + return e==3; + }) + th.data.wrinkle_num3=w_arr.length; + w_arr=wrinkle_types.filter(function (e) { + return e==4; + }) + th.data.wrinkle_num4=w_arr.length; + w_arr=wrinkle_types.filter(function (e) { + return e==5; + }) + th.data.wrinkle_num5=w_arr.length; + w_arr=wrinkle_types.filter(function (e) { + return e==6; + }) + th.data.wrinkle_num6=w_arr.length; + + //痘痘的不同的统计 + var acne_list = face_data.acnespotmole.acne_list; + var a_arr=acne_list.filter(function (e) { + return e.type==0; + }) + th.data.acne_num1=a_arr.length; + a_arr=acne_list.filter(function (e) { + return e.type==1; + }) + th.data.acne_num2=a_arr.length; + a_arr=acne_list.filter(function (e) { + return e.type==2; + }) + th.data.acne_num3=a_arr.length; + a_arr=acne_list.filter(function (e) { + return e.type==3; + }) + th.data.acne_num4=a_arr.length; th.setData({ acne_num: acne_num, speckle_num: speckle_num, wrinkle_num: wrinkle_num, + wrinkle_types:wrinkle_types, //皱纹类型 blackhead_num: blackhead_num, pore_num: pore_num, dark_type: dark_type, + dark_typ1: dk_type1, + dark_type2: dk_type2, skin_sensitive_check: skin_sensitive_check, skin_dryoil_check: skin_dryoil_check, + skin_dryoil_check_type:skin_dryoil_check_type, 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, - sex: sex + m_top: (location.top - location.height / 2.5) * bili, + m_left: (location.left - location.width / 7) * bili, + bili: bili, + bili_eye:bili_eye, + sex:sex, + skin_dryoil_check_type:skin_dryoil_check_type, + eye_top:eye_top, + eye_left1:eye_left1* bili_eye, + eye_left2:eye_left2* bili_eye, + + wrinkle_num1:th.data.wrinkle_num1, //抬头纹 + wrinkle_num2:th.data.wrinkle_num2, //川字纹 + wrinkle_num3:th.data.wrinkle_num3, //眼周细纹 + wrinkle_num4:th.data.wrinkle_num4, //鱼尾纹 + wrinkle_num5:th.data.wrinkle_num5, //法令纹 + wrinkle_num6:th.data.wrinkle_num6, //口周纹 + + acne_num1:th.data.acne_num1, //粉刺 + acne_num2:th.data.acne_num2, //痘印 + acne_num3:th.data.acne_num3, //脓包 + acne_num4:th.data.acne_num4, //结节 }) var sort = 1; //-- 调用毛孔的推荐函数 -- @@ -120,7 +232,7 @@ Page({ if (acne_num > -0) acne.get_goods(th, setting.stoid, sort++); - //获取一下分享要用的图片 + //-- 获取一下分享要用的图片 -- th.set_share_img(); acne.get_goods(th, setting.stoid); let { heightRecord, tab } = th.data; @@ -272,12 +384,26 @@ Page({ }, click_scroll(e) { - console.log(e); - let { index, scroll_id } = e.currentTarget.dataset; + let { index, scroll_id} = e.currentTarget.dataset; this.setData({ scroll_index: index, scroll_id, }) + + //-- 如果是黑眼圈的控制 -- + if(this.data.show_type==5){ + switch (scroll_id){ + case 1: + this.setData({is_esys_show:0}) + break; + case 2: + this.setData({is_esys_show:1}) + break; + default: + this.setData({is_esys_show:2}) + break + } + } }, /** @@ -301,6 +427,7 @@ Page({ this.setData({ img_scale: !this.data.img_scale, img_scale_icon: !this.data.yanjing, + ig_scale:1,img_top:0,img_left:0 }) }, @@ -318,9 +445,10 @@ Page({ }, show_dailog(e) { + var th=this; var type = parseInt(e.currentTarget.dataset.type); this.setData({ - showDialog: true, show_type: type + showDialog: true, show_type: type,is_esys_show:0,ig_scale:1,img_top:0,img_left:0,scroll_index:0,scroll_id:1 }) switch (type) { case 1: //毛孔 @@ -333,6 +461,13 @@ Page({ break; case 3://皱纹 var wrinkle_list = this.data.face_data.wrinkle.wrinkle_data; + for(let i in wrinkle_list){ + let item=wrinkle_list[i]; + item.map(function (e) { + e.w_type=th.data.wrinkle_types[i]; + return e; + }) + } this.setData({ wrinkle_list: wrinkle_list }); break; case 4://黑头 @@ -451,10 +586,11 @@ Page({ var imgheight = e.detail.height; var w = th.data.cWidth * 0.8; - this.setData({ iwidth: imgwidth * th.data.bili, iheight: imgheight * th.data.bili, + eye_w:imgwidth*th.data.bili_eye, + eye_h:imgheight*th.data.bili_eye, bili1: w / imgwidth //图片放大时候的比例 }) }, @@ -513,9 +649,8 @@ Page({ }, touchendCallback: function (e) { this.data.tc_end = 1; - }, - + }, //--定义的保存图片方法，分享团--- saveImageToPhotosAlbum: function () { @@ -551,101 +686,93 @@ Page({ wx.getImageInfo({ src: path3, success: function (res) { - var b = 1.1; - //获取到二维码的图片 - var vpath = res.path; - var context = wx.createCanvasContext('share'); - // 先画背景 - context.fillStyle = '#ebf6f8'; - // 灰色实心矩形 - // 1. 语法： x坐标, y坐标, 宽度, 高度 - context.fillRect(0, 0, 750 * rpx, 1338 * rpx); - - context.setFontSize(20 * rpx) - context.setFillStyle("#00d8e9") - context.fillText("官方检测认证", 28 * b * rpx, 80 * b * rpx); - - //两个底部颜色 - context.fillStyle = '#a7ecf5'; - context.fillRect(28 * b * rpx, 136 * b * rpx, 262 * b * rpx, 18 * b * rpx); - context.fillRect(28 * b * rpx, 194 * b * rpx, 262 * b * rpx, 18 * b * rpx); - - context.setFontSize(42 * b * rpx) - context.setFillStyle("#070609") - context.fillText("我的肌底强韧", 30 * b * rpx, 140 * b * rpx); - context.fillText("肌肤鲜活润泽", 30 * b * rpx, 196 * b * rpx); - - //先画一个圆形 - th.circle(context, 110 * b * rpx, 280 * b * rpx, 140 * b * rpx, "#e7f3f8"); - th.circle(context, 130 * b * rpx, 300 * b * rpx, 120 * b * rpx, "#c8f2fa"); - //绘制人脸 - context.drawImage(th.data.share_head, 132 * b * rpx, 310 * b * rpx, 230 * b * rpx, 230 * b * rpx); - - //左右俩个框并填充文字 - th.darwRoundRect(38 * b * rpx, 340 * b * rpx, 140 * b * rpx, 40 * b * rpx, 20 * b * rpx, context); - th.darwRoundRect(324 * b * rpx, 340 * b * rpx, 140 * b * rpx, 40 * b * rpx, 20 * b * rpx, context); - context.setFontSize(20 * b * rpx) - context.setFillStyle("black") - context.fillText("黑眼圈 重度", 50 * b * rpx, 368 * b * rpx); - context.fillText("毛孔 较粗大", 336 * b * rpx, 368 * b * rpx); - - //左右俩个框并填充文字 - th.darwRoundRect(40 * b * rpx, 412 * b * rpx, 116 * b * rpx, 40 * b * rpx, 20 * b * rpx, context); - th.darwRoundRect(348 * b * rpx, 412 * b * rpx, 116 * b * rpx, 40 * b * rpx, 20 * b * rpx, context); - context.setFillStyle("black") - context.fillText("黑头 重度", 52 * b * rpx, 440 * b * rpx); - context.fillText("色斑 轻度", 354 * b * rpx, 440 * b * rpx); - - //左右俩个框并填充文字 - th.darwRoundRect(60 * b * rpx, 484 * b * rpx, 116 * b * rpx, 40 * b * rpx, 20 * b * rpx, context); - th.darwRoundRect(328 * b * rpx, 484 * b * rpx, 116 * b * rpx, 40 * b * rpx, 20 * b * rpx, context); - context.setFillStyle("black") - context.fillText("皱纹 重度", 74 * b * rpx, 510 * b * rpx); - context.fillText("痤疮 轻度", 344 * b * rpx, 510 * b * rpx); - - //底部的绘制 - th.darwRoundRect(38 * b * rpx, 650 * b * rpx, 430 * b * rpx, 160 * b * rpx, 10 * b * rpx, context); - //绘制二维码 - context.drawImage(vpath, 60 * b * rpx, 672 * b * rpx, 120 * b * rpx, 120 * b * rpx); - context.setFillStyle("black") - context.setFontSize(32 * b * rpx) - context.fillText("美肤管家AI测肤", 200 * b * rpx, 726 * b * rpx); - context.setFontSize(22 * b * rpx) - context.fillText("科学了解皮肤的真实状态", 200 * b * rpx, 766 * b * rpx); - - //把画板内容绘制成图片，并回调 画板图片路径 - context.draw(false, function () { - setTimeout(function () { - wx.canvasToTempFilePath({ - x: 0, - y: 0, - width: 750, - height: 1338, - destWidth: 1.4 * 750 * 750 / th.data.screenWidth, - destHeight: 1.4 * 750 * 750 / th.data.screenWidth, - canvasId: 'share', - success: function (res) { - that.setData({ - shareImgPath: res.tempFilePath, - canvasHidden: true, - share_show: 1 - }) - - if (!res.tempFilePath) { - wx.showModal({ - title: '提示', - content: '图片绘制中，请稍后重试', - showCancel: false + var b=1.1; + //获取到二维码的图片 + var vpath = res.path; + var context = wx.createCanvasContext('share'); + // 先画背景 + context.fillStyle = '#ebf6f8'; + // 灰色实心矩形 + // 1. 语法： x坐标, y坐标, 宽度, 高度 + context.fillRect(0,0,750 * rpx,1338 * rpx); + + context.setFontSize(20* rpx) + context.setFillStyle("#00d8e9") + context.fillText("官方检测认证", 28*b* rpx, 80*b* rpx); + + //两个底部颜色 + context.fillStyle = '#a7ecf5'; + context.fillRect(28 *b* rpx,136 *b* rpx,262 *b* rpx,18 *b* rpx); + context.fillRect(28 *b* rpx,194 *b* rpx,262 *b* rpx,18 *b* rpx); + + context.setFontSize(42*b*rpx) + context.setFillStyle("#070609") + context.fillText("我的肌底强韧", 30*b* rpx, 140*b* rpx); + context.fillText("肌肤鲜活润泽", 30*b* rpx, 196*b* rpx); + + //先画一个圆形 + th.circle(context,110*b*rpx, 280*b*rpx,140*b*rpx,"#e7f3f8"); + th.circle(context,130*b*rpx, 300*b*rpx,120*b*rpx,"#c8f2fa"); + //绘制人脸 + context.drawImage(th.data.share_head, 132*b*rpx, 310*b*rpx, 230*b* rpx, 230 *b* rpx); + + //左右俩个框并填充文字 + th.darwRoundRect(38 *b* rpx,340*b*rpx,140*b*rpx,40*b*rpx,20*b*rpx,context); + th.darwRoundRect(324 *b* rpx,340*b*rpx,140*b*rpx,40*b*rpx,20*b*rpx,context); + context.setFontSize(20*b*rpx) + context.setFillStyle("black") + context.fillText("黑眼圈 重度", 50*b* rpx, 368*b* rpx); + context.fillText("毛孔 "+th.data.pore_num, 336*b* rpx, 368*b* rpx); + + //左右俩个框并填充文字 + th.darwRoundRect(40 *b* rpx,412*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context); + th.darwRoundRect(348 *b* rpx,412*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context); + context.setFillStyle("black") + context.fillText("黑头 "+th.data.blackhead_num, 52*b* rpx, 440*b* rpx); + context.fillText("色斑 "+th.data.speckle_num, 354*b* rpx, 440*b* rpx); + + //左右俩个框并填充文字 + th.darwRoundRect(60 *b* rpx,484*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context); + th.darwRoundRect(328 *b* rpx,484*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context); + context.setFillStyle("black") + context.fillText("皱纹 "+th.data.wrinkle_num, 74*b* rpx, 510*b* rpx); + context.fillText("痤疮 "+th.data.acne_num, 344*b* rpx, 510*b* rpx); + + //底部的绘制 + th.darwRoundRect(38 *b* rpx,650*b*rpx,430*b*rpx,160*b*rpx,10*b*rpx,context); + //绘制二维码 + context.drawImage(vpath, 60*b*rpx, 672*b*rpx, 120 *b* rpx, 120 *b* rpx); + context.setFillStyle("black") + context.setFontSize(32*b*rpx) + context.fillText("美肤管家AI测肤", 200*b* rpx, 726*b* rpx); + context.setFontSize(22*b*rpx) + context.fillText("科学了解皮肤的真实状态", 200*b* rpx, 766*b* rpx); + + //把画板内容绘制成图片，并回调 画板图片路径 + context.draw(false, function () { + setTimeout(function () { + wx.canvasToTempFilePath({ + x: 0, + y: 0, + width: 750, + height: 1338, + destWidth: 1.4 * 750 * 750 / th.data.screenWidth, + destHeight: 1.4 * 750 * 750 / th.data.screenWidth, + canvasId: 'share', + success: function (res) { + that.setData({ + shareImgPath: res.tempFilePath, + canvasHidden: true, + share_show:1 }) return false; - } - /*-- - wx.previewImage({ - //将图片预览出来 - ur--*/ + /*-- + wx.previewImage({ + //将图片预览出来 + ur--*/ - wx.hideLoading(); + wx.hideLoading(); } }) }, 500) @@ -715,8 +842,6 @@ Page({ close_share: function () { this.setData({ share_show: 0 }) }, - - // 保存图片到手机 savePic() { var self = this; diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxml b/packageD/pages/AI-test-skin/success_result/success_result.wxml index 36eb39f..3c7619d 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.wxml +++ b/packageD/pages/AI-test-skin/success_result/success_result.wxml @@ -26,7 +26,7 @@ - + 黑头 {{blackhead_num}} @@ -53,19 +53,36 @@ - - - + + + + + + + + + + + + + - 待确定 - - 干性区 - 油性区 + {{s_filter.get_dryoil_check(skin_dryoil_check_type)}} + + 干性区 + 油性区 - - 你的皮肤总体油脂过剩，容易引发皮肤问题。日常可使用一些具有控油，补水功效产品，帮助调理肌肤 + + 你的皮肤油脂过剩，部分干燥，容易引发皮肤问题。日常可使用一些具有控油和补水功效产品，帮助调理肌肤 + + 你的皮肤油脂过剩，容易引发皮肤问题。日常可使用一些具有控油产品，帮助调理肌肤 + + + 你的皮肤比较干燥，容易引发皮肤问题。日常可使用一些补水功效产品，帮助调理肌肤 + + @@ -112,11 +129,28 @@ + - - + + + + + + + + + + + + + + + + @@ -135,8 +169,14 @@ - - + + + + + + + + @@ -148,25 +188,39 @@ - - - - - + + + + + + + + + + + + 粉刺 + 痘印 + 脓包 + 结节 + + + + @@ -176,38 +230,56 @@ + - 血管型 无 + 血管型 - 色素型 轻度 + 色素型 - 阴影型 轻度 + 阴影型 + - - - 毛孔较粗大 - 色斑轻度 - 皱纹轻度 - 黑头轻度 - 黑眼圈轻度 - 痤疮轻度 + 毛孔粗大{{pore_num}} + 色斑{{speckle_num}} + + 全部皱纹{{wrinkle_num}} + 抬头纹{{wrinkle_num1}} + 川字纹{{wrinkle_num2}} + 眼周细纹{{wrinkle_num3}} + 鱼尾纹{{wrinkle_num4}} + 法令纹{{wrinkle_num5}} + 口周纹{{wrinkle_num6}} + + 黑头{{blackhead_num}} + + 黑眼圈 {{s_filter.get_dark_type(dark_type)}} + 左眼黑眼圈 {{s_filter.get_dark_type(dark_type1)}} + 右眼黑眼圈 {{s_filter.get_dark_type(dark_type2)}} + + + 全部痤疮{{acne_num}} + 粉刺{{acne_num1}} + 痘印{{acne_num2}} + 脓包{{acne_num3}} + 结节{{acne_num4}} + 敏感度{{s_filter.get_nai_shou(skin_sensitive_check)}} - + @@ -221,7 +293,7 @@ - + {{item.name}} @@ -232,8 +304,6 @@ - - @@ -257,12 +327,17 @@ - - + + + + + + + + - @@ -271,22 +346,25 @@ - - - + + + + + + + - @@ -299,7 +377,6 @@ - @@ -309,5 +386,5 @@ - + \ No newline at end of file diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxss b/packageD/pages/AI-test-skin/success_result/success_result.wxss index ddc859d..caadbb1 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.wxss +++ b/packageD/pages/AI-test-skin/success_result/success_result.wxss @@ -723,4 +723,30 @@ page { .icon-close:before { content: "\e668"; +} + +.e_tou{width: 50rpx; height: 20rpx;border-radius: 50%; top: 70rpx; left: 78rpx} +.e_bz{width: 18rpx; height: 40rpx;border-radius: 50%; top: 100rpx; left: 93rpx} +.e_zlian{width: 20rpx; height: 30rpx;border-radius: 50%; top: 126rpx; left: 60rpx} +.e_ylian{width: 20rpx; height: 30rpx; border-radius: 50%; top: 126rpx; left: 126rpx} +.e_xb{width: 20rpx; height: 16rpx; border-radius: 50%; top: 170rpx; left: 92rpx} + +.g_x{ background-color: #c0e2b7 } +.y_x{ background-color: #ffd6bd } + +.acne_show_li{ border-radius: 10rpx; position: absolute; left: 10rpx; bottom: 10rpx; + font-size: 20rpx;color: #fff;background-color: rgba(0,0,0,0.5);padding: 30rpx} + +.acne_show_li_item{width: 10rpx; height: 10rpx;border-radius: 50%;display: inline-block;margin-right: 10rpx} +.p_circle.colore0{ + border: 4rpx solid #c8162c; +} +.p_circle.colore1{ + border: 4rpx solid #E1E10B; +} +.p_circle.colore2{ + border: 4rpx solid #4E8DF6; +} +.p_circle.colore3{ + border: 4rpx solid #c0e2b7; } \ No newline at end of file diff --git a/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml b/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml index 440b265..8391b53 100644 --- a/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml +++ b/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml @@ -24,9 +24,19 @@ 眼周 - 鱼尾纹 - 眼部皱纹 - 泪沟(健康) + + 鱼尾纹 + + + 鱼尾纹(健康) + + + + 眼周细纹 + + + 眼周细纹(健康) + @@ -39,13 +49,34 @@ 额头 - 抬头皱纹(健康) - 眉间纹(健康) + + 抬头皱纹 + + + 抬头皱纹(健康) + + + 川字纹 + + + 川字纹(健康) + 嘴周 - 法令纹 - 口角纹 + + 法令纹 + + + 法令纹(健康) + + + + 口周纹 + + + 口周纹(健康) +