app.js 测肤

yvan.ni
1 parent 408d3e01
Showing 11 changed files with 147 additions and 22 deletions
app.js
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/s_filter.wxs
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.wxml
packageB/pages/AI-test-skin/success_result/success_result.wxss
packageB/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml
@@ -281,7 +281,7 @@ App({
     var th = this, st = this.globalData.setting;
     //获取物流不缓存
     a.get("/api/weshop/storeshipping/list", {
-        data: { store_id: st.stoid, status: 1, pageSize:600 },
+        data: { store_id: st.stoid, status: 1, pageSize:2000 },
         success: function (o) {
           console.log('getwuliu');
           console.log(o);
@@ -302,7 +302,7 @@ App({
     var e = this,th=e, st = this.globalData.setting;
     //获取物流不缓存
     a.get("/api/weshop/shippingarea/list",{
-        data: { store_id: st.stoid,pageSize: 600 },
+        data: { store_id: st.stoid,pageSize: 2000 },
         success: function (o) {
           console.log('getwuliuprice');
           console.log(o);
@@ -5,7 +5,7 @@
                 <view style="color: #45d4eb;">#06</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">痤疮</text>
-                    <view class="fs26" style="display: flex;align-items: center;">
+                    <view class="fs26" catchtap="show_dailog" data-type="6" style="display: flex;align-items: center;">
                         <text>问题标注</text>
                         <text class="iconfont icon-xia"></text>
@@ -5,7 +5,7 @@
                 <view style="color: #45d4eb;">#01</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">黑头</text>
-                    <view class="fs26" catchtap="show_dailog" style="display: flex;align-items: center;">
+                    <view class="fs26" catchtap="show_dailog" data-type="4" style="display: flex;align-items: center;">
                         <text>问题标注</text>
                         <text class="iconfont icon-xia"></text>
                     </view>
@@ -5,7 +5,7 @@
                 <view style="color: #45d4eb;">#05</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">黑眼圈</text>
-                    <view class="fs26" style="display: flex;align-items: center;">
+                    <view class="fs26" catchtap="show_dailog" data-type="5" style="display: flex;align-items: center;">
                         <text>问题标注</text>
                         <text class="iconfont icon-xia"></text>
                     </view>
@@ -110,11 +110,24 @@ var get_card_price=function(goods,all_card,type){
 			     return min_name;
 		}
+var get_nai_shou=function(type){
+
+
+ switch(type){
+        case 0:return '耐受';
+        case 1:return '中性';
+        case 2:return '敏感';
+    }
+    return '';
+}
+
+
 module.exports = {
    get_dark_type: get_dark_type,
    get_goods_url: get_goods_url,
    guige:guige,
    dryoil_check:dryoil_check,
    is_has_rank:is_has_rank,
-   get_card_price:get_card_price
+   get_card_price:get_card_price,
+   get_nai_shou:get_nai_shou
 }
@@ -5,7 +5,7 @@
                 <view style="color: #45d4eb;">#01</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">敏感度</text>
-                    <view class="fs26" catchtap="show_dailog" data-type="1" style="display: flex;align-items: center;">
+                    <view class="fs26" catchtap="show_dailog" data-type="7" style="display: flex;align-items: center;">
                         <text>问题标注</text>
                         <text class="iconfont icon-xia"></text>
                     </view>
@@ -17,7 +17,7 @@
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
-                    <view class="bold">待确定</view>
+                    <view class="bold">{{s_filter.get_nai_shou(skin_sensitive_check)}}</view>
                 </view>
             </view>
             <view class="analyse_classify_header_item mt_b5">
@@ -2,10 +2,10 @@
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#01</view>
+                <view style="color: #45d4eb;">#02</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">色斑</text>
-                    <view class="fs26" catchtap="show_dailog" style="display: flex;align-items: center;">
+                    <view class="fs26" catchtap="show_dailog" data-type="2" style="display: flex;align-items: center;">
                         <text>问题标注</text>
                         <text class="iconfont icon-xia"></text>
                     </view>
@@ -71,7 +71,7 @@ Page({
            if(dark_type1>dark_type){
                dark_type=dark_type1;
            }
-           var skin_sensitive_check=face_data.skinquality.skin_sensitive_check[0];
+           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;
@@ -219,21 +219,40 @@ Page({
     },
     show_dailog(e) {
+        var type=parseInt(e.currentTarget.dataset.type);
         this.setData({
-            showDialog: true,
+            showDialog: true,show_type:type
         })
-
-        var type=parseInt(e.currentTarget.dataset.type);
-         switch (type){
+        switch (type){
          	case 1: //毛孔
                 var pore_list=this.data.face_data.blackheadpore.circles[0].pore;
-                this.setData({pore_list:pore_list,show_type:type});
+                this.setData({pore_list:pore_list});
          		break;
-         	case 2:
+            case 2://色斑
+                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 4://黑头
+                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});
+                break;
+            case 6://痤疮
+                var acne_list=this.data.face_data.acnespotmole.acne_list;
+                this.setData({acne_list:acne_list});
+                break;
          	default:
          	 	break
-         }
+        }
     },
     close_dialog() {
@@ -118,6 +118,46 @@
                                  <view class="abs p_circle" style="left:{{(item.x-item.r)*bili}}px; top:{{(item.y-item.r)*bili}}px; height:{{2*item.r*bili}}px;width: {{2*item.r*bili}}px"></view>
                              </block>
                        </block>
+                        <!-- 显示色斑 -->
+                        <block wx:if="{{show_type==2}}">
+                            <block wx:for="{{speckle_list}}" >
+                                <block wx:for="{{item.position}}" wx:for-item="bitem">
+                                    <view class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
+                                </block>
+                            </block>
+                        </block>
+                        <!-- 显示皱纹 -->
+                        <block wx:if="{{show_type==3}}">
+                            <block wx:for="{{wrinkle_list}}" >
+                                <block wx:for="{{item}}" wx:for-item="bitem">
+                                  <view class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
+                                </block>
+                            </block>
+                        </block>
+                        <!-- 显示黑头 -->
+                        <block wx:if="{{show_type==4}}">
+                            <block wx:for="{{blackhead_list}}" >
+                                <block wx:for="{{item}}" wx:for-item="bitem">
+                                    <view class="abs p_circle" style="left:{{(item.x-item.r)*bili}}px; top:{{(item.y-item.r)*bili}}px; height:{{2*item.r*bili}}px;width: {{2*item.r*bili}}px"></view>
+                                </block>
+                            </block>
+                        </block>
+
+                        <!-- 显示黑眼圈 -->
+                        <block wx:if="{{show_type==5}}">
+                            <block wx:for="{{dark_list}}">
+                                <view class="abs p_point" style="left:{{item.x*bili}}px; top:{{item.y*bili}}px; "></view>
+                            </block>
+                        </block>
+
+
+                        <!-- 显示痤疮 -->
+                        <block wx:if="{{show_type==6}}">
+                            <block wx:for="{{acne_list}}">
+                                <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>
+                            </block>
+                        </block>
+
                     </block>
                 </view>
             </view>
@@ -131,7 +171,15 @@
             </view>
         </view>
         <view class="dialog_txt">
-            <view class="fs28" style="margin-right:15rpx;">毛孔较粗大</view>
+            <view class="fs28" style="margin-right:15rpx;">
+                <text wx:if="{{show_type==1}}">毛孔较粗大</text>
+                <text wx:if="{{show_type==2}}">色斑轻度</text>
+                <text wx:if="{{show_type==3}}">皱纹轻度</text>
+                <text wx:if="{{show_type==4}}">黑头轻度</text>
+                <text wx:if="{{show_type==5}}">黑眼圈轻度</text>
+                <text wx:if="{{show_type==6}}">痤疮轻度</text>
+                <text wx:if="{{show_type==7}}">敏感度{{s_filter.get_nai_shou(skin_sensitive_check)}}</text>
+            </view>
             <view style="margin-top:2rpx;display: flex;">
                 <view class="pp"></view>
                 <view class="pp"></view>
@@ -153,9 +201,50 @@
                 <!-- 显示毛孔 -->
                 <block wx:if="{{show_type==1}}">
                     <block wx:for="{{pore_list}}">
-                        <view class="abs p_circle" style="left:{{(item.x-item.r)*bili1}}px; top:{{(item.y-item.r)*bili1}}px; height:{{2*item.r*bili1}}px;width: {{2*item.r*bili1}}px"></view>
+                        <view class="abs p_circle" style="left:{{(item.x-item.r)*bili1}}px; top:{{(item.y-item.r)*bili1}}px;height:{{2*item.r*bili1}}px;width: {{2*item.r*bili1}}px"></view>
+                    </block>
+                </block>
+                <!-- 显示色斑 -->
+                <block wx:if="{{show_type==2}}">
+                    <block wx:for="{{speckle_list}}" >
+                        <block wx:for="{{item.position}}" wx:for-item="bitem">
+                            <view class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
+                        </block>
+                    </block>
+                </block>
+                <!-- 显示皱纹 -->
+                <block wx:if="{{show_type==3}}">
+                    <block wx:for="{{wrinkle_list}}" >
+                        <block wx:for="{{item}}" wx:for-item="bitem">
+                            <view class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
+                        </block>
+                    </block>
+                </block>
+
+                <!-- 显示黑头 -->
+                <block wx:if="{{show_type==4}}">
+                    <block wx:for="{{blackhead_list}}" >
+                        <block wx:for="{{item}}" wx:for-item="bitem">
+                            <view class="abs p_circle" style="left:{{(item.x-item.r)*bili1}}px; top:{{(item.y-item.r)*bili1}}px; height:{{2*item.r*bili1}}px;width: {{2*item.r*bili1}}px"></view>
+                        </block>
+                    </block>
+                </block>
+
+                <!-- 显示黑眼圈 -->
+                <block wx:if="{{show_type==5}}">
+                    <block wx:for="{{dark_list}}">
+                        <view class="abs p_point" style="left:{{item.x*bili1}}px; top:{{item.y*bili1}}px; "></view>
                     </block>
                 </block>
+
+                <!-- 显示痤疮 -->
+                <block wx:if="{{show_type==6}}">
+                    <block wx:for="{{acne_list}}">
+                        <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>
+                    </block>
+                </block>
+
+
             </block>
         </view>
@@ -544,6 +544,10 @@ page {
     background: #fff;
 }
+.abs{position: absolute}
+.p_circle{ border: 1rpx solid #c8162c;border-radius: 50%}
+.p_point{background-color:#c8162c;height:2px;width:2px}
+
 .xc-spacing {
     letter-spacing: 4rpx;
 }
 \ No newline at end of file
@@ -2,10 +2,10 @@
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#04</view>
+                <view style="color: #45d4eb;">#03</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">皱纹</text>
-                    <view class="fs26" style="display: flex;align-items: center;">
+                    <view class="fs26" catchtap="show_dailog" data-type="3" style="display: flex;align-items: center;">
                         <text>问题标注</text>
                         <text class="iconfont icon-xia"></text>
                     </view>