diff --git a/app.json b/app.json
index 5917eb6..15d90df 100644
--- a/app.json
+++ b/app.json
@@ -154,14 +154,8 @@
"pages/user/choice_guide/choice_guide",
"pages/video/index",
"pages/boxes-list/boxes-list",
- "pages/boxes-details/boxes-details",
- "pages/AI-test-skin/index/aiskin",
- "pages/AI-test-skin/shoot_notice/shoot_notice",
- "pages/AI-test-skin/history_record/history_record",
- "pages/AI-test-skin/select_photo/select_photo",
- "pages/AI-test-skin/fail_result/fail_result",
- "pages/AI-test-skin/success_result/success_result",
- "pages/AI-test-skin/analyse/analyse"
+ "pages/boxes-details/boxes-details"
+
]
},
{
@@ -187,6 +181,19 @@
"pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo",
"pages/luckyGo/luckyGo_activityList/luckyGo_activityList"
]
+ },
+ {
+ "root": "packageD/",
+ "name": "pack4",
+ "pages": [
+ "pages/AI-test-skin/index/aiskin",
+ "pages/AI-test-skin/shoot_notice/shoot_notice",
+ "pages/AI-test-skin/history_record/history_record",
+ "pages/AI-test-skin/select_photo/select_photo",
+ "pages/AI-test-skin/fail_result/fail_result",
+ "pages/AI-test-skin/success_result/success_result",
+ "pages/AI-test-skin/analyse/analyse"
+ ]
}
],
"permission": {
diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 1aa3464..6064565 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -449,7 +449,7 @@ Component({
var now = ut.gettimestamp();
var th = this;
if (!goods || goods.length == 0) return false;
- var user_id = getApp().globalData.userInfo.user_id;
+ var user_id = getApp().globalData.user_id;
if (!user_id) user_id = 0;
for (var i in goods) {
var val = goods[i];
diff --git a/packageB/pages/AI-test-skin/history_record/history_record.wxml b/packageB/pages/AI-test-skin/history_record/history_record.wxml
deleted file mode 100644
index 3faa719..0000000
--- a/packageB/pages/AI-test-skin/history_record/history_record.wxml
+++ /dev/null
@@ -1,68 +0,0 @@
-
- 历史分析
-
-
-
-
-
- 注：请确保多次拍摄姿态和环境光线一致。拍摄姿态的偏移、环境光线变化或者皮肤状态变化都可能导致分数较大波动。
-
-
- 历史报告
-
-
-
- 2022年02月
-
- 2022/02/19 15:35
- 73分
-
-
- 2022/02/19 15:35
- 73分
-
-
- 2022/02/19 15:35
- 73分
-
-
- 2022/02/19 15:35
- 73分
-
-
- 2022/02/19 15:35
- 73分
-
-
- 2022/02/19 15:35
- 73分
-
-
- 2022/02/19 15:35
- 73分
-
-
- 2022/02/19 15:35
- 73分
-
-
- 2022/02/19 15:35
- 73分
-
-
-
- 2022年02月
-
- 2022/02/19 15:35
- 73分
-
-
-
- 2022年02月
-
- 2022/02/19 15:35
- 73分
-
-
-
-
\ No newline at end of file
diff --git a/packageB/pages/AI-test-skin/success_result/success_result.js b/packageB/pages/AI-test-skin/success_result/success_result.js
deleted file mode 100644
index a15fbc4..0000000
--- a/packageB/pages/AI-test-skin/success_result/success_result.js
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * @Author: abson
- * @Date: 2022-02-16 15:36:47
- * @LastEditTime: 2022-02-21 16:07:09
- * @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
- */
-// packageB/pages/AI-test-skin/success_result/success_result.js
-const app = getApp();
-const request = app.request;
-const os = app.globalData;
-const setting = os.setting;
-const ut = require('../../../../utils/util');
-//毛孔
-const acne = require('acne/acne');
-const blackhead = require('blackhead/blackhead');
-const dark = require('dark/dark');
-const pore = require('pore/pore');
-const speckle = require('speckle/speckle');
-const wrinkle = require('wrinkle/wrinkle');
-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: 'ming_gan_ji', name: '敏感度' }],
- currentIndex: 0,
- tab_id: 'zong_he',
- iurl: setting.imghost,
- showDialog: false,
- yanjing: true, //显示皮肤问题
- img_scale: true, //问题标注放大图片
- img_scale_icon:true,
- show_problem:1, //问题标注显示问题
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- var th=this;
- //初始化一下，获取商品的价格
- this.init();
- //var face_result=getApp().globalData.face_result;
- //var face_data=face_result.face_list[0];
- this.data.id=options.id;
-
- //计算图片要显示的大小
- th.data.cWidth = wx.getSystemInfoSync().windowWidth;
- th.data.cHeight = wx.getSystemInfoSync().windowHeight;
- th.data.face_height=th.data.cHeight*0.8*0.8;
-
- this.get_data(function (json,img) {
- //-- 数据先存着 --
- var face_data=th.data.face_data=json.face_list[0];
- //痤疮数
- var acne_num=face_data.acnespotmole.acne_num;
- //色斑数
- var speckle_num=face_data.acnespotmole.speckle_num;
- //皱纹数
- var wrinkle_num=face_data.wrinkle.wrinkle_num;
- //黑头数
- var blackhead_num=face_data.blackheadpore.blackhead_num;
- //毛孔数
- var pore_num=face_data.blackheadpore.pore_num;
- //黑眼圈的严重程度
- var dark_type=face_data.eyesattr.dark_circle_left_type.length>0?face_data.eyesattr.dark_circle_left_type[0]:-1;
- var dark_type1=face_data.eyesattr.dark_circle_right_type.length>0?face_data.eyesattr.dark_circle_right_type[0]:-1;
- if(dark_type1>dark_type){
- dark_type=dark_type1;
- }
- var skin_sensitive_check= parseInt(face_data.skinquality.skin_sensitive_check[0]);
- var skin_dryoil_check=face_data.skinquality.skin_dryoil_check;
-
- var location=face_data.location;
- th.data.bili=th.data.face_height/(location.height+location.height/2.3);
-
- th.setData({
- acne_num:acne_num,
- speckle_num:speckle_num,
- wrinkle_num:wrinkle_num,
- blackhead_num:blackhead_num,
- pore_num:pore_num,
- dark_type:dark_type,
- skin_sensitive_check:skin_sensitive_check,
- skin_dryoil_check:skin_dryoil_check,
- face_img:img,
- m_top:(location.top-location.height/2.5)*th.data.bili,
- m_left:(location.left-location.width/7)*th.data.bili,
- bili:th.data.bili
- })
- //-- 调用毛孔的推荐函数 --
- if(pore_num>0)
- pore.get_goods(th,setting.stoid);
- //-- 调用黑头的推荐函数 --
- if(blackhead_num>0)
- blackhead.get_goods(th,setting.stoid);
- //-- 调用色斑的推荐函数 --
- if(speckle_num>0)
- speckle.get_goods(th,setting.stoid);
- //-- 调用皱纹的推荐函数 --
- if(wrinkle_num>0)
- wrinkle.get_goods(th,setting.stoid);
- //-- 黑眼圈 --
- if(dark_type>-1)
- dark.get_goods(th,setting.stoid);
- //-- 黑眼圈 --
- if(acne_num>-0)
- acne.get_goods(th,setting.stoid);
- })
- },
-
- //-- 初始等级卡 --
- init: function () {
- var th = this;
- if (!getApp().globalData.user_id) return false;
- getApp().request.get("/api/weshop/users/get/" + setting.stoid + "/" + getApp().globalData.user_id, {
- isShowLoading: false,
- success: function (e) {
- if (e.data.code == 0 && e.data && e.data.data) {
- getApp().globalData.userInfo = e.data.data;
- getApp().getConfig2(function (e) {
- var swithc_list = e.switch_list;
- var sw_arr = JSON.parse(swithc_list);
- //---如果后台有开等级卡的开关---
- if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
- th.setData({
- rank_switch: true
- });
- //---回调卡的列表---
- th.getPlusCardType(function (ob) {
- th.setData({
- card_list: ob.card_list
- });
- var ti = setInterval(function () {
- var user = getApp().globalData.userInfo;
- if (!user) return false;
- clearInterval(ti);
- if (user.card_field && user['card_expiredate']) {
- var str = user['card_expiredate'].replace(/-/g, '/');
- var end = new Date(str);
- end = Date.parse(end) / 1000;
- var now = ut.gettimestamp();
- //--- 判断是等级会员，且在有效期范围内 ---
- if (user.card_field && now < end) {
- var card_name = ob.name_map.get(user.card_field);
- if (card_name.length > 4) card_name = card_name.substring(0, 8);
- th.setData({
- card_field: user.card_field,
- card_name: card_name,
- card_list: ob.card_list
- });
- }
- }
- }, 500)
- })
- }
- })
-
- }
- }
- })
- },
- //-- 获取json数据 --
- get_data:function (func) {
- var url="/api/weshop/face/storeSkinface/get/"+setting.stoid+"/"+this.data.id;
- getApp().request.promiseGet(url, {}).then(res=>{
- if(res.data.code==0){
- var json=JSON.parse(res.data.data.resultjson);
- func(json,res.data.data.img)
- }else{
- getApp().showWarning("获取数据失败");
- }
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {},
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {},
-
- clickTab(e) {
- let { index, tab_id } = e.currentTarget.dataset;
- this.setData({
- currentIndex: index,
- tab_id,
- })
- },
- click_yanjing() {
- this.setData({
- yanjing: !this.data.yanjing,
- })
- },
- click_fangda() {
- this.setData({
- img_scale: !this.data.img_scale,
- img_scale_icon:!this.data.yanjing,
- })
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
- show_dailog(e) {
- var type=parseInt(e.currentTarget.dataset.type);
- this.setData({
- showDialog: true,show_type:type
- })
- switch (type){
- case 1: //毛孔
- var pore_list=this.data.face_data.blackheadpore.circles[0].pore;
- this.setData({pore_list:pore_list});
- break;
- case 2://色斑
- var speckle_list=this.data.face_data.acnespotmole.speckle_list;
- this.setData({speckle_list:speckle_list});
- break;
- case 3://皱纹
- var wrinkle_list=this.data.face_data.wrinkle.wrinkle_data;
- this.setData({wrinkle_list:wrinkle_list});
- break;
- case 4://黑头
- var blackhead_list=this.data.face_data.blackheadpore.circles[0].blackhead;
- this.setData({blackhead_list:blackhead_list});
- break;
- case 5://黑眼圈
- var arr=this.data.face_data.eyesattr.dark_circle_left[0];
- var arr2=this.data.face_data.eyesattr.dark_circle_right[0];
- var arr3=[...arr,...arr2];
- this.setData({dark_list:arr3});
- break;
- case 6://痤疮
- var acne_list=this.data.face_data.acnespotmole.acne_list;
- this.setData({acne_list:acne_list});
- break;
- default:
- break
- }
- },
-
- close_dialog() {
- this.setData({
- showDialog: false,
- })
- },
-
- close_mask() {
- this.setData({
- showDialog: false,
- img_scale: true,
- })
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- },
-
- //商品页面跳转
- go_url:function (e) {
- var url=e.currentTarget.dataset.url;
- getApp().goto(url);
- },
-
- //--- 获取卡类列表 ---
- getPlusCardType: function (func) {
- var storid = setting.stoid;
- var th = this;
- getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
-
- if (res.data.code != 0 || !res.data.data) {
- var ob = {
- "card_list": [],
- "name_map": ""
- };
- func(ob);
- return false;
- }
-
- var plusCard = res.data.data;
- var arr = [1219, 2089, 3031];
- var new_arr = new Array();
- var card_name_map = new Map();
-
- var user = getApp().globalData.userInfo;
- if (plusCard) {
- for (var i = 0; i < plusCard.length; i++) {
- if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
- continue;
- }
- var name = "card" + plusCard[i].CorrPrice.toLowerCase();
- card_name_map.set(name, plusCard[i].CardName);
- new_arr.push(plusCard[i]);
-
- }
- }
- var ob = {
- "card_list": new_arr,
- "name_map": card_name_map
- };
- func(ob);
- })
- },
-
- //图片加载的时候，计算图片的像素大小
- face_img_load: function (e) {
- var th=this;
- var imgwidth = e.detail.width;
- var imgheight = e.detail.height;
-
- var w= th.data.cWidth*0.8;
-
- this.setData({
- iwidth:imgwidth*th.data.bili,
- iheight:imgheight*th.data.bili,
- bili1:w/imgwidth //图片放大时候的比例
- })
- },
-})
\ No newline at end of file
diff --git a/packageB/components/ec-canvas/ec-canvas.js b/packageD/components/ec-canvas/ec-canvas.js
index 37ff834..37ff834 100644
--- a/packageB/components/ec-canvas/ec-canvas.js
+++ b/packageD/components/ec-canvas/ec-canvas.js
diff --git a/packageB/components/ec-canvas/ec-canvas.json b/packageD/components/ec-canvas/ec-canvas.json
index e8cfaaf..e8cfaaf 100644
--- a/packageB/components/ec-canvas/ec-canvas.json
+++ b/packageD/components/ec-canvas/ec-canvas.json
diff --git a/packageB/components/ec-canvas/ec-canvas.wxml b/packageD/components/ec-canvas/ec-canvas.wxml
index 88826d9..88826d9 100644
--- a/packageB/components/ec-canvas/ec-canvas.wxml
+++ b/packageD/components/ec-canvas/ec-canvas.wxml
diff --git a/packageB/components/ec-canvas/ec-canvas.wxss b/packageD/components/ec-canvas/ec-canvas.wxss
index 0d64b10..0d64b10 100644
--- a/packageB/components/ec-canvas/ec-canvas.wxss
+++ b/packageD/components/ec-canvas/ec-canvas.wxss
diff --git a/packageB/components/ec-canvas/echarts.js b/packageD/components/ec-canvas/echarts.js
index 016dd56..016dd56 100644
--- a/packageB/components/ec-canvas/echarts.js
+++ b/packageD/components/ec-canvas/echarts.js
diff --git a/packageB/components/ec-canvas/wx-canvas.js b/packageD/components/ec-canvas/wx-canvas.js
index 7b0b453..7b0b453 100644
--- a/packageB/components/ec-canvas/wx-canvas.js
+++ b/packageD/components/ec-canvas/wx-canvas.js
diff --git a/packageB/pages/AI-test-skin/analyse/analyse.js b/packageD/pages/AI-test-skin/analyse/analyse.js
index 0023c27..0023c27 100644
--- a/packageB/pages/AI-test-skin/analyse/analyse.js
+++ b/packageD/pages/AI-test-skin/analyse/analyse.js
diff --git a/packageB/pages/AI-test-skin/analyse/analyse.json b/packageD/pages/AI-test-skin/analyse/analyse.json
index 8835af0..8835af0 100644
--- a/packageB/pages/AI-test-skin/analyse/analyse.json
+++ b/packageD/pages/AI-test-skin/analyse/analyse.json
diff --git a/packageB/pages/AI-test-skin/analyse/analyse.wxml b/packageD/pages/AI-test-skin/analyse/analyse.wxml
index 475638a..475638a 100644
--- a/packageB/pages/AI-test-skin/analyse/analyse.wxml
+++ b/packageD/pages/AI-test-skin/analyse/analyse.wxml
diff --git a/packageB/pages/AI-test-skin/analyse/analyse.wxss b/packageD/pages/AI-test-skin/analyse/analyse.wxss
index ac83838..ac83838 100644
--- a/packageB/pages/AI-test-skin/analyse/analyse.wxss
+++ b/packageD/pages/AI-test-skin/analyse/analyse.wxss
diff --git a/packageB/pages/AI-test-skin/fail_result/fail_result.js b/packageD/pages/AI-test-skin/fail_result/fail_result.js
index 3a0769c..3a0769c 100644
--- a/packageB/pages/AI-test-skin/fail_result/fail_result.js
+++ b/packageD/pages/AI-test-skin/fail_result/fail_result.js
diff --git a/packageB/pages/AI-test-skin/fail_result/fail_result.json b/packageD/pages/AI-test-skin/fail_result/fail_result.json
index 79a65ac..79a65ac 100644
--- a/packageB/pages/AI-test-skin/fail_result/fail_result.json
+++ b/packageD/pages/AI-test-skin/fail_result/fail_result.json
diff --git a/packageB/pages/AI-test-skin/fail_result/fail_result.wxml b/packageD/pages/AI-test-skin/fail_result/fail_result.wxml
index 6849bab..6849bab 100644
--- a/packageB/pages/AI-test-skin/fail_result/fail_result.wxml
+++ b/packageD/pages/AI-test-skin/fail_result/fail_result.wxml
diff --git a/packageB/pages/AI-test-skin/fail_result/fail_result.wxss b/packageD/pages/AI-test-skin/fail_result/fail_result.wxss
index d09a20f..d09a20f 100644
--- a/packageB/pages/AI-test-skin/fail_result/fail_result.wxss
+++ b/packageD/pages/AI-test-skin/fail_result/fail_result.wxss
diff --git a/packageB/pages/AI-test-skin/fail_result/iconfont.ttf b/packageD/pages/AI-test-skin/fail_result/iconfont.ttf
index 5d2b39e..5d2b39e 100644
--- a/packageB/pages/AI-test-skin/fail_result/iconfont.ttf
+++ b/packageD/pages/AI-test-skin/fail_result/iconfont.ttf
diff --git a/packageB/pages/AI-test-skin/fail_result/iconfont.woff b/packageD/pages/AI-test-skin/fail_result/iconfont.woff
index fe37de2..fe37de2 100644
--- a/packageB/pages/AI-test-skin/fail_result/iconfont.woff
+++ b/packageD/pages/AI-test-skin/fail_result/iconfont.woff
diff --git a/packageB/pages/AI-test-skin/fail_result/iconfont.woff2 b/packageD/pages/AI-test-skin/fail_result/iconfont.woff2
index bda85ff..bda85ff 100644
--- a/packageB/pages/AI-test-skin/fail_result/iconfont.woff2
+++ b/packageD/pages/AI-test-skin/fail_result/iconfont.woff2
diff --git a/packageB/pages/AI-test-skin/history_record/history_record.js b/packageD/pages/AI-test-skin/history_record/history_record.js
index 60e8503..dac750e 100644
--- a/packageB/pages/AI-test-skin/history_record/history_record.js
+++ b/packageD/pages/AI-test-skin/history_record/history_record.js
@@ -10,15 +10,15 @@ let initChart = null;
const option = {
backgroundColor: 'white',
tooltip: {},
- grid:{
+ grid: {
// left:'20%',
- top:'30%',
+ top: '30%',
// right:'10%'
},
legend: {
icon: 'circle',
- itemWidth: 5,
- itemHeight: 5,
+ itemWidth: 5,
+ itemHeight: 5,
selected: {
'综合': true,
'毛孔': false,
@@ -29,7 +29,7 @@ const option = {
'敏感度': false,
'黑眼圈': false,
},
- padding:[20,50],
+ padding: [20, 50],
data: [
{
name: '综合',
@@ -183,7 +183,57 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ let url = `/api/weshop/face/storeSkinface/page`;
+ app.request.promiseGet(url, {
+ isShowLoading: true,
+ data: {
+ store_id: setting.stoid,
+ user_id: os.user_id,
+ }
+ }).then(res => {
+ console.log('111111111', res);
+ if (ut.ajax_ok(res)) {
+ let data = res.data.data.pageData;
+ let arr = [];
+ for (let i = 0; i < data.length; i++) {
+ let history = data[i];
+ let id = history.id;
+ let now = new Date(history['addtime'] * 1000);
+ let year = now.getFullYear(); //年
+ let month = (now.getMonth() + 1).toString().padStart(2, 0); //月
+ let day = (now.getDate()).toString().padStart(2, 0); //日
+ let hour = (now.getHours()).toString().padStart(2, 0); //时
+ let minute = (now.getMinutes()).toString().padStart(2, 0); //分
+ let history_time = `${year}年${month}月`;
+ let time = `${year}/${month}/${day} ${hour}:${minute}`;
+ let time_obj = {
+ history_time,
+ time_arr: new Array(),
+ };
+ if (arr.length > 0) {
+ let index = arr.findIndex(item => {
+ return item['history_time'] === history_time;
+ })
+ if (index > -1) {
+ let obj = {
+ time,
+ id,
+ };
+ arr[index]['time_arr'].push(obj);
+ } else {
+ arr.push(time_obj);
+ }
+ } else {
+ arr.push(time_obj);
+ }
+ }
+ this.setData({
+ history: arr,
+ })
+ initChart.setOption(option);
+ }
+ })
},
/**
@@ -192,17 +242,18 @@ Page({
onReady: function () {
},
- initChartOption() {
- initChart.setOption(option);
- },
+
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
setTimeout(() => {
- initChart.setOption(option);
+
}, 1000);
},
+ go_result(e) {
+
+ },
/**
* 生命周期函数--监听页面隐藏
diff --git a/packageB/pages/AI-test-skin/history_record/history_record.json b/packageD/pages/AI-test-skin/history_record/history_record.json
index 3ea23fa..3ea23fa 100644
--- a/packageB/pages/AI-test-skin/history_record/history_record.json
+++ b/packageD/pages/AI-test-skin/history_record/history_record.json
diff --git a/packageD/pages/AI-test-skin/history_record/history_record.wxml b/packageD/pages/AI-test-skin/history_record/history_record.wxml
new file mode 100644
index 0000000..c0211fa
--- /dev/null
+++ b/packageD/pages/AI-test-skin/history_record/history_record.wxml
@@ -0,0 +1,22 @@
+
+ 历史分析
+
+
+
+
+
+ 注：请确保多次拍摄姿态和环境光线一致。拍摄姿态的偏移、环境光线变化或者皮肤状态变化都可能导致分数较大波动。
+
+
+ 历史报告
+
+
+
+ {{item.time}}
+
+ {{subitem}}
+ 去查看
+
+
+
+
\ No newline at end of file
diff --git a/packageB/pages/AI-test-skin/history_record/history_record.wxss b/packageD/pages/AI-test-skin/history_record/history_record.wxss
index a7a41fd..a7a41fd 100644
--- a/packageB/pages/AI-test-skin/history_record/history_record.wxss
+++ b/packageD/pages/AI-test-skin/history_record/history_record.wxss
diff --git a/packageB/pages/AI-test-skin/index/aiskin.js b/packageD/pages/AI-test-skin/index/aiskin.js
index d5350c4..fa0d8ce 100644
--- a/packageB/pages/AI-test-skin/index/aiskin.js
+++ b/packageD/pages/AI-test-skin/index/aiskin.js
@@ -1,7 +1,7 @@
/*
- * @Author: your name
+ * @Author: abson
* @Date: 2022-02-11 14:13:05
- * @LastEditTime: 2022-02-16 14:18:30
+ * @LastEditTime: 2022-02-22 15:17:48
* @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\index\aiskin.js
diff --git a/packageB/pages/AI-test-skin/index/aiskin.json b/packageD/pages/AI-test-skin/index/aiskin.json
index c0ea678..c0ea678 100644
--- a/packageB/pages/AI-test-skin/index/aiskin.json
+++ b/packageD/pages/AI-test-skin/index/aiskin.json
diff --git a/packageB/pages/AI-test-skin/index/aiskin.wxml b/packageD/pages/AI-test-skin/index/aiskin.wxml
index 800c610..cf73e9b 100644
--- a/packageB/pages/AI-test-skin/index/aiskin.wxml
+++ b/packageD/pages/AI-test-skin/index/aiskin.wxml
@@ -3,7 +3,7 @@
历史档案
-
+
开始测肤
diff --git a/packageB/pages/AI-test-skin/index/aiskin.wxss b/packageD/pages/AI-test-skin/index/aiskin.wxss
index cd27949..cd27949 100644
--- a/packageB/pages/AI-test-skin/index/aiskin.wxss
+++ b/packageD/pages/AI-test-skin/index/aiskin.wxss
diff --git a/packageB/pages/AI-test-skin/select_photo/select_photo.js b/packageD/pages/AI-test-skin/select_photo/select_photo.js
index cd1872c..cd1872c 100644
--- a/packageB/pages/AI-test-skin/select_photo/select_photo.js
+++ b/packageD/pages/AI-test-skin/select_photo/select_photo.js
diff --git a/packageB/pages/AI-test-skin/select_photo/select_photo.json b/packageD/pages/AI-test-skin/select_photo/select_photo.json
index 64a8e6e..64a8e6e 100644
--- a/packageB/pages/AI-test-skin/select_photo/select_photo.json
+++ b/packageD/pages/AI-test-skin/select_photo/select_photo.json
diff --git a/packageB/pages/AI-test-skin/select_photo/select_photo.wxml b/packageD/pages/AI-test-skin/select_photo/select_photo.wxml
index b9fd5d9..b9fd5d9 100644
--- a/packageB/pages/AI-test-skin/select_photo/select_photo.wxml
+++ b/packageD/pages/AI-test-skin/select_photo/select_photo.wxml
diff --git a/packageB/pages/AI-test-skin/select_photo/select_photo.wxss b/packageD/pages/AI-test-skin/select_photo/select_photo.wxss
index cc1af5f..cc1af5f 100644
--- a/packageB/pages/AI-test-skin/select_photo/select_photo.wxss
+++ b/packageD/pages/AI-test-skin/select_photo/select_photo.wxss
diff --git a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.js b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js
index ca7c7eb..ca7c7eb 100644
--- a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.js
+++ b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js
diff --git a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.json b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.json
index bf55ee4..bf55ee4 100644
--- a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.json
+++ b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.json
diff --git a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxml
index 4c2e7e7..99642af 100644
--- a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml
+++ b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxml
@@ -7,25 +7,25 @@
-
+
-
+
1、请对准镜头，闭眼拍照
-
+
-
+
2、请摘下眼镜，撩起刘海
-
+
-
+
3、保持脸部垂直，切勿距离过远过近
@@ -37,13 +37,13 @@
-
+
1、脸部置于画面中央，请勿距离过远或过近
-
+
2、脸部保持平视摄像头
diff --git a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxss
index a2b1eba..f098f26 100644
--- a/packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss
+++ b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.wxss
@@ -16,7 +16,7 @@ page {
.content .work {
text-align: center;
- padding: 60rpx 0 30rpx 0;
+ padding: 50rpx 0 30rpx 0;
font-size: 36rpx;
}
diff --git a/packageB/pages/AI-test-skin/success_result/acne/acne.js b/packageD/pages/AI-test-skin/success_result/acne/acne.js
index bbf38ae..30c043e 100644
--- a/packageB/pages/AI-test-skin/success_result/acne/acne.js
+++ b/packageD/pages/AI-test-skin/success_result/acne/acne.js
@@ -1,14 +1,7 @@
-/*
- * @Author: abson
- * @Date: 2022-02-21 11:03:07
- * @LastEditTime: 2022-02-21 17:50:35
- * @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\acne\acne.js
- */
module.exports = {
//把组合购的商品价格计算出来,同时每个会员都有购买组合商品的上限！ladder_b_num是已经购买了多少件
- get_goods: function(th,stoid) {
+ get_goods: function(th,stoid,sort) {
+ th.setData({acne_sort:sort});
var r_code='03';
//获取痘痘的类型
var list=th.data.face_data.acnespotmole.acne_list;
@@ -42,9 +35,16 @@ module.exports = {
var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2";
getApp().request.promiseGet(url, {}).then(res=>{
if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
- th.setData({acne_quan_list:res.data.data.pageData});
+ var arr=res.data.data.pageData;
+ arr.map(function (e) {
+ e.q_word='acne_quan_list';
+ return e;
+ })
+ th.setData({acne_quan_list:arr});
}
})
+
+
},
}
diff --git a/packageB/pages/AI-test-skin/success_result/acne/acne.wxml b/packageD/pages/AI-test-skin/success_result/acne/acne.wxml
index 5a8bdd7..9fa7938 100644
--- a/packageB/pages/AI-test-skin/success_result/acne/acne.wxml
+++ b/packageD/pages/AI-test-skin/success_result/acne/acne.wxml
@@ -1,8 +1,8 @@
-
+