wxd / MShopWeApp

Commit a0bc67fd6e49107da05af8025942f8a0964667e4

Authored by 后端研发-苏明海
2 parents 2a6f39d0 1bbe59ff

Merge branch 'test' into 'qa' 

Test

See merge request !970
Inline Side-by-side
Showing 7 changed files with 443 additions and 164 deletions
packageD/pages/AI-test-skin/success_result/dark/dark.wxml
  View file @a0bc67f
... ... @@ -58,15 +58,15 @@
58 58 <view class="leixing">
59 59 <view class="_img">
60 60 <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nv4.jpeg"></image>
61   - <view class="fs28">色素性-中度</view>
  61 + <view class="fs28">色素性</view>
62 62 </view>
63 63 <view class="_img">
64 64 <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nv5.jpeg"></image>
65   - <view class="fs28">血管性-轻度</view>
  65 + <view class="fs28">血管性</view>
66 66 </view>
67 67 <view class="_img">
68 68 <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nv6.jpeg"></image>
69   - <view class="fs28" style="color: #666;">阴影型-无</view>
  69 + <view class="fs28" style="color: #666;">阴影型</view>
70 70 </view>
71 71 </view>
72 72 </block>
... ...
packageD/pages/AI-test-skin/success_result/iconfont.ttf 0 → 100644
View file @a0bc67f
No preview for this file type
packageD/pages/AI-test-skin/success_result/s_filter.wxs
  View file @a0bc67f
... ... @@ -5,6 +5,7 @@ var get_dark_type = function(column) {
5 5 case 1:return "中度";
6 6 case 2:return "重度";
7 7 }
  8 + return "无"
8 9 }
9 10  
10 11 //跳转的接口
... ... @@ -112,7 +113,6 @@ var get_card_price=function(goods,all_card,type){
112 113  
113 114 var get_nai_shou=function(type){
114 115  
115   -
116 116 switch(type){
117 117 case 0:return '耐受';
118 118 case 1:return '中性';
... ... @@ -121,6 +121,24 @@ var get_nai_shou=function(type){
121 121 return '';
122 122 }
123 123  
  124 +//获取样式
  125 +var get_dryoil_check = function(column) {
  126 + switch(column){
  127 + case 0:return "干性";
  128 + case 1:return "中性";
  129 + case 2:return "油性";
  130 + case 3:return "混合型";
  131 + }
  132 + return "无"
  133 +}
  134 +
  135 +//是否包含
  136 +var is_has= function(num,arr){
  137 + if(arr.indexOf(num)!=-1){
  138 + return true;
  139 + }
  140 + return false;
  141 +}
124 142  
125 143 module.exports = {
126 144 get_dark_type: get_dark_type,
... ... @@ -129,5 +147,7 @@ module.exports = {
129 147 dryoil_check:dryoil_check,
130 148 is_has_rank:is_has_rank,
131 149 get_card_price:get_card_price,
132   - get_nai_shou:get_nai_shou
  150 + get_nai_shou:get_nai_shou,
  151 + get_dryoil_check:get_dryoil_check,
  152 + is_has:is_has
133 153 }
... ...
packageD/pages/AI-test-skin/success_result/success_result.js
  View file @a0bc67f
... ... @@ -25,8 +25,8 @@ Page({
25 25 */
26 26 data: {
27 27 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: '敏感度' }],
28   - 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: '眉间纹' }],
29   - cuochuang_arr: [{ id: 1, name: '全部痤疮' }, { id: 2, name: '痘印' }, { id: 3, name: '囊肿' }, { id: 4, name: '丘疹' }, { id: 5, name: '粉刺' }],
  28 + zhouwen_arr: [{ id: 1, name: '全部皱纹' }, { id: 2, name: '抬头纹' }, { id: 3, name: '川字纹' }, { id: 4, name: '眼周细纹' }, { id: 5, name: '鱼尾纹' }, { id: 6, name: '法令纹' }, { id: 7, name: '口周纹' }],
  29 + cuochuang_arr: [{ id: 1, name: '全部痤疮' }, { id: 2, name: '粉刺 ' }, { id: 3, name: '痘印 ' }, { id: 4, name: '脓包' }, { id: 5, name: '结节'}],
30 30 heitanquan_arr: [{ id: 1, name: '综合情况' }, { id: 2, name: '左眼' }, { id: 3, name: '右眼' }],
31 31 currentIndex: 0,
32 32 scroll_index: 0,
... ... @@ -40,6 +40,21 @@ Page({
40 40 img_scale_icon: true,
41 41 show_problem: 1, //问题标注显示问题
42 42 img_scale: 1, //缩放问题
  43 + sex:'',
  44 + is_esys_show:0, //是不是显示眼睛
  45 + scroll_id:1, //初始为1
  46 +
  47 + wrinkle_num1:0, //抬头纹
  48 + wrinkle_num2:0, //川字纹
  49 + wrinkle_num3:0, //眼周细纹
  50 + wrinkle_num4:0, //鱼尾纹
  51 + wrinkle_num5:0, //法令纹
  52 + wrinkle_num6:0, //口周纹
  53 +
  54 + acne_num1:0, //粉刺
  55 + acne_num2:0, //痘印
  56 + acne_num3:0, //脓包
  57 + acne_num4:0, //结节
43 58 },
44 59  
45 60 /**
... ... @@ -57,12 +72,14 @@ Page({
57 72 //计算图片要显示的大小
58 73 th.data.cWidth = wx.getSystemInfoSync().windowWidth;
59 74 th.data.cHeight = wx.getSystemInfoSync().windowHeight;
60   - th.data.face_height = th.data.cHeight * 0.8 * 0.8;
  75 + th.data.face_height = th.data.cHeight * 0.8 * 0.75;
61 76  
  77 + var bi1= (th.data.cHeight * 0.8 * 0.8)/(th.data.cWidth*0.8);
62 78 this.get_data(function (json, json1, img) {
63 79 //-- 数据先存着 --
64 80 var face_data = th.data.face_data = json.face_list[0];
65   - var sex = json1.face_list[0].gender.type;
  81 + var face_data1 = th.data.face_data1 = json1.face_list[0];
  82 + var sex = face_data1.gender.type;
66 83 //痤疮数
67 84 var acne_num = face_data.acnespotmole.acne_num;
68 85 //色斑数
... ... @@ -76,6 +93,9 @@ Page({
76 93 //黑眼圈的严重程度
77 94 var dark_type = face_data.eyesattr.dark_circle_left_type.length > 0 ? face_data.eyesattr.dark_circle_left_type[0] : -1;
78 95 var dark_type1 = face_data.eyesattr.dark_circle_right_type.length > 0 ? face_data.eyesattr.dark_circle_right_type[0] : -1;
  96 +
  97 + var dk_type1=dark_type;
  98 + var dk_type2=dark_type1;
79 99 if (dark_type1 > dark_type) {
80 100 dark_type = dark_type1;
81 101 }
... ... @@ -83,22 +103,114 @@ Page({
83 103 var skin_dryoil_check = face_data.skinquality.skin_dryoil_check;
84 104  
85 105 var location = face_data.location;
86   - th.data.bili = th.data.face_height / (location.height + location.height / 2.3);
  106 + var bili = th.data.face_height / (location.height + location.height / 2.3);
  107 +
  108 + //获取眼睛的画图比例
  109 + var eye_data1=face_data1.landmark150.eye_left_corner_right;
  110 + var eye_data2=face_data1.landmark150.eye_left_corner_left;
  111 + var eye_data3=face_data1.landmark150.eye_right_corner_left;
  112 +
  113 + var hei1=Math.abs(eye_data1.x-eye_data2.x);
  114 + var bili_eye = th.data.face_height /(2*hei1*bi1);
  115 + var eye_top=eye_data1.y-hei1*3/4
  116 + var eye_left1=eye_data1.x-hei1/2;
  117 + var eye_left2=eye_data3.x-hei1-hei1/2;
  118 +
  119 + var skin_dryoil_check_type=0;//干性
  120 + var skin_dryoil_check_arr=[]
  121 + for(let i in skin_dryoil_check){
  122 + let item=skin_dryoil_check[i];
  123 + if(item!='1' && skin_dryoil_check_arr.indexOf(item)==-1){
  124 + skin_dryoil_check_arr.push(item);
  125 + }
  126 + }
  127 + //皮肤干油性的判断
  128 + if(skin_dryoil_check_arr.length==0) skin_dryoil_check_type=1;
  129 + else if(skin_dryoil_check_arr.length==1) skin_dryoil_check_type=parseInt(skin_dryoil_check_arr[0]);
  130 + else skin_dryoil_check_type=3;
  131 +
  132 + var wrinkle_types=face_data.wrinkle.wrinkle_types;
  133 + var w_arr=wrinkle_types.filter(function (e) {
  134 + return e==1;
  135 + })
  136 + th.data.wrinkle_num1=w_arr.length;
  137 +
  138 + //皱纹的数量的统计
  139 + w_arr=wrinkle_types.filter(function (e) {
  140 + return e==2;
  141 + })
  142 + th.data.wrinkle_num2=w_arr.length;
  143 + w_arr=wrinkle_types.filter(function (e) {
  144 + return e==3;
  145 + })
  146 + th.data.wrinkle_num3=w_arr.length;
  147 + w_arr=wrinkle_types.filter(function (e) {
  148 + return e==4;
  149 + })
  150 + th.data.wrinkle_num4=w_arr.length;
  151 + w_arr=wrinkle_types.filter(function (e) {
  152 + return e==5;
  153 + })
  154 + th.data.wrinkle_num5=w_arr.length;
  155 + w_arr=wrinkle_types.filter(function (e) {
  156 + return e==6;
  157 + })
  158 + th.data.wrinkle_num6=w_arr.length;
  159 +
  160 + //痘痘的不同的统计
  161 + var acne_list = face_data.acnespotmole.acne_list;
  162 + var a_arr=acne_list.filter(function (e) {
  163 + return e.type==0;
  164 + })
  165 + th.data.acne_num1=a_arr.length;
  166 + a_arr=acne_list.filter(function (e) {
  167 + return e.type==1;
  168 + })
  169 + th.data.acne_num2=a_arr.length;
  170 + a_arr=acne_list.filter(function (e) {
  171 + return e.type==2;
  172 + })
  173 + th.data.acne_num3=a_arr.length;
  174 + a_arr=acne_list.filter(function (e) {
  175 + return e.type==3;
  176 + })
  177 + th.data.acne_num4=a_arr.length;
87 178  
88 179 th.setData({
89 180 acne_num: acne_num,
90 181 speckle_num: speckle_num,
91 182 wrinkle_num: wrinkle_num,
  183 + wrinkle_types:wrinkle_types, //皱纹类型
92 184 blackhead_num: blackhead_num,
93 185 pore_num: pore_num,
94 186 dark_type: dark_type,
  187 + dark_typ1: dk_type1,
  188 + dark_type2: dk_type2,
95 189 skin_sensitive_check: skin_sensitive_check,
96 190 skin_dryoil_check: skin_dryoil_check,
  191 + skin_dryoil_check_type:skin_dryoil_check_type,
97 192 face_img: img,
98   - m_top: (location.top - location.height / 2.5) * th.data.bili,
99   - m_left: (location.left - location.width / 7) * th.data.bili,
100   - bili: th.data.bili,
101   - sex: sex
  193 + m_top: (location.top - location.height / 2.5) * bili,
  194 + m_left: (location.left - location.width / 7) * bili,
  195 + bili: bili,
  196 + bili_eye:bili_eye,
  197 + sex:sex,
  198 + skin_dryoil_check_type:skin_dryoil_check_type,
  199 + eye_top:eye_top,
  200 + eye_left1:eye_left1* bili_eye,
  201 + eye_left2:eye_left2* bili_eye,
  202 +
  203 + wrinkle_num1:th.data.wrinkle_num1, //抬头纹
  204 + wrinkle_num2:th.data.wrinkle_num2, //川字纹
  205 + wrinkle_num3:th.data.wrinkle_num3, //眼周细纹
  206 + wrinkle_num4:th.data.wrinkle_num4, //鱼尾纹
  207 + wrinkle_num5:th.data.wrinkle_num5, //法令纹
  208 + wrinkle_num6:th.data.wrinkle_num6, //口周纹
  209 +
  210 + acne_num1:th.data.acne_num1, //粉刺
  211 + acne_num2:th.data.acne_num2, //痘印
  212 + acne_num3:th.data.acne_num3, //脓包
  213 + acne_num4:th.data.acne_num4, //结节
102 214 })
103 215 var sort = 1;
104 216 //-- 调用毛孔的推荐函数 --
... ... @@ -120,7 +232,7 @@ Page({
120 232 if (acne_num > -0)
121 233 acne.get_goods(th, setting.stoid, sort++);
122 234  
123   - //获取一下分享要用的图片
  235 + //-- 获取一下分享要用的图片 --
124 236 th.set_share_img();
125 237 acne.get_goods(th, setting.stoid);
126 238 let { heightRecord, tab } = th.data;
... ... @@ -272,12 +384,26 @@ Page({
272 384 },
273 385  
274 386 click_scroll(e) {
275   - console.log(e);
276   - let { index, scroll_id } = e.currentTarget.dataset;
  387 + let { index, scroll_id} = e.currentTarget.dataset;
277 388 this.setData({
278 389 scroll_index: index,
279 390 scroll_id,
280 391 })
  392 +
  393 + //-- 如果是黑眼圈的控制 --
  394 + if(this.data.show_type==5){
  395 + switch (scroll_id){
  396 + case 1:
  397 + this.setData({is_esys_show:0})
  398 + break;
  399 + case 2:
  400 + this.setData({is_esys_show:1})
  401 + break;
  402 + default:
  403 + this.setData({is_esys_show:2})
  404 + break
  405 + }
  406 + }
281 407 },
282 408  
283 409 /**
... ... @@ -301,6 +427,7 @@ Page({
301 427 this.setData({
302 428 img_scale: !this.data.img_scale,
303 429 img_scale_icon: !this.data.yanjing,
  430 + ig_scale:1,img_top:0,img_left:0
304 431 })
305 432 },
306 433  
... ... @@ -318,9 +445,10 @@ Page({
318 445  
319 446 },
320 447 show_dailog(e) {
  448 + var th=this;
321 449 var type = parseInt(e.currentTarget.dataset.type);
322 450 this.setData({
323   - showDialog: true, show_type: type
  451 + showDialog: true, show_type: type,is_esys_show:0,ig_scale:1,img_top:0,img_left:0,scroll_index:0,scroll_id:1
324 452 })
325 453 switch (type) {
326 454 case 1: //毛孔
... ... @@ -333,6 +461,13 @@ Page({
333 461 break;
334 462 case 3://皱纹
335 463 var wrinkle_list = this.data.face_data.wrinkle.wrinkle_data;
  464 + for(let i in wrinkle_list){
  465 + let item=wrinkle_list[i];
  466 + item.map(function (e) {
  467 + e.w_type=th.data.wrinkle_types[i];
  468 + return e;
  469 + })
  470 + }
336 471 this.setData({ wrinkle_list: wrinkle_list });
337 472 break;
338 473 case 4://黑头
... ... @@ -451,10 +586,11 @@ Page({
451 586 var imgheight = e.detail.height;
452 587  
453 588 var w = th.data.cWidth * 0.8;
454   -
455 589 this.setData({
456 590 iwidth: imgwidth * th.data.bili,
457 591 iheight: imgheight * th.data.bili,
  592 + eye_w:imgwidth*th.data.bili_eye,
  593 + eye_h:imgheight*th.data.bili_eye,
458 594 bili1: w / imgwidth //图片放大时候的比例
459 595 })
460 596 },
... ... @@ -513,9 +649,8 @@ Page({
513 649 },
514 650 touchendCallback: function (e) {
515 651 this.data.tc_end = 1;
516   - },
517   -
518 652  
  653 + },
519 654  
520 655 //--定义的保存图片方法，分享团---
521 656 saveImageToPhotosAlbum: function () {
... ... @@ -551,101 +686,93 @@ Page({
551 686 wx.getImageInfo({
552 687 src: path3,
553 688 success: function (res) {
554   - var b = 1.1;
555   - //获取到二维码的图片
556   - var vpath = res.path;
557   - var context = wx.createCanvasContext('share');
558   - // 先画背景
559   - context.fillStyle = '#ebf6f8';
560   - // 灰色实心矩形
561   - // 1. 语法： x坐标, y坐标, 宽度, 高度
562   - context.fillRect(0, 0, 750 * rpx, 1338 * rpx);
563   -
564   - context.setFontSize(20 * rpx)
565   - context.setFillStyle("#00d8e9")
566   - context.fillText("官方检测认证", 28 * b * rpx, 80 * b * rpx);
567   -
568   - //两个底部颜色
569   - context.fillStyle = '#a7ecf5';
570   - context.fillRect(28 * b * rpx, 136 * b * rpx, 262 * b * rpx, 18 * b * rpx);
571   - context.fillRect(28 * b * rpx, 194 * b * rpx, 262 * b * rpx, 18 * b * rpx);
572   -
573   - context.setFontSize(42 * b * rpx)
574   - context.setFillStyle("#070609")
575   - context.fillText("我的肌底强韧", 30 * b * rpx, 140 * b * rpx);
576   - context.fillText("肌肤鲜活润泽", 30 * b * rpx, 196 * b * rpx);
577   -
578   - //先画一个圆形
579   - th.circle(context, 110 * b * rpx, 280 * b * rpx, 140 * b * rpx, "#e7f3f8");
580   - th.circle(context, 130 * b * rpx, 300 * b * rpx, 120 * b * rpx, "#c8f2fa");
581   - //绘制人脸
582   - context.drawImage(th.data.share_head, 132 * b * rpx, 310 * b * rpx, 230 * b * rpx, 230 * b * rpx);
583   -
584   - //左右俩个框并填充文字
585   - th.darwRoundRect(38 * b * rpx, 340 * b * rpx, 140 * b * rpx, 40 * b * rpx, 20 * b * rpx, context);
586   - th.darwRoundRect(324 * b * rpx, 340 * b * rpx, 140 * b * rpx, 40 * b * rpx, 20 * b * rpx, context);
587   - context.setFontSize(20 * b * rpx)
588   - context.setFillStyle("black")
589   - context.fillText("黑眼圈 重度", 50 * b * rpx, 368 * b * rpx);
590   - context.fillText("毛孔 较粗大", 336 * b * rpx, 368 * b * rpx);
591   -
592   - //左右俩个框并填充文字
593   - th.darwRoundRect(40 * b * rpx, 412 * b * rpx, 116 * b * rpx, 40 * b * rpx, 20 * b * rpx, context);
594   - th.darwRoundRect(348 * b * rpx, 412 * b * rpx, 116 * b * rpx, 40 * b * rpx, 20 * b * rpx, context);
595   - context.setFillStyle("black")
596   - context.fillText("黑头 重度", 52 * b * rpx, 440 * b * rpx);
597   - context.fillText("色斑 轻度", 354 * b * rpx, 440 * b * rpx);
598   -
599   - //左右俩个框并填充文字
600   - th.darwRoundRect(60 * b * rpx, 484 * b * rpx, 116 * b * rpx, 40 * b * rpx, 20 * b * rpx, context);
601   - th.darwRoundRect(328 * b * rpx, 484 * b * rpx, 116 * b * rpx, 40 * b * rpx, 20 * b * rpx, context);
602   - context.setFillStyle("black")
603   - context.fillText("皱纹 重度", 74 * b * rpx, 510 * b * rpx);
604   - context.fillText("痤疮 轻度", 344 * b * rpx, 510 * b * rpx);
605   -
606   - //底部的绘制
607   - th.darwRoundRect(38 * b * rpx, 650 * b * rpx, 430 * b * rpx, 160 * b * rpx, 10 * b * rpx, context);
608   - //绘制二维码
609   - context.drawImage(vpath, 60 * b * rpx, 672 * b * rpx, 120 * b * rpx, 120 * b * rpx);
610   - context.setFillStyle("black")
611   - context.setFontSize(32 * b * rpx)
612   - context.fillText("美肤管家AI测肤", 200 * b * rpx, 726 * b * rpx);
613   - context.setFontSize(22 * b * rpx)
614   - context.fillText("科学了解皮肤的真实状态", 200 * b * rpx, 766 * b * rpx);
615   -
616   - //把画板内容绘制成图片，并回调 画板图片路径
617   - context.draw(false, function () {
618   - setTimeout(function () {
619   - wx.canvasToTempFilePath({
620   - x: 0,
621   - y: 0,
622   - width: 750,
623   - height: 1338,
624   - destWidth: 1.4 * 750 * 750 / th.data.screenWidth,
625   - destHeight: 1.4 * 750 * 750 / th.data.screenWidth,
626   - canvasId: 'share',
627   - success: function (res) {
628   - that.setData({
629   - shareImgPath: res.tempFilePath,
630   - canvasHidden: true,
631   - share_show: 1
632   - })
633   -
634   - if (!res.tempFilePath) {
635   - wx.showModal({
636   - title: '提示',
637   - content: '图片绘制中，请稍后重试',
638   - showCancel: false
  689 + var b=1.1;
  690 + //获取到二维码的图片
  691 + var vpath = res.path;
  692 + var context = wx.createCanvasContext('share');
  693 + // 先画背景
  694 + context.fillStyle = '#ebf6f8';
  695 + // 灰色实心矩形
  696 + // 1. 语法： x坐标, y坐标, 宽度, 高度
  697 + context.fillRect(0,0,750 * rpx,1338 * rpx);
  698 +
  699 + context.setFontSize(20* rpx)
  700 + context.setFillStyle("#00d8e9")
  701 + context.fillText("官方检测认证", 28*b* rpx, 80*b* rpx);
  702 +
  703 + //两个底部颜色
  704 + context.fillStyle = '#a7ecf5';
  705 + context.fillRect(28 *b* rpx,136 *b* rpx,262 *b* rpx,18 *b* rpx);
  706 + context.fillRect(28 *b* rpx,194 *b* rpx,262 *b* rpx,18 *b* rpx);
  707 +
  708 + context.setFontSize(42*b*rpx)
  709 + context.setFillStyle("#070609")
  710 + context.fillText("我的肌底强韧", 30*b* rpx, 140*b* rpx);
  711 + context.fillText("肌肤鲜活润泽", 30*b* rpx, 196*b* rpx);
  712 +
  713 + //先画一个圆形
  714 + th.circle(context,110*b*rpx, 280*b*rpx,140*b*rpx,"#e7f3f8");
  715 + th.circle(context,130*b*rpx, 300*b*rpx,120*b*rpx,"#c8f2fa");
  716 + //绘制人脸
  717 + context.drawImage(th.data.share_head, 132*b*rpx, 310*b*rpx, 230*b* rpx, 230 *b* rpx);
  718 +
  719 + //左右俩个框并填充文字
  720 + th.darwRoundRect(38 *b* rpx,340*b*rpx,140*b*rpx,40*b*rpx,20*b*rpx,context);
  721 + th.darwRoundRect(324 *b* rpx,340*b*rpx,140*b*rpx,40*b*rpx,20*b*rpx,context);
  722 + context.setFontSize(20*b*rpx)
  723 + context.setFillStyle("black")
  724 + context.fillText("黑眼圈 重度", 50*b* rpx, 368*b* rpx);
  725 + context.fillText("毛孔 "+th.data.pore_num, 336*b* rpx, 368*b* rpx);
  726 +
  727 + //左右俩个框并填充文字
  728 + th.darwRoundRect(40 *b* rpx,412*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context);
  729 + th.darwRoundRect(348 *b* rpx,412*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context);
  730 + context.setFillStyle("black")
  731 + context.fillText("黑头 "+th.data.blackhead_num, 52*b* rpx, 440*b* rpx);
  732 + context.fillText("色斑 "+th.data.speckle_num, 354*b* rpx, 440*b* rpx);
  733 +
  734 + //左右俩个框并填充文字
  735 + th.darwRoundRect(60 *b* rpx,484*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context);
  736 + th.darwRoundRect(328 *b* rpx,484*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context);
  737 + context.setFillStyle("black")
  738 + context.fillText("皱纹 "+th.data.wrinkle_num, 74*b* rpx, 510*b* rpx);
  739 + context.fillText("痤疮 "+th.data.acne_num, 344*b* rpx, 510*b* rpx);
  740 +
  741 + //底部的绘制
  742 + th.darwRoundRect(38 *b* rpx,650*b*rpx,430*b*rpx,160*b*rpx,10*b*rpx,context);
  743 + //绘制二维码
  744 + context.drawImage(vpath, 60*b*rpx, 672*b*rpx, 120 *b* rpx, 120 *b* rpx);
  745 + context.setFillStyle("black")
  746 + context.setFontSize(32*b*rpx)
  747 + context.fillText("美肤管家AI测肤", 200*b* rpx, 726*b* rpx);
  748 + context.setFontSize(22*b*rpx)
  749 + context.fillText("科学了解皮肤的真实状态", 200*b* rpx, 766*b* rpx);
  750 +
  751 + //把画板内容绘制成图片，并回调 画板图片路径
  752 + context.draw(false, function () {
  753 + setTimeout(function () {
  754 + wx.canvasToTempFilePath({
  755 + x: 0,
  756 + y: 0,
  757 + width: 750,
  758 + height: 1338,
  759 + destWidth: 1.4 * 750 * 750 / th.data.screenWidth,
  760 + destHeight: 1.4 * 750 * 750 / th.data.screenWidth,
  761 + canvasId: 'share',
  762 + success: function (res) {
  763 + that.setData({
  764 + shareImgPath: res.tempFilePath,
  765 + canvasHidden: true,
  766 + share_show:1
639 767 })
640 768 return false;
641   - }
642 769  
643   - /*--
644   - wx.previewImage({
645   - //将图片预览出来
646   - ur--*/
  770 + /*--
  771 + wx.previewImage({
  772 + //将图片预览出来
  773 + ur--*/
647 774  
648   - wx.hideLoading();
  775 + wx.hideLoading();
649 776 }
650 777 })
651 778 }, 500)
... ... @@ -715,8 +842,6 @@ Page({
715 842 close_share: function () {
716 843 this.setData({ share_show: 0 })
717 844 },
718   -
719   -
720 845 // 保存图片到手机
721 846 savePic() {
722 847 var self = this;
... ...
packageD/pages/AI-test-skin/success_result/success_result.wxml
  View file @a0bc67f
... ... @@ -26,7 +26,7 @@
26 26 </view>
27 27 <view class="analyse_center">
28 28 <image wx:if="{{sex === 'female'}}" src="{{iurl}}/miniapp/images/skinimg/nv.png"></image>
29   - <image wx:else src="{{iurl}}/miniapp/images/skinimg/nan.png"></image>
  29 + <image wx:if="{{sex === 'male'}}" src="{{iurl}}/miniapp/images/skinimg/nan.png"></image>
30 30 </view>
31 31 <view class="analyse_right">
32 32 <view class="mark">黑头 {{blackhead_num}}</view>
... ... @@ -53,19 +53,36 @@
53 53 <image src="{{iurl}}/miniapp/images/skinimg/_code.png" style="height: 200rpx;width: 100%;"></image>
54 54 </view>
55 55 <view class="analyse_result mt_b5">
56   - <view class="img">
57   - <image wx:if="{{sex === 'female'}}" src="{{iurl}}/miniapp/images/skinimg/nv1.jpeg" style="width: 100%;height: 100%;"></image>
58   - <image wx:else src="{{iurl}}/miniapp/images/skinimg/nan1.jpeg" style="width: 100%;height: 100%;"></image>
  56 + <view class="img" style="position: relative;">
  57 + <image wx:if="{{sex === 'female'}}" src="{{iurl}}/miniapp/images/skinimg/nv.png" style="width: 100%;height: 100%;"></image>
  58 + <image wx:if="{{sex === 'male'}}" src="{{iurl}}/miniapp/images/skinimg/nan.png" style="width: 100%;height: 100%;"></image>
  59 +
  60 + <block wx:for="{{skin_dryoil_check}}">
  61 + <block wx:if="{{item=='0' || item=='2' }}">
  62 + <view wx:if="{{index==0}}" class="abs e_tou {{item=='0'?'g_x':'y_x'}}"></view>
  63 + <view wx:if="{{index==1}}" class="abs e_bz {{item=='0'?'g_x':'y_x'}}"></view>
  64 + <view wx:if="{{index==2}}" class="abs e_zlian {{item=='0'?'g_x':'y_x'}}"></view>
  65 + <view wx:if="{{index==3}}" class="abs e_ylian {{item=='0'?'g_x':'y_x'}}"></view>
  66 + <view wx:if="{{index==4}}" class="abs e_xb {{item=='0'?'g_x':'y_x'}}"></view>
  67 + </block>
  68 + </block>
59 69 </view>
60 70 <view class="f1 ml20">
61   - <view class="bold">待确定</view>
62   - <view class="fs24 mt10">
63   - <text class="gan" style="margin-right: 30rpx;">干性区</text>
64   - <text class="you">油性区</text>
  71 + <view class="bold">{{s_filter.get_dryoil_check(skin_dryoil_check_type)}}</view>
  72 + <view class="fs24 mt10" wx:if="{{skin_dryoil_check_type==0 || skin_dryoil_check_type==2 || skin_dryoil_check_type==3}}">
  73 + <text wx:if="{{skin_dryoil_check_type==0 || skin_dryoil_check_type==3}}"class="gan" style="margin-right: 30rpx;">干性区</text>
  74 + <text wx:if="{{skin_dryoil_check_type==2 || skin_dryoil_check_type==3}}" class="you">油性区</text>
65 75 </view>
66   - <view class="mt20 fs26">
67   - <text>你的皮肤总体油脂过剩，容易引发皮肤问题。日常可使用一些具有控油，补水功效产品，帮助调理肌肤</text>
  76 + <view class="mt20 fs26" wx:if="{{skin_dryoil_check_type==3 }}">
  77 + <text>你的皮肤油脂过剩，部分干燥，容易引发皮肤问题。日常可使用一些具有控油和补水功效产品，帮助调理肌肤</text>
68 78 </view>
  79 + <view class="mt20 fs26" wx:if="{{skin_dryoil_check_type==2 }}">
  80 + <text>你的皮肤油脂过剩，容易引发皮肤问题。日常可使用一些具有控油产品，帮助调理肌肤</text>
  81 + </view>
  82 + <view class="mt20 fs26" wx:if="{{skin_dryoil_check_type==0 }}">
  83 + <text>你的皮肤比较干燥，容易引发皮肤问题。日常可使用一些补水功效产品，帮助调理肌肤</text>
  84 + </view>
  85 +
69 86 </view>
70 87 </view>
71 88 </view>
... ... @@ -112,11 +129,28 @@
112 129 <view class="dialog {{img_scale?'scale':'fangda'}}" wx:if="{{showDialog}}">
113 130 <!-- 局部放大的 -->
114 131 <block wx:if="{{img_scale}}">
  132 + <!-- 图片显示区 -->
115 133 <view class="dialog_img" style="{{show_type == 5?'height:60%':'height:75%'}}">
116   - <view class="img_content">
117   - <view class="face_show_view" style="position: relative;width:{{iwidth}}px;height:{{iheight}}px;margin-top: -{{m_top}}px;margin-left: -{{m_left}}px">
  134 + <view class="img_content rel">
  135 + <!-- 如果是黑眼圈的左眼右眼的时候 -->
  136 + <view wx:if="{{is_esys_show}}" class="face_show_view rel"
  137 + style="width:{{eye_w}}px;height:{{eye_h}}px;margin-top: -{{eye_top}}px;margin-left: -{{is_esys_show==1?eye_left1:eye_left2}}px">
  138 +
118 139 <image src="{{iurl}}{{face_img}}" bindload="face_img_load" style="width: 100%;height: 100%;"></image>
  140 + <block wx:if="{{yanjing}}">
  141 + <!-- 显示黑眼圈 -->
  142 + <block wx:if="{{show_type==5}}">
  143 + <block wx:for="{{dark_list}}">
  144 + <view class="abs p_point" style="left:{{item.x*(is_esys_show?bili_eye:bili)}}px; top:{{item.y*(is_esys_show?bili_eye:bili)}}px; "></view>
  145 + </block>
  146 + </block>
  147 + </block>
  148 + </view>
  149 + <!-- 其他显示 -->
  150 + <view wx:else class="face_show_view rel"
  151 + style="width:{{iwidth}}px;height:{{iheight}}px;margin-top: -{{m_top}}px;margin-left: -{{m_left}}px">
119 152  
  153 + <image src="{{iurl}}{{face_img}}" bindload="face_img_load" style="width: 100%;height: 100%;"></image>
120 154 <block wx:if="{{yanjing}}">
121 155 <!-- 显示毛孔 -->
122 156 <block wx:if="{{show_type==1}}">
... ... @@ -135,8 +169,14 @@
135 169 <!-- 显示皱纹 -->
136 170 <block wx:if="{{show_type==3}}">
137 171 <block wx:for="{{wrinkle_list}}">
138   - <block wx:for="{{item}}" wx:for-item="bitem">
139   - <view class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
  172 + <!-- 当点击了tabs -->
  173 + <block wx:if="{{scroll_id>1}}">
  174 + <block wx:for="{{item}}" wx:for-item="bitem">
  175 + <view wx:if="{{bitem.w_type==(scroll_id-1)}}" class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
  176 + </block>
  177 + </block>
  178 + <block wx:else>
  179 + <view wx:for="{{item}}" wx:for-item="bitem" class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
140 180 </block>
141 181 </block>
142 182 </block>
... ... @@ -148,25 +188,39 @@
148 188 </block>
149 189 </block>
150 190 </block>
151   -
152 191 <!-- 显示黑眼圈 -->
153 192 <block wx:if="{{show_type==5}}">
154 193 <block wx:for="{{dark_list}}">
155 194 <view class="abs p_point" style="left:{{item.x*bili}}px; top:{{item.y*bili}}px; "></view>
156 195 </block>
157 196 </block>
158   -
159   -
160 197 <!-- 显示痤疮 -->
161 198 <block wx:if="{{show_type==6}}">
162 199 <block wx:for="{{acne_list}}">
163   - <view class="abs p_circle" style="left:{{(item.center_x-item.radius)*bili}}px; top:{{(item.center_y-item.radius)*bili}}px;height:{{2*item.radius*bili}}px;width: {{2*item.radius*bili}}px"></view>
164   - </block>
  200 + <!-- 当点击了tabs -->
  201 + <block wx:if="{{scroll_id>1}}">
  202 + <view wx:if="{{item.type==(scroll_id-2)}}" class="abs p_circle colore{{item.type}}" style="left:{{(item.center_x-item.radius)*bili}}px; top:{{(item.center_y-item.radius)*bili}}px;height:{{2*item.radius*bili}}px;width: {{2*item.radius*bili}}px"></view>
  203 + </block>
  204 + <block wx:else>
  205 + <view class="abs p_circle colore{{item.type}}" style="left:{{(item.center_x-item.radius)*bili}}px; top:{{(item.center_y-item.radius)*bili}}px;height:{{2*item.radius*bili}}px;width: {{2*item.radius*bili}}px"></view>
  206 + </block>
  207 + </block>
165 208 </block>
166 209  
167 210 </block>
168 211 </view>
  212 +
  213 + <!-- 痤疮的展示 -->
  214 + <view wx:if="{{show_type==6}}" class="acne_show_li">
  215 + <view><text class="acne_show_li_item p_circle colore0"></text>粉刺</view>
  216 + <view><text class="acne_show_li_item p_circle colore1"></text>痘印</view>
  217 + <view><text class="acne_show_li_item p_circle colore2"></text>脓包</view>
  218 + <view><text class="acne_show_li_item p_circle colore3"></text>结节</view>
  219 + </view>
  220 +
169 221 </view>
  222 +
  223 + <!-- 按钮使用 -->
170 224 <view class="dialog_icon" catchtap="close_dialog" style="justify-content: flex-start;">
171 225 <text class="iconfont icon-guan mt20" style="z-index: 999;font-size: 20rpx;"></text>
172 226 </view>
... ... @@ -176,38 +230,56 @@
176 230 <text catchtap="click_fangda" class="iconfont icon-fangda mgb20"></text>
177 231 </view>
178 232 </view>
  233 + <!-- 文字显示区 -->
179 234 <view class="dialog_txt" style="{{show_type == 5?'height:40%':'height:25%'}}">
180 235 <block wx:if="{{show_type == 5}}">
181 236 <view class="heiyanquan_img flex">
182 237 <view class="img1 t-c">
183 238 <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv4.jpeg"></image>
184 239 <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan4.jpeg"></image>
185   - <view class="fs24">血管型 无</view>
  240 + <view class="fs24">血管型</view>
186 241 </view>
187 242 <view class="img1 t-c">
188 243 <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv5.jpeg"></image>
189 244 <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan5.jpeg"></image>
190   - <view class="fs24">色素型 轻度</view>
  245 + <view class="fs24">色素型</view>
191 246 </view>
192 247 <view class="img1 t-c">
193 248 <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv6.jpeg"></image>
194 249 <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan6.jpeg"></image>
195   - <view class="fs24">阴影型 轻度</view>
  250 + <view class="fs24">阴影型</view>
  251 + </view>
196 252 </view>
197   - </view>
198   -
199 253 </block>
200 254 <view class="dialog_progress">
201 255 <view style="margin-right:7px;font-size:32rpx;">
202   - <text wx:if="{{show_type==1}}">毛孔较粗大</text>
203   - <text wx:if="{{show_type==2}}">色斑轻度</text>
204   - <text wx:if="{{show_type==3}}">皱纹轻度</text>
205   - <text wx:if="{{show_type==4}}">黑头轻度</text>
206   - <text wx:if="{{show_type==5}}">黑眼圈轻度</text>
207   - <text wx:if="{{show_type==6}}">痤疮轻度</text>
  256 + <text wx:if="{{show_type==1}}">毛孔粗大{{pore_num}}</text>
  257 + <text wx:if="{{show_type==2}}">色斑{{speckle_num}}</text>
  258 + <block wx:if="{{show_type==3}}">
  259 + <text wx:if="{{scroll_id==1}}">全部皱纹{{wrinkle_num}}</text>
  260 + <text wx:if="{{scroll_id==2}}">抬头纹{{wrinkle_num1}}</text>
  261 + <text wx:if="{{scroll_id==3}}">川字纹{{wrinkle_num2}}</text>
  262 + <text wx:if="{{scroll_id==4}}">眼周细纹{{wrinkle_num3}}</text>
  263 + <text wx:if="{{scroll_id==5}}">鱼尾纹{{wrinkle_num4}}</text>
  264 + <text wx:if="{{scroll_id==6}}">法令纹{{wrinkle_num5}}</text>
  265 + <text wx:if="{{scroll_id==7}}">口周纹{{wrinkle_num6}}</text>
  266 + </block>
  267 + <text wx:if="{{show_type==4}}">黑头{{blackhead_num}}</text>
  268 + <block wx:if="{{show_type==5}}">
  269 + <text wx:if="{{!s_dark_type}}">黑眼圈 {{s_filter.get_dark_type(dark_type)}}</text>
  270 + <text wx:if="{{s_dark_type==1}}">左眼黑眼圈 {{s_filter.get_dark_type(dark_type1)}}</text>
  271 + <text wx:if="{{s_dark_type==2}}">右眼黑眼圈 {{s_filter.get_dark_type(dark_type2)}}</text>
  272 + </block>
  273 + <block wx:if="{{show_type==6}}">
  274 + <text wx:if="{{scroll_id==1}}">全部痤疮{{acne_num}}</text>
  275 + <text wx:if="{{scroll_id==2}}">粉刺{{acne_num1}}</text>
  276 + <text wx:if="{{scroll_id==3}}">痘印{{acne_num2}}</text>
  277 + <text wx:if="{{scroll_id==4}}">脓包{{acne_num3}}</text>
  278 + <text wx:if="{{scroll_id==5}}">结节{{acne_num4}}</text>
  279 + </block>
208 280 <text wx:if="{{show_type==7}}">敏感度{{s_filter.get_nai_shou(skin_sensitive_check)}}</text>
209 281 </view>
210   - <view style="margin-top:10rpx;display: flex;">
  282 + <view style="margin-top:10rpx;display: flex;display: none">
211 283 <view class="pp"></view>
212 284 <view class="pp"></view>
213 285 <view class="pp"></view>
... ... @@ -221,7 +293,7 @@
221 293 </view>
222 294 <scroll-view wx:if="{{show_type == 3|| show_type == 5|| show_type == 6}}" style="margin-top: 20rpx;" enable-flex scroll-into-view="scroll{{scroll_id}}" scroll-with-animation scroll-x>
223 295 <view class="flex fs28" style="height: 100%;">
224   - <view wx:for="{{show_type == 3?zhouwen_arr:(show_type == 5?heitanquan_arr:cuochuang_arr)}}" bindtap="click_scroll" data-scroll_id="{{item.id}}" data-index="{{index}}" wx:key="id" id="scroll{{item.id}}" class="dialog_item {{scroll_index==index?'active1':''}}">
  296 + <view wx:for="{{show_type == 3?zhouwen_arr:(show_type == 5?heitanquan_arr:cuochuang_arr)}}" bindtap="click_scroll" data-scroll_id="{{item.id}}" data-index="{{index}}" wx:key="id" id="scroll{{item.id}}" class="dialog_item {{scroll_index==index?'active1':''}}">
225 297 {{item.name}}
226 298 </view>
227 299 </view>
... ... @@ -232,8 +304,6 @@
232 304 </block>
233 305  
234 306 <!-- 全图的，能够自由拖拽和放大 -->
235   -
236   - <!-- 缩小 -->
237 307 <block wx:else>
238 308 <view bindtouchstart='touchstartCallback' bindtouchmove='touchmoveCallback' bindtouchEnd='touchendCallback'
239 309 style="position: relative;transform: scale({{ig_scale}});top: {{img_top}}px; left: {{img_left}}px;">
... ... @@ -257,12 +327,17 @@
257 327 <!-- 显示皱纹 -->
258 328 <block wx:if="{{show_type==3}}">
259 329 <block wx:for="{{wrinkle_list}}">
260   - <block wx:for="{{item}}" wx:for-item="bitem">
261   - <view class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
  330 + <!-- 当点击了tabs -->
  331 + <block wx:if="{{scroll_id>1}}">
  332 + <block wx:for="{{item}}" wx:for-item="bitem">
  333 + <view wx:if="{{bitem.w_type==(scroll_id-1)}}" class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
  334 + </block>
  335 + </block>
  336 + <block wx:else>
  337 + <view wx:for="{{item}}" wx:for-item="bitem" class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
262 338 </block>
263 339 </block>
264 340 </block>
265   -
266 341 <!-- 显示黑头 -->
267 342 <block wx:if="{{show_type==4}}">
268 343 <block wx:for="{{blackhead_list}}">
... ... @@ -271,22 +346,25 @@
271 346 </block>
272 347 </block>
273 348 </block>
274   -
275 349 <!-- 显示黑眼圈 -->
276 350 <block wx:if="{{show_type==5}}">
277 351 <block wx:for="{{dark_list}}">
278 352 <view class="abs p_point" style="left:{{item.x*bili1}}px; top:{{item.y*bili1}}px; "></view>
279 353 </block>
280 354 </block>
281   -
282 355 <!-- 显示痤疮 -->
283 356 <block wx:if="{{show_type==6}}">
284 357 <block wx:for="{{acne_list}}">
285   - <view class="abs p_circle" style="left:{{(item.center_x-item.radius)*bili1}}px; top:{{(item.center_y-item.radius)*bili1}}px;height:{{2*item.radius*bili1}}px;width: {{2*item.radius*bili1}}px"></view>
  358 + <!-- 当点击了tabs -->
  359 + <block wx:if="{{scroll_id>1}}">
  360 + <view wx:if="{{item.type==(scroll_id-2)}}" class="abs p_circle colore{{item.type}}" style="left:{{(item.center_x-item.radius)*bili1}}px; top:{{(item.center_y-item.radius)*bili1}}px;height:{{2*item.radius*bili1}}px;width: {{2*item.radius*bili1}}px"></view>
  361 + </block>
  362 + <block wx:else>
  363 + <view class="abs p_circle colore{{item.type}}" style="left:{{(item.center_x-item.radius)*bili1}}px; top:{{(item.center_y-item.radius)*bili1}}px;height:{{2*item.radius*bili1}}px;width: {{2*item.radius*bili1}}px"></view>
  364 + </block>
286 365 </block>
287 366 </block>
288 367  
289   -
290 368 </block>
291 369 </view>
292 370  
... ... @@ -299,7 +377,6 @@
299 377  
300 378 <!-- 二维码显示页面 -->
301 379 <canvas canvas-id='share' style='width:750rpx;height:1338rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas>
302   -
303 380 <!-- 展示分享图 -->
304 381 <view id="share_show" wx:if="{{share_show}}">
305 382 <view class="cover-layer" bindtap="close_share" style="z-index: 77777"></view>
... ... @@ -309,5 +386,5 @@
309 386 <view class="share_save_btn" bindtap="savePic">保存到相册</view>
310 387 </view>
311 388 </view>
312   -
  389 +<!-- 提示 -->
313 390 <warn id="warn"></warn>
314 391 \ No newline at end of file
... ...
packageD/pages/AI-test-skin/success_result/success_result.wxss
  View file @a0bc67f
... ... @@ -723,4 +723,30 @@ page {
723 723  
724 724 .icon-close:before {
725 725 content: "\e668";
  726 +}
  727 +
  728 +.e_tou{width: 50rpx; height: 20rpx;border-radius: 50%; top: 70rpx; left: 78rpx}
  729 +.e_bz{width: 18rpx; height: 40rpx;border-radius: 50%; top: 100rpx; left: 93rpx}
  730 +.e_zlian{width: 20rpx; height: 30rpx;border-radius: 50%; top: 126rpx; left: 60rpx}
  731 +.e_ylian{width: 20rpx; height: 30rpx; border-radius: 50%; top: 126rpx; left: 126rpx}
  732 +.e_xb{width: 20rpx; height: 16rpx; border-radius: 50%; top: 170rpx; left: 92rpx}
  733 +
  734 +.g_x{ background-color: #c0e2b7 }
  735 +.y_x{ background-color: #ffd6bd }
  736 +
  737 +.acne_show_li{ border-radius: 10rpx; position: absolute; left: 10rpx; bottom: 10rpx;
  738 + font-size: 20rpx;color: #fff;background-color: rgba(0,0,0,0.5);padding: 30rpx}
  739 +
  740 +.acne_show_li_item{width: 10rpx; height: 10rpx;border-radius: 50%;display: inline-block;margin-right: 10rpx}
  741 +.p_circle.colore0{
  742 + border: 4rpx solid #c8162c;
  743 +}
  744 +.p_circle.colore1{
  745 + border: 4rpx solid #E1E10B;
  746 +}
  747 +.p_circle.colore2{
  748 + border: 4rpx solid #4E8DF6;
  749 +}
  750 +.p_circle.colore3{
  751 + border: 4rpx solid #c0e2b7;
726 752 }
727 753 \ No newline at end of file
... ...
packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml
  View file @a0bc67f
... ... @@ -24,9 +24,19 @@
24 24 <view class="zhouwen f1" style="justify-content:space-around">
25 25 <view class="">
26 26 <view class="fenxi1">眼周</view>
27   - <view class="fs26">鱼尾纹</view>
28   - <view class="fs26">眼部皱纹</view>
29   - <view class="jiankang">泪沟(健康)</view>
  27 + <block wx:if="{{s_filter.is_has(4,wrinkle_types)}}">
  28 + <view class="fs26">鱼尾纹</view>
  29 + </block>
  30 + <block wx:else>
  31 + <view class="jiankang">鱼尾纹(健康)</view>
  32 + </block>
  33 +
  34 + <block wx:if="{{s_filter.is_has(3,wrinkle_types)}}">
  35 + <view class="fs26">眼周细纹</view>
  36 + </block>
  37 + <block wx:else>
  38 + <view class="jiankang">眼周细纹(健康)</view>
  39 + </block>
30 40 </view>
31 41 </view>
32 42 <view class="analyse_center" style="width: 250rpx;height: 250rpx;">
... ... @@ -39,13 +49,34 @@
39 49 <view class="zhouwen f1" style="margin-left:20rpx;">
40 50 <view class="">
41 51 <view class="fenxi1">额头</view>
42   - <view class="jiankang">抬头皱纹(健康)</view>
43   - <view class="jiankang">眉间纹(健康)</view>
  52 + <block wx:if="{{s_filter.is_has(1,wrinkle_types)}}">
  53 + <view class="fs26">抬头皱纹</view>
  54 + </block>
  55 + <block wx:else>
  56 + <view class="jiankang">抬头皱纹(健康)</view>
  57 + </block>
  58 + <block wx:if="{{s_filter.is_has(2,wrinkle_types)}}">
  59 + <view class="fs26">川字纹</view>
  60 + </block>
  61 + <block wx:else>
  62 + <view class="jiankang">川字纹(健康)</view>
  63 + </block>
44 64 </view>
45 65 <view class="">
46 66 <view class="fenxi1">嘴周</view>
47   - <view class="fs28">法令纹</view>
48   - <view class="fs28">口角纹</view>
  67 + <block wx:if="{{s_filter.is_has(5,wrinkle_types)}}">
  68 + <view class="fs26">法令纹</view>
  69 + </block>
  70 + <block wx:else>
  71 + <view class="jiankang">法令纹(健康)</view>
  72 + </block>
  73 +
  74 + <block wx:if="{{s_filter.is_has(6,wrinkle_types)}}">
  75 + <view class="fs26">口周纹</view>
  76 + </block>
  77 + <block wx:else>
  78 + <view class="jiankang">口周纹(健康)</view>
  79 + </block>
49 80 </view>
50 81 </view>
51 82 </view>
... ...