测试报告男女图片优化

abson
1 parent 0d4d8f53
Showing 13 changed files with 226 additions and 175 deletions
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss
packageB/pages/AI-test-skin/success_result/acne/acne.wxml
packageB/pages/AI-test-skin/success_result/blackhead/blackhead.wxml
packageB/pages/AI-test-skin/success_result/dark/dark.wxml
packageB/pages/AI-test-skin/success_result/pore/pore.wxml
packageB/pages/AI-test-skin/success_result/sensitive/sensitive.wxml
packageB/pages/AI-test-skin/success_result/speckle/speckle.wxml
packageB/pages/AI-test-skin/success_result/success_result.js
packageB/pages/AI-test-skin/success_result/success_result.json
packageB/pages/AI-test-skin/success_result/success_result.wxml
packageB/pages/AI-test-skin/success_result/success_result.wxss
packageB/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml
@@ -7,25 +7,25 @@
     <view>
         <view class="ready">
             <view class="image">
-                <image src="{{iurl}}/miniapp/images/skinimg/4.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei1.jpeg"></image>
                 <text class="shuxian"></text>
-                <image src="{{iurl}}/miniapp/images/skinimg/7.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei2.jpeg"></image>
             </view>
             <text class="fs28">1、请对准镜头，闭眼拍照</text>
         </view>
         <view class="ready">
             <view class="image">
-                <image src="{{iurl}}/miniapp/images/skinimg/5.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei3.jpeg"></image>
                 <text class="shuxian"></text>
-                <image src="{{iurl}}/miniapp/images/skinimg/7.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei2.jpeg"></image>
             </view>
             <text class="fs28">2、请摘下眼镜，撩起刘海</text>
         </view>
         <view class="ready">
             <view class="image">
-                <image src="{{iurl}}/miniapp/images/skinimg/8.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei4.jpeg"></image>
                 <text class="shuxian"></text>
-                <image src="{{iurl}}/miniapp/images/skinimg/10.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei5.jpeg"></image>
             </view>
             <text class="fs28">3、保持脸部垂直，切勿距离过远过近</text>
         </view>
@@ -37,13 +37,13 @@
     <view>
         <view class="ready">
             <view class="image_1">
-                <image src="{{iurl}}/miniapp/images/skinimg/6.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei6.jpeg"></image>
             </view>
             <text class="fs28">1、脸部置于画面中央，请勿距离过远或过近</text>
         </view>
         <view class="ready1">
             <view class="image_1">
-                <image src="{{iurl}}/miniapp/images/skinimg/9.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei7.jpeg"></image>
             </view>
             <text class="fs28">2、脸部保持平视摄像头</text>
         </view>
