Commit b699cb07a2361f7904b36b45649e264b512a1e09

Authored by yvan.ni
1 parent c8fe7f0c

测肤样式排版的优化

packageD/pages/AI-test-skin/success_result/success_result.wxml
@@ -259,31 +259,31 @@ @@ -259,31 +259,31 @@
259 </block> 259 </block>
260 <view class="dialog_progress"> 260 <view class="dialog_progress">
261 <view style="margin-right:7px;font-size:32rpx;"> 261 <view style="margin-right:7px;font-size:32rpx;">
262 - <text wx:if="{{show_type==1}}">毛孔粗大 {{pore_num}}</text>  
263 - <text wx:if="{{show_type==2}}">色斑 {{speckle_num}}</text> 262 + <text wx:if="{{show_type==1}}">毛孔粗大:{{pore_num}}</text>
  263 + <text wx:if="{{show_type==2}}">色斑:{{speckle_num}}</text>
264 <block wx:if="{{show_type==3}}"> 264 <block wx:if="{{show_type==3}}">
265 - <text wx:if="{{scroll_id==1}}" style="position: relative;top: 25rpx;">全部皱纹 {{wrinkle_num}}</text>  
266 - <text wx:if="{{scroll_id==2}}" style="position: relative;top: 25rpx;">抬头纹 {{wrinkle_num1}}</text>  
267 - <text wx:if="{{scroll_id==3}}" style="position: relative;top: 25rpx;">川字纹 {{wrinkle_num2}}</text>  
268 - <text wx:if="{{scroll_id==4}}" style="position: relative;top: 25rpx;">眼周细纹 {{wrinkle_num3}}</text>  
269 - <text wx:if="{{scroll_id==5}}" style="position: relative;top: 25rpx;">鱼尾纹 {{wrinkle_num4}}</text>  
270 - <text wx:if="{{scroll_id==6}}" style="position: relative;top: 25rpx;">法令纹 {{wrinkle_num5}}</text>  
271 - <text wx:if="{{scroll_id==7}}" style="position: relative;top: 25rpx;">口周纹 {{wrinkle_num6}}</text> 265 + <text wx:if="{{scroll_id==1}}" style="position: relative;top: 25rpx;">全部皱纹:{{wrinkle_num}}</text>
  266 + <text wx:if="{{scroll_id==2}}" style="position: relative;top: 25rpx;">抬头纹:{{wrinkle_num1}}</text>
  267 + <text wx:if="{{scroll_id==3}}" style="position: relative;top: 25rpx;">川字纹:{{wrinkle_num2}}</text>
  268 + <text wx:if="{{scroll_id==4}}" style="position: relative;top: 25rpx;">眼周细纹:{{wrinkle_num3}}</text>
  269 + <text wx:if="{{scroll_id==5}}" style="position: relative;top: 25rpx;">鱼尾纹:{{wrinkle_num4}}</text>
  270 + <text wx:if="{{scroll_id==6}}" style="position: relative;top: 25rpx;">法令纹:{{wrinkle_num5}}</text>
  271 + <text wx:if="{{scroll_id==7}}" style="position: relative;top: 25rpx;">口周纹:{{wrinkle_num6}}</text>
272 </block> 272 </block>
273 - <text wx:if="{{show_type==4}}">黑头 {{blackhead_num}}</text> 273 + <text wx:if="{{show_type==4}}">黑头{{blackhead_num}}</text>
274 <block wx:if="{{show_type==5}}"> 274 <block wx:if="{{show_type==5}}">
275 - <text wx:if="{{!s_dark_type}}">黑眼圈 {{s_filter.get_dark_type(dark_type)}}</text>  
276 - <text wx:if="{{s_dark_type==1}}">左眼黑眼圈 {{s_filter.get_dark_type(dark_type1)}}</text>  
277 - <text wx:if="{{s_dark_type==2}}">右眼黑眼圈 {{s_filter.get_dark_type(dark_type2)}}</text> 275 + <text wx:if="{{!s_dark_type}}">黑眼圈:{{s_filter.get_dark_type(dark_type)}}</text>
  276 + <text wx:if="{{s_dark_type==1}}">左眼黑眼圈:{{s_filter.get_dark_type(dark_type1)}}</text>
  277 + <text wx:if="{{s_dark_type==2}}">右眼黑眼圈:{{s_filter.get_dark_type(dark_type2)}}</text>
278 </block> 278 </block>
279 <block wx:if="{{show_type==6}}"> 279 <block wx:if="{{show_type==6}}">
280 - <text wx:if="{{scroll_id==1}}">全部痤疮 {{acne_num}}</text>  
281 - <text wx:if="{{scroll_id==2}}">粉刺 {{acne_num1}}</text>  
282 - <text wx:if="{{scroll_id==3}}">痘印 {{acne_num2}}</text>  
283 - <text wx:if="{{scroll_id==4}}">脓包 {{acne_num3}}</text>  
284 - <text wx:if="{{scroll_id==5}}">结节 {{acne_num4}}</text> 280 + <text wx:if="{{scroll_id==1}}">全部痤疮:{{acne_num}}</text>
  281 + <text wx:if="{{scroll_id==2}}">粉刺:{{acne_num1}}</text>
  282 + <text wx:if="{{scroll_id==3}}">痘印:{{acne_num2}}</text>
  283 + <text wx:if="{{scroll_id==4}}">脓包:{{acne_num3}}</text>
  284 + <text wx:if="{{scroll_id==5}}">结节:{{acne_num4}}</text>
285 </block> 285 </block>
286 - <text wx:if="{{show_type==7}}">敏感度 {{s_filter.get_nai_shou(skin_sensitive_check)}}</text> 286 + <text wx:if="{{show_type==7}}">敏感度{{s_filter.get_nai_shou(skin_sensitive_check)}}</text>
287 </view> 287 </view>
288 <view style="margin-top:10rpx;display: flex;display: none"> 288 <view style="margin-top:10rpx;display: flex;display: none">
289 <view class="pp"></view> 289 <view class="pp"></view>
@@ -306,7 +306,6 @@ @@ -306,7 +306,6 @@
306 </scroll-view> 306 </scroll-view>
307 </view> 307 </view>
308 </block> 308 </block>
309 -  
310 <!-- 全图的,能够自由拖拽和放大 --> 309 <!-- 全图的,能够自由拖拽和放大 -->
311 <block wx:else> 310 <block wx:else>
312 <view bindtouchstart='touchstartCallback' bindtouchmove='touchmoveCallback' bindtouchEnd='touchendCallback' style="position: relative;transform: scale({{ig_scale}});top: {{img_top}}px; left: {{img_left}}px;"> 311 <view bindtouchstart='touchstartCallback' bindtouchmove='touchmoveCallback' bindtouchEnd='touchendCallback' style="position: relative;transform: scale({{ig_scale}});top: {{img_top}}px; left: {{img_left}}px;">
packageD/pages/AI-test-skin/success_result/success_result.wxss
@@ -449,8 +449,7 @@ page { @@ -449,8 +449,7 @@ page {
449 transform: translate(50%, -50%); 449 transform: translate(50%, -50%);
450 height: 80%; 450 height: 80%;
451 width: 80%; 451 width: 80%;
452 - border-top-left-radius: 12rpx;  
453 - border-top-right-radius: 12rpx; 452 + border-radius: 18rpx;
454 z-index: 99999999; 453 z-index: 99999999;
455 overflow: hidden; 454 overflow: hidden;
456 } 455 }
@@ -474,7 +473,7 @@ page { @@ -474,7 +473,7 @@ page {
474 } 473 }
475 474
476 .dialog_txt .heiyanquan_img .img1 { 475 .dialog_txt .heiyanquan_img .img1 {
477 - width: 32%; 476 + width: 32%;color: #777;
478 } 477 }
479 478
480 .dialog .dialog_progress { 479 .dialog .dialog_progress {
@@ -493,6 +492,7 @@ page { @@ -493,6 +492,7 @@ page {
493 padding: 3% 5%; 492 padding: 3% 5%;
494 white-space: nowrap; 493 white-space: nowrap;
495 background-color: #fff; 494 background-color: #fff;
  495 + color: #a9a9a9;
496 } 496 }
497 497
498 .dialog .dialog_icon { 498 .dialog .dialog_icon {