From b699cb07a2361f7904b36b45649e264b512a1e09 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 1 Mar 2022 09:21:42 +0800
Subject: [PATCH] 测肤样式排版的优化

---
 packageD/pages/AI-test-skin/success_result/success_result.wxml | 39 +++++++++++++++++++--------------------
 packageD/pages/AI-test-skin/success_result/success_result.wxss |  6 +++---
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxml b/packageD/pages/AI-test-skin/success_result/success_result.wxml
index 2dc0933..a0ab3df 100644
--- a/packageD/pages/AI-test-skin/success_result/success_result.wxml
+++ b/packageD/pages/AI-test-skin/success_result/success_result.wxml
@@ -259,31 +259,31 @@
             </block>
             <view class="dialog_progress">
                 <view style="margin-right:7px;font-size:32rpx;">
-                    <text wx:if="{{show_type==1}}">毛孔粗大 {{pore_num}}</text>
-                    <text wx:if="{{show_type==2}}">色斑 {{speckle_num}}</text>
+                    <text wx:if="{{show_type==1}}">毛孔粗大：{{pore_num}}</text>
+                    <text wx:if="{{show_type==2}}">色斑：{{speckle_num}}</text>
                     <block wx:if="{{show_type==3}}">
-                        <text wx:if="{{scroll_id==1}}" style="position: relative;top: 25rpx;">全部皱纹 {{wrinkle_num}}</text>
-                        <text wx:if="{{scroll_id==2}}" style="position: relative;top: 25rpx;">抬头纹 {{wrinkle_num1}}</text>
-                        <text wx:if="{{scroll_id==3}}" style="position: relative;top: 25rpx;">川字纹 {{wrinkle_num2}}</text>
-                        <text wx:if="{{scroll_id==4}}" style="position: relative;top: 25rpx;">眼周细纹 {{wrinkle_num3}}</text>
-                        <text wx:if="{{scroll_id==5}}" style="position: relative;top: 25rpx;">鱼尾纹 {{wrinkle_num4}}</text>
-                        <text wx:if="{{scroll_id==6}}" style="position: relative;top: 25rpx;">法令纹 {{wrinkle_num5}}</text>
-                        <text wx:if="{{scroll_id==7}}" style="position: relative;top: 25rpx;">口周纹 {{wrinkle_num6}}</text>
+                        <text wx:if="{{scroll_id==1}}" style="position: relative;top: 25rpx;">全部皱纹：{{wrinkle_num}}</text>
+                        <text wx:if="{{scroll_id==2}}" style="position: relative;top: 25rpx;">抬头纹：{{wrinkle_num1}}</text>
+                        <text wx:if="{{scroll_id==3}}" style="position: relative;top: 25rpx;">川字纹：{{wrinkle_num2}}</text>
+                        <text wx:if="{{scroll_id==4}}" style="position: relative;top: 25rpx;">眼周细纹：{{wrinkle_num3}}</text>
+                        <text wx:if="{{scroll_id==5}}" style="position: relative;top: 25rpx;">鱼尾纹：{{wrinkle_num4}}</text>
+                        <text wx:if="{{scroll_id==6}}" style="position: relative;top: 25rpx;">法令纹：{{wrinkle_num5}}</text>
+                        <text wx:if="{{scroll_id==7}}" style="position: relative;top: 25rpx;">口周纹：{{wrinkle_num6}}</text>
                     </block>
-                    <text wx:if="{{show_type==4}}">黑头 {{blackhead_num}}</text>
+                    <text wx:if="{{show_type==4}}">黑头：{{blackhead_num}}</text>
                     <block wx:if="{{show_type==5}}">
-                        <text wx:if="{{!s_dark_type}}">黑眼圈 {{s_filter.get_dark_type(dark_type)}}</text>
-                        <text wx:if="{{s_dark_type==1}}">左眼黑眼圈 {{s_filter.get_dark_type(dark_type1)}}</text>
-                        <text wx:if="{{s_dark_type==2}}">右眼黑眼圈 {{s_filter.get_dark_type(dark_type2)}}</text>
+                        <text wx:if="{{!s_dark_type}}">黑眼圈：{{s_filter.get_dark_type(dark_type)}}</text>
+                        <text wx:if="{{s_dark_type==1}}">左眼黑眼圈：{{s_filter.get_dark_type(dark_type1)}}</text>
+                        <text wx:if="{{s_dark_type==2}}">右眼黑眼圈：{{s_filter.get_dark_type(dark_type2)}}</text>
                     </block>
                     <block wx:if="{{show_type==6}}">
-                        <text wx:if="{{scroll_id==1}}">全部痤疮 {{acne_num}}</text>
-                        <text wx:if="{{scroll_id==2}}">粉刺 {{acne_num1}}</text>
-                        <text wx:if="{{scroll_id==3}}">痘印 {{acne_num2}}</text>
-                        <text wx:if="{{scroll_id==4}}">脓包 {{acne_num3}}</text>
-                        <text wx:if="{{scroll_id==5}}">结节 {{acne_num4}}</text>
+                        <text wx:if="{{scroll_id==1}}">全部痤疮：{{acne_num}}</text>
+                        <text wx:if="{{scroll_id==2}}">粉刺：{{acne_num1}}</text>
+                        <text wx:if="{{scroll_id==3}}">痘印：{{acne_num2}}</text>
+                        <text wx:if="{{scroll_id==4}}">脓包：{{acne_num3}}</text>
+                        <text wx:if="{{scroll_id==5}}">结节：{{acne_num4}}</text>
                     </block>
-                    <text wx:if="{{show_type==7}}">敏感度 {{s_filter.get_nai_shou(skin_sensitive_check)}}</text>
+                    <text wx:if="{{show_type==7}}">敏感度：{{s_filter.get_nai_shou(skin_sensitive_check)}}</text>
                 </view>
                 <view style="margin-top:10rpx;display: flex;display: none">
                     <view class="pp"></view>
@@ -306,7 +306,6 @@
             </scroll-view>
         </view>
     </block>
-
     <!-- 全图的，能够自由拖拽和放大 -->
     <block wx:else>
         <view bindtouchstart='touchstartCallback' bindtouchmove='touchmoveCallback' bindtouchEnd='touchendCallback' style="position: relative;transform: scale({{ig_scale}});top: {{img_top}}px; left: {{img_left}}px;">
diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxss b/packageD/pages/AI-test-skin/success_result/success_result.wxss
index a07114f..24be046 100644
--- a/packageD/pages/AI-test-skin/success_result/success_result.wxss
+++ b/packageD/pages/AI-test-skin/success_result/success_result.wxss
@@ -449,8 +449,7 @@ page {
     transform: translate(50%, -50%);
     height: 80%;
     width: 80%;
-    border-top-left-radius: 12rpx;
-    border-top-right-radius: 12rpx;
+    border-radius: 18rpx;
     z-index: 99999999;
     overflow: hidden;
 }
@@ -474,7 +473,7 @@ page {
 }
 
 .dialog_txt .heiyanquan_img .img1 {
-    width: 32%;
+    width: 32%;color: #777;
 }
 
 .dialog .dialog_progress {
@@ -493,6 +492,7 @@ page {
     padding: 3% 5%;
     white-space: nowrap;
     background-color: #fff;
+    color: #a9a9a9;
 }
 
 .dialog .dialog_icon {
--
libgit2 0.21.4