Commit 2c4431c281424989128731d6deead1a8b81dd1a3

Authored by yvan.ni
1 parent e39b5c05

自测返回界面排版问题优化5条

packageD/pages/AI-test-skin/analyse/analyse.wxml
1 <view class="content"> 1 <view class="content">
2 - <view style="width: 750rpx; display: flex;justify-content: center; height: autuo"> 2 + <view style="width: 750rpx; display: flex;justify-content: center; height: 310px">
3 <view class="img" style="background-image: url({{iurl}}/miniapp/images/skinimg/11.png);"></view> 3 <view class="img" style="background-image: url({{iurl}}/miniapp/images/skinimg/11.png);"></view>
4 </view> 4 </view>
5 - <view style="text-align: center;margin-top: -20%;">  
6 - <text style="color: #fff;">正在分析...</text>  
7 - <progress border-radius="6" percent="{{per}}" activeColor="#fff" backgroundColor="#85898a" class="progress"></progress> 5 + <view style="text-align: center;">
  6 + <text style="color: #fff; font-size: 28rpx">正在分析...</text>
  7 + <progress border-radius="3" percent="{{per}}" activeColor="#fff" stroke-width="4"
  8 + backgroundColor="#85898a" class="progress"></progress>
8 </view> 9 </view>
9 </view> 10 </view>
packageD/pages/AI-test-skin/analyse/analyse.wxss
@@ -29,13 +29,13 @@ page { @@ -29,13 +29,13 @@ page {
29 display: inline-block; 29 display: inline-block;
30 width: 350px; 30 width: 350px;
31 height: 350px; 31 height: 350px;
32 - transform: scale(0.5);  
33 - animation: 1s mymove infinite steps(27, end); 32 + transform: scale(0.4);
  33 + animation: 2s mymove infinite steps(27, end);
34 } 34 }
35 35
36 .progress { 36 .progress {
37 margin-top: 3%; 37 margin-top: 3%;
38 - width: 60%; 38 + width: 48%;
39 /* text-align: center; */ 39 /* text-align: center; */
40 margin-left: 50%; 40 margin-left: 50%;
41 transform: translateX(-50%); 41 transform: translateX(-50%);
packageD/pages/AI-test-skin/fail_result/fail_result.wxss
@@ -25,10 +25,10 @@ page { @@ -25,10 +25,10 @@ page {
25 margin: 70rpx 0 30rpx 50%; 25 margin: 70rpx 0 30rpx 50%;
26 transform: translateX(-50%); 26 transform: translateX(-50%);
27 background: #4bd6df; 27 background: #4bd6df;
28 - padding: 20rpx;  
29 - width: 50%; 28 + padding: 15rpx 10rpx;
  29 + width: 46%;
30 text-align: center; 30 text-align: center;
31 - border-radius: 40rpx; 31 + border-radius: 50rpx;
32 color: #fff; 32 color: #fff;
33 } 33 }
34 .btn_fixed { 34 .btn_fixed {
packageD/pages/AI-test-skin/index/aiskin.wxml
@@ -3,8 +3,10 @@ @@ -3,8 +3,10 @@
3 <cover-view style="padding: 6rpx 6rpx 6rpx 25rpx;" bindtap="goto" data-url="/packageD/pages/AI-test-skin/history_record/history_record">历史档案</cover-view> 3 <cover-view style="padding: 6rpx 6rpx 6rpx 25rpx;" bindtap="goto" data-url="/packageD/pages/AI-test-skin/history_record/history_record">历史档案</cover-view>
4 <text class="iconfont icon-arrow_right" style="font-size: 30rpx"></text> 4 <text class="iconfont icon-arrow_right" style="font-size: 30rpx"></text>
5 </view> 5 </view>
6 - <image src="{{iurl}}/miniapp/images/skinimg/shouye.jpeg"></image>  
7 - <view class="start_btn" bindtap="goto" data-url="/packageD/pages/AI-test-skin/shoot_notice/shoot_notice">  
8 - <text>开始测肤</text> 6 + <view style="position: relative;width: 100%">
  7 + <image style="width: 100%" src="{{iurl}}/miniapp/images/skinimg/shouye.jpeg" mode="widthFix"></image>
  8 + <view class="start_btn" bindtap="goto" data-url="/packageD/pages/AI-test-skin/shoot_notice/shoot_notice">
  9 + <text>开始测肤</text>
  10 + </view>
9 </view> 11 </view>
10 </view> 12 </view>
11 \ No newline at end of file 13 \ No newline at end of file
packageD/pages/AI-test-skin/index/aiskin.wxss
1 -/* packageB/pages/AI-test-skin/aiskin.wxss */  
2 -page {  
3 - width: 100%;  
4 - height: 100%;  
5 -}  
6 -image {  
7 - width: 100vw;  
8 - height: 100%;  
9 -} 1 +
10 .container1 { 2 .container1 {
11 position: relative; 3 position: relative;
12 width: 100%; 4 width: 100%;
13 - height: 100%;  
14 } 5 }
15 .history { 6 .history {
16 margin-top: 30rpx; 7 margin-top: 30rpx;
@@ -22,18 +13,18 @@ image { @@ -22,18 +13,18 @@ image {
22 box-shadow: 0 0 2px 2px #f7f5f5; 13 box-shadow: 0 0 2px 2px #f7f5f5;
23 color: #4ad5df; 14 color: #4ad5df;
24 align-items: center; 15 align-items: center;
  16 + z-index: 100;
25 } 17 }
26 .start_btn { 18 .start_btn {
27 - position: fixed;  
28 - bottom: 50rpx;  
29 - /* margin: auto; */  
30 - /* text-align: center; */  
31 margin-left: 50%; 19 margin-left: 50%;
32 transform: translateX(-50%); 20 transform: translateX(-50%);
33 background: #4bd6df; 21 background: #4bd6df;
34 - padding: 20rpx; 22 + padding:16rpx 20rpx;
35 width: 67%; 23 width: 67%;
36 text-align: center; 24 text-align: center;
37 border-radius: 40rpx; 25 border-radius: 40rpx;
38 color: #fff; 26 color: #fff;
  27 + font-size: 30rpx;
  28 + position:absolute;
  29 + bottom: 90rpx;
39 } 30 }
40 \ No newline at end of file 31 \ No newline at end of file
packageD/pages/AI-test-skin/select_photo/select_photo.wxss
@@ -23,9 +23,8 @@ page { @@ -23,9 +23,8 @@ page {
23 23
24 .foot_btn .ok_btn { 24 .foot_btn .ok_btn {
25 background: #5dd9dc; 25 background: #5dd9dc;
26 - padding: 0 50rpx; 26 + padding: 16rpx 40rpx;
27 border-radius: 50rpx; 27 border-radius: 50rpx;
28 /* margin: 0 auto; */ 28 /* margin: 0 auto; */
29 - line-height: 100rpx;  
30 color: #fff; 29 color: #fff;
31 } 30 }
packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxss
@@ -72,10 +72,10 @@ page { @@ -72,10 +72,10 @@ page {
72 margin: 70rpx 0 30rpx 50%; 72 margin: 70rpx 0 30rpx 50%;
73 transform: translateX(-50%); 73 transform: translateX(-50%);
74 background: #4bd6df; 74 background: #4bd6df;
75 - padding: 20rpx; 75 + padding: 15rpx 15rpx;
76 width: 50%; 76 width: 50%;
77 text-align: center; 77 text-align: center;
78 - border-radius: 40rpx; 78 + border-radius: 50rpx;
79 color: #fff; 79 color: #fff;
80 } 80 }
81 .btn_fixed { 81 .btn_fixed {
packageD/pages/AI-test-skin/success_result/success_result.wxml
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 <!-- 局部放大的 --> 130 <!-- 局部放大的 -->
131 <block wx:if="{{img_scale}}"> 131 <block wx:if="{{img_scale}}">
132 <!-- 图片显示区 --> 132 <!-- 图片显示区 -->
133 - <view class="dialog_img" style="{{show_type == 5?'height:60%':'height:75%'}}"> 133 + <view class="dialog_img" style="{{show_type == 5?'height:60%':'height:85%'}}">
134 <view class="img_content rel"> 134 <view class="img_content rel">
135 <!-- 如果是黑眼圈的左眼右眼的时候 --> 135 <!-- 如果是黑眼圈的左眼右眼的时候 -->
136 <view wx:if="{{is_esys_show}}" class="face_show_view rel" style="width:{{eye_w}}px;height:{{eye_h}}px;margin-top: -{{eye_top}}px;margin-left: -{{is_esys_show==1?eye_left1:eye_left2}}px"> 136 <view wx:if="{{is_esys_show}}" class="face_show_view rel" style="width:{{eye_w}}px;height:{{eye_h}}px;margin-top: -{{eye_top}}px;margin-left: -{{is_esys_show==1?eye_left1:eye_left2}}px">
@@ -237,7 +237,7 @@ @@ -237,7 +237,7 @@
237 </block> --> 237 </block> -->
238 </view> 238 </view>
239 <!-- 文字显示区 --> 239 <!-- 文字显示区 -->
240 - <view class="dialog_txt" style="{{show_type == 5?'height:40%':'height:25%'}}"> 240 + <view class="dialog_txt" style="{{show_type == 5?'height:40%':'height:15%'}}">
241 <block wx:if="{{show_type == 5}}"> 241 <block wx:if="{{show_type == 5}}">
242 <view class="heiyanquan_img flex"> 242 <view class="heiyanquan_img flex">
243 <view class="img1 t-c"> 243 <view class="img1 t-c">
@@ -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}}">全部皱纹{{wrinkle_num}}</text>  
266 - <text wx:if="{{scroll_id==2}}">抬头纹{{wrinkle_num1}}</text>  
267 - <text wx:if="{{scroll_id==3}}">川字纹{{wrinkle_num2}}</text>  
268 - <text wx:if="{{scroll_id==4}}">眼周细纹{{wrinkle_num3}}</text>  
269 - <text wx:if="{{scroll_id==5}}">鱼尾纹{{wrinkle_num4}}</text>  
270 - <text wx:if="{{scroll_id==6}}">法令纹{{wrinkle_num5}}</text>  
271 - <text wx:if="{{scroll_id==7}}">口周纹{{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> 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> 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> 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>
@@ -305,8 +305,6 @@ @@ -305,8 +305,6 @@
305 </view> 305 </view>
306 </scroll-view> 306 </scroll-view>
307 </view> 307 </view>
308 -  
309 -  
310 </block> 308 </block>
311 309
312 <!-- 全图的,能够自由拖拽和放大 --> 310 <!-- 全图的,能够自由拖拽和放大 -->
packageD/pages/AI-test-skin/success_result/success_result.wxss
@@ -19,7 +19,7 @@ page { @@ -19,7 +19,7 @@ page {
19 position: fixed; 19 position: fixed;
20 bottom: 100rpx; 20 bottom: 100rpx;
21 right: 0; 21 right: 0;
22 - padding:8rpx 20rpx; 22 + padding:8rpx 20rpx;
23 background-color: #fff; 23 background-color: #fff;
24 border: 2rpx solid #f0f0f0; 24 border: 2rpx solid #f0f0f0;
25 /* color: #FFF; */ 25 /* color: #FFF; */
@@ -465,7 +465,7 @@ page { @@ -465,7 +465,7 @@ page {
465 flex-direction: column; 465 flex-direction: column;
466 justify-content: space-evenly; 466 justify-content: space-evenly;
467 background-color: #fff; 467 background-color: #fff;
468 - min-height: 25%; 468 + min-height: 10%;
469 } 469 }
470 470
471 .dialog_txt .heiyanquan_img { 471 .dialog_txt .heiyanquan_img {
@@ -859,4 +859,10 @@ page { @@ -859,4 +859,10 @@ page {
859 top: 15px; 859 top: 15px;
860 position: absolute; 860 position: absolute;
861 right: 50rpx; 861 right: 50rpx;
862 -}  
863 \ No newline at end of file 862 \ No newline at end of file
  863 +}
  864 +
  865 +::-webkit-scrollbar {
  866 + width: 0;
  867 + height: 0;
  868 + color: transparent;
  869 +}