@@ -16,7 +16,7 @@ page {
 .content .work {
     text-align: center;
-    padding: 60rpx 0 30rpx 0;
+    padding: 50rpx 0 30rpx 0;
     font-size: 36rpx;
 }
@@ -14,7 +14,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_heitou_maokong_.png"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
@@ -23,7 +23,7 @@
             </view>
             <view class="analyse_classify_header_item" style="margin-top:5%">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/cuochuang_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view>痤疮个数</view>
@@ -32,28 +32,28 @@
             </view>
             <view class="leixing mt_b10">
                 <view class="_img">
-                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/mao25.jpeg"></image>
+                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/nongzhong.jpeg"></image>
                     <view class="fs28 c_666">
                         <view>囊肿</view>
                         <view>健康</view>
                     </view>
                 </view>
                 <view class="_img">
-                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/mao28.jpeg"></image>
+                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/qiuzheng.jpeg"></image>
                     <view class="fs28 c_666">
                         <view>丘疹</view>
                         <view>健康</view>
                     </view>
                 </view>
                 <view class="_img">
-                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/mao27.jpeg"></image>
+                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/fengci.jpeg"></image>
                     <view class="fs28 c_666">
                         <view>粉刺</view>
                         <view>健康</view>
                     </view>
                 </view>
                 <view class="_img">
-                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/mao29.jpeg"></image>
+                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/douying.jpeg"></image>
                     <view class="fs28 c_666">
                         <view>痘印</view>
                         <view>健康</view>
@@ -13,7 +13,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_heitou_maokong_.png"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
@@ -22,7 +22,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/heitou_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">粗大区域</view>
@@ -13,7 +13,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/heiyanquan.png"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx" style="margin-top:5%">
                     <view class="fs28">程度情况</view>
@@ -23,7 +23,7 @@
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/heiyanquan_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">黑眼圈类型</view>
@@ -32,23 +32,44 @@
             </view>
             <view>
-                <view class="heiyanquan">
-                    <image src="{{iurl}}/miniapp/images/skinimg/man1.jpeg" style="width: 100%;height: 100%;"></image>
-                </view>
-                <view class="leixing">
-                    <view class="_img">
-                        <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/man2.jpeg"></image>
-                        <view class="fs28">色素性-中度</view>
+                <block wx:if="{{sex === 'male'}}">
+                    <view class="heiyanquan">
+                        <image src="{{iurl}}/miniapp/images/skinimg/nan3.jpeg" style="width: 100%;height: 100%;"></image>
                     </view>
-                    <view class="_img">
-                        <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/man8.jpeg"></image>
-                        <view class="fs28">血管性-轻度</view>
+                    <view class="leixing">
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nan4.jpeg"></image>
+                            <view class="fs28">色素性-中度</view>
+                        </view>
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nan5.jpeg"></image>
+                            <view class="fs28">血管性-轻度</view>
+                        </view>
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nan6.jpeg"></image>
+                            <view class="fs28" style="color: #666;">阴影型-无</view>
+                        </view>
                     </view>
-                    <view class="_img">
-                        <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/man11.jpeg"></image>
-                        <view class="fs28" style="color: #666;">阴影型-无</view>
+                </block>
+                <block wx:else>
+                    <view class="heiyanquan">
+                        <image src="{{iurl}}/miniapp/images/skinimg/nv3.jpeg" style="width: 100%;height: 100%;"></image>
                     </view>
-                </view>
+                    <view class="leixing">
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nv4.jpeg"></image>
+                            <view class="fs28">色素性-中度</view>
+                        </view>
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nv5.jpeg"></image>
+                            <view class="fs28">血管性-轻度</view>
+                        </view>
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nv6.jpeg"></image>
+                            <view class="fs28" style="color: #666;">阴影型-无</view>
+                        </view>
+                    </view>
+                </block>
             </view>
             <view class="fs28 mt_b10">
                 <text>明显可见毛孔或内含小于毛孔大小角栓</text>
@@ -22,7 +22,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/maokong_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">粗大区域</view>
-<view class="mb_b5" id="mao_kong">
+<view class="mb_b5" id="min_gan_du">
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#01</view>
+                <view style="color: #45d4eb;">#07</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">敏感度</text>
                     <view class="fs26" catchtap="show_dailog" data-type="7" style="display: flex;align-items: center;">
@@ -13,7 +13,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_heitou_maokong_.png"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
@@ -22,7 +22,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/mingandu_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">敏感度得分</view>
@@ -13,7 +13,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_heitou_maokong_.png"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
@@ -22,7 +22,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">色斑个数</view>
 /*
  * @Author: abson
  * @Date: 2022-02-16 15:36:47
- * @LastEditTime: 2022-02-21 16:07:09
+ * @LastEditTime: 2022-02-22 16:16:59
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js
@@ -24,15 +24,15 @@ Page({
      * 页面的初始数据
      */
     data: {
-        tab: [{ id: 'zong_he', name: '综合肤质' }, { id: 'mao_kong', name: '毛孔' }, { id: 'hei_tou', name: '黑头' }, { id: 'se_ban', name: '色斑' }, { id: 'zhou_wen', name: '皱纹' }, { id: 'hei_yan_quan', name: '黑眼圈' }, { id: 'cuo_chuang', name: '痤疮' }, { id: 'ming_gan_ji', name: '敏感度' }],
+        tab: [{ id: 'zong_he', name: '综合肤质' }, { id: 'mao_kong', name: '毛孔' }, { id: 'hei_tou', name: '黑头' }, { id: 'se_ban', name: '色斑' }, { id: 'zhou_wen', name: '皱纹' }, { id: 'hei_yan_quan', name: '黑眼圈' }, { id: 'cuo_chuang', name: '痤疮' }, { id: 'min_gan_du', name: '敏感度' }],
         currentIndex: 0,
         tab_id: 'zong_he',
         iurl: setting.imghost,
         showDialog: false,
         yanjing: true,  //显示皮肤问题
         img_scale: true, //问题标注放大图片
-        img_scale_icon:true,
-        show_problem:1, //问题标注显示问题
+        img_scale_icon: true,
+        show_problem: 1, //问题标注显示问题
     },
@@ -40,76 +40,77 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-       var th=this;
-       //初始化一下，获取商品的价格
-       this.init();
-       //var face_result=getApp().globalData.face_result;
-       //var face_data=face_result.face_list[0];
-       this.data.id=options.id;
+        var th = this;
+        //初始化一下，获取商品的价格
+        this.init();
+        //var face_result=getApp().globalData.face_result;
+        //var face_data=face_result.face_list[0];
+        this.data.id = options.id;
         //计算图片要显示的大小
         th.data.cWidth = wx.getSystemInfoSync().windowWidth;
         th.data.cHeight = wx.getSystemInfoSync().windowHeight;
-        th.data.face_height=th.data.cHeight*0.8*0.8;
-
-        this.get_data(function (json,img) {
-           //-- 数据先存着 --
-           var face_data=th.data.face_data=json.face_list[0];
-           //痤疮数
-           var acne_num=face_data.acnespotmole.acne_num;
-           //色斑数
-           var speckle_num=face_data.acnespotmole.speckle_num;
-           //皱纹数
-           var wrinkle_num=face_data.wrinkle.wrinkle_num;
-           //黑头数
-           var blackhead_num=face_data.blackheadpore.blackhead_num;
-           //毛孔数
-           var pore_num=face_data.blackheadpore.pore_num;
-           //黑眼圈的严重程度
-           var dark_type=face_data.eyesattr.dark_circle_left_type.length>0?face_data.eyesattr.dark_circle_left_type[0]:-1;
-           var dark_type1=face_data.eyesattr.dark_circle_right_type.length>0?face_data.eyesattr.dark_circle_right_type[0]:-1;
-           if(dark_type1>dark_type){
-               dark_type=dark_type1;
-           }
-           var skin_sensitive_check= parseInt(face_data.skinquality.skin_sensitive_check[0]);
-           var skin_dryoil_check=face_data.skinquality.skin_dryoil_check;
-
-           var location=face_data.location;
-           th.data.bili=th.data.face_height/(location.height+location.height/2.3);
-
-           th.setData({
-               acne_num:acne_num,
-               speckle_num:speckle_num,
-               wrinkle_num:wrinkle_num,
-               blackhead_num:blackhead_num,
-               pore_num:pore_num,
-               dark_type:dark_type,
-               skin_sensitive_check:skin_sensitive_check,
-               skin_dryoil_check:skin_dryoil_check,
-               face_img:img,
-               m_top:(location.top-location.height/2.5)*th.data.bili,
-               m_left:(location.left-location.width/7)*th.data.bili,
-               bili:th.data.bili
-           })
-           //-- 调用毛孔的推荐函数 --
-           if(pore_num>0)
-               pore.get_goods(th,setting.stoid);
-           //-- 调用黑头的推荐函数 --
-           if(blackhead_num>0)
-               blackhead.get_goods(th,setting.stoid);
-           //-- 调用色斑的推荐函数 --
-           if(speckle_num>0)
-               speckle.get_goods(th,setting.stoid);
-           //-- 调用皱纹的推荐函数 --
-           if(wrinkle_num>0)
-               wrinkle.get_goods(th,setting.stoid);
-           //-- 黑眼圈 --
-           if(dark_type>-1)
-               dark.get_goods(th,setting.stoid);
-           //-- 黑眼圈 --
-           if(acne_num>-0)
-               acne.get_goods(th,setting.stoid);
-       })
+        th.data.face_height = th.data.cHeight * 0.8 * 0.8;
+
+        this.get_data(function (json, json1, img) {
+            //-- 数据先存着 --
+            var face_data = th.data.face_data = json.face_list[0];
+            var sex = json1.face_list[0].gender.type;
+            //痤疮数
+            var acne_num = face_data.acnespotmole.acne_num;
+            //色斑数
+            var speckle_num = face_data.acnespotmole.speckle_num;
+            //皱纹数
+            var wrinkle_num = face_data.wrinkle.wrinkle_num;
+            //黑头数
+            var blackhead_num = face_data.blackheadpore.blackhead_num;
+            //毛孔数
+            var pore_num = face_data.blackheadpore.pore_num;
+            //黑眼圈的严重程度
+            var dark_type = face_data.eyesattr.dark_circle_left_type.length > 0 ? face_data.eyesattr.dark_circle_left_type[0] : -1;
+            var dark_type1 = face_data.eyesattr.dark_circle_right_type.length > 0 ? face_data.eyesattr.dark_circle_right_type[0] : -1;
+            if (dark_type1 > dark_type) {
+                dark_type = dark_type1;
+            }
+            var skin_sensitive_check = parseInt(face_data.skinquality.skin_sensitive_check[0]);
+            var skin_dryoil_check = face_data.skinquality.skin_dryoil_check;
+
+            var location = face_data.location;
+            th.data.bili = th.data.face_height / (location.height + location.height / 2.3);
+
+            th.setData({
+                acne_num: acne_num,
+                speckle_num: speckle_num,
+                wrinkle_num: wrinkle_num,
+                blackhead_num: blackhead_num,
+                pore_num: pore_num,
+                dark_type: dark_type,
+                skin_sensitive_check: skin_sensitive_check,
+                skin_dryoil_check: skin_dryoil_check,
+                face_img: img,
+                m_top: (location.top - location.height / 2.5) * th.data.bili,
+                m_left: (location.left - location.width / 7) * th.data.bili,
+                bili: th.data.bili
+            })
+            //-- 调用毛孔的推荐函数 --
+            if (pore_num > 0)
+                pore.get_goods(th, setting.stoid);
+            //-- 调用黑头的推荐函数 --
+            if (blackhead_num > 0)
+                blackhead.get_goods(th, setting.stoid);
+            //-- 调用色斑的推荐函数 --
+            if (speckle_num > 0)
+                speckle.get_goods(th, setting.stoid);
+            //-- 调用皱纹的推荐函数 --
+            if (wrinkle_num > 0)
+                wrinkle.get_goods(th, setting.stoid);
+            //-- 黑眼圈 --
+            if (dark_type > -1)
+                dark.get_goods(th, setting.stoid);
+            //-- 黑眼圈 --
+            if (acne_num > -0)
+                acne.get_goods(th, setting.stoid);
+        })
     },
     //-- 初始等级卡 --
@@ -164,27 +165,52 @@ Page({
         })
     },
     //-- 获取json数据 --
-    get_data:function (func) {
-       var url="/api/weshop/face/storeSkinface/get/"+setting.stoid+"/"+this.data.id;
-       getApp().request.promiseGet(url, {}).then(res=>{
-         if(res.data.code==0){
-             var json=JSON.parse(res.data.data.resultjson);
-             func(json,res.data.data.img)
-         }else{
-             getApp().showWarning("获取数据失败");
-         }
-       })
+    get_data: function (func) {
+        var url = "/api/weshop/face/storeSkinface/get/" + setting.stoid + "/" + this.data.id;
+        getApp().request.promiseGet(url, {}).then(res => {
+            if (res.data.code == 0) {
+                console.log(res, 'dsffffff');
+                var json = JSON.parse(res.data.data.resultjson);
+                var json1 = JSON.parse(res.data.data.detectjson);
+                func(json, json1, res.data.data.img)
+            } else {
+                getApp().showWarning("获取数据失败");
+            }
+        })
     },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
-    onReady: function () {},
+    onReady: function () {
+        // let heightRecords = [];
+        // setTimeout(() => {
+        //     for (let i = 0; i < this.data.tab.length; i++) {
+        //         let item = this.data.tab[i];
+        //         let id = `#${item.id}`;
+        //         let query = wx.createSelectorQuery();
+        //         query.select(id).boundingClientRect(rect => {
+        //             console.log(rect, i);
+        //             heightRecords[i] = rect.height;
+        //         }).exec()
+        //     }
+        //     this.setData({
+        //         heightRecords,
+        //     })
+        // }, 1000)
+
+    },
+    binddragend(e) {
+        console.log(e);
+        this.setData({
+            scrollTop: e.detail.scrollTop,
+        })
+    },
     /**
      * 生命周期函数--监听页面显示
      */
-    onShow: function () {},
+    onShow: function () { },
     clickTab(e) {
         let { index, tab_id } = e.currentTarget.dataset;
@@ -201,7 +227,7 @@ Page({
     click_fangda() {
         this.setData({
             img_scale: !this.data.img_scale,
-            img_scale_icon:!this.data.yanjing,
+            img_scale_icon: !this.data.yanjing,
         })
     },
@@ -219,39 +245,39 @@ Page({
     },
     show_dailog(e) {
-        var type=parseInt(e.currentTarget.dataset.type);
+        var type = parseInt(e.currentTarget.dataset.type);
         this.setData({
-            showDialog: true,show_type:type
+            showDialog: true, show_type: type
         })
-        switch (type){
-         	case 1: //毛孔
-                var pore_list=this.data.face_data.blackheadpore.circles[0].pore;
-                this.setData({pore_list:pore_list});
-         		break;
+        switch (type) {
+            case 1: //毛孔
+                var pore_list = this.data.face_data.blackheadpore.circles[0].pore;
+                this.setData({ pore_list: pore_list });
+                break;
             case 2://色斑
-                var speckle_list=this.data.face_data.acnespotmole.speckle_list;
-                this.setData({speckle_list:speckle_list});
+                var speckle_list = this.data.face_data.acnespotmole.speckle_list;
+                this.setData({ speckle_list: speckle_list });
+                break;
+            case 3://皱纹
+                var wrinkle_list = this.data.face_data.wrinkle.wrinkle_data;
+                this.setData({ wrinkle_list: wrinkle_list });
                 break;
-         	case 3://皱纹
-                var wrinkle_list=this.data.face_data.wrinkle.wrinkle_data;
-                this.setData({wrinkle_list:wrinkle_list});
-         		break;
             case 4://黑头
-                var blackhead_list=this.data.face_data.blackheadpore.circles[0].blackhead;
-                this.setData({blackhead_list:blackhead_list});
+                var blackhead_list = this.data.face_data.blackheadpore.circles[0].blackhead;
+                this.setData({ blackhead_list: blackhead_list });
                 break;
             case 5://黑眼圈
-                var arr=this.data.face_data.eyesattr.dark_circle_left[0];
-                var arr2=this.data.face_data.eyesattr.dark_circle_right[0];
-                var  arr3=[...arr,...arr2];
-                this.setData({dark_list:arr3});
+                var arr = this.data.face_data.eyesattr.dark_circle_left[0];
+                var arr2 = this.data.face_data.eyesattr.dark_circle_right[0];
+                var arr3 = [...arr, ...arr2];
+                this.setData({ dark_list: arr3 });
                 break;
             case 6://痤疮
-                var acne_list=this.data.face_data.acnespotmole.acne_list;
-                this.setData({acne_list:acne_list});
+                var acne_list = this.data.face_data.acnespotmole.acne_list;
+                this.setData({ acne_list: acne_list });
                 break;
-         	default:
-         	 	break
+            default:
+                break
         }
     },
@@ -290,8 +316,8 @@ Page({
     },
     //商品页面跳转
-    go_url:function (e) {
-        var url=e.currentTarget.dataset.url;
+    go_url: function (e) {
+        var url = e.currentTarget.dataset.url;
         getApp().goto(url);
     },
@@ -337,16 +363,16 @@ Page({
     //图片加载的时候，计算图片的像素大小
     face_img_load: function (e) {
-        var th=this;
+        var th = this;
         var imgwidth = e.detail.width;
         var imgheight = e.detail.height;
-        var w= th.data.cWidth*0.8;
+        var w = th.data.cWidth * 0.8;
         this.setData({
-            iwidth:imgwidth*th.data.bili,
-            iheight:imgheight*th.data.bili,
-            bili1:w/imgwidth  //图片放大时候的比例
+            iwidth: imgwidth * th.data.bili,
+            iheight: imgheight * th.data.bili,
+            bili1: w / imgwidth  //图片放大时候的比例
         })
     },
 })
 \ No newline at end of file
 {
-  "usingComponents": {},
+  "usingComponents": {
+    "vant-tabs":"../../../components/vant_ui/tabs",
+    "vant-tab":"../../../components/vant_ui/tab"
+  },
   "navigationBarTitleText": "测肤报告"
 }
 \ No newline at end of file
@@ -2,16 +2,16 @@
 <view style="height: 100rpx;">
     <scroll-view enable-flex scroll-into-view="{{tab_id}}" scroll-with-animation scroll-x class="tab_scroll">
-    <view class="flex" style="height: 100%;">
-        <view wx:for="{{tab}}" wx:key="id" id="{{item.id}}" bindtap="clickTab" data-tab_id="{{item.id}}" data-index="{{index}}" class="tab_scroll_item {{currentIndex==index?'active':''}}">
-            {{item.name}}
+        <view class="flex" style="height: 100%;">
+            <view wx:for="{{tab}}" wx:key="id" id="{{item.id}}" bindtap="clickTab" data-tab_id="{{item.id}}" data-index="{{index}}" class="tab_scroll_item {{currentIndex==index?'active':''}}">
+                {{item.name}}
+            </view>
         </view>
-    </view>
-</scroll-view>
+    </scroll-view>
 </view>
-<scroll-view enable-flex scroll-into-view="{{tab_id}}" scroll-with-animation scroll-y style="height: 100%;">
-    <view bindtap="lo" class="analyse_by_people" id="zong_he" >
+<scroll-view enable-flex enhanced scroll-into-view="{{tab_id}}" scroll-with-animation bindscroll="binddragend" scroll-y style="height: calc(100% - 100rpx)">
+    <view class="analyse_by_people" id="zong_he">
         <view class="analyse">
             <view class="analyse_left">
                 <view class="mark">毛孔 {{pore_num}}</view>
@@ -19,7 +19,8 @@
                 <view class="mark">黑眼圈 {{s_filter.get_dark_type(dark_type)}}</view>
             </view>
             <view class="analyse_center">
-                <image src="{{iurl}}/miniapp/images/skinimg/man.png"></image>
+                <image wx:if="{{sex === 'female'}}" src="{{iurl}}/miniapp/images/skinimg/nv.png"></image>
+                <image wx:else src="{{iurl}}/miniapp/images/skinimg/nan.png"></image>
             </view>
             <view class="analyse_right">
                 <view class="mark">黑头 {{blackhead_num}}</view>
@@ -43,12 +44,12 @@
         </view>
         <view class="content" style="padding-bottom: 0;">
             <view class="mb_b5" style="display: none">
-                <image src="/packageB/images/1.png" style="height: 200rpx;width: 100%;"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/_code.png" style="height: 200rpx;width: 100%;"></image>
             </view>
             <view class="analyse_result mt_b5">
-                <!-- <view> -->
                 <view class="img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao18.jpeg" style="width: 100%;height: 100%;"></image>
+                    <image wx:if="{{sex === 'female'}}" src="{{iurl}}/miniapp/images/skinimg/nv1.jpeg" style="width: 100%;height: 100%;"></image>
+                    <image wx:else src="{{iurl}}/miniapp/images/skinimg/nan1.jpeg" style="width: 100%;height: 100%;"></image>
                 </view>
                 <view class="f1 ml20">
                     <view class="bold">待确定</view>
@@ -57,10 +58,9 @@
                         <text class="you">油性区</text>
                     </view>
                     <view class="mt20 fs26">
-                        <text>你的油性的身份骨科大夫地方官梵蒂冈反对烦得很东方红风格和的发挥</text>
+                        <text>你的皮肤总体油脂过剩，容易引发皮肤问题。日常可使用一些具有控油，补水功效产品，帮助调理肌肤</text>
                     </view>
                 </view>
-                <!-- </view> -->
             </view>
         </view>
     </view>
@@ -68,7 +68,7 @@
     <view class="content">
         <!-- 毛孔 -->
         <block wx:if="{{pore_num}}">
-           <include src="pore/pore.wxml" />
+            <include src="pore/pore.wxml" />
         </block>
         <!-- 黑头 -->
         <block wx:if="{{blackhead_num}}">
@@ -107,9 +107,8 @@
     <block wx:if="{{img_scale}}">
         <view class="dialog_img">
             <view class="img_content">
-                <view class="face_show_view"
-                      style="position: relative;width:{{iwidth}}px;height:{{iheight}}px;margin-top: -{{m_top}}px;margin-left: -{{m_left}}px">
-                   <image src="{{iurl}}{{face_img}}" bindload="face_img_load" style="width: 100%;height: 100%;"></image>
+                <view class="face_show_view" style="position: relative;width:{{iwidth}}px;height:{{iheight}}px;margin-top: -{{m_top}}px;margin-left: -{{m_left}}px">
+                    <image src="{{iurl}}{{face_img}}" bindload="face_img_load" style="width: 100%;height: 100%;"></image>
                     <block wx:if="{{yanjing}}">
                        <!-- 显示毛孔 -->
@@ -196,7 +195,7 @@
     <!-- 缩小 -->
     <block wx:else>
         <view style="position: relative">
-            <image style="width: 100%;" src="{{iurl}}{{face_img}}" mode="widthFix" ></image>
+            <image style="width: 100%;" src="{{iurl}}{{face_img}}" mode="widthFix"></image>
             <block wx:if="{{yanjing}}">
                 <!-- 显示毛孔 -->
                 <block wx:if="{{show_type==1}}">
@@ -252,4 +251,4 @@
             <text catchtap="click_fangda" class="iconfont icon-suoxiao mgb20"></text>
         </view>
     </block>
 -</view>
+</view>
 \ No newline at end of file
@@ -48,6 +48,7 @@ page {
     display: flex;
     align-items: center;
     margin-top: 50rpx;
+    justify-content: center;
     /* justify-content: space-evenly; */
 }
@@ -13,7 +13,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/zhouwen.png"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
@@ -30,7 +30,8 @@
                     </view>
                 </view>
                 <view class="analyse_center" style="width: 250rpx;height: 250rpx;">
-                    <image src="{{iurl}}/miniapp/images/skinimg/man10.jpeg"></image>
+                    <image wx:if="{{sex === 'male'}}" src="{{iurl}}/miniapp/images/skinimg/nan2.jpeg"></image>
+                    <image wx:else src="{{iurl}}/miniapp/images/skinimg/nv2.jpeg"></image>
                     <view class="lianxian"></view>
                     <view class="lianxian1"></view>
                     <view class="lianxian2"></view>