diff --git a/packageD/pages/AI-test-skin/analyse/analyse.js b/packageD/pages/AI-test-skin/analyse/analyse.js index 56a2c87..52775d1 100644 --- a/packageD/pages/AI-test-skin/analyse/analyse.js +++ b/packageD/pages/AI-test-skin/analyse/analyse.js @@ -557,6 +557,61 @@ Page({ detectjson: JSON.stringify(th.data.check_data), skin_type: 0, } + + var txt=[]; + var face_data = res.data.data.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; + + var skin_dryoil_check = face_data.skinquality.skin_dryoil_check; + 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; + + switch (skin_dryoil_check_type) { + case 0: + txt.push('干性'); + break; + case 1: + txt.push('中性'); + break; + case 2: + txt.push('油性'); + break; + case 3: + txt.push('混合性'); + break; + } + + if (acne_num) txt.push('痤疮'); + if (speckle_num) txt.push('色斑'); + if (wrinkle_num) txt.push('皱纹'); + if (blackhead_num) txt.push('黑头'); + if (pore_num) txt.push('毛孔'); + if (dark_type > -1 || dark_type1 > -1) txt.push('黑眼圈'); + //-- 内容传值 -- + req_data.resulttext= txt.join('/'); + //要保存一下分析的结果 th.json_post("/api/weshop/face/storeSkinface/save", req_data, function (res) { if (res.data.code == 0) { diff --git a/packageD/pages/AI-test-skin/index/aiskin.js b/packageD/pages/AI-test-skin/index/aiskin.js index 29d3bb3..89cd8e7 100644 --- a/packageD/pages/AI-test-skin/index/aiskin.js +++ b/packageD/pages/AI-test-skin/index/aiskin.js @@ -63,14 +63,13 @@ Page({ }, goto(e) { - + var that=this; var need=e.currentTarget.dataset.need; let url = e.currentTarget.dataset.url; if(this.data.ce_user_id){ url+="?ce_user_id="+this.data.ce_user_id; } - if(!need){ app.goto(url); @@ -78,7 +77,7 @@ Page({ } this.check_num(function () { - var user = getApp().globalData.userInfo || this.ce_user_id + var user = getApp().globalData.userInfo || that.data.ce_user_id if (!user) { wx.showToast({ title: "请先授权登陆", @@ -153,7 +152,7 @@ Page({ check_num:function (func) { - var user_id=this.ce_user_id || getApp().globalData.user_id; + var user_id=this.data.ce_user_id || getApp().globalData.user_id; if (!user_id) return false; //判断右没有开AI测肤