wxd / MShopWeApp

Commit 2a4495b8e2e09214010b5967e7aeffbca0da69da

Authored by yvan.ni
1 parent 408d3e01

app.js 测肤

Inline Side-by-side
Showing 11 changed files with 147 additions and 22 deletions
... ... @@ -281,7 +281,7 @@ App({
281 281 var th = this, st = this.globalData.setting;
282 282 //获取物流不缓存
283 283 a.get("/api/weshop/storeshipping/list", {
284   - data: { store_id: st.stoid, status: 1, pageSize:600 },
  284 + data: { store_id: st.stoid, status: 1, pageSize:2000 },
285 285 success: function (o) {
286 286 console.log('getwuliu');
287 287 console.log(o);
... ... @@ -302,7 +302,7 @@ App({
302 302 var e = this,th=e, st = this.globalData.setting;
303 303 //获取物流不缓存
304 304 a.get("/api/weshop/shippingarea/list",{
305   - data: { store_id: st.stoid,pageSize: 600 },
  305 + data: { store_id: st.stoid,pageSize: 2000 },
306 306 success: function (o) {
307 307 console.log('getwuliuprice');
308 308 console.log(o);
... ...
packageB/pages/AI-test-skin/success_result/acne/acne.wxml
  View file @2a4495b
... ... @@ -5,7 +5,7 @@
5 5 <view style="color: #45d4eb;">#06</view>
6 6 <view class="flex-space-between">
7 7 <text style="font-size: 42rpx;" class="bold">痤疮</text>
8   - <view class="fs26" style="display: flex;align-items: center;">
  8 + <view class="fs26" catchtap="show_dailog" data-type="6" style="display: flex;align-items: center;">
9 9 <text>问题标注</text>
10 10 <text class="iconfont icon-xia"></text>
11 11  
... ...
packageB/pages/AI-test-skin/success_result/blackhead/blackhead.wxml
  View file @2a4495b
... ... @@ -5,7 +5,7 @@
5 5 <view style="color: #45d4eb;">#01</view>
6 6 <view class="flex-space-between">
7 7 <text style="font-size: 42rpx;" class="bold">黑头</text>
8   - <view class="fs26" catchtap="show_dailog" style="display: flex;align-items: center;">
  8 + <view class="fs26" catchtap="show_dailog" data-type="4" style="display: flex;align-items: center;">
9 9 <text>问题标注</text>
10 10 <text class="iconfont icon-xia"></text>
11 11 </view>
... ...
packageB/pages/AI-test-skin/success_result/dark/dark.wxml
  View file @2a4495b
... ... @@ -5,7 +5,7 @@
5 5 <view style="color: #45d4eb;">#05</view>
6 6 <view class="flex-space-between">
7 7 <text style="font-size: 42rpx;" class="bold">黑眼圈</text>
8   - <view class="fs26" style="display: flex;align-items: center;">
  8 + <view class="fs26" catchtap="show_dailog" data-type="5" style="display: flex;align-items: center;">
9 9 <text>问题标注</text>
10 10 <text class="iconfont icon-xia"></text>
11 11 </view>
... ...
packageB/pages/AI-test-skin/success_result/s_filter.wxs
  View file @2a4495b
... ... @@ -110,11 +110,24 @@ var get_card_price=function(goods,all_card,type){
110 110 return min_name;
111 111 }
112 112  
  113 +var get_nai_shou=function(type){
  114 +
  115 +
  116 + switch(type){
  117 + case 0:return '耐受';
  118 + case 1:return '中性';
  119 + case 2:return '敏感';
  120 + }
  121 + return '';
  122 +}
  123 +
  124 +
113 125 module.exports = {
114 126 get_dark_type: get_dark_type,
115 127 get_goods_url: get_goods_url,
116 128 guige:guige,
117 129 dryoil_check:dryoil_check,
118 130 is_has_rank:is_has_rank,
119   - get_card_price:get_card_price
  131 + get_card_price:get_card_price,
  132 + get_nai_shou:get_nai_shou
120 133 }
... ...
packageB/pages/AI-test-skin/success_result/sensitive/sensitive.wxml
  View file @2a4495b
... ... @@ -5,7 +5,7 @@
5 5 <view style="color: #45d4eb;">#01</view>
6 6 <view class="flex-space-between">
7 7 <text style="font-size: 42rpx;" class="bold">敏感度</text>
8   - <view class="fs26" catchtap="show_dailog" data-type="1" style="display: flex;align-items: center;">
  8 + <view class="fs26" catchtap="show_dailog" data-type="7" style="display: flex;align-items: center;">
9 9 <text>问题标注</text>
10 10 <text class="iconfont icon-xia"></text>
11 11 </view>
... ... @@ -17,7 +17,7 @@
17 17 </view>
18 18 <view style="line-height:60rpx;margin-left:20rpx">
19 19 <view class="fs28">程度情况</view>
20   - <view class="bold">待确定</view>
  20 + <view class="bold">{{s_filter.get_nai_shou(skin_sensitive_check)}}</view>
21 21 </view>
22 22 </view>
23 23 <view class="analyse_classify_header_item mt_b5">
... ...
packageB/pages/AI-test-skin/success_result/speckle/speckle.wxml
  View file @2a4495b
... ... @@ -2,10 +2,10 @@
2 2 <view class="analyse_classify bg_white">
3 3 <view class="analyse_classify_header">
4 4 <view>
5   - <view style="color: #45d4eb;">#01</view>
  5 + <view style="color: #45d4eb;">#02</view>
6 6 <view class="flex-space-between">
7 7 <text style="font-size: 42rpx;" class="bold">色斑</text>
8   - <view class="fs26" catchtap="show_dailog" style="display: flex;align-items: center;">
  8 + <view class="fs26" catchtap="show_dailog" data-type="2" style="display: flex;align-items: center;">
9 9 <text>问题标注</text>
10 10 <text class="iconfont icon-xia"></text>
11 11 </view>
... ...
packageB/pages/AI-test-skin/success_result/success_result.js
  View file @2a4495b
... ... @@ -71,7 +71,7 @@ Page({
71 71 if(dark_type1>dark_type){
72 72 dark_type=dark_type1;
73 73 }
74   - var skin_sensitive_check=face_data.skinquality.skin_sensitive_check[0];
  74 + var skin_sensitive_check= parseInt(face_data.skinquality.skin_sensitive_check[0]);
75 75 var skin_dryoil_check=face_data.skinquality.skin_dryoil_check;
76 76  
77 77 var location=face_data.location;
... ... @@ -219,21 +219,40 @@ Page({
219 219  
220 220 },
221 221 show_dailog(e) {
  222 + var type=parseInt(e.currentTarget.dataset.type);
222 223 this.setData({
223   - showDialog: true,
  224 + showDialog: true,show_type:type
224 225 })
225   -
226   - var type=parseInt(e.currentTarget.dataset.type);
227   - switch (type){
  226 + switch (type){
228 227 case 1: //毛孔
229 228 var pore_list=this.data.face_data.blackheadpore.circles[0].pore;
230   - this.setData({pore_list:pore_list,show_type:type});
  229 + this.setData({pore_list:pore_list});
231 230 break;
232   - case 2:
  231 + case 2://色斑
  232 + var speckle_list=this.data.face_data.acnespotmole.speckle_list;
  233 + this.setData({speckle_list:speckle_list});
  234 + break;
  235 + case 3://皱纹
  236 + var wrinkle_list=this.data.face_data.wrinkle.wrinkle_data;
  237 + this.setData({wrinkle_list:wrinkle_list});
233 238 break;
  239 + case 4://黑头
  240 + var blackhead_list=this.data.face_data.blackheadpore.circles[0].blackhead;
  241 + this.setData({blackhead_list:blackhead_list});
  242 + break;
  243 + case 5://黑眼圈
  244 + var arr=this.data.face_data.eyesattr.dark_circle_left[0];
  245 + var arr2=this.data.face_data.eyesattr.dark_circle_right[0];
  246 + var arr3=[...arr,...arr2];
  247 + this.setData({dark_list:arr3});
  248 + break;
  249 + case 6://痤疮
  250 + var acne_list=this.data.face_data.acnespotmole.acne_list;
  251 + this.setData({acne_list:acne_list});
  252 + break;
234 253 default:
235 254 break
236   - }
  255 + }
237 256 },
238 257  
239 258 close_dialog() {
... ...
packageB/pages/AI-test-skin/success_result/success_result.wxml
  View file @2a4495b
... ... @@ -118,6 +118,46 @@
118 118 <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>
119 119 </block>
120 120 </block>
  121 + <!-- 显示色斑 -->
  122 + <block wx:if="{{show_type==2}}">
  123 + <block wx:for="{{speckle_list}}" >
  124 + <block wx:for="{{item.position}}" wx:for-item="bitem">
  125 + <view class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
  126 + </block>
  127 + </block>
  128 + </block>
  129 + <!-- 显示皱纹 -->
  130 + <block wx:if="{{show_type==3}}">
  131 + <block wx:for="{{wrinkle_list}}" >
  132 + <block wx:for="{{item}}" wx:for-item="bitem">
  133 + <view class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
  134 + </block>
  135 + </block>
  136 + </block>
  137 + <!-- 显示黑头 -->
  138 + <block wx:if="{{show_type==4}}">
  139 + <block wx:for="{{blackhead_list}}" >
  140 + <block wx:for="{{item}}" wx:for-item="bitem">
  141 + <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>
  142 + </block>
  143 + </block>
  144 + </block>
  145 +
  146 + <!-- 显示黑眼圈 -->
  147 + <block wx:if="{{show_type==5}}">
  148 + <block wx:for="{{dark_list}}">
  149 + <view class="abs p_point" style="left:{{item.x*bili}}px; top:{{item.y*bili}}px; "></view>
  150 + </block>
  151 + </block>
  152 +
  153 +
  154 + <!-- 显示痤疮 -->
  155 + <block wx:if="{{show_type==6}}">
  156 + <block wx:for="{{acne_list}}">
  157 + <view class="abs p_circle" style="left:{{(item.center_x-item.radius)*bili}}px; top:{{(item.center_y-item.radius)*bili}}px;height:{{2*item.radius*bili}}px;width: {{2*item.radius*bili}}px"></view>
  158 + </block>
  159 + </block>
  160 +
121 161 </block>
122 162 </view>
123 163 </view>
... ... @@ -131,7 +171,15 @@
131 171 </view>
132 172 </view>
133 173 <view class="dialog_txt">
134   - <view class="fs28" style="margin-right:15rpx;">毛孔较粗大</view>
  174 + <view class="fs28" style="margin-right:15rpx;">
  175 + <text wx:if="{{show_type==1}}">毛孔较粗大</text>
  176 + <text wx:if="{{show_type==2}}">色斑轻度</text>
  177 + <text wx:if="{{show_type==3}}">皱纹轻度</text>
  178 + <text wx:if="{{show_type==4}}">黑头轻度</text>
  179 + <text wx:if="{{show_type==5}}">黑眼圈轻度</text>
  180 + <text wx:if="{{show_type==6}}">痤疮轻度</text>
  181 + <text wx:if="{{show_type==7}}">敏感度{{s_filter.get_nai_shou(skin_sensitive_check)}}</text>
  182 + </view>
135 183 <view style="margin-top:2rpx;display: flex;">
136 184 <view class="pp"></view>
137 185 <view class="pp"></view>
... ... @@ -153,9 +201,50 @@
153 201 <!-- 显示毛孔 -->
154 202 <block wx:if="{{show_type==1}}">
155 203 <block wx:for="{{pore_list}}">
156   - <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>
  204 + <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>
  205 + </block>
  206 + </block>
  207 + <!-- 显示色斑 -->
  208 + <block wx:if="{{show_type==2}}">
  209 + <block wx:for="{{speckle_list}}" >
  210 + <block wx:for="{{item.position}}" wx:for-item="bitem">
  211 + <view class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
  212 + </block>
  213 + </block>
  214 + </block>
  215 + <!-- 显示皱纹 -->
  216 + <block wx:if="{{show_type==3}}">
  217 + <block wx:for="{{wrinkle_list}}" >
  218 + <block wx:for="{{item}}" wx:for-item="bitem">
  219 + <view class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
  220 + </block>
  221 + </block>
  222 + </block>
  223 +
  224 + <!-- 显示黑头 -->
  225 + <block wx:if="{{show_type==4}}">
  226 + <block wx:for="{{blackhead_list}}" >
  227 + <block wx:for="{{item}}" wx:for-item="bitem">
  228 + <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>
  229 + </block>
  230 + </block>
  231 + </block>
  232 +
  233 + <!-- 显示黑眼圈 -->
  234 + <block wx:if="{{show_type==5}}">
  235 + <block wx:for="{{dark_list}}">
  236 + <view class="abs p_point" style="left:{{item.x*bili1}}px; top:{{item.y*bili1}}px; "></view>
157 237 </block>
158 238 </block>
  239 +
  240 + <!-- 显示痤疮 -->
  241 + <block wx:if="{{show_type==6}}">
  242 + <block wx:for="{{acne_list}}">
  243 + <view class="abs p_circle" style="left:{{(item.center_x-item.radius)*bili1}}px; top:{{(item.center_y-item.radius)*bili1}}px;height:{{2*item.radius*bili1}}px;width: {{2*item.radius*bili1}}px"></view>
  244 + </block>
  245 + </block>
  246 +
  247 +
159 248 </block>
160 249 </view>
161 250  
... ...
packageB/pages/AI-test-skin/success_result/success_result.wxss
  View file @2a4495b
... ... @@ -544,6 +544,10 @@ page {
544 544 background: #fff;
545 545 }
546 546  
  547 +.abs{position: absolute}
  548 +.p_circle{ border: 1rpx solid #c8162c;border-radius: 50%}
  549 +.p_point{background-color:#c8162c;height:2px;width:2px}
  550 +
547 551 .xc-spacing {
548 552 letter-spacing: 4rpx;
549 553 }
550 554 \ No newline at end of file
... ...
packageB/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml
  View file @2a4495b
... ... @@ -2,10 +2,10 @@
2 2 <view class="analyse_classify bg_white">
3 3 <view class="analyse_classify_header">
4 4 <view>
5   - <view style="color: #45d4eb;">#04</view>
  5 + <view style="color: #45d4eb;">#03</view>
6 6 <view class="flex-space-between">
7 7 <text style="font-size: 42rpx;" class="bold">皱纹</text>
8   - <view class="fs26" style="display: flex;align-items: center;">
  8 + <view class="fs26" catchtap="show_dailog" data-type="3" style="display: flex;align-items: center;">
9 9 <text>问题标注</text>
10 10 <text class="iconfont icon-xia"></text>
11 11 </view>
... ...