修复弹窗被删除的问题

master
blak-kong 2 years ago
parent 32d03bd9ee
commit 3a3d164762

@ -185,8 +185,6 @@ class IotCarePlanFR200 extends Component<any, any> {
SwitchActiveModeItem: {}, // 切换选中模式 SwitchActiveModeItem: {}, // 切换选中模式
ModeID: "mode_", // 模式KEY ModeID: "mode_", // 模式KEY
activeModeID: "", // 当前选中模式ID:用于高亮 activeModeID: "", // 当前选中模式ID:用于高亮
ModeStepIndex: 0, // 当前护理功效步骤:每个步骤时间不定,所以时间另外计算,根据步骤显示
ModeStepTimeArray: [], // 护理功效时间步骤用于切换显示GIF
// TestModeStepIndex: 0, // 水分测试步骤 // TestModeStepIndex: 0, // 水分测试步骤
EssenceStepIndex: 0, // 精华促渗步骤 EssenceStepIndex: 0, // 精华促渗步骤
@ -197,12 +195,6 @@ class IotCarePlanFR200 extends Component<any, any> {
MaskModeBuzzingIndex: 0, // 面膜蜂鸣 MaskModeBuzzingIndex: 0, // 面膜蜂鸣
MaskModeVibrateIndex: 0, // 面膜震动 MaskModeVibrateIndex: 0, // 面膜震动
currentServiceData: {
// 当前展示的开启暂停GIF: 因为时间判断不方便,所以单独领出来
startSource: "",
stopSource: "",
},
// 倒计时 // 倒计时
isShowCountdown: false, // 倒计时弹窗 isShowCountdown: false, // 倒计时弹窗
countdown: 3, countdown: 3,
@ -382,7 +374,7 @@ class IotCarePlanFR200 extends Component<any, any> {
"intelligence", "intelligence",
]; ];
/** 基础版:脸部/眼部/PRO 设备使用时,会自动开启暂停 */ /** 基础版:脸部/眼部/PRO 设备使用时,会自动开启,不能暂停 */
BaseModeType: string[] = [ BaseModeType: string[] = [
"face", "face",
"eyes", "eyes",
@ -602,7 +594,6 @@ class IotCarePlanFR200 extends Component<any, any> {
ActiveModeItem: data, ActiveModeItem: data,
activeModeID: data.id, activeModeID: data.id,
ModeID: "mode_" + data.id, ModeID: "mode_" + data.id,
ModeStepIndex: 0,
waterStepIndex: 0, // 水分测试步骤 waterStepIndex: 0, // 水分测试步骤
EssenceStepIndex: 0, // 精华促渗步骤 EssenceStepIndex: 0, // 精华促渗步骤
MaskModeStepIndex: 0, // 面膜促渗步骤 MaskModeStepIndex: 0, // 面膜促渗步骤
@ -618,9 +609,10 @@ class IotCarePlanFR200 extends Component<any, any> {
this.changeItemUpdateFR200NursingHistory(); this.changeItemUpdateFR200NursingHistory();
this.stepNext(); // 仅切换模式,不执行开始逻辑 this.stepNext(); // 仅切换模式,不执行开始逻辑
// FR200水分测试不可自动运行,需手动点击开始测试,手动启动检测 // FR200 水分测试和促渗不可自动运行,需手动点击开始测试,手动启动检测
// 其他模式可以自动运行 // 其他模式可以自动运行
if (data.modeType !== "moistureTest") { let notStartArr = ["moistureTest", "maskPenetration", "essence"];
if (!notStartArr.includes(data.modeType)) {
setTimeout(() => { setTimeout(() => {
this.onNursingTap("switch"); this.onNursingTap("switch");
}, 800); }, 800);
@ -2317,7 +2309,6 @@ class IotCarePlanFR200 extends Component<any, any> {
isStopNurse, isStopNurse,
ModeList, ModeList,
ModeType, ModeType,
ModeStepIndex,
ActiveModeItem, ActiveModeItem,
currentWorkModeType, currentWorkModeType,
isSwitchActiveMode, isSwitchActiveMode,
@ -2347,7 +2338,6 @@ class IotCarePlanFR200 extends Component<any, any> {
showEcharts, showEcharts,
echartsData, echartsData,
isShowReReadRecordConnect, isShowReReadRecordConnect,
currentServiceData,
series, series,
isFullScreen, isFullScreen,
} = this.state; } = this.state;
@ -2423,6 +2413,85 @@ class IotCarePlanFR200 extends Component<any, any> {
confirm={this.confirmModeSwitchBtn} confirm={this.confirmModeSwitchBtn}
/> />
{ActiveModeItem.openSourceData.length > 0 && (
<PopupStepTips
isShow={isShowStepTips}
isLarge
isFirstEntry={false}
confirmButtonText="知道了"
data={ActiveModeItem.openSourceData}
close={this.closeStepTips}
/>
)}
<PopupAlert
isShow={isNotEnoughTime}
isClose
title="提示"
content="您的本次护理时间不足,请重新护理"
confirmButtonText="确认"
textAlgin="center"
close={this.closeNotEnoughTime}
confirm={this.closeNotEnoughTime}
/>
<PopupAlert
isShow={isShowErrorTipsText}
isClose
zIndex={10020}
myClassName="level-up"
title="提示"
content={errorTipsText}
confirmButtonText="知道了"
textAlgin="center"
close={this.closeErrorTipsText}
confirm={this.closeErrorTipsText}
/>
<PopupConfirm
isShow={isShowTipsSave}
isClose
zIndex={10020}
myClassName="level-up"
title="提示"
content={
<Block>
<View></View>
<View></View>
</Block>
}
cancelButtonText="取消"
confirmButtonText="确认"
textAlgin="center"
close={this.closeTipsSave}
cancel={this.cancelTipsSave}
confirm={this.confirmTipsSave}
/>
<PopupStatus
isShow={isShowNursingSuccess}
isClose
title="您已结束本次护理"
type="success"
content="正在上传护理记录……"
confirmButtonText="知道了"
textAlgin="center"
close={() => {
/*不需要做处理*/
}}
/>
{isConnectShow && (
<ConnectionBluetoot
deviceInfo={currentDevice}
close={this.connectionClose}
isDisconnect={!isConnectionBlutoot}
offlineChange={() => {}}
pairingChange={this.pairingChange}
upgradeFun={() => {}}
/>
)}
<Popup <Popup
show={isShowHistoryMsg} show={isShowHistoryMsg}
className="custom-popup" className="custom-popup"

Loading…
Cancel
Save