diff --git a/packageB/pages/AI-test-skin/history_record/history_record.js b/packageB/pages/AI-test-skin/history_record/history_record.js
index 3f973fe..60e8503 100644
--- a/packageB/pages/AI-test-skin/history_record/history_record.js
+++ b/packageB/pages/AI-test-skin/history_record/history_record.js
@@ -1,11 +1,182 @@
// packageB/pages/AI-test-skin/history_record/history_record.js
+import * as echarts from '../../../components/ec-canvas/echarts';
+
+const app = getApp();
+const request = app.request;
+const os = app.globalData;
+const setting = os.setting;
+const ut = require('../../../../utils/util');
+let initChart = null;
+const option = {
+ backgroundColor: 'white',
+ tooltip: {},
+ grid:{
+ // left:'20%',
+ top:'30%',
+ // right:'10%'
+ },
+ legend: {
+ icon: 'circle',
+ itemWidth: 5,
+ itemHeight: 5,
+ selected: {
+ '综合': true,
+ '毛孔': false,
+ '黑头': false,
+ '色斑': false,
+ '皱纹': false,
+ '痤疮': false,
+ '敏感度': false,
+ '黑眼圈': false,
+ },
+ padding:[20,50],
+ data: [
+ {
+ name: '综合',
+ // textStyle: {
+ // backgroundColor: "#999",
+ // }
+ },
+ {
+ name: '毛孔',
+ }, {
+ name: '黑头',
+ },
+ {
+ name: '色斑',
+ },
+ {
+ name: '皱纹',
+ },
+ {
+ name: '痤疮',
+ },
+ {
+ name: '敏感度',
+ },
+ {
+ name: '黑眼圈',
+ },
+ ]
+ },
+ xAxis: {
+ type: 'category',
+ data: ["02/11", "02/16", "02/17"]
+ },
+ yAxis: {
+ type: 'value',
+ min: 0,
+ max: 100,
+ splitNumber: 4,
+ interval: 25,
+ },
+ series: [
+ {
+ name: '综合',
+ type: 'bar',
+ itemStyle: {
+ color: '#84e1eb',
+ borderRadius: 3,
+ },
+ barWidth: 8,
+ data: [5, 20, 36, 10, 10, 20]
+ },
+ {
+ name: '毛孔',
+ type: 'line',
+ lineStyle: {
+ color: "#fbb11f"
+ },
+ itemStyle: {
+ color: '#fbb11f',
+ },
+ data: [5, 20, 36, 10, 10, 20]
+ },
+ {
+ name: '黑头',
+ type: 'line',
+ lineStyle: {
+ color: "#e9552b"
+ },
+ itemStyle: {
+ color: '#e9552b',
+ },
+ data: [50, 60, 70]
+ },
+ {
+ name: '色斑',
+ type: 'line',
+ lineStyle: {
+ color: "#38ce87"
+ },
+ itemStyle: {
+ color: '#38ce87',
+ },
+ data: [50, 55, 60]
+ },
+ {
+ name: '皱纹',
+ type: 'line',
+ lineStyle: {
+ color: "#d67bf0"
+ },
+ itemStyle: {
+ color: '#d67bf0',
+ },
+ data: [80, 85, 90]
+ },
+ {
+ name: '痤疮',
+ type: 'line',
+ lineStyle: {
+ color: "#f85b95"
+ },
+ itemStyle: {
+ color: '#f85b95',
+ },
+ data: [30, 35, 40]
+ },
+ {
+ name: '敏感度',
+ type: 'line',
+ lineStyle: {
+ color: "#af78fc"
+ },
+ itemStyle: {
+ color: '#af78fc',
+ },
+ data: [20, 26, 10]
+ },
+ {
+ name: '黑眼圈',
+ type: 'line',
+ lineStyle: {
+ color: "#688eff"
+ },
+ itemStyle: {
+ color: '#688eff',
+ },
+ data: [50, 60, 20]
+ }
+ ]
+};
Page({
/**
* 页面的初始数据
*/
data: {
-
+ arr1: ['综合', '毛孔', '黑头', '色斑', '皱纹', '痤疮', '敏感度', '黑眼圈'],
+ ec: {
+ onInit: function (canvas, width, height) {
+ initChart = echarts.init(canvas, null, {
+ width: width,
+ height: height,
+ });
+ canvas.setChart(initChart);
+ return initChart;
+ }
+ },
},
/**
@@ -21,12 +192,16 @@ Page({
onReady: function () {
},
-
+ initChartOption() {
+ initChart.setOption(option);
+ },
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ setTimeout(() => {
+ initChart.setOption(option);
+ }, 1000);
},
/**
diff --git a/packageB/pages/AI-test-skin/history_record/history_record.json b/packageB/pages/AI-test-skin/history_record/history_record.json
index 8835af0..3ea23fa 100644
--- a/packageB/pages/AI-test-skin/history_record/history_record.json
+++ b/packageB/pages/AI-test-skin/history_record/history_record.json
@@ -1,3 +1,6 @@
{
- "usingComponents": {}
+ "navigationBarTitleText": "历史变化",
+ "usingComponents": {
+ "ec-canvas": "../../../components/ec-canvas/ec-canvas"
+ }
}
\ No newline at end of file
diff --git a/packageB/pages/AI-test-skin/history_record/history_record.wxml b/packageB/pages/AI-test-skin/history_record/history_record.wxml
index 94d50bb..3faa719 100644
--- a/packageB/pages/AI-test-skin/history_record/history_record.wxml
+++ b/packageB/pages/AI-test-skin/history_record/history_record.wxml
@@ -1,2 +1,68 @@
-
-packageB/pages/AI-test-skin/history_record/history_record.wxml
+
+ 历史分析
+
+
+
+
+
+ 注：请确保多次拍摄姿态和环境光线一致。拍摄姿态的偏移、环境光线变化或者皮肤状态变化都可能导致分数较大波动。
+
+
+ 历史报告
+
+
+
+ 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/history_record/history_record.wxss b/packageB/pages/AI-test-skin/history_record/history_record.wxss
index 2853cd7..a7a41fd 100644
--- a/packageB/pages/AI-test-skin/history_record/history_record.wxss
+++ b/packageB/pages/AI-test-skin/history_record/history_record.wxss
@@ -2,8 +2,52 @@
page {
width: 100vw;
height: 100%;
- padding: 20rpx;
- padding-top: 40rpx;
+}
+
+.mgv5 {
+ margin-top: 5%;
+ margin-bottom: 5%;
+}
+
+.content {
+ padding: 5%;
+ height: 100%;
+ width: 100%;
box-sizing: border-box;
background-color: #e7f5fb;
+}
+
+.item {
+ padding: 10rpx 40rpx;
+ color: red;
+}
+
+.echarts {
+ position: relative;
+ height: 60%;
+ padding: 20rpx;
+ background-color: #fff;
+}
+
+.tubiao {
+ position: absolute;
+ top: 3%;
+ left: 50%;
+ transform: translateX(-50%);
+ height: 80%;
+ width: 100%;
+}
+
+.history_list {
+ border-radius: 30rpx;
+ padding: 20rpx;
+ background-color: #fff;
+}
+
+.souce {
+ display: flex;
+ justify-content: space-between;
+ font-size: 28rpx;
+ padding: 30rpx 0;
+ border-bottom: 2rpx solid #ccc;
}
\ No newline at end of file
diff --git a/packageB/pages/AI-test-skin/success_result/acne/acne.wxml b/packageB/pages/AI-test-skin/success_result/acne/acne.wxml
index 6fea6ea..d3be73a 100644
--- a/packageB/pages/AI-test-skin/success_result/acne/acne.wxml
+++ b/packageB/pages/AI-test-skin/success_result/acne/acne.wxml
@@ -1,4 +1,4 @@
-
+