From 99e964313ebc00ac70f24349bfe90adb754aa84d Mon Sep 17 00:00:00 2001 From: rongweikang <1174906669@qq.com> Date: Fri, 15 Mar 2024 17:23:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B0=B4=E5=88=86=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 76 +++++++++---------- .../moisture_test_report.tsx | 74 ++++++++++++++++-- 2 files changed, 104 insertions(+), 46 deletions(-) diff --git a/src/app.config.ts b/src/app.config.ts index cd85c63..e1f9347 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -1,42 +1,43 @@ export default defineAppConfig({ __usePrivacyCheck__: true, pages: [ - 'pages/index/index', - 'pages/login/login', - 'pages/initiate/initiate', - 'pages/entry/entry', - 'pages/activity/activity', + "pages/index/index", + "pages/login/login", + "pages/initiate/initiate", + "pages/entry/entry", + "pages/activity/activity", "pages/detect/detect", "pages/shop/shop", "pages/user/user", "pages/userInfo/userInfo", - 'pages/userInfoDetail/userInfoDetail', + "pages/userInfoDetail/userInfoDetail", "pages/register/register", - 'pages/instrument/instrument', + "pages/instrument/instrument", "pages/instrument/intro", "pages/instrument_manage/index", "pages/instrument_detail/index", "pages/instrumentClickinUpload/index", - 'pages/privacyPolicy/privacyPolicy', - 'pages/userPolicy/userPolicy', - 'pages/about/about', - 'pages/message/message', - 'pages/consultant/consultant', - 'pages/integral_list/integral_list', + "pages/privacyPolicy/privacyPolicy", + "pages/userPolicy/userPolicy", + "pages/about/about", + "pages/message/message", + "pages/consultant/consultant", + "pages/integral_list/integral_list", "pages/recording/recording", "pages/webViewPage/webViewPage", - 'pages/template/template', - 'pages/face_report/face_report', + "pages/template/template", + "pages/face_report/face_report", "pages/connection_help/connection_help", "pages/errorpage/errorpage", + "pages/moisture_test_report/moisture_test_report", ], - "tabBar": { - "custom": true, - "color": "#707070", - "selectedColor": "#CAB18C", - "backgroundColor": "#ffffff", - "borderStyle": "black", - "list": [ + tabBar: { + custom: true, + color: "#707070", + selectedColor: "#CAB18C", + backgroundColor: "#ffffff", + borderStyle: "black", + list: [ { pagePath: "pages/index/index", text: "主页", @@ -67,28 +68,23 @@ export default defineAppConfig({ iconPath: "img/tabar/5.png", selectedIconPath: "img/tabar/55.png", }, - ] + ], }, - usingComponents: { - - }, - lazyCodeLoading: 'requiredComponents', + usingComponents: {}, + lazyCodeLoading: "requiredComponents", window: { - backgroundTextStyle: 'light', - navigationStyle: 'custom', - navigationBarBackgroundColor: '#fff', - navigationBarTitleText: 'WeChat', - navigationBarTextStyle: 'black', + backgroundTextStyle: "light", + navigationStyle: "custom", + navigationBarBackgroundColor: "#fff", + navigationBarTitleText: "WeChat", + navigationBarTextStyle: "black", // enablePullDownRefresh: true }, requiredPrivateInfos: ["getLocation"], subPackages: [ { - root: 'moduleIOT', - pages: [ - "pages/iotCarePlan/WL200", - "pages/iotCarePlan/FR200", - ] - } - ] -}) + root: "moduleIOT", + pages: ["pages/iotCarePlan/WL200", "pages/iotCarePlan/FR200"], + }, + ], +}); diff --git a/src/pages/moisture_test_report/moisture_test_report.tsx b/src/pages/moisture_test_report/moisture_test_report.tsx index a71d9e1..67baec6 100644 --- a/src/pages/moisture_test_report/moisture_test_report.tsx +++ b/src/pages/moisture_test_report/moisture_test_report.tsx @@ -12,7 +12,7 @@ import { setMobile } from "../../store/features/userInfo"; import { WCUserLogin } from "../../utils/Interface"; -import "./login.less"; +import "./moisture_test_report.less"; class MoistureTestReport extends Component { constructor(props) { @@ -60,6 +60,63 @@ class MoistureTestReport extends Component { async initData() { } + getStatusData(level) { + var bgCssData = { + serious: 'background: #FFE3E3', + moderate: 'background: #FFEBDC', + slight: 'background: #F6FCFF', + normal: 'background: #F8F8F8', + sufficient: 'background: #F8F8F8' + } + var progressBgData = { + serious: 'background: #FF9393', + moderate: 'background: #FFC58C', + slight: 'background: #E5F3F9', + normal: 'background: #C2E5F3', + sufficient: 'background: #9FDBF3' + } + if (level >= 1 && level <= 2) { + return { + bg: bgCssData.serious, + title: '严重缺水', + gear: 1, + img: 'serious', + progressBg: progressBgData.serious + } + } else if (level >= 3 && level <= 4) { + return { + bg: bgCssData.moderate, + title: '中度缺水', + gear: 2, + img: 'moderate', + progressBg: progressBgData.moderate + } + } else if (level >= 5 && level <= 6) { + return { + bg: bgCssData.slight, + title: '轻微缺水', + gear: 3, + img: 'slight', + progressBg: progressBgData.slight + } + } else if (level >= 7 && level <= 8) { + return { + bg: bgCssData.normal, + title: '水分正常', + gear: 4, + img: 'normal', + progressBg: progressBgData.normal + } + } else if (level >= 9 && level <= 10) { + return { + bg: bgCssData.sufficient, + title: '水分充足', + gear: 5, + img: 'sufficient', + progressBg: progressBgData.sufficient + } + } + } render() { let { name, imgUrl, reportData, bgCssData, isClock, xinde, imglist, id, show } = this.state @@ -70,24 +127,29 @@ class MoistureTestReport extends Component { - + 额头 - {util.getStatusData(reportData.shuifenLevel.head).title} + {/* {this.getStatusData(7).title} */} + + 左脸颊 - {util.getStatusData(reportData.shuifenLevel.leftFace).title} + {/* {this.getStatusData(reportData.shuifenLevel.leftFace).title} */} + + 右脸颊 - {util.getStatusData(reportData.shuifenLevel.rightFace).title} + {/* {this.getStatusData(reportData.shuifenLevel.rightFace).title} */} + @@ -213,4 +275,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(setMobile(value)); }, }); -export default connect(mapStateToProps, mapDispatchToProps)(Login); +export default connect(mapStateToProps, mapDispatchToProps)(MoistureTestReport);