Commit 7a40fead63a72704e0fadc04376392bead9c52a7
1 parent
8d19bac3
测肤的问题优化
Showing
8 changed files
with
134 additions
and
11 deletions
packageB/pages/AI-test-skin/success_result/acne/acne.js
| ... | ... | @@ -15,7 +15,7 @@ module.exports = { |
| 15 | 15 | }) |
| 16 | 16 | var re_word=set.join(','); |
| 17 | 17 | //-- 服务卡 -- |
| 18 | - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 18 | + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 19 | 19 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 20 | 20 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 21 | 21 | th.setData({acne_fuwu:res.data.data.pageData}) |
| ... | ... | @@ -23,7 +23,7 @@ module.exports = { |
| 23 | 23 | }) |
| 24 | 24 | |
| 25 | 25 | //-- 商品 -- |
| 26 | - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 26 | + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 27 | 27 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 28 | 28 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 29 | 29 | th.setData({acne_goods:res.data.data.pageData}) | ... | ... |
packageB/pages/AI-test-skin/success_result/blackhead/blackhead.js
| ... | ... | @@ -10,7 +10,7 @@ module.exports = { |
| 10 | 10 | }) |
| 11 | 11 | var re_word=set.join(','); |
| 12 | 12 | //-- 服务卡 -- |
| 13 | - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 13 | + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 14 | 14 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 15 | 15 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 16 | 16 | th.setData({blackhead_fuwu:res.data.data.pageData}) |
| ... | ... | @@ -18,7 +18,7 @@ module.exports = { |
| 18 | 18 | }) |
| 19 | 19 | |
| 20 | 20 | //-- 商品 -- |
| 21 | - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 21 | + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 22 | 22 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 23 | 23 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 24 | 24 | th.setData({blackhead_goods:res.data.data.pageData}) | ... | ... |
packageB/pages/AI-test-skin/success_result/dark/dark.js
| ... | ... | @@ -14,7 +14,7 @@ module.exports = { |
| 14 | 14 | //获取黑眼圈的类型 |
| 15 | 15 | var re_word= arr.join(',') |
| 16 | 16 | //-- 服务卡 -- |
| 17 | - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 17 | + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 18 | 18 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 19 | 19 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 20 | 20 | th.setData({dark_fuwu:res.data.data.pageData}) |
| ... | ... | @@ -22,7 +22,7 @@ module.exports = { |
| 22 | 22 | }) |
| 23 | 23 | |
| 24 | 24 | //-- 商品 -- |
| 25 | - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 25 | + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 26 | 26 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 27 | 27 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 28 | 28 | th.setData({dark_goods:res.data.data.pageData}) | ... | ... |
packageB/pages/AI-test-skin/success_result/pore/pore.js
| ... | ... | @@ -10,7 +10,7 @@ module.exports = { |
| 10 | 10 | }) |
| 11 | 11 | var re_word=set.join(','); |
| 12 | 12 | //-- 服务卡 -- |
| 13 | - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 13 | + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 14 | 14 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 15 | 15 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 16 | 16 | th.setData({pore_fuwu:res.data.data.pageData}) |
| ... | ... | @@ -18,7 +18,7 @@ module.exports = { |
| 18 | 18 | }) |
| 19 | 19 | |
| 20 | 20 | //-- 商品 -- |
| 21 | - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 21 | + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 22 | 22 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 23 | 23 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 24 | 24 | th.setData({pore_goods:res.data.data.pageData}) | ... | ... |
packageB/pages/AI-test-skin/success_result/sensitive/sensitive.js
0 → 100644
| 1 | +module.exports = { | |
| 2 | + //把组合购的商品价格计算出来,同时每个会员都有购买组合商品的上限！ladder_b_num是已经购买了多少件 | |
| 3 | + get_goods: function(th,stoid) { | |
| 4 | + var r_code='12'; | |
| 5 | + //获取毛孔的类型 | |
| 6 | + var arr=th.data.face_data.skinquality.skin_sensitive_check; | |
| 7 | + //去掉重复 | |
| 8 | + var set= arr.filter(function (element, index, self) { | |
| 9 | + return self.indexOf(element) === index; | |
| 10 | + }) | |
| 11 | + var re_word=set.join(','); | |
| 12 | + //-- 服务卡 -- | |
| 13 | + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 14 | + getApp().request.promiseGet(url, {}).then(res=>{ | |
| 15 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 16 | + th.setData({sensitive_fuwu:res.data.data.pageData}) | |
| 17 | + } | |
| 18 | + }) | |
| 19 | + | |
| 20 | + //-- 商品 -- | |
| 21 | + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 22 | + getApp().request.promiseGet(url, {}).then(res=>{ | |
| 23 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 24 | + th.setData({sensitive_goods:res.data.data.pageData}) | |
| 25 | + } | |
| 26 | + }) | |
| 27 | + // 优惠券 | |
| 28 | + | |
| 29 | + }, | |
| 30 | +} | ... | ... |
packageB/pages/AI-test-skin/success_result/sensitive/sensitive.wxml
0 → 100644
| 1 | +<view class="mb_b5" id="mao_kong"> | |
| 2 | + <view class="analyse_classify bg_white"> | |
| 3 | + <view class="analyse_classify_header"> | |
| 4 | + <view> | |
| 5 | + <view style="color: #45d4eb;">#01</view> | |
| 6 | + <view class="flex-space-between"> | |
| 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;"> | |
| 9 | + <text>问题标注</text> | |
| 10 | + <text class="iconfont icon-xia"></text> | |
| 11 | + </view> | |
| 12 | + </view> | |
| 13 | + </view> | |
| 14 | + <view class="analyse_classify_header_item mt_b5"> | |
| 15 | + <view class="analyse_classify_header_img"> | |
| 16 | + <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image> | |
| 17 | + </view> | |
| 18 | + <view style="line-height:60rpx;margin-left:20rpx"> | |
| 19 | + <view class="fs28">程度情况</view> | |
| 20 | + <view class="bold">待确定</view> | |
| 21 | + </view> | |
| 22 | + </view> | |
| 23 | + <view class="analyse_classify_header_item mt_b5"> | |
| 24 | + <view class="analyse_classify_header_img"> | |
| 25 | + <image src="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image> | |
| 26 | + </view> | |
| 27 | + <view style="line-height:60rpx;margin-left:20rpx"> | |
| 28 | + <view class="fs28">敏感度得分</view> | |
| 29 | + <view class="bold">待确定</view> | |
| 30 | + </view> | |
| 31 | + </view> | |
| 32 | + <view class="fs28 mt_b10"> | |
| 33 | + <text>明显可见毛孔或内含小于毛孔大小角栓</text> | |
| 34 | + </view> | |
| 35 | + </view> | |
| 36 | + <view class="analyse_classify_body"> | |
| 37 | + <view class="mt_b10"> | |
| 38 | + <view class="fenxi mgb10">原因分析</view> | |
| 39 | + <view class="flex" style="flex-wrap: wrap"> | |
| 40 | + <view style="margin-right: 20rpx"> | |
| 41 | + <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text> | |
| 42 | + <text class="fs26">皮脂腺分泌旺盛</text> | |
| 43 | + </view> | |
| 44 | + <view style="margin-right: 20rpx"> | |
| 45 | + <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text> | |
| 46 | + <text class="fs26">日光暴晒过度</text> | |
| 47 | + </view> | |
| 48 | + <view style="margin-right: 20rpx"> | |
| 49 | + <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text> | |
| 50 | + <text class="fs26">护肤不当清洁不足</text> | |
| 51 | + </view> | |
| 52 | + </view> | |
| 53 | + </view> | |
| 54 | + | |
| 55 | + <view class="mt_b10"> | |
| 56 | + <view class="fenxi mgb10">护理建议</view> | |
| 57 | + <view class=""> | |
| 58 | + <view class="mgb30"> | |
| 59 | + <text style="font-size: 28rpx;margin-right: 10rpx;"><text class="bold">01</text> 日常防晒</text> | |
| 60 | + <view class="fs26 c_666">用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根使用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根大股东是公司山豆根山豆根收到二十个的山豆根山豆根</view> | |
| 61 | + </view> | |
| 62 | + <view class="mgb30"> | |
| 63 | + <text style="font-size: 28rpx;margin-right: 10rpx;"><text class="bold">02</text> 补水保湿</text> | |
| 64 | + <view class="fs26 c_666">用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根使用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根大股东是公司山豆根山豆根收到二十个的山豆根山豆根</view> | |
| 65 | + </view> | |
| 66 | + <view class="mgb30"> | |
| 67 | + <text style="font-size: 28rpx;margin-right: 10rpx;"><text class="bold">03</text> 早晚清洁</text> | |
| 68 | + <view class="fs26 c_666">用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根使用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根大股东是公司山豆根山豆根收到二十个的山豆根山豆根</view> | |
| 69 | + </view> | |
| 70 | + </view> | |
| 71 | + </view> | |
| 72 | + </view> | |
| 73 | + </view> | |
| 74 | + | |
| 75 | + <view class="analyse_classify_foot" style="background:#e6f4fa"> | |
| 76 | + <!-- 服务卡 --> | |
| 77 | + <view wx:if="{{sensitive_fuwu}}"> | |
| 78 | + <view style="margin:5% 0">敏感度问题的疗程</view> | |
| 79 | + <block wx:for="{{sensitive_fuwu}}"> | |
| 80 | + <include src="../fuwu.wxml" /> | |
| 81 | + </block> | |
| 82 | + </view> | |
| 83 | + <!-- 商品 --> | |
| 84 | + <view wx:if="{{sensitive_goods}}"> | |
| 85 | + <view style="margin:5% 0">适合敏感度问题的护肤品</view> | |
| 86 | + <view class="product flex"> | |
| 87 | + <block wx:for="{{sensitive_goods}}"> | |
| 88 | + <include src="../goods.wxml" /> | |
| 89 | + </block> | |
| 90 | + </view> | |
| 91 | + </view> | |
| 92 | + </view> | |
| 93 | +</view> | |
| 0 | 94 | \ No newline at end of file | ... | ... |
packageB/pages/AI-test-skin/success_result/speckle/speckle.js
| ... | ... | @@ -15,7 +15,7 @@ module.exports = { |
| 15 | 15 | }) |
| 16 | 16 | var re_word=set.join(','); |
| 17 | 17 | //-- 服务卡 -- |
| 18 | - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 18 | + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 19 | 19 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 20 | 20 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 21 | 21 | th.setData({speckle_fuwu:res.data.data.pageData}) |
| ... | ... | @@ -23,7 +23,7 @@ module.exports = { |
| 23 | 23 | }) |
| 24 | 24 | |
| 25 | 25 | //-- 商品 -- |
| 26 | - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=1000"; | |
| 26 | + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; | |
| 27 | 27 | getApp().request.promiseGet(url, {}).then(res=>{ |
| 28 | 28 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 29 | 29 | th.setData({speckle_goods:res.data.data.pageData}) | ... | ... |
packageB/pages/AI-test-skin/success_result/success_result.wxml