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

abson
2 parents b1acfdf2 b9314b65
Showing 4 changed files with 89 additions and 13 deletions
packageB/pages/AI-test-skin/success_result/pore/pore.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
@@ -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="1" style="display: flex;align-items: center;">
                         <text>问题标注</text>
                         <text class="iconfont icon-xia"></text>
                     </view>
@@ -29,9 +29,11 @@ Page({
         tab_id: 'zong_he',
         iurl: setting.imghost,
         showDialog: false,
-        yanjing: true,
+        yanjing: true,  //显示皮肤问题
         img_scale: true, //问题标注放大图片
         img_scale_icon:true,
+        show_problem:1, //问题标注显示问题
+
     },
     /**
@@ -44,7 +46,13 @@ Page({
        //var face_result=getApp().globalData.face_result;
        //var face_data=face_result.face_list[0];
        this.data.id=options.id;
-       this.get_data(function (json,img) {
+
+        //计算图片要显示的大小
+        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];
            //痤疮数
@@ -66,6 +74,9 @@ Page({
            var skin_sensitive_check=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,
@@ -75,7 +86,10 @@ Page({
                dark_type:dark_type,
                skin_sensitive_check:skin_sensitive_check,
                skin_dryoil_check:skin_dryoil_check,
-               face_img:img
+               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)
@@ -97,13 +111,12 @@ Page({
                acne.get_goods(th,setting.stoid);
        })
     },
-   
     //-- 初始等级卡 --
     init: function () {
         var th = this;
         if (!getApp().globalData.user_id) return false;
-        getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+        getApp().request.get("/api/weshop/users/get/" + setting.stoid + "/" + getApp().globalData.user_id, {
             isShowLoading: false,
             success: function (e) {
                 if (e.data.code == 0 && e.data && e.data.data) {
@@ -205,10 +218,22 @@ Page({
     onUnload: function () {
     },
-    show_dailog() {
+    show_dailog(e) {
         this.setData({
             showDialog: true,
         })
+
+        var type=parseInt(e.currentTarget.dataset.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});
+         		break;
+         	case 2:
+         		break;
+         	default:
+         	 	break
+         }
     },
     close_dialog() {
@@ -253,7 +278,7 @@ Page({
     //--- 获取卡类列表 ---
     getPlusCardType: function (func) {
-        var storid = o.stoid;
+        var storid = setting.stoid;
         var th = this;
         getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
@@ -290,4 +315,19 @@ Page({
             func(ob);
         })
     },
+
+    //图片加载的时候，计算图片的像素大小
+    face_img_load: function (e) {
+        var th=this;
+        var imgwidth = e.detail.width;
+        var imgheight = e.detail.height;
+
+        var w= th.data.cWidth*0.8;
+
+        this.setData({
+            iwidth:imgwidth*th.data.bili,
+            iheight:imgheight*th.data.bili,
+            bili1:w/imgwidth  //图片放大时候的比例
+        })
+    },
 })
 \ No newline at end of file
@@ -102,11 +102,24 @@
     <cover-view>分享</cover-view>
 </cover-view>
-<view class="dialog" wx:if="{{showDialog}}">
+<view class="dialog {{img_scale?'scale':'fangda'}}" wx:if="{{showDialog}}">
+    <!-- 放大的 -->
     <block wx:if="{{img_scale}}">
         <view class="dialog_img">
-            <view style="height: 100%; overflow: hidden">
-                <image src="{{iurl}}{{face_img}}" style="width: 100%;height: 100%;"></image>
+            <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>
+
+                    <block wx:if="{{yanjing}}">
+                       <!-- 显示毛孔 -->
+                       <block wx:if="{{show_type==1}}">
+                             <block wx:for="{{pore_list}}">
+                                 <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>
+                </view>
             </view>
             <view class="dialog_icon" catchtap="close_dialog" style="justify-content: flex-start;">
                 <text class="iconfont icon-guan mt20" style="z-index: 999;font-size: 20rpx;"></text>
@@ -132,8 +145,20 @@
             </view>
         </view>
     </block>
+    <!-- 缩小 -->
     <block wx:else>
-        <image style="width: 100%;height: 100%;" src="../../../images/1.jpg"></image>
+        <view style="position: relative">
+            <image style="width: 100%;" src="{{iurl}}{{face_img}}" mode="widthFix" ></image>
+            <block wx:if="{{yanjing}}">
+                <!-- 显示毛孔 -->
+                <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>
+                    </block>
+                </block>
+            </block>
+        </view>
+
         <view class="dialog_icon">
             <text catchtap="click_fangda" class="iconfont icon-suoxiao mgb20"></text>
         </view>
@@ -117,6 +117,7 @@ page {
     left: 0;
     right: 0;
     background-color: rgba(0, 0, 0, .6);
+    z-index: 999;
 }
 .ll::after {
@@ -382,10 +383,11 @@ page {
     height: 70%;
     width: 80%;
     border-radius: 30rpx;
+    z-index: 99999999;
 }
 .dialog .dialog_img {
-    height: 80%;
+    height: 84%;
     position: relative;
 }
@@ -394,6 +396,7 @@ page {
     align-items: center;
     justify-content: center;
     background-color: #fff;
+    min-height: 20%;
 }
 .dialog .dialog_icon {
@@ -424,3 +427,11 @@ page {
     border-radius: 3rpx;
     background: #2cb344;
 }
+
+.img_content{
+    height: 100%;overflow: hidden;border-top-left-radius: 8px;border-top-right-radius: 8px;
+}
+.abs{position: absolute}
+.p_circle{ border: 1rpx solid #c8162c;border-radius: 50%}
+
+.dialog.fangda{ height: auto}