wxd / MShopWeApp

Commit a74dea2ad06b139f1ef14ed77aef271a502ec22c

Authored by 后端研发-苏泰源
2 parents a7cc09e9 42f8786a

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 16 changed files with 538 additions and 321 deletions
packageD/pages/AI-test-skin/analyse/analyse.js
  View file @a74dea2
... ... @@ -315,7 +315,7 @@ Page({
315 315  
316 316 //跳转到错误页面
317 317 go_error:function (msg) {
318   - let url = "/packageB/pages/AI-test-skin/fail_result/fail_result?msg="+msg; //跳到分析页
  318 + let url = "/packageD/pages/AI-test-skin/fail_result/fail_result?msg="+msg; //跳到分析页
319 319 wx.redirectTo({
320 320 url: url
321 321 });
... ... @@ -339,7 +339,7 @@ Page({
339 339 //要保存一下分析的结果
340 340 th.json_post("/api/weshop/face/storeSkinface/save",req_data,function (res) {
341 341 if(res.data.code==0){
342   - let url = "/packageB/pages/AI-test-skin/success_result/success_result?id="+res.data.data.id; //跳到分析页
  342 + let url = "/packageD/pages/AI-test-skin/success_result/success_result?id="+res.data.data.id; //跳到分析页
343 343 wx.redirectTo({
344 344 url: url
345 345 })
... ... @@ -349,7 +349,7 @@ Page({
349 349 })
350 350 }else{
351 351 var msg=th.data.err_map[res.data.code+""];
352   - let url = "/packageB/pages/AI-test-skin/fail_result/fail_result?msg="+msg; //跳到分析页
  352 + let url = "/packageD/pages/AI-test-skin/fail_result/fail_result?msg="+msg; //跳到分析页
353 353 wx.redirectTo({
354 354 url: url
355 355 })
... ...
packageD/pages/AI-test-skin/analyse/analyse.wxml
  View file @a74dea2
1 1 <view class="content">
2   - <view class="img" style="margin-left: -38rpx"></view>
  2 + <view style="width: 750rpx; display: flex;justify-content: center; height: autuo">
  3 + <view class="img" style="background-image: url({{iurl}}/miniapp/images/skinimg/11.png);"></view>
  4 + </view>
3 5 <view style="text-align: center;margin-top: -20%;">
4 6 <text style="color: #fff;">正在分析...</text>
5 7 <progress border-radius="6" percent="{{per}}" activeColor="#fff" backgroundColor="#85898a" class="progress"></progress>
... ...
packageD/pages/AI-test-skin/analyse/analyse.wxss
  View file @a74dea2
... ... @@ -25,12 +25,11 @@ page {
25 25 }
26 26  
27 27 .img {
28   - background: url("https://mshopimg.yolipai.net//miniapp/images/skinimg/11.png");
29 28 margin-top: 15%;
30 29 display: inline-block;
31 30 width: 350px;
32 31 height: 350px;
33   - transform: scale(0.55);
  32 + transform: scale(0.5);
34 33 animation: 1s mymove infinite steps(27, end);
35 34 }
36 35  
... ...
packageD/pages/AI-test-skin/fail_result/fail_result.js
  View file @a74dea2
... ... @@ -53,7 +53,7 @@ Page({
53 53 },
54 54 //从相册中选择图片
55 55 back_to:function () {
56   - let url = "/packageB/pages/AI-test-skin/shoot_notice/shoot_notice";
  56 + let url = "/packageD/pages/AI-test-skin/shoot_notice/shoot_notice";
57 57 app.goto(url);
58 58 },
59 59  
... ...
packageD/pages/AI-test-skin/history_record/history_record.js
  View file @a74dea2
... ... @@ -188,7 +188,7 @@ Page({
188 188 * 生命周期函数--监听页面加载
189 189 */
190 190 onLoad: function (options) {
191   -
  191 + this.getHistoryData();
192 192 },
193 193  
194 194 /**
... ... @@ -215,20 +215,22 @@ Page({
215 215 history_time,
216 216 time_arr: new Array(),
217 217 };
  218 + let obj = {
  219 + time,
  220 + id,
  221 + };
218 222 if (arr.length > 0) {
219 223 let index = arr.findIndex(item => {
220 224 return item['history_time'] === history_time;
221 225 })
222 226 if (index > -1) {
223   - let obj = {
224   - time,
225   - id,
226   - };
227 227 arr[index]['time_arr'].push(obj);
228 228 } else {
  229 + time_obj['time_arr'].push(obj);
229 230 arr.push(time_obj);
230 231 }
231 232 } else {
  233 + time_obj['time_arr'].push(obj);
232 234 arr.push(time_obj);
233 235 }
234 236 }
... ... @@ -280,7 +282,7 @@ Page({
280 282 * 生命周期函数--监听页面显示
281 283 */
282 284 onShow: function () {
283   - this.getHistoryData();
  285 +
284 286 },
285 287 go_result(e) {
286 288 let id = e.currentTarget.dataset.id;
... ...
packageD/pages/AI-test-skin/select_photo/select_photo.js
  View file @a74dea2
... ... @@ -66,7 +66,7 @@ Page({
66 66 getApp().globalData.face_img=e.data.data.img;
67 67 getApp().globalData.face_SourceImg=e.data.data.SourceImg;
68 68  
69   - let url = "/packageB/pages/AI-test-skin/analyse/analyse"; //跳到分析页
  69 + let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页
70 70 app.goto(url);
71 71  
72 72 } else {
... ...
packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js
  View file @a74dea2
... ... @@ -73,7 +73,7 @@ Page({
73 73 success (res) {
74 74 let imgArr = res.tempFilePaths;
75 75 getApp().globalData.skin_img=imgArr[0];
76   - let url = "/packageB/pages/AI-test-skin/select_photo/select_photo";
  76 + let url = "/packageD/pages/AI-test-skin/select_photo/select_photo";
77 77 app.goto(url);
78 78 }
79 79 })
... ...
packageD/pages/AI-test-skin/success_result/acne/acne.wxml
  View file @a74dea2
... ... @@ -4,7 +4,11 @@
4 4 <view>
5 5 <view style="color: #45d4eb;">#0{{acne_sort}}</view>
6 6 <view class="flex-space-between">
7   - <text style="font-size: 42rpx;" class="bold">痤疮</text>
  7 + <!-- <text style="font-size: 42rpx;" class="bold">痤疮</text> -->
  8 + <view class="bold">
  9 + <text style="font-size: 42rpx;">痤疮</text>
  10 + <text class="iconfont icon-wenhao" style="margin-left:10rpx" catchtap="show_yiwen_dialog" data-yiwen_type="3"></text>
  11 + </view>
8 12 <view class="fs26" catchtap="show_dailog" data-type="6" style="display: flex;align-items: center;">
9 13 <text>问题标注</text>
10 14 <text class="iconfont icon-xia"></text>
... ...
packageD/pages/AI-test-skin/success_result/dark/dark.wxml
  View file @a74dea2
... ... @@ -4,7 +4,11 @@
4 4 <view>
5 5 <view style="color: #45d4eb;">#0{{dark_sort}}</view>
6 6 <view class="flex-space-between">
7   - <text style="font-size: 42rpx;" class="bold">黑眼圈</text>
  7 + <!-- <text style="font-size: 42rpx;" class="bold">黑眼圈</text> -->
  8 + <view class="bold">
  9 + <text style="font-size: 42rpx;">黑眼圈</text>
  10 + <text class="iconfont icon-wenhao" style="margin-left:10rpx" catchtap="show_yiwen_dialog" data-yiwen_type="2"></text>
  11 + </view>
8 12 <view class="fs26" catchtap="show_dailog" data-type="5" style="display: flex;align-items: center;">
9 13 <text>问题标注</text>
10 14 <text class="iconfont icon-xia"></text>
... ...
packageD/pages/AI-test-skin/success_result/pore/pore.wxml
  View file @a74dea2
... ... @@ -4,7 +4,10 @@
4 4 <view>
5 5 <view style="color: #45d4eb;">#0{{port_sort}}</view>
6 6 <view class="flex-space-between">
7   - <text style="font-size: 42rpx;" class="bold">毛孔</text>
  7 + <view class="bold">
  8 + <text style="font-size: 42rpx;">毛孔</text>
  9 + <!-- <text class="iconfont icon-info" style="margin-left:10rpx" catchtap="show_yiwen_dialog" data-yiwen_type="1"></text> -->
  10 + </view>
8 11 <view class="fs26" catchtap="show_dailog" data-type="1" style="display: flex;align-items: center;">
9 12 <text>问题标注</text>
10 13 <text class="iconfont icon-xia"></text>
... ...
packageD/pages/AI-test-skin/success_result/success_result.js
  View file @a74dea2
1 1 /*
2 2 * @Author: abson
3 3 * @Date: 2022-02-16 15:36:47
4   - * @LastEditTime: 2022-02-24 14:16:37
  4 + * @LastEditTime: 2022-02-25 11:10:36
5 5 * @LastEditors: Please set LastEditors
6 6 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
7 7 * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js
... ... @@ -26,11 +26,15 @@ Page({
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 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: '结节'}],
  29 + cuochuang_arr: [{ id: 1, name: '全部痤疮' }, { id: 2, name: '粉刺 ' }, { id: 3, name: '痘印 ' }, { id: 4, name: '脓包' }, { id: 5, name: '结节' }],
  30 + zhouwen_arr1: [{ id: 1, name: '皱纹/细纹',des:'是指皮肤受到外界环境影响，形成游离自由基，自由基破坏正常细胞膜组织内的胶原蛋白、活性物质，氧化细胞，或缺水而形成的小细纹，继而严重形成皱纹',sign: 'zhou1',sign1: 'zhou2' }, { id: 2, name: '抬头皱纹/抬头细纹',des:'位于额头的皱纹、细纹。形成原因因人而异，后天因素是比较少的。-般多为横纹， 竖纹较少见。' ,sign: 'zhou3',sign1:'zhou4'}, { id: 3, name: '眼部皱纹/眼部细纹',des:'眼部皱纹、细纹一般位于下眼睑部位，多见于下脸内1/3处。',sign:'zhou5',sign1:'zhou6' }, { id: 4, name: '鱼尾纹',des:'眼部皱纹的一种，是在人两侧外眼角和登角之间出现的皱纹，其纹路与鱼尾巴上的纹路很相似，故被形象地称为鱼尾纹。',sign:'zhou7',sign1:'zhou8' }, { id: 5, name: '眉间纹',des:'又叫川字纹，皱眉纹，是面部的一种正常的表情纹，随着年龄的增长，面部的皱纹会逐渐加深，双眉之间逐渐形成了较深的皱折，会使人看起来总是愁眉不展。',sign:'zhou9',sign1:'zhou10'}, { id: 6, name: '泪沟',des:'泪沟是指由内眼角开始出现在下眼睑靠鼻侧的两条凹沟，是由于眼眶隔膜下缘的软组织萎缩、下垂而生成的。',sign:'zhou11',sign1:'zhou12' }, { id: 7, name: '法令纹',des:'法令纹是位于鼻翼边延伸而下的两道纹路，是典型的皮肤组织老化、造成肌肤表面凹陷的现象。',sign:'zhou15',sign1:'zhou16' }, { id: 8, name: '口角纹',des:'口角纹又称木偶纹、括号纹，位于嘴角延伸而下的两道纹路，是表情肌、重力和遗传基因等几方面因素综合形成的。',sign:'zhou13',sign1:'zhou14' }],
  31 + cuochuang_arr1: [{ id: 1, name: '痘印，痘坑',des:'痤疮消退后留下的痕迹，- 般包括黑色痘印，红色痘印，凹洞性痘坑，增生性凸疤。', sign: 'cuo1',sign1: 'cuo2'}, { id: 2, name: '粉刺',des:'粉刺也称为白头，是毛囊漏斗部被角质层细胞堆积、堵塞，角化物质和皮脂充塞其中，形成白色丘疹，表面有表皮覆盖，与外界不相通，成为封闭式粉刺。(痤疮I级)', sign: 'cuo3',sign1: 'cuo4' }, { id: 3, name: '丘疹',des:'丘疹性痤疮是由皮损导致炎性弓|起的小米至豌豆大的坚硬的小丘疹，呈淡红色至深红色。丘疹中央可有一个黑头粉刺或顶端未变黑的皮脂栓。(痤疮II级)', sign: 'cuo5',sign1: 'cuo6' }, { id: 4, name: '结节囊肿',des:'表现为蚕豆至指甲大的炎性结节或囊肿，为重度痤疮，严重者可继发化脓感染、破溃流出血脓，后形成窦道及瘢痕。触摸有波动感。若面部相邻长着多个囊肿，可能通过皮下的“窦道"“暗通，可能需要手术解决。(痤疮IV级)',sign:'cuo7',sign1:'cuo8' }],
30 32 heitanquan_arr: [{ id: 1, name: '综合情况' }, { id: 2, name: '左眼' }, { id: 3, name: '右眼' }],
  33 + heitanquan_arr1: [{ id: 1, name: '色素性黑眼圈', des: '呈茶褐色，是因眼裂向外眼角的延伸段有色素沉着或因先天或外来刺激导致眼周肤色黯沉。', sign: 'hei1',sign1: 'hei2' }, { id: 2, name: '血管性黑眼圈', des: '呈青紫色，由于眼周血液循环不良，下眼脸处皮肤与皮下脂肪变薄，皮下血管透出颜色形成的。', sign: 'hei3',sign1: 'hei4' }, { id: 3, name: '阴影型黑眼圈', des: '表现为眼袋膨出、泪沟凹陷。由于年龄的增长，眼周皮肤肌肉都会变得松弛，脂肪量变化而引起。', sign: 'hei5',sign1: 'hei6' }],
31 34 currentIndex: 0,
32 35 scroll_index: 0,
33   - sex:'female', //female女 male男
  36 + yiwen_index:0,
  37 + sex: 'female', //female女 male男
34 38 tab_id: 'zong_he',
35 39 iurl: setting.imghost,
36 40 showDialog: false,
... ... @@ -40,21 +44,32 @@ Page({
40 44 img_scale_icon: true,
41 45 show_problem: 1, //问题标注显示问题
42 46 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, //口周纹
  47 + sex: '',
  48 + is_esys_show: 0, //是不是显示眼睛
  49 + scroll_id: 1, //初始为1
  50 +
  51 + wrinkle_num1: 0, //抬头纹
  52 + wrinkle_num2: 0, //川字纹
  53 + wrinkle_num3: 0, //眼周细纹
  54 + wrinkle_num4: 0, //鱼尾纹
  55 + wrinkle_num5: 0, //法令纹
  56 + wrinkle_num6: 0, //口周纹
  57 + yiwen_type:0, //1皱纹 2黑眼圈 3痤疮
  58 + acne_num1: 0, //粉刺
  59 + acne_num2: 0, //痘印
  60 + acne_num3: 0, //脓包
  61 + acne_num4: 0, //结节
  62 + },
53 63  
54   - acne_num1:0, //粉刺
55   - acne_num2:0, //痘印
56   - acne_num3:0, //脓包
57   - acne_num4:0, //结节
  64 + onReady:function () {
  65 + //用异步的获取比较准一点
  66 + wx.getSystemInfo({
  67 + success (res) {
  68 + console.log(111);
  69 + console.log(res.windowWidth);
  70 + console.log(res.windowHeight);
  71 + }
  72 + })
58 73 },
59 74  
60 75 /**
... ... @@ -69,210 +84,222 @@ Page({
69 84 //var face_data=face_result.face_list[0];
70 85 this.data.id = options.id;
71 86  
72   - //计算图片要显示的大小
73   - th.data.cWidth = wx.getSystemInfoSync().windowWidth;
74   - th.data.cHeight = wx.getSystemInfoSync().windowHeight;
75   - th.data.face_height = th.data.cHeight * 0.8 * 0.75;
76   -
77   - var bi1= (th.data.cHeight * 0.8 * 0.8)/(th.data.cWidth*0.8);
78   - this.get_data(function (json, json1, img) {
79   - //-- 数据先存着 --
80   - var face_data = th.data.face_data = json.face_list[0];
81   - var face_data1 = th.data.face_data1 = json1.face_list[0];
82   - var sex = face_data1.gender.type;
83   - //痤疮数
84   - var acne_num = face_data.acnespotmole.acne_num;
85   - //色斑数
86   - var speckle_num = face_data.acnespotmole.speckle_num;
87   - //皱纹数
88   - var wrinkle_num = face_data.wrinkle.wrinkle_num;
89   - //黑头数
90   - var blackhead_num = face_data.blackheadpore.blackhead_num;
91   - //毛孔数
92   - var pore_num = face_data.blackheadpore.pore_num;
93   - //黑眼圈的严重程度
94   - var dark_type = face_data.eyesattr.dark_circle_left_type.length > 0 ? face_data.eyesattr.dark_circle_left_type[0] : -1;
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;
99   - if (dark_type1 > dark_type) {
100   - dark_type = dark_type1;
101   - }
102   - var skin_sensitive_check = parseInt(face_data.skinquality.skin_sensitive_check[0]);
103   - var skin_dryoil_check = face_data.skinquality.skin_dryoil_check;
104   -
105   - var location = face_data.location;
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;
  87 + //用异步的获取比较准一点
  88 + wx.getSystemInfo({
  89 + success (res) {
  90 + //计算图片要显示的大小
  91 + th.data.cWidth = res.windowWidth;
  92 + th.data.cHeight = res.windowHeight;
  93 +
  94 + console.log(222);
  95 + console.log(res.windowWidth);
  96 + console.log(res.windowHeight);
  97 +
  98 +
  99 + th.data.face_height = th.data.cHeight * 0.8 * 0.75;
  100 +
  101 + var bi1= (th.data.cHeight * 0.8 * 0.8)/(th.data.cWidth*0.8);
  102 + th.get_data(function (json, json1, img) {
  103 + //-- 数据先存着 --
  104 + var face_data = th.data.face_data = json.face_list[0];
  105 + var face_data1 = th.data.face_data1 = json1.face_list[0];
  106 + var sex = face_data1.gender.type;
  107 + //痤疮数
  108 + var acne_num = face_data.acnespotmole.acne_num;
  109 + //色斑数
  110 + var speckle_num = face_data.acnespotmole.speckle_num;
  111 + //皱纹数
  112 + var wrinkle_num = face_data.wrinkle.wrinkle_num;
  113 + //黑头数
  114 + var blackhead_num = face_data.blackheadpore.blackhead_num;
  115 + //毛孔数
  116 + var pore_num = face_data.blackheadpore.pore_num;
  117 + //黑眼圈的严重程度
  118 + var dark_type = face_data.eyesattr.dark_circle_left_type.length > 0 ? face_data.eyesattr.dark_circle_left_type[0] : -1;
  119 + var dark_type1 = face_data.eyesattr.dark_circle_right_type.length > 0 ? face_data.eyesattr.dark_circle_right_type[0] : -1;
  120 +
  121 + var dk_type1=dark_type;
  122 + var dk_type2=dark_type1;
  123 + if (dark_type1 > dark_type) {
  124 + dark_type = dark_type1;
  125 + }
  126 + var skin_sensitive_check = parseInt(face_data.skinquality.skin_sensitive_check[0]);
  127 + var skin_dryoil_check = face_data.skinquality.skin_dryoil_check;
  128 +
  129 + var location = face_data.location;
  130 + var bili = th.data.face_height*0.76/location.height;
  131 +
  132 + //获取眼睛的画图比例
  133 + var eye_data1=face_data1.landmark150.eye_left_corner_right;
  134 + var eye_data2=face_data1.landmark150.eye_left_corner_left;
  135 + var eye_data3=face_data1.landmark150.eye_right_corner_right;
  136 +
  137 + var hei1=Math.abs(eye_data1.x-eye_data2.x);
  138 + var bili_eye = th.data.face_height*0.56/hei1;
  139 + var eye_top=eye_data1.y-hei1/2
  140 + var eye_left1=eye_data1.x-hei1/6;
  141 + var eye_left2=eye_data3.x-hei1/6;
  142 +
  143 + var skin_dryoil_check_type=0;//干性
  144 + var skin_dryoil_check_arr=[]
  145 + for(let i in skin_dryoil_check){
  146 + let item=skin_dryoil_check[i];
  147 + if(item!='1' && skin_dryoil_check_arr.indexOf(item)==-1){
  148 + skin_dryoil_check_arr.push(item);
  149 + }
  150 + }
  151 + //皮肤干油性的判断
  152 + if(skin_dryoil_check_arr.length==0) skin_dryoil_check_type=1;
  153 + else if(skin_dryoil_check_arr.length==1) skin_dryoil_check_type=parseInt(skin_dryoil_check_arr[0]);
  154 + else skin_dryoil_check_type=3;
  155 +
  156 + var wrinkle_types=face_data.wrinkle.wrinkle_types;
  157 + var w_arr=wrinkle_types.filter(function (e) {
  158 + return e==1;
  159 + })
  160 + th.data.wrinkle_num1=w_arr.length;
137 161  
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;
  162 + //皱纹的数量的统计
  163 + w_arr=wrinkle_types.filter(function (e) {
  164 + return e==2;
  165 + })
  166 + th.data.wrinkle_num2=w_arr.length;
  167 + w_arr=wrinkle_types.filter(function (e) {
  168 + return e==3;
  169 + })
  170 + th.data.wrinkle_num3=w_arr.length;
  171 + w_arr=wrinkle_types.filter(function (e) {
  172 + return e==4;
  173 + })
  174 + th.data.wrinkle_num4=w_arr.length;
  175 + w_arr=wrinkle_types.filter(function (e) {
  176 + return e==5;
  177 + })
  178 + th.data.wrinkle_num5=w_arr.length;
  179 + w_arr=wrinkle_types.filter(function (e) {
  180 + return e==6;
  181 + })
  182 + th.data.wrinkle_num6=w_arr.length;
159 183  
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;
178   -
179   - th.setData({
180   - acne_num: acne_num,
181   - speckle_num: speckle_num,
182   - wrinkle_num: wrinkle_num,
183   - wrinkle_types:wrinkle_types, //皱纹类型
184   - blackhead_num: blackhead_num,
185   - pore_num: pore_num,
186   - dark_type: dark_type,
187   - dark_typ1: dk_type1,
188   - dark_type2: dk_type2,
189   - skin_sensitive_check: skin_sensitive_check,
190   - skin_dryoil_check: skin_dryoil_check,
191   - skin_dryoil_check_type:skin_dryoil_check_type,
192   - face_img: img,
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, //结节
214   - })
215   - var sort = 1;
216   - //-- 调用毛孔的推荐函数 --
217   - if (pore_num > 0)
218   - pore.get_goods(th, setting.stoid, sort++);
219   - //-- 调用黑头的推荐函数 --
220   - if (blackhead_num > 0)
221   - blackhead.get_goods(th, setting.stoid, sort++);
222   - //-- 调用色斑的推荐函数 --
223   - if (speckle_num > 0)
224   - speckle.get_goods(th, setting.stoid, sort++);
225   - //-- 调用皱纹的推荐函数 --
226   - if (wrinkle_num > 0)
227   - wrinkle.get_goods(th, setting.stoid, sort++);
228   - //-- 黑眼圈 --
229   - if (dark_type > -1)
230   - dark.get_goods(th, setting.stoid, sort++);
231   - //-- 黑眼圈 --
232   - if (acne_num > -0)
233   - acne.get_goods(th, setting.stoid, sort++);
234   -
235   - //-- 获取一下分享要用的图片 --
236   - th.set_share_img();
237   - acne.get_goods(th, setting.stoid);
238   - let { heightRecord, tab } = th.data;
239   - tab.forEach(item => {
240   - console.log(2);
241   - var query = th.createSelectorQuery();
242   - let class_name = `.${item['id']}`;
243   - query.select(class_name).boundingClientRect(function (rect) {
244   - // let ratio = 750 / rect.width;
245   - let height = parseInt(rect.height); //加上导航栏50px
246   - heightRecord.push(height);
247   - // item['top'] = top;
248   - }).exec();
249   - });
250   - heightRecord.sort((a, b) => {
251   - return a - b;
252   - });
253   - th.setData({
254   - heightRecord,
255   - })
256   - // setTimeout(() => {
257   - // heightRecord.sort((a, b) => {
258   - // return a - b;
259   - // })
260   - // let new_arr = [];
261   - // if (heightRecord.length > 0) {
262   - // heightRecord.reduce((pre, cur) => {
263   - // let sum = pre + cur;
264   - // new_arr.push(sum);
265   - // return sum;
266   - // })
267   - // }
268   - // th.setData({
269   - // heightRecord:new_arr,
270   - // })
271   - // },1000)
  184 + //痘痘的不同的统计
  185 + var acne_list = face_data.acnespotmole.acne_list;
  186 + var a_arr=acne_list.filter(function (e) {
  187 + return e.type==0;
  188 + })
  189 + th.data.acne_num1=a_arr.length;
  190 + a_arr=acne_list.filter(function (e) {
  191 + return e.type==1;
  192 + })
  193 + th.data.acne_num2=a_arr.length;
  194 + a_arr=acne_list.filter(function (e) {
  195 + return e.type==2;
  196 + })
  197 + th.data.acne_num3=a_arr.length;
  198 + a_arr=acne_list.filter(function (e) {
  199 + return e.type==3;
  200 + })
  201 + th.data.acne_num4=a_arr.length;
  202 +
  203 + th.setData({
  204 + acne_num: acne_num,
  205 + speckle_num: speckle_num,
  206 + wrinkle_num: wrinkle_num,
  207 + wrinkle_types:wrinkle_types, //皱纹类型
  208 + blackhead_num: blackhead_num,
  209 + pore_num: pore_num,
  210 + dark_type: dark_type,
  211 + dark_typ1: dk_type1,
  212 + dark_type2: dk_type2,
  213 + skin_sensitive_check: skin_sensitive_check,
  214 + skin_dryoil_check: skin_dryoil_check,
  215 + skin_dryoil_check_type:skin_dryoil_check_type,
  216 + face_img: img,
  217 + m_top: (location.top-location.height/3)* bili,
  218 + m_left:Math.abs(th.data.cWidth*0.8-(location.width+location.left*2)* bili)/2,
  219 + bili: bili,
  220 + bili_eye:bili_eye,
  221 + sex:sex,
  222 + skin_dryoil_check_type:skin_dryoil_check_type,
  223 + eye_top:eye_top* bili_eye,
  224 + eye_left1:eye_left1* bili_eye,
  225 + eye_left2:eye_left2* bili_eye,
  226 +
  227 + wrinkle_num1:th.data.wrinkle_num1, //抬头纹
  228 + wrinkle_num2:th.data.wrinkle_num2, //川字纹
  229 + wrinkle_num3:th.data.wrinkle_num3, //眼周细纹
  230 + wrinkle_num4:th.data.wrinkle_num4, //鱼尾纹
  231 + wrinkle_num5:th.data.wrinkle_num5, //法令纹
  232 + wrinkle_num6:th.data.wrinkle_num6, //口周纹
  233 +
  234 + acne_num1:th.data.acne_num1, //粉刺
  235 + acne_num2:th.data.acne_num2, //痘印
  236 + acne_num3:th.data.acne_num3, //脓包
  237 + acne_num4:th.data.acne_num4, //结节
  238 + })
  239 + var sort = 1;
  240 + //-- 调用毛孔的推荐函数 --
  241 + if (pore_num > 0)
  242 + pore.get_goods(th, setting.stoid, sort++);
  243 + //-- 调用黑头的推荐函数 --
  244 + if (blackhead_num > 0)
  245 + blackhead.get_goods(th, setting.stoid, sort++);
  246 + //-- 调用色斑的推荐函数 --
  247 + if (speckle_num > 0)
  248 + speckle.get_goods(th, setting.stoid, sort++);
  249 + //-- 调用皱纹的推荐函数 --
  250 + if (wrinkle_num > 0)
  251 + wrinkle.get_goods(th, setting.stoid, sort++);
  252 + //-- 黑眼圈 --
  253 + if (dark_type > -1)
  254 + dark.get_goods(th, setting.stoid, sort++);
  255 + //-- 黑眼圈 --
  256 + if (acne_num > -0)
  257 + acne.get_goods(th, setting.stoid, sort++);
  258 +
  259 + //-- 获取一下分享要用的图片 --
  260 + th.set_share_img();
  261 + acne.get_goods(th, setting.stoid);
  262 + // let { heightRecord, tab } = th.data;
  263 + // tab.forEach(item => {
  264 + // console.log(2);
  265 + // var query = th.createSelectorQuery();
  266 + // let class_name = `.${item['id']}`;
  267 + // query.select(class_name).boundingClientRect(function (rect) {
  268 + // // let ratio = 750 / rect.width;
  269 + // let height = parseInt(rect.height); //加上导航栏50px
  270 + // heightRecord.push(height);
  271 + // // item['top'] = top;
  272 + // }).exec();
  273 + // });
  274 + // heightRecord.sort((a, b) => {
  275 + // return a - b;
  276 + // });
  277 + // th.setData({
  278 + // heightRecord,
  279 + // })
  280 + // setTimeout(() => {
  281 + // heightRecord.sort((a, b) => {
  282 + // return a - b;
  283 + // })
  284 + // let new_arr = [];
  285 + // if (heightRecord.length > 0) {
  286 + // heightRecord.reduce((pre, cur) => {
  287 + // let sum = pre + cur;
  288 + // new_arr.push(sum);
  289 + // return sum;
  290 + // })
  291 + // }
  292 + // th.setData({
  293 + // heightRecord:new_arr,
  294 + // })
  295 + // },1000)
272 296  
273   - })
274 297  
  298 + })
  299 + }
  300 + })
275 301 },
  302 +
276 303  
277 304 //-- 初始等级卡 --
278 305 init: function () {
... ... @@ -384,25 +411,25 @@ Page({
384 411 },
385 412  
386 413 click_scroll(e) {
387   - let { index, scroll_id} = e.currentTarget.dataset;
  414 + let { index, scroll_id } = e.currentTarget.dataset;
388 415 this.setData({
389 416 scroll_index: index,
390 417 scroll_id,
391 418 })
392 419  
393 420 //-- 如果是黑眼圈的控制 --
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   - }
  421 + if (this.data.show_type == 5) {
  422 + switch (scroll_id) {
  423 + case 1:
  424 + this.setData({ is_esys_show: 0 })
  425 + break;
  426 + case 2:
  427 + this.setData({ is_esys_show: 1 })
  428 + break;
  429 + default:
  430 + this.setData({ is_esys_show: 2 })
  431 + break
  432 + }
406 433 }
407 434 },
408 435  
... ... @@ -427,7 +454,22 @@ Page({
427 454 this.setData({
428 455 img_scale: !this.data.img_scale,
429 456 img_scale_icon: !this.data.yanjing,
430   - ig_scale:1,img_top:0,img_left:0
  457 + ig_scale: 1, img_top: 0, img_left: 0
  458 + })
  459 + },
  460 +
  461 + click_yiwen_scroll(e) {
  462 + let { index, yiwen_id } = e.currentTarget.dataset;
  463 + this.setData({
  464 + yiwen_index: index,
  465 + yiwen_id,
  466 + })
  467 + },
  468 +
  469 + close_yiwen(){
  470 + this.setData({
  471 + question_dialog:false,
  472 + yiwen_index:0,
431 473 })
432 474 },
433 475  
... ... @@ -445,10 +487,10 @@ Page({
445 487  
446 488 },
447 489 show_dailog(e) {
448   - var th=this;
  490 + var th = this;
449 491 var type = parseInt(e.currentTarget.dataset.type);
450 492 this.setData({
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
  493 + showDialog: true, show_type: type, is_esys_show: 0, ig_scale: 1, img_top: 0, img_left: 0, scroll_index: 0, scroll_id: 1
452 494 })
453 495 switch (type) {
454 496 case 1: //毛孔
... ... @@ -461,10 +503,10 @@ Page({
461 503 break;
462 504 case 3://皱纹
463 505 var wrinkle_list = this.data.face_data.wrinkle.wrinkle_data;
464   - for(let i in wrinkle_list){
465   - let item=wrinkle_list[i];
  506 + for (let i in wrinkle_list) {
  507 + let item = wrinkle_list[i];
466 508 item.map(function (e) {
467   - e.w_type=th.data.wrinkle_types[i];
  509 + e.w_type = th.data.wrinkle_types[i];
468 510 return e;
469 511 })
470 512 }
... ... @@ -589,8 +631,8 @@ Page({
589 631 this.setData({
590 632 iwidth: imgwidth * th.data.bili,
591 633 iheight: imgheight * th.data.bili,
592   - eye_w:imgwidth*th.data.bili_eye,
593   - eye_h:imgheight*th.data.bili_eye,
  634 + eye_w: imgwidth * th.data.bili_eye,
  635 + eye_h: imgheight * th.data.bili_eye,
594 636 bili1: w / imgwidth //图片放大时候的比例
595 637 })
596 638 },
... ... @@ -650,7 +692,7 @@ Page({
650 692 touchendCallback: function (e) {
651 693 this.data.tc_end = 1;
652 694  
653   - },
  695 + },
654 696  
655 697 //--定义的保存图片方法，分享团---
656 698 saveImageToPhotosAlbum: function () {
... ... @@ -665,7 +707,7 @@ Page({
665 707 if (this.data.share_hidden) {
666 708 this.setData({ share_hidden: false, });
667 709 }
668   - ;
  710 +
669 711  
670 712 wx.showLoading({ title: '生成中...', })
671 713 var that = this, th = that;
... ... @@ -686,6 +728,7 @@ Page({
686 728 wx.getImageInfo({
687 729 src: path3,
688 730 success: function (res) {
  731 +
689 732 var b=1.1;
690 733 //获取到二维码的图片
691 734 var vpath = res.path;
... ... @@ -765,15 +808,13 @@ Page({
765 808 canvasHidden: true,
766 809 share_show:1
767 810 })
768   - return false;
769   -
770 811 /*--
771 812 wx.previewImage({
772 813 //将图片预览出来
773 814 ur--*/
774 815  
775 816 wx.hideLoading();
776   - }
  817 + }
777 818 })
778 819 }, 500)
779 820  
... ... @@ -933,6 +974,14 @@ Page({
933 974 })
934 975 },
935 976  
  977 + show_yiwen_dialog(e) {
  978 + let yiwen_type = e.currentTarget.dataset.yiwen_type;
  979 + this.setData({
  980 + question_dialog: true,
  981 + yiwen_type,
  982 + })
  983 + },
  984 +
936 985 //-----领取券-----
937 986 get_quan: function (e) {
938 987  
... ...
packageD/pages/AI-test-skin/success_result/success_result.wxml
  View file @a74dea2
... ... @@ -70,8 +70,8 @@
70 70 <view class="f1 ml20">
71 71 <view class="bold">{{s_filter.get_dryoil_check(skin_dryoil_check_type)}}</view>
72 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>
  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>
75 75 </view>
76 76 <view class="mt20 fs26" wx:if="{{skin_dryoil_check_type==3 }}">
77 77 <text>你的皮肤油脂过剩，部分干燥，容易引发皮肤问题。日常可使用一些具有控油和补水功效产品，帮助调理肌肤</text>
... ... @@ -119,7 +119,7 @@
119 119 </scroll-view>
120 120  
121 121  
122   -<view class="mask" catchtap="close_mask" wx:if="{{showDialog}}"></view>
  122 +<view class="mask" catchtap="close_mask" wx:if="{{showDialog || question_dialog}}"></view>
123 123 <cover-view bindtap="saveImageToPhotosAlbum" class="share fs28">
124 124 <cover-view class="iconfont icon-zhuanfa1" style="padding: 0 10rpx;"></cover-view>
125 125 <cover-view>分享</cover-view>
... ... @@ -133,8 +133,7 @@
133 133 <view class="dialog_img" style="{{show_type == 5?'height:60%':'height:75%'}}">
134 134 <view class="img_content rel">
135 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">
  136 + <view wx:if="{{is_esys_show}}" class="face_show_view rel" 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 137  
139 138 <image src="{{iurl}}{{face_img}}" bindload="face_img_load" style="width: 100%;height: 100%;"></image>
140 139 <block wx:if="{{yanjing}}">
... ... @@ -147,8 +146,7 @@
147 146 </block>
148 147 </view>
149 148 <!-- 其他显示 -->
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">
  149 + <view wx:else class="face_show_view rel" style="width:{{iwidth}}px;height:{{iheight}}px;margin-top: -{{m_top}}px;margin-left: -{{m_left}}px">
152 150  
153 151 <image src="{{iurl}}{{face_img}}" bindload="face_img_load" style="width: 100%;height: 100%;"></image>
154 152 <block wx:if="{{yanjing}}">
... ... @@ -172,11 +170,11 @@
172 170 <!-- 当点击了tabs -->
173 171 <block wx:if="{{scroll_id>1}}">
174 172 <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>
  173 + <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 174 </block>
177 175 </block>
178 176 <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>
  177 + <view wx:for="{{item}}" wx:for-item="bitem" class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
180 178 </block>
181 179 </block>
182 180 </block>
... ... @@ -199,12 +197,12 @@
199 197 <block wx:for="{{acne_list}}">
200 198 <!-- 当点击了tabs -->
201 199 <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>
  200 + <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 201 </block>
204 202 <block wx:else>
205 203 <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 204 </block>
207   - </block>
  205 + </block>
208 206 </block>
209 207  
210 208 </block>
... ... @@ -229,26 +227,34 @@
229 227 <!-- <text class="iconfont icon-yanjing-guan mgb20"></text> -->
230 228 <text catchtap="click_fangda" class="iconfont icon-fangda mgb20"></text>
231 229 </view>
  230 + <block wx:if="{{show_type == 6}}">
  231 + <view class="cuochuang">
  232 + <view class="cuochuang_icon">囊肿</view>
  233 + <view class="cuochuang_icon">丘疹</view>
  234 + <view class="cuochuang_icon">粉刺</view>
  235 + <view class="cuochuang_icon">痘印</view>
  236 + </view>
  237 + </block>
232 238 </view>
233 239 <!-- 文字显示区 -->
234 240 <view class="dialog_txt" style="{{show_type == 5?'height:40%':'height:25%'}}">
235 241 <block wx:if="{{show_type == 5}}">
236 242 <view class="heiyanquan_img flex">
237   - <view class="img1 t-c">
238   - <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv4.jpeg"></image>
239   - <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan4.jpeg"></image>
240   - <view class="fs24">血管型</view>
241   - </view>
242   - <view class="img1 t-c">
243   - <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv5.jpeg"></image>
244   - <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan5.jpeg"></image>
245   - <view class="fs24">色素型</view>
246   - </view>
247   - <view class="img1 t-c">
248   - <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv6.jpeg"></image>
249   - <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan6.jpeg"></image>
250   - <view class="fs24">阴影型</view>
251   - </view>
  243 + <view class="img1 t-c">
  244 + <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv4.jpeg"></image>
  245 + <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan4.jpeg"></image>
  246 + <view class="fs24">血管型</view>
  247 + </view>
  248 + <view class="img1 t-c">
  249 + <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv5.jpeg"></image>
  250 + <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan5.jpeg"></image>
  251 + <view class="fs24">色素型</view>
  252 + </view>
  253 + <view class="img1 t-c">
  254 + <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv6.jpeg"></image>
  255 + <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan6.jpeg"></image>
  256 + <view class="fs24">阴影型</view>
  257 + </view>
252 258 </view>
253 259 </block>
254 260 <view class="dialog_progress">
... ... @@ -293,7 +299,7 @@
293 299 </view>
294 300 <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>
295 301 <view class="flex fs28" style="height: 100%;">
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':''}}">
  302 + <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':''}}">
297 303 {{item.name}}
298 304 </view>
299 305 </view>
... ... @@ -305,9 +311,8 @@
305 311  
306 312 <!-- 全图的，能够自由拖拽和放大 -->
307 313 <block wx:else>
308   - <view bindtouchstart='touchstartCallback' bindtouchmove='touchmoveCallback' bindtouchEnd='touchendCallback'
309   - style="position: relative;transform: scale({{ig_scale}});top: {{img_top}}px; left: {{img_left}}px;">
310   - <image style="width: 100%;" src="{{iurl}}{{face_img}}" mode="widthFix" ></image>
  314 + <view bindtouchstart='touchstartCallback' bindtouchmove='touchmoveCallback' bindtouchEnd='touchendCallback' style="position: relative;transform: scale({{ig_scale}});top: {{img_top}}px; left: {{img_left}}px;">
  315 + <image style="width: 100%;" src="{{iurl}}{{face_img}}" mode="widthFix"></image>
311 316  
312 317 <block wx:if="{{yanjing}}">
313 318 <!-- 显示毛孔 -->
... ... @@ -330,11 +335,11 @@
330 335 <!-- 当点击了tabs -->
331 336 <block wx:if="{{scroll_id>1}}">
332 337 <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>
  338 + <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 339 </block>
335 340 </block>
336 341 <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>
  342 + <view wx:for="{{item}}" wx:for-item="bitem" class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
338 343 </block>
339 344 </block>
340 345 </block>
... ... @@ -357,7 +362,7 @@
357 362 <block wx:for="{{acne_list}}">
358 363 <!-- 当点击了tabs -->
359 364 <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>
  365 + <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 366 </block>
362 367 <block wx:else>
363 368 <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>
... ... @@ -379,12 +384,39 @@
379 384 <canvas canvas-id='share' style='width:750rpx;height:1338rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas>
380 385 <!-- 展示分享图 -->
381 386 <view id="share_show" wx:if="{{share_show}}">
382   - <view class="cover-layer" bindtap="close_share" style="z-index: 77777"></view>
383   - <view class="share_content">
384   - <view class="sh_close" bindtap="close_share"><text class="iconfont icon-close"></text></view>
385   - <image src="{{shareImgPath}}" style="width: 100%" mode="widthFix"></image>
386   - <view class="share_save_btn" bindtap="savePic">保存到相册</view>
387   - </view>
  387 + <view class="cover-layer" bindtap="close_share" style="z-index: 77777"></view>
  388 + <view class="share_content">
  389 + <view class="sh_close" bindtap="close_share"><text class="iconfont icon-close"></text></view>
  390 + <image src="{{shareImgPath}}" style="width: 100%" mode="widthFix"></image>
  391 + <view class="share_save_btn" bindtap="savePic">保存到相册</view>
  392 + </view>
  393 +</view>
  394 +
  395 +
  396 +<!-- 疑问弹框 -->
  397 +<view class="dialog" wx:if="{{question_dialog}}" style="padding:5% 3% 3% 3%;background: #fff;">
  398 + <scroll-view enable-flex style="height: 80%;" scroll-into-view="yiwen{{yiwen_id}}" scroll-y scroll-with-animation enhanced show-scrollbar="false">
  399 + <view class="mt20" id="yiwen{{item.id}}" wx:for="{{yiwen_type==1?zhouwen_arr1:(yiwen_type==2?heitanquan_arr1:cuochuang_arr1)}}" wx:key="id">
  400 + <view>{{item.name}}</view>
  401 + <view class="fs28 mt10" style="color: #666;">
  402 + {{item.des}}
  403 + </view>
  404 + <image class="yiwen_img" src="{{iurl}}/miniapp/images/skinimg/{{item.sign}}.png"></image>
  405 + <image class="yiwen_img" src="{{iurl}}/miniapp/images/skinimg/{{item.sign1}}.png"></image>
  406 + </view>
  407 + </scroll-view>
  408 + <view style="position:fixed;bottom:0;width: 100%;">
  409 + <scroll-view enable-flex scroll-into-view="yiwen{{yiwen_id}}" scroll-with-animation scroll-x>
  410 + <view class="flex" style="padding: 30rpx 0;align-items: center;">
  411 + <view wx:for="{{yiwen_type==1?zhouwen_arr1:(yiwen_type==2?heitanquan_arr1:cuochuang_arr1)}}" bindtap="click_yiwen_scroll" data-yiwen_id="{{item.id}}" data-index="{{index}}" wx:key="id" id="yiwen{{item.id}}" class="dialog_item {{yiwen_index==index?'active1':''}}">
  412 + {{item.name}}
  413 + </view>
  414 + </view>
  415 + </scroll-view>
  416 + </view>
  417 + <view class="close_icon" bindtap="close_yiwen">
  418 + <text class="iconfont icon-close"></text>
  419 + </view>
388 420 </view>
389 421 <!-- 提示 -->
390 422 <warn id="warn"></warn>
391 423 \ No newline at end of file
... ...
packageD/pages/AI-test-skin/success_result/success_result.wxss
  View file @a74dea2
... ... @@ -274,9 +274,6 @@ page {
274 274 /* border-radius: 50%; */
275 275 }
276 276  
277   -.bold {
278   - font-weight: 600;
279   -}
280 277  
281 278  
282 279 .analyse_result .gan::before {
... ... @@ -473,6 +470,7 @@ page {
473 470 justify-content: space-between;
474 471 padding: 2%;
475 472 }
  473 +
476 474 .dialog_txt .heiyanquan_img .img1 {
477 475 width: 32%;
478 476 }
... ... @@ -490,7 +488,7 @@ page {
490 488  
491 489 .dialog_item {
492 490 position: relative;
493   - padding: 3% 6%;
  491 + padding: 3% 5%;
494 492 white-space: nowrap;
495 493 background-color: #fff;
496 494 }
... ... @@ -516,6 +514,46 @@ page {
516 514 height: 50rpx;
517 515 }
518 516  
  517 +.cuochuang {
  518 + padding: 20rpx 30rpx;
  519 + position: absolute;
  520 + bottom: 50rpx;
  521 + left: 35rpx;
  522 + border-radius: 10rpx;
  523 + background-color: rgba(0, 0, 0, .2);
  524 + font-size: 24rpx;
  525 + color: #fff;
  526 +}
  527 +
  528 +.cuochuang_icon.cuochuang_icon {
  529 + margin-bottom: 10rpx;
  530 +}
  531 +
  532 +.cuochuang .cuochuang_icon::before {
  533 + content: "";
  534 + margin-right: 15rpx;
  535 + display: inline-block;
  536 + width: 16rpx;
  537 + height: 16rpx;
  538 + /* border: 2rpx solid red; */
  539 +}
  540 +
  541 +.cuochuang_icon:nth-child(1)::before {
  542 + border: 3rpx solid #d12126;
  543 +}
  544 +
  545 +.cuochuang_icon:nth-child(2)::before {
  546 + border: 3rpx solid #fff342;
  547 +}
  548 +
  549 +.cuochuang_icon:nth-child(3)::before {
  550 + border: 3rpx solid #d83fe4;
  551 +}
  552 +
  553 +.cuochuang_icon:nth-child(4)::before {
  554 + border: 3rpx solid #80c36c;
  555 +}
  556 +
519 557 .pp {
520 558 width: 8rpx;
521 559 height: 40rpx;
... ... @@ -725,28 +763,107 @@ page {
725 763 content: "\e668";
726 764 }
727 765  
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}
  766 +.e_tou {
  767 + width: 50rpx;
  768 + height: 20rpx;
  769 + border-radius: 50%;
  770 + top: 70rpx;
  771 + left: 78rpx
  772 +}
733 773  
734   -.g_x{ background-color: #c0e2b7 }
735   -.y_x{ background-color: #ffd6bd }
  774 +.e_bz {
  775 + width: 18rpx;
  776 + height: 40rpx;
  777 + border-radius: 50%;
  778 + top: 100rpx;
  779 + left: 93rpx
  780 +}
736 781  
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}
  782 +.e_zlian {
  783 + width: 20rpx;
  784 + height: 30rpx;
  785 + border-radius: 50%;
  786 + top: 126rpx;
  787 + left: 60rpx
  788 +}
739 789  
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;
  790 +.e_ylian {
  791 + width: 20rpx;
  792 + height: 30rpx;
  793 + border-radius: 50%;
  794 + top: 126rpx;
  795 + left: 126rpx
743 796 }
744   -.p_circle.colore1{
  797 +
  798 +.e_xb {
  799 + width: 20rpx;
  800 + height: 16rpx;
  801 + border-radius: 50%;
  802 + top: 170rpx;
  803 + left: 92rpx
  804 +}
  805 +
  806 +.g_x {
  807 + background-color: #c0e2b7
  808 +}
  809 +
  810 +.y_x {
  811 + background-color: #ffd6bd
  812 +}
  813 +
  814 +.acne_show_li {
  815 + border-radius: 10rpx;
  816 + position: absolute;
  817 + left: 10rpx;
  818 + bottom: 10rpx;
  819 + font-size: 20rpx;
  820 + color: #fff;
  821 + background-color: rgba(0, 0, 0, 0.5);
  822 + padding: 30rpx
  823 +}
  824 +
  825 +.acne_show_li_item {
  826 + width: 10rpx;
  827 + height: 10rpx;
  828 + border-radius: 50%;
  829 + display: inline-block;
  830 + margin-right: 10rpx
  831 +}
  832 +
  833 +.p_circle.colore0 {
  834 + border: 4rpx solid #c8162c;
  835 +}
  836 +
  837 +.p_circle.colore1 {
745 838 border: 4rpx solid #E1E10B;
746 839 }
747   -.p_circle.colore2{
  840 +
  841 +.p_circle.colore2 {
748 842 border: 4rpx solid #4E8DF6;
749 843 }
750   -.p_circle.colore3{
  844 +
  845 +.p_circle.colore3 {
751 846 border: 4rpx solid #c0e2b7;
  847 +}
  848 +
  849 +.yiwen {
  850 + font-size: 42rpx;
  851 + display: flex;
  852 + align-items: center;
  853 +}
  854 +
  855 +.yiwen_img {
  856 + margin-top: 40rpx;
  857 + /* width: 600rpx;
  858 + height: 600rpx; */
  859 +}
  860 +
  861 +.mt50 {
  862 + margin-top: 50rpx;
  863 +}
  864 +
  865 +.close_icon {
  866 + top: 15px;
  867 + position: absolute;
  868 + right: 50rpx;
752 869 }
753 870 \ No newline at end of file
... ...
packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml
  View file @a74dea2
... ... @@ -4,7 +4,11 @@
4 4 <view>
5 5 <view style="color: #45d4eb;">#0{{wrinkle_sort}}</view>
6 6 <view class="flex-space-between">
7   - <text style="font-size: 42rpx;" class="bold">皱纹</text>
  7 + <!-- <text style="font-size: 42rpx;" class="bold">皱纹</text> -->
  8 + <view class="bold">
  9 + <text style="font-size: 42rpx;">皱纹</text>
  10 + <text class="iconfont icon-wenhao" style="margin-left:10rpx" catchtap="show_yiwen_dialog" data-yiwen_type="1"></text>
  11 + </view>
8 12 <view class="fs26" catchtap="show_dailog" data-type="3" style="display: flex;align-items: center;">
9 13 <text>问题标注</text>
10 14 <text class="iconfont icon-xia"></text>
... ...
pages/user/my_service/beauty_deta.js
  View file @a74dea2
... ... @@ -51,7 +51,8 @@ Page({
51 51 modify: options.modify,
52 52 hours: hours,
53 53 projectId: options.projectId,
54   - storageId: storageId
  54 + storageId: storageId,
  55 + VipId:options.VipId,
55 56 })
56 57 if (options.url != undefined) {
57 58 th.setData({
... ...
pages/user/my_service/tment_details.wxml
  View file @a74dea2
... ... @@ -101,7 +101,7 @@
101 101 <view class="yellow-b">我的服务</view>
102 102 </navigator>
103 103 <!-- 右边栏 -->
104   - <navigator wx:if="{{item.State==0}}" class="sub rb flex-center" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">
  104 + <navigator wx:if="{{item.State==0}}" class="sub rb flex-center" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}&VipId={{item.VipID}}">
105 105 <view>更改时间</view>
106 106 </navigator>
107 107 <navigator wx:if="{{item.State==1}}" class="sub rb flex-center" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}">
... ...