diff --git a/app.js b/app.js index dae9f42..f24da70 100644 --- a/app.js +++ b/app.js @@ -51,7 +51,7 @@ App({ config: null, //门店参数 config2: null, //门店配置 code: null, - user_id: 5682094,//1564704,// 10153869,// 6453964,//5682094,6520044,6520119 qa 4687 6519901 + user_id: null,//1564704,// 10153869,// 6453964,//5682094,6520044,6520119 qa 4687 6519901 buy_now: null, picklist: null, //门店列表 wuliuprice: null, //物流价格表 diff --git a/packageA/pages/jfbuy/jfbuy.wxss b/packageA/pages/jfbuy/jfbuy.wxss index d7d08bc..e30a18b 100644 --- a/packageA/pages/jfbuy/jfbuy.wxss +++ b/packageA/pages/jfbuy/jfbuy.wxss @@ -130,7 +130,7 @@ page { .img-container { background-color: #f0f0f0; width: 280rpx; - height: 248rpx; + height: 280rpx; display: flex; align-items: center; justify-content: center; diff --git a/packageD/pages/AI-test-skin/analyse/analyse.json b/packageD/pages/AI-test-skin/analyse/analyse.json index 8835af0..a9c180d 100644 --- a/packageD/pages/AI-test-skin/analyse/analyse.json +++ b/packageD/pages/AI-test-skin/analyse/analyse.json @@ -1,3 +1,4 @@ { - "usingComponents": {} + "usingComponents": {}, + "navigationBarTitleText": "测肤报告" } \ No newline at end of file diff --git a/packageD/pages/AI-test-skin/analyse/analyse.wxml b/packageD/pages/AI-test-skin/analyse/analyse.wxml index f27fc6e..60b0fda 100644 --- a/packageD/pages/AI-test-skin/analyse/analyse.wxml +++ b/packageD/pages/AI-test-skin/analyse/analyse.wxml @@ -1,9 +1,10 @@ - + - - 正在分析... - + + 正在分析... + diff --git a/packageD/pages/AI-test-skin/analyse/analyse.wxss b/packageD/pages/AI-test-skin/analyse/analyse.wxss index 600a029..426f8a6 100644 --- a/packageD/pages/AI-test-skin/analyse/analyse.wxss +++ b/packageD/pages/AI-test-skin/analyse/analyse.wxss @@ -29,13 +29,13 @@ page { display: inline-block; width: 350px; height: 350px; - transform: scale(0.5); - animation: 1s mymove infinite steps(27, end); + transform: scale(0.4); + animation: 2s mymove infinite steps(27, end); } .progress { margin-top: 3%; - width: 60%; + width: 48%; /* text-align: center; */ margin-left: 50%; transform: translateX(-50%); diff --git a/packageD/pages/AI-test-skin/fail_result/fail_result.wxss b/packageD/pages/AI-test-skin/fail_result/fail_result.wxss index b3457de..51a0f2e 100644 --- a/packageD/pages/AI-test-skin/fail_result/fail_result.wxss +++ b/packageD/pages/AI-test-skin/fail_result/fail_result.wxss @@ -25,10 +25,10 @@ page { margin: 70rpx 0 30rpx 50%; transform: translateX(-50%); background: #4bd6df; - padding: 20rpx; - width: 50%; + padding: 15rpx 10rpx; + width: 46%; text-align: center; - border-radius: 40rpx; + border-radius: 50rpx; color: #fff; } .btn_fixed { diff --git a/packageD/pages/AI-test-skin/history_record/history_record.js b/packageD/pages/AI-test-skin/history_record/history_record.js index 1c1e44f..a1f954d 100644 --- a/packageD/pages/AI-test-skin/history_record/history_record.js +++ b/packageD/pages/AI-test-skin/history_record/history_record.js @@ -234,6 +234,20 @@ Page({ arr.push(time_obj); } } + function _sort_by_history_time (property){ + return function(a,b){ + let val1 = a[property]; + let val2 = b[property]; + if(val2 > val1){ + return 1 + }else if(val2 < val1){ + return -1 + }else{ + return 0 + } + } + } + arr.sort(_sort_by_history_time('history_time')); return arr; }, diff --git a/packageD/pages/AI-test-skin/index/aiskin.wxml b/packageD/pages/AI-test-skin/index/aiskin.wxml index fb38b4c..0bb66b7 100644 --- a/packageD/pages/AI-test-skin/index/aiskin.wxml +++ b/packageD/pages/AI-test-skin/index/aiskin.wxml @@ -1,10 +1,12 @@ - - 历史档案 - + + 历史档案 + - - - 开始测肤 + + + + 开始测肤 + \ No newline at end of file diff --git a/packageD/pages/AI-test-skin/index/aiskin.wxss b/packageD/pages/AI-test-skin/index/aiskin.wxss index cd27949..04e15c2 100644 --- a/packageD/pages/AI-test-skin/index/aiskin.wxss +++ b/packageD/pages/AI-test-skin/index/aiskin.wxss @@ -1,16 +1,7 @@ -/* packageB/pages/AI-test-skin/aiskin.wxss */ -page { - width: 100%; - height: 100%; -} -image { - width: 100vw; - height: 100%; -} + .container1 { position: relative; width: 100%; - height: 100%; } .history { margin-top: 30rpx; @@ -21,18 +12,19 @@ image { border-radius: 50rpx 0 0 50rpx; box-shadow: 0 0 2px 2px #f7f5f5; color: #4ad5df; + align-items: center; + z-index: 100; } .start_btn { - position: fixed; - bottom: 50rpx; - /* margin: auto; */ - /* text-align: center; */ margin-left: 50%; transform: translateX(-50%); background: #4bd6df; - padding: 20rpx; + padding:16rpx 20rpx; width: 67%; text-align: center; border-radius: 40rpx; color: #fff; + font-size: 30rpx; + position:absolute; + bottom: 90rpx; } \ No newline at end of file diff --git a/packageD/pages/AI-test-skin/select_photo/select_photo.wxml b/packageD/pages/AI-test-skin/select_photo/select_photo.wxml index b9fd5d9..e71d53b 100644 --- a/packageD/pages/AI-test-skin/select_photo/select_photo.wxml +++ b/packageD/pages/AI-test-skin/select_photo/select_photo.wxml @@ -1,6 +1,6 @@ - - + + diff --git a/packageD/pages/AI-test-skin/select_photo/select_photo.wxss b/packageD/pages/AI-test-skin/select_photo/select_photo.wxss index cc1af5f..3bb701c 100644 --- a/packageD/pages/AI-test-skin/select_photo/select_photo.wxss +++ b/packageD/pages/AI-test-skin/select_photo/select_photo.wxss @@ -23,9 +23,8 @@ page { .foot_btn .ok_btn { background: #5dd9dc; - padding: 0 50rpx; + padding: 16rpx 40rpx; border-radius: 50rpx; /* margin: 0 auto; */ - line-height: 100rpx; color: #fff; } diff --git a/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js index 623b83d..ce7ce0e 100644 --- a/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js +++ b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js @@ -1,7 +1,7 @@ /* * @Author: abson * @Date: 2022-02-15 10:01:57 - * @LastEditTime: 2022-02-17 09:40:38 + * @LastEditTime: 2022-02-28 15:37:20 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AEet urkl * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\shoot_notice\shoot_notice.js @@ -19,6 +19,7 @@ Page({ */ data: { iurl: setting.imghost, + notice_show:"", }, /** @@ -32,7 +33,11 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - + setTimeout(()=>{ + this.setData({ + notice_show:'none', + }) + },3000).bind(this) }, /** @@ -64,15 +69,15 @@ Page({ }, //从相册中选择图片 - show_pai_pop:function () { + show_pai_pop: function () { //选择和拍照一张图片 wx.chooseImage({ count: 1, sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], - success (res) { - let imgArr = res.tempFilePaths; - getApp().globalData.skin_img=imgArr[0]; + success(res) { + let imgArr = res.tempFiles; + getApp().globalData.skin_img_info = imgArr[0]; let url = "/packageD/pages/AI-test-skin/select_photo/select_photo"; app.goto(url); } diff --git a/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxml b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxml index 99642af..b99fc67 100644 --- a/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxml +++ b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxml @@ -1,5 +1,6 @@ + 根据要求拍摄，测肤结果更准确。 准备工作 diff --git a/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxss b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxss index f098f26..3b40331 100644 --- a/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxss +++ b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxss @@ -6,7 +6,31 @@ page { box-sizing: border-box; background-color: #e7f5fb; } + +@keyframes notice_show { + 0% { + top: -999rpx; + } + + 100% { + top: 10rpx; + } +} + +.notice_show { + text-align: center; + padding: 30rpx; + color: skyblue; + position: absolute; + right: 10%; + box-shadow: #f0f0f0 0px 0px 5px; + z-index: 999; + background: #fff; + animation: 2s notice_show linear; +} + .content { + position: relative; width: 100%; /* height: 100%; */ border-radius: 25rpx; @@ -26,11 +50,12 @@ page { align-items: center; margin-bottom: 40rpx } + .content .ready1 { display: flex; flex-direction: column; align-items: center; - padding-bottom: 50rpx ; + padding-bottom: 50rpx; /* margin-bottom: 40rpx */ } @@ -65,19 +90,21 @@ page { .content image { height: 100%; } + .btn { - + /* height: 150rpx; */ /* margin-left: 50%; */ margin: 70rpx 0 30rpx 50%; transform: translateX(-50%); background: #4bd6df; - padding: 20rpx; + padding: 15rpx 15rpx; width: 50%; text-align: center; - border-radius: 40rpx; + border-radius: 50rpx; color: #fff; } + .btn_fixed { position: fixed; width: 100%; @@ -85,6 +112,7 @@ page { height: 300rpx; background: #e7f5fb; } + .notice { text-align: center; color: red; @@ -98,36 +126,71 @@ page { right: 0; bottom: 0; z-index: 11; - background: rgba(0,0,0,0.4); + background: rgba(0, 0, 0, 0.4); width: 100%; height: 100%; } -.flex{display: flex} -.jc-center{ +.flex { + display: flex +} + +.jc-center { justify-content: center; } -.ac{align-items: center} -.pai_content{ - position: fixed;z-index: 100;bottom: 0;background: #FFFFFF;width: 100%; - border-top-left-radius:30rpx; - border-top-right-radius:30rpx; + +.ac { + align-items: center } -.p_item{ height: 100rpx; line-height: 100rpx;text-align: center; border-bottom: 1rpx solid #eee} -.p_cancle{height: 100rpx; line-height: 100rpx;text-align: center; border-top:20rpx solid #f8f8f8;} -@keyframes p_up -{ - from {transform:translateY(100%);} - to {transform:translateY(0);} +.pai_content { + position: fixed; + z-index: 100; + bottom: 0; + background: #FFFFFF; + width: 100%; + border-top-left-radius: 30rpx; + border-top-right-radius: 30rpx; +} + +.p_item { + height: 100rpx; + line-height: 100rpx; + text-align: center; + border-bottom: 1rpx solid #eee +} + +.p_cancle { + height: 100rpx; + line-height: 100rpx; + text-align: center; + border-top: 20rpx solid #f8f8f8; } -@keyframes p_down -{ - from {transform:translateY(0);} - to {transform:translateY(100%);} +@keyframes p_up { + from { + transform: translateY(100%); + } + + to { + transform: translateY(0); + } } -.p_to_up{animation:p_up 1s;} -.p_to_down{animation:p_down 0.5s;} +@keyframes p_down { + from { + transform: translateY(0); + } + + to { + transform: translateY(100%); + } +} + +.p_to_up { + animation: p_up 1s; +} +.p_to_down { + animation: p_down 0.5s; +} \ No newline at end of file diff --git a/packageD/pages/AI-test-skin/success_result/success_result.js b/packageD/pages/AI-test-skin/success_result/success_result.js index e00232d..d764c24 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.js +++ b/packageD/pages/AI-test-skin/success_result/success_result.js @@ -1,7 +1,7 @@ /* * @Author: abson * @Date: 2022-02-16 15:36:47 - * @LastEditTime: 2022-02-25 11:30:33 + * @LastEditTime: 2022-02-28 10:44:27 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js @@ -24,7 +24,7 @@ Page({ * 页面的初始数据 */ data: { - tab: [{ id: 'zong_he', name: '综合肤质' }, { id: 'mao_kong', name: '毛孔' }, { id: 'hei_tou', name: '黑头' }, { id: 'se_ban', name: '色斑' }, { id: 'zhou_wen', name: '皱纹' }, { id: 'hei_yan_quan', name: '黑眼圈' }, { id: 'cuo_chuang', name: '痤疮' }, { id: 'min_gan_du', name: '敏感度' }], + // tab: [{ id: 'zong_he', name: '综合肤质' }, { id: 'mao_kong', name: '毛孔' }, { id: 'hei_tou', name: '黑头' }, { id: 'se_ban', name: '色斑' }, { id: 'zhou_wen', name: '皱纹' }, { id: 'hei_yan_quan', name: '黑眼圈' }, { id: 'cuo_chuang', name: '痤疮' }, { id: 'min_gan_du', name: '敏感度' }], zhouwen_arr: [{ id: 1, name: '全部皱纹' }, { id: 2, name: '抬头纹' }, { id: 3, name: '川字纹' }, { id: 4, name: '眼周细纹' }, { id: 5, name: '鱼尾纹' }, { id: 6, name: '法令纹' }, { id: 7, name: '口周纹' }], cuochuang_arr: [{ id: 1, name: '全部痤疮' }, { id: 2, name: '粉刺 ' }, { id: 3, name: '痘印 ' }, { id: 4, name: '脓包' }, { id: 5, name: '结节' }], zhouwen_arr1: [{ id: 1, name: '皱纹/细纹',des:'是指皮肤受到外界环境影响，形成游离自由基，自由基破坏正常细胞膜组织内的胶原蛋白、活性物质，氧化细胞，或缺水而形成的小细纹，继而严重形成皱纹',sign: 'zhou1',sign1: 'zhou2' }, { id: 2, name: '抬头皱纹/抬头细纹',des:'位于额头的皱纹、细纹。形成原因因人而异，后天因素是比较少的。-般多为横纹， 竖纹较少见。' ,sign: 'zhou3',sign1:'zhou4'}, { id: 3, name: '眼部皱纹/眼部细纹',des:'眼部皱纹、细纹一般位于下眼睑部位，多见于下脸内1/3处。',sign:'zhou5',sign1:'zhou6' }, { id: 4, name: '鱼尾纹',des:'眼部皱纹的一种，是在人两侧外眼角和登角之间出现的皱纹，其纹路与鱼尾巴上的纹路很相似，故被形象地称为鱼尾纹。',sign:'zhou7',sign1:'zhou8' }, { id: 5, name: '眉间纹',des:'又叫川字纹，皱眉纹，是面部的一种正常的表情纹，随着年龄的增长，面部的皱纹会逐渐加深，双眉之间逐渐形成了较深的皱折，会使人看起来总是愁眉不展。',sign:'zhou9',sign1:'zhou10'}, { id: 6, name: '泪沟',des:'泪沟是指由内眼角开始出现在下眼睑靠鼻侧的两条凹沟，是由于眼眶隔膜下缘的软组织萎缩、下垂而生成的。',sign:'zhou11',sign1:'zhou12' }, { id: 7, name: '法令纹',des:'法令纹是位于鼻翼边延伸而下的两道纹路，是典型的皮肤组织老化、造成肌肤表面凹陷的现象。',sign:'zhou15',sign1:'zhou16' }, { id: 8, name: '口角纹',des:'口角纹又称木偶纹、括号纹，位于嘴角延伸而下的两道纹路，是表情肌、重力和遗传基因等几方面因素综合形成的。',sign:'zhou13',sign1:'zhou14' }], @@ -199,7 +199,26 @@ Page({ return e.type==3; }) th.data.acne_num4=a_arr.length; - + let tab_arr = [{ id: 'zong_he', name: '综合肤质' }]; + if(pore_num) { + tab_arr.push({ id: 'mao_kong', name: '毛孔' }); + } + if(blackhead_num){ + tab_arr.push({ id: 'hei_tou', name: '黑头' }); + } + if(speckle_num){ + tab_arr.push({ id: 'se_ban', name: '色斑' }); + } + if(wrinkle_num){ + tab_arr.push({ id: 'zhou_wen', name: '皱纹' }); + } + if(dark_type > -1) { + tab_arr.push( { id: 'hei_yan_quan', name: '黑眼圈' }); + } + if(acne_num){ + tab_arr.push({ id: 'cuo_chuang', name: '痤疮' }); + } + tab_arr.push( { id: 'min_gan_du', name: '敏感度' }); th.setData({ acne_num: acne_num, speckle_num: speckle_num, @@ -219,6 +238,7 @@ Page({ bili: bili, bili_eye:bili_eye, sex:sex, + tab:tab_arr, skin_dryoil_check_type:skin_dryoil_check_type, eye_top:eye_top* bili_eye, eye_left1:eye_left1* bili_eye, 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 6220f88..a0ab3df 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.wxml +++ b/packageD/pages/AI-test-skin/success_result/success_result.wxml @@ -130,7 +130,7 @@ - + @@ -237,7 +237,7 @@ --> - + @@ -259,31 +259,31 @@ - 毛孔粗大{{pore_num}} - 色斑{{speckle_num}} + 毛孔粗大：{{pore_num}} + 色斑：{{speckle_num}} - 全部皱纹{{wrinkle_num}} - 抬头纹{{wrinkle_num1}} - 川字纹{{wrinkle_num2}} - 眼周细纹{{wrinkle_num3}} - 鱼尾纹{{wrinkle_num4}} - 法令纹{{wrinkle_num5}} - 口周纹{{wrinkle_num6}} + 全部皱纹：{{wrinkle_num}} + 抬头纹：{{wrinkle_num1}} + 川字纹：{{wrinkle_num2}} + 眼周细纹：{{wrinkle_num3}} + 鱼尾纹：{{wrinkle_num4}} + 法令纹：{{wrinkle_num5}} + 口周纹：{{wrinkle_num6}} - 黑头{{blackhead_num}} + 黑头：{{blackhead_num}} - 黑眼圈 {{s_filter.get_dark_type(dark_type)}} - 左眼黑眼圈 {{s_filter.get_dark_type(dark_type1)}} - 右眼黑眼圈 {{s_filter.get_dark_type(dark_type2)}} + 黑眼圈：{{s_filter.get_dark_type(dark_type)}} + 左眼黑眼圈：{{s_filter.get_dark_type(dark_type1)}} + 右眼黑眼圈：{{s_filter.get_dark_type(dark_type2)}} - 全部痤疮{{acne_num}} - 粉刺{{acne_num1}} - 痘印{{acne_num2}} - 脓包{{acne_num3}} - 结节{{acne_num4}} + 全部痤疮：{{acne_num}} + 粉刺：{{acne_num1}} + 痘印：{{acne_num2}} + 脓包：{{acne_num3}} + 结节：{{acne_num4}} - 敏感度{{s_filter.get_nai_shou(skin_sensitive_check)}} + 敏感度：{{s_filter.get_nai_shou(skin_sensitive_check)}} @@ -305,10 +305,7 @@ - - - @@ -401,8 +398,8 @@ {{item.des}} - - + + @@ -415,7 +412,7 @@ - + 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 8358dc7..24be046 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.wxss +++ b/packageD/pages/AI-test-skin/success_result/success_result.wxss @@ -11,6 +11,7 @@ page { z-index: 99; display: flex; height: 100rpx; + background-color: #fff; } .share { @@ -18,12 +19,13 @@ page { position: fixed; bottom: 100rpx; right: 0; - padding: 20rpx; + padding:8rpx 20rpx; background-color: #fff; border: 2rpx solid #f0f0f0; /* color: #FFF; */ border-radius: 40rpx 0 0 40rpx; z-index: 99; + align-items: center; } .tab_scroll_item { @@ -447,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; } @@ -463,7 +464,7 @@ page { flex-direction: column; justify-content: space-evenly; background-color: #fff; - min-height: 25%; + min-height: 10%; } .dialog_txt .heiyanquan_img { @@ -472,7 +473,7 @@ page { } .dialog_txt .heiyanquan_img .img1 { - width: 32%; + width: 32%;color: #777; } .dialog .dialog_progress { @@ -491,6 +492,7 @@ page { padding: 3% 5%; white-space: nowrap; background-color: #fff; + color: #a9a9a9; } .dialog .dialog_icon { @@ -735,7 +737,7 @@ page { line-height: 80rpx; text-align: center; color: #fff; - background-color: #c3172d + background-color: #45d4eb } .sh_close { @@ -843,6 +845,7 @@ page { } .yiwen_img { + width: 100%; margin-top: 40rpx; /* width: 600rpx; height: 600rpx; */ @@ -856,4 +859,10 @@ page { top: 15px; position: absolute; right: 50rpx; -} \ No newline at end of file +} + +::-webkit-scrollbar { + width: 0; + height: 0; + color: transparent; +} diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index 7c9780e..7979aad 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -727,14 +727,19 @@ Page({ //--转到用户余额-- to_user_money:function(){ - this.setData({yu_e_show:1}) + //提现小于0的值也不提现 + if(!this.data.free.VIPRebate || parseFloat(this.data.free.VIPRebate)<=0){ + getApp().my_warnning("您目前没有可提现的金额",0,th); return false; + } + this.setData({yu_e_show:1}) }, close_yu_e:function(){ this.setData({yu_e_show:0}) }, go_yu_e:function(){ var th=this,free=th.data.free; - if(!th.data.free.VIPRebate){ + //提现小于0的值也不提现 + if(!th.data.free.VIPRebate || parseFloat(th.data.free.VIPRebate)<=0){ getApp().my_warnning("您目前没有可提现的金额",0,th); return false; } wx.showModal({