314637581
/
flossom-miniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev

Browse Source
master
blak-kong 2 years ago
parent a7e7f63b4d 89a76582b9
commit e909ed328d
2 changed files with 131 additions and 133 deletions
Show Stats Download Patch File Download Diff File

232
src/recoding/pages/moisture_test_report/moisture_test_report.tsx
Unescape Escape View File

@ -191,84 +191,84 @@ class MoistureTestReport extends Component<any, any> {
}; };
return ( return (
<Block> <Block>
<Navbar isBack titleSlot="水分测试报告"></Navbar> <Navbar isBack titleSlot='水分测试报告'></Navbar>
<View className="moisture_test_report"> <View className='moisture_test_report'>
<View className="time">{reportData.curDate}</View> <View className='time'>{reportData.curDate}</View>
<View className="report_data"> <View className='report_data'>
<View <View
className="forehead moisture_block flex" className='forehead moisture_block flex'
style={getStatusData(reportData.shuifenLevel.head)!.bg} style={getStatusData(reportData.shuifenLevel.head)!.bg}
> >
<Image <Image
className="moisture_img" className='moisture_img'
src={require(`@/img/fr200/${ src={require(`@/img/fr200/${
getStatusData(reportData.shuifenLevel.head)!.img getStatusData(reportData.shuifenLevel.head)!.img
}.png`)} }.png`)}
mode="aspectFill" mode='aspectFill'
></Image> ></Image>
<View className="pos_info"> <View className='pos_info'>
<View className="top">额头</View> <View className='top'>额头</View>
<View className="bottom"> <View className='bottom'>
{getStatusData(reportData.shuifenLevel.head)!.title} {getStatusData(reportData.shuifenLevel.head)!.title}
</View> </View>
<View className="bottom"></View> <View className='bottom'></View>
</View> </View>
</View> </View>
<View <View
className="left_face moisture_block flex" className='left_face moisture_block flex'
style={getStatusData(reportData.shuifenLevel.leftFace)!.bg} style={getStatusData(reportData.shuifenLevel.leftFace)!.bg}
> >
<Image <Image
className="moisture_img" className='moisture_img'
src={require(`@/img/fr200/${ src={require(`@/img/fr200/${
getStatusData(reportData.shuifenLevel.leftFace)!.img getStatusData(reportData.shuifenLevel.leftFace)!.img
}.png`)} }.png`)}
mode="aspectFill" mode='aspectFill'
></Image> ></Image>
<View className="pos_info"> <View className='pos_info'>
<View className="top">左脸颊</View> <View className='top'>左脸颊</View>
<View className="bottom"> <View className='bottom'>
{getStatusData(reportData.shuifenLevel.leftFace)!.title} {getStatusData(reportData.shuifenLevel.leftFace)!.title}
</View> </View>
<View className="bottom"></View> <View className='bottom'></View>
</View> </View>
</View> </View>
<View <View
className="right_face moisture_block flex" className='right_face moisture_block flex'
style={getStatusData(reportData.shuifenLevel.rightFace)!.bg} style={getStatusData(reportData.shuifenLevel.rightFace)!.bg}
> >
<Image <Image
className="moisture_img" className='moisture_img'
src={require(`@/img/fr200/${ src={require(`@/img/fr200/${
getStatusData(reportData.shuifenLevel.rightFace)!.img getStatusData(reportData.shuifenLevel.rightFace)!.img
}.png`)} }.png`)}
mode="aspectFill" mode='aspectFill'
></Image> ></Image>
<View className="pos_info"> <View className='pos_info'>
<View className="top">右脸颊</View> <View className='top'>右脸颊</View>
<View className="bottom"> <View className='bottom'>
{getStatusData(reportData.shuifenLevel.rightFace)!.title} {getStatusData(reportData.shuifenLevel.rightFace)!.title}
</View> </View>
<View className="bottom"></View> <View className='bottom'></View>
</View> </View>
</View> </View>
<View className="example_box"> <View className='example_box'>
<Image <Image
className="banner_img" className='banner_img'
src="@/img/fr200/shuifen.png" src='@/img/fr200/shuifen.png'
mode="aspectFill" mode='aspectFill'
></Image> ></Image>
<View className="line1"></View> <View className='line1'></View>
<View className="line2"></View> <View className='line2'></View>
<View className="line3"></View> <View className='line3'></View>
</View> </View>
<View className="moisture_level_info"> <View className='moisture_level_info'>
<View className="level_info"> <View className='level_info'>
<View className="items flex aitems"> <View className='items flex aitems'>
<View className="pos_name">额头</View> <View className='pos_name'>额头</View>
<View className="progress"> <View className='progress'>
<View <View
className="progress_width" className='progress_width'
style={{ style={{
width: `${reportData.shuifenLevel.head * 10}%`, width: `${reportData.shuifenLevel.head * 10}%`,
backgroundColor: getStatusData( backgroundColor: getStatusData(
@ -278,15 +278,15 @@ class MoistureTestReport extends Component<any, any> {
></View> ></View>
{/* style='{width: {reportData.shuifenLevel.head * 10}%;{util.getStatusData(reportData.shuifenLevel.head).progressBg}}' */} {/* style='{width: {reportData.shuifenLevel.head * 10}%;{util.getStatusData(reportData.shuifenLevel.head).progressBg}}' */}
</View> </View>
<View className="level"> <View className='level'>
{reportData.shuifenLevel.head}级 {reportData.shuifenLevel.head}级
</View> </View>
</View> </View>
<View className="items flex aitems"> <View className='items flex aitems'>
<View className="pos_name">左脸颊</View> <View className='pos_name'>左脸颊</View>
<View className="progress"> <View className='progress'>
<View <View
className="progress_width left_face_progress" className='progress_width left_face_progress'
style={{ style={{
width: `${reportData.shuifenLevel.leftFace * 10}%`, width: `${reportData.shuifenLevel.leftFace * 10}%`,
backgroundColor: getStatusData( backgroundColor: getStatusData(
@ -295,15 +295,15 @@ class MoistureTestReport extends Component<any, any> {
}} }}
></View> ></View>
</View> </View>
<View className="level"> <View className='level'>
{reportData.shuifenLevel.leftFace}级 {reportData.shuifenLevel.leftFace}级
</View> </View>
</View> </View>
<View className="items flex aitems"> <View className='items flex aitems'>
<View className="pos_name">右脸颊</View> <View className='pos_name'>右脸颊</View>
<View className="progress"> <View className='progress'>
<View <View
className="progress_width right_face_progress" className='progress_width right_face_progress'
style={{ style={{
width: `${reportData.shuifenLevel.rightFace * 10}%`, width: `${reportData.shuifenLevel.rightFace * 10}%`,
backgroundColor: getStatusData( backgroundColor: getStatusData(
@ -312,120 +312,120 @@ class MoistureTestReport extends Component<any, any> {
}} }}
></View> ></View>
</View> </View>
<View className="level"> <View className='level'>
{reportData.shuifenLevel.rightFace}级 {reportData.shuifenLevel.rightFace}级
</View> </View>
</View> </View>
</View> </View>
<View className="moisture_level"> <View className='moisture_level'>
<View className="level_txt flex aitems jcenter"> <View className='level_txt flex aitems jcenter'>
<View className="circle normal"></View> <View className='circle normal'></View>
<View className="txt">水分等级</View> <View className='txt'>水分等级</View>
</View> </View>
<View className="level_list flex"> <View className='level_list flex'>
<View className="items flex aitems"> <View className='items flex aitems'>
<View className="circle serious"></View> <View className='circle serious'></View>
<View className="txt">严重缺水：1-2级</View> <View className='txt'>严重缺水：1-2级</View>
</View> </View>
<View className="items flex aitems"> <View className='items flex aitems'>
<View className="circle moderate"></View> <View className='circle moderate'></View>
<View className="txt">中度缺水：3-4级</View> <View className='txt'>中度缺水：3-4级</View>
</View> </View>
<View className="items flex aitems"> <View className='items flex aitems'>
<View className="circle slight"></View> <View className='circle slight'></View>
<View className="txt">轻微缺水：5-6级</View> <View className='txt'>轻微缺水：5-6级</View>
</View> </View>
<View className="items flex aitems"> <View className='items flex aitems'>
<View className="circle normal"></View> <View className='circle normal'></View>
<View className="txt">水分正常：7-8级</View> <View className='txt'>水分正常：7-8级</View>
</View> </View>
<View className="items flex aitems"> <View className='items flex aitems'>
<View className="circle sufficient"></View> <View className='circle sufficient'></View>
<View className="txt">水分充足：9-10级</View> <View className='txt'>水分充足：9-10级</View>
</View> </View>
</View> </View>
<View className="pour"> <View className='pour'>
注：各水分等级依据测量得出肌肤含水量划分 注：各水分等级依据测量得出肌肤含水量划分
</View> </View>
</View> </View>
</View> </View>
</View> </View>
</View> </View>
<View className="report_chart"> <View className='report_chart'>
<View className="chart_title common_title">肌肤整体水分测试报告</View> <View className='chart_title common_title'>肌肤整体水分测试报告</View>
<View className="container"> <View className='container'>
<Echarts echartsData={echartsData}></Echarts> <Echarts echartsData={echartsData}></Echarts>
</View> </View>
</View> </View>
<View className="gear_recommend"> <View className='gear_recommend'>
<View className="gear_header flex aitems sb"> <View className='gear_header flex aitems sb'>
<View className="gear_title common_title">促渗档位推荐</View> <View className='gear_title common_title'>促渗档位推荐</View>
{reportShow ? <View className="gear_btn">前往护理</View> : null} {reportShow ? <View className='gear_btn'>前往护理</View> : null}
</View> </View>
<View className="gear_content flex aitems sb"> <View className='gear_content flex aitems sb'>
<View className="left_content"> <View className='left_content'>
<Image <Image
className="banner_img" className='banner_img'
src="@/img/fr200/mian-mo.png" src='@/img/fr200/mian-mo.png'
mode="aspectFill" mode='aspectFill'
></Image> ></Image>
<View className="type">面膜促渗</View> <View className='type'>面膜促渗</View>
</View> </View>
</View> </View>
<View className="gear_recommend"> <View className='gear_recommend'>
<View className="gear_header flex aitems sb"> <View className='gear_header flex aitems sb'>
<View className="gear_title common_title">促渗档位推荐</View> <View className='gear_title common_title'>促渗档位推荐</View>
<View className="gear_btn">前往护理</View> <View className='gear_btn'>前往护理</View>
</View> </View>
<View className="gear_content flex aitems sb"> <View className='gear_content flex aitems sb'>
<View className="left_content"> <View className='left_content'>
<Image <Image
className="banner_img" className='banner_img'
src="@/img/fr200/mian-mo.png" src='@/img/fr200/mian-mo.png'
mode="aspectFill" mode='aspectFill'
></Image> ></Image>
<View className="type">面膜促渗</View> <View className='type'>面膜促渗</View>
</View> </View>
<View className="right_content flex aitems"> <View className='right_content flex aitems'>
<View className="gear_list flex aitems sa"> <View className='gear_list flex aitems sa'>
<View className="items flex aitems jcenter"> <View className='items flex aitems jcenter'>
<Image <Image
className="gear_img" className='gear_img'
src={require(`@/img/fr200/${ src={require(`@/img/fr200/${
getStatusData(reportData.shuifenLevel.head)!.gear getStatusData(reportData.shuifenLevel.head)!.gear
}.png`)} }.png`)}
mode="aspectFill" mode='aspectFill'
></Image> ></Image>
<View className="name">额头</View> <View className='name'>额头</View>
<View className="level"> <View className='level'>
{reportData.shuifenGear.head}档 {reportData.shuifenGear.head}档
</View> </View>
</View> </View>
<View className="items flex aitems jcenter"> <View className='items flex aitems jcenter'>
<Image <Image
className="gear_img" className='gear_img'
src={require(`@/img/fr200/${ src={require(`@/img/fr200/${
getStatusData(reportData.shuifenLevel.leftFace)!.gear getStatusData(reportData.shuifenLevel.leftFace)!.gear
}.png`)} }.png`)}
mode="aspectFill" mode='aspectFill'
></Image> ></Image>
<View className="name">左脸颊</View> <View className='name'>左脸颊</View>
<View className="level"> <View className='level'>
{reportData.shuifenGear.leftFace}档 {reportData.shuifenGear.leftFace}档
</View> </View>
</View> </View>
<View className="items flex aitems jcenter"> <View className='items flex aitems jcenter'>
<Image <Image
className="gear_img" className='gear_img'
src={require(`@/img/fr200/${ src={require(`@/img/fr200/${
getStatusData(reportData.shuifenLevel.rightFace)!.gear getStatusData(reportData.shuifenLevel.rightFace)!.gear
}.png`)} }.png`)}
mode="aspectFill" mode='aspectFill'
></Image> ></Image>
<View className="name">右脸颊</View> <View className='name'>右脸颊</View>
<View className="level"> <View className='level'>
{reportData.shuifenGear.rightFace}档 {reportData.shuifenGear.rightFace}档
</View> </View>
</View> </View>
@ -436,13 +436,13 @@ class MoistureTestReport extends Component<any, any> {
</View> </View>
{reportShow ? ( {reportShow ? (
<View className="go_clock_in flex sb aitems"> <View className='go_clock_in flex sb aitems'>
<View className="go_clock_btn" onClick={this.toNursing.bind(this)}> <View className='go_clock_btn' onClick={this.toNursing.bind(this)}>
继续护理 继续护理
</View> </View>
<View className="jump_box flex aitems" onClick={this.toIndex}> <View className='jump_box flex aitems' onClick={this.toIndex}>
<View className="txt">主页</View> <View className='txt'>主页</View>
<Image src="@/img/fr200/right.png" mode="aspectFill"></Image> <Image src='@/img/fr200/right.png' mode='aspectFill'></Image>
</View> </View>
</View> </View>
) : null} ) : null}

6
src/recoding/pages/recording/recording.tsx
Unescape Escape View File

@ -409,10 +409,8 @@ export default class Recording extends Component<any, any> {
setStorageSync("moistureEachtsData", JSON.stringify(echartsData)); setStorageSync("moistureEachtsData", JSON.stringify(echartsData));
let report = false; let report = false;
go( go(
`/recoding/pages/moisture_test_report/moisture_test_report?data=${ `/recoding/pages/moisture_test_report/moisture_test_report?data=${allData.nursingData
allData.nursingData }&date=${allData.createTime}&modeId=${allData.modeId}&id=${allData.instrumentId
}&date=${allData.createTime}&modeId=${allData.modeId}&id=${
allData.instrumentId
}&echartsData=${JSON.stringify(echartsData)}&report=${report}` }&echartsData=${JSON.stringify(echartsData)}&report=${report}`
); );
} }

Write Preview
Loading…
Cancel
Save