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

yvan.ni
2 parents 03c97ea1 a17da0b4
Showing 3 changed files with 145 additions and 19 deletions
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
 /*
  * @Author: abson
  * @Date: 2022-02-16 15:36:47
- * @LastEditTime: 2022-02-18 14:00:54
+ * @LastEditTime: 2022-02-18 17:06:27
  * @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
@@ -20,9 +20,12 @@ 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: '敏感度' }],
         currentIndex: 0,
-        tab_id:'zong_he',
+        tab_id: 'zong_he',
         iurl: setting.imghost,
-        showDialog:false,
+        showDialog: false,
+        yanjing: true,
+        img_scale: true, //问题标注放大图片
+        img_scale_icon:true,
     },
  
     /**
@@ -52,6 +55,17 @@ Page({
             tab_id,
         })
     },
+    click_yanjing() {
+        this.setData({
+            yanjing: !this.data.yanjing,
+        })
+    },
+    click_fangda() {
+        this.setData({
+            img_scale: !this.data.img_scale,
+            img_scale_icon:!this.data.yanjing,
+        })
+    },
  
     /**
      * 生命周期函数--监听页面隐藏
@@ -66,6 +80,24 @@ Page({
     onUnload: function () {
  
     },
+    show_dailog() {
+        this.setData({
+            showDialog: true,
+        })
+    },
+
+    close_dialog() {
+        this.setData({
+            showDialog: false,
+        })
+    },
+
+    close_mask() {
+        this.setData({
+            showDialog: false,
+            img_scale: true,
+        })
+    },
  
     /**
      * 页面相关事件处理函数--监听用户下拉动作
@@ -69,7 +69,7 @@
                         <view style="color: #45d4eb;">#01</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" style="display: flex;align-items: center;">
                                 <text>问题标注</text>
                                 <text class="iconfont icon-xia"></text>
                             </view>
@@ -339,7 +339,7 @@
                     <view>
                         <view style="color: #45d4eb;">#05</view>
                         <view class="flex-space-between">
-                            <text style="font-size: 42rpx;"  class="bold">黑眼圈</text>
+                            <text style="font-size: 42rpx;" class="bold">黑眼圈</text>
                             <view class="fs26" style="display: flex;align-items: center;">
                                 <text>问题标注</text>
                                 <text class="iconfont icon-xia"></text>
@@ -629,8 +629,46 @@
     </view>
 </scroll-view>
  
-<view class="mask" wx:if="{{showDialog}}"></view>
+<view class="mask" catchtap="close_mask" wx:if="{{showDialog}}"></view>
 <cover-view class="share fs28">
-    <text class="iconfont icon-zhuanfa1" style="padding: 0 10rpx;"></text>
-    <text>分享</text>
-</cover-view>
 \ No newline at end of file
+    <cover-view class="iconfont icon-zhuanfa1" style="padding: 0 10rpx;"></cover-view>
+    <cover-view>分享</cover-view>
+</cover-view>
+
+<view class="dialog" wx:if="{{showDialog}}">
+    <block wx:if="{{img_scale}}">
+        <view class="dialog_img">
+            <view style="height: 100%;">
+                <image src="../../../images/1.jpg" style="width: 100%;height: 100%;"></image>
+            </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>
+            </view>
+            <view class="dialog_icon">
+                <text catchtap="click_yanjing" class="iconfont {{yanjing?'icon-yanjing-kai':'icon-yanjing-guan'}} mgb20"></text>
+                <!-- <text class="iconfont icon-yanjing-guan mgb20"></text> -->
+                <text catchtap="click_fangda" class="iconfont icon-fangda mgb20"></text>
+            </view>
+        </view>
+        <view class="dialog_txt">
+            <view class="fs28" style="margin-right:15rpx;">毛孔较粗大</view>
+            <view style="margin-top:2rpx;display: flex;">
+                <view class="pp"></view>
+                <view class="pp"></view>
+                <view class="pp"></view>
+                <view class="pp"></view>
+                <view class="pp"></view>
+                <view class="pp"></view>
+                <view class="pp"></view>
+                <view class="pp"></view>
+                <view class="pp"></view>
+            </view>
+        </view>
+    </block>
+    <block wx:else>
+        <image style="width: 100%;height: 100%;" src="../../../images/1.jpg"></image>
+        <view class="dialog_icon">
+            <text catchtap="click_fangda" class="iconfont icon-suoxiao mgb20"></text>
+        </view>
+    </block>
+</view>
 \ No newline at end of file
@@ -11,16 +11,18 @@ page {
     display: flex;
     height: 100rpx;
 }
+
 .share {
+    display: flex;
     position: fixed;
     bottom: 100rpx;
     right: 0;
-	padding: 20rpx;
-	background-color: #fff;
-	border: 2rpx solid #f0f0f0;
-	/* color: #FFF; */
-	border-radius: 40rpx 0 0 40rpx;
-	z-index: 99;
+    padding: 20rpx;
+    background-color: #fff;
+    border: 2rpx solid #f0f0f0;
+    /* color: #FFF; */
+    border-radius: 40rpx 0 0 40rpx;
+    z-index: 99;
 }
  
 .tab_scroll_item {
@@ -110,14 +112,16 @@ page {
     width: 100%;
     height: 100%;
     top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
     background-color: rgba(0, 0, 0, .6);
 }
+
 .ll::after {
     content: "\e650";
 }
+
 .analyse .analyse_center image {
     height: 100%;
     width: 100%;
@@ -364,4 +368,56 @@ page {
     /* width: 160rpx; */
     flex-direction: column;
     align-items: center;
-}
 \ No newline at end of file
+}
+
+.dialog {
+    position: fixed;
+    top: 50%;
+    right: 50%;
+    transform: translate(50%, -50%);
+    height: 70%;
+    width: 80%;
+    border-radius: 30rpx;
+}
+
+.dialog .dialog_img {
+    height: 80%;
+    position: relative;
+}
+
+.dialog .dialog_txt {
+    height: 20%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: #fff;
+}
+
+.dialog .dialog_icon {
+    position: absolute;
+    right: 30rpx;
+    top: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    height: 100%;
+}
+
+.dialog .iconfont {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #fff;
+    background-color: #1f1919;
+    border-radius: 50%;
+    width: 50rpx;
+    height: 50rpx;
+}
+
+.pp {
+    width: 8rpx;
+    height: 35rpx;
+    margin-right: 5rpx;
+    border-radius: 3rpx;
+    background: #2cb344;
+}