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

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

Browse Source
master
rongweikang 2 years ago
parent e788268e24 6b44f79caf
commit a4297eec94
9 changed files with 682 additions and 491 deletions
Show Stats Download Patch File Download Diff File

2
src/components/popup/popup-step-tips.tsx
Unescape Escape View File

@ -123,7 +123,7 @@ export default class PopupStepTips extends Component<any, any> {
"margin-samll": isLarge,
})}
>
{data[current].openTitle}
{data.length > 0 ? data[current].openTitle : "暂无数据"}
</View>
{/* {title && (
<View

0
src/pages/index/componet/instrument.tsx
Unescape Escape View File

21
src/pages/index/index.tsx
Unescape Escape View File

@ -600,7 +600,6 @@ class Index extends Component<any, any> {
Taro.getSystemInfo({
success: (res) => {
console.log("getSystemInfo", res);
this.setState({ isConnectShow: true });
let { locationEnabled, locationAuthorized, bluetoothEnabled } = res;
if (!locationEnabled || !locationAuthorized) {
showModal({
@ -618,7 +617,7 @@ class Index extends Component<any, any> {
});
} else {
// 打开连接弹窗
this.setState({ isConnectShow: true });
this.connectionOpen();
}
},
});
@ -628,11 +627,12 @@ class Index extends Component<any, any> {
/**
* WE100,WL200配对完成回调
*/
async pairingChange(e) {
pairingChange = (e) => {
console.log("===epairingChange===》", e);
go("/pages/iotCarePlan/iotCarePlan"); // 画页面直接跳转
// return;
}
this.connectionClose();
};
async goIot() {
go("/pages/iotCarePlan/iotCarePlan"); // 画页面直接跳转
@ -746,14 +746,15 @@ class Index extends Component<any, any> {
console.log(offlinelist);
};
connectionClose = async (data) => {
console.log("connectionClose", data);
this.setState({ isConnectShow: false });
connectionOpen = async () => {
this.setState({ isConnectShow: true });
};
connectionConfirm = async (data) => {
console.log("connectionConfirm", data);
connectionClose = async () => {
this.setState({ isConnectShow: false });
};
connectionConfirm = async () => {
this.connectionClose();
};
/*蓝牙 END*/
render() {

3
src/pages/instrument/instrument.tsx
Unescape Escape View File

@ -343,10 +343,9 @@ export default class Instrument extends Component<any, any> {
});
Taro.hideLoading();
if (res.data.code === 200) {
// this.setState({ isVisibleBinding: false });
this.binding();
} else if (res.data.code === 204) {
this.setState({ isBindingCheckError: false });
this.setState({ isBindingCheckError: true });
} else {
this.setState({ isBindingError: true });
}

119
src/pages/iotCarePlan/components/ElectricityView/index.tsx
Unescape Escape View File

@ -0,0 +1,119 @@
import Taro from "@tarojs/taro";
import classnames from "classnames";
import { Block, View, Image, Text } from "@tarojs/components";
import { useState, useEffect } from "react";
// import "./index.less";
interface Props {
Electricity: any;
matrixElectricity: any;
facialMaskConnectStatus: any;
}
function Index({
Electricity,
matrixElectricity,
facialMaskConnectStatus,
}: Props) {
return (
<Block>
<View className="electricity-box">
<View className="item">
<View className="label">WE200电量 :</View>
<View className="value flex aitems">
{matrixElectricity >= 4 && (
<Block>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
</Block>
)}
{matrixElectricity === 3 && (
<Block>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v2 battery_icon"></View>
</Block>
)}
{matrixElectricity === 2 && (
<Block>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
</Block>
)}
{matrixElectricity === 1 && (
<Block>
<View className="v1 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
</Block>
)}
{matrixElectricity === 0 && (
<Block>
<View className="v3 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
</Block>
)}
</View>
</View>
{facialMaskConnectStatus === 1 && (
<Block>
<View className="item">
<View className="label">面罩电量 :</View>
<View className="value flex aitems">
{Electricity >= 4 && (
<Block>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
</Block>
)}
{Electricity === 3 && (
<Block>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v2 battery_icon"></View>
</Block>
)}
{Electricity === 2 && (
<Block>
<View className="v1 battery_icon"></View>
<View className="v1 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
</Block>
)}
{Electricity === 1 && (
<Block>
<View className="v1 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
</Block>
)}
{Electricity === 0 && (
<Block>
<View className="v3 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
<View className="v2 battery_icon"></View>
</Block>
)}
</View>
</View>
</Block>
)}
</View>
</Block>
);
}
export default Index;

72
src/pages/iotCarePlan/components/ModeList/index.tsx
Unescape Escape View File

@ -5,51 +5,55 @@ import { useState, useEffect } from "react";
import "./index.less";
interface Props {
ModeID: any;
activeModeID: any;
ModeList: any;
ModeType: string; // all visor cabin yimeish
ActiveModeItem: any;
isShowNurse: boolean; // 是否已进入护理详情页
isPop: boolean; // 是否弹窗
onEmit: Function; // 每次点击item，回调事件和数据给父组件
onEmitShowAll: Function; // 打开弹窗按钮
}
function Index({
isShowNurse,
isPop,
ModeList,
ModeType,
isShowNurse,
ActiveModeItem,
ModeID,
activeModeID,
onEmit,
onEmitShowAll,
}: Props) {
let VisorList = ModeList.filter((item) => item.modeClass === 1); // 面罩模式
let CabinList = ModeList.filter((item) => item.modeClass === 2); // 舱体模式
let YimeishList = ModeList.filter((item) => item.modeClass === 3); // 医美术后
const [ModeID, setModeID] = useState<any>("mode_" + ActiveModeItem.id);
const [activeID, setActiveID] = useState<any>(ActiveModeItem.id);
console.log("ModeID", ModeID, activeID);
// const [ModeID, setModeID] = useState<any>("mode_" + ActiveModeItem.id);
// const [activeModeID, setactiveModeID] = useState<any>(ActiveModeItem.id);
const yimeishClick = (item) => {
onEmit(item);
setActiveID(item.id);
setModeID("mode_" + item.id);
};
const cabinClick = (item) => {
onEmit(item);
setActiveID(item.id);
setModeID("mode_" + item.id);
};
const visorClick = (item) => {
onEmit(item);
setActiveID(item.id);
setModeID("mode_" + item.id);
};
const showAll = () => {
onEmitShowAll();
};
return (
<Block>
<View className="mode-list-main">
{ModeList.length > 0 && isShowNurse && (
<View className="change-all-mode-btn">
{!isPop && ModeList.length > 0 && isShowNurse && (
<View className="change-all-mode-btn" onClick={showAll}>
<View className="title">全部模式</View>
<Image
className="icon"
@ -58,7 +62,7 @@ function Index({
</View>
)}
{VisorList.length > 0 &&
(ModeType === "all" || ModeType === "visor") && (
(ModeType === "all" || ModeType === "visor" || isPop) && (
<ScrollView
className="mode-list-box"
scroll-x="true"
@ -72,7 +76,7 @@ function Index({
key={"visor_" + index}
id={"visor_" + item.id}
className={classnames("mode-item", {
"mode-item-active": activeID === item.id,
"mode-item-active": activeModeID === item.id,
})}
onClick={visorClick.bind(this, item)}
>
@ -85,19 +89,21 @@ function Index({
</View>
<View className="mode-info">
<View className="mode-info-title">{item.modeName}</View>
<View className="mode-info-time">{item.modeTime}</View>
<View className="mode-info-time">
{item.modeTimeStr}
</View>
<View
className={classnames("mode-info-select", {
"is-select": activeID === item.id,
"is-select": activeModeID === item.id,
})}
>
{activeID === item.id && (
{activeModeID === item.id && (
<View className="mode-info-select-point"></View>
)}
</View>
</View>
{activeID === item.id && (
{activeModeID === item.id && (
<View className="mode-pic">
<Image src={item.modeBanner} mode="aspectFill" />
</View>
@ -110,7 +116,7 @@ function Index({
</ScrollView>
)}
{CabinList.length > 0 &&
(ModeType === "all" || ModeType === "cabin") && (
(ModeType === "all" || ModeType === "cabin" || isPop) && (
<ScrollView
className="mode-list-box"
scrollX={true}
@ -125,7 +131,7 @@ function Index({
id={"cabin_" + item.id}
onClick={cabinClick.bind(this, item)}
className={classnames("mode-item", {
"mode-item-active": activeID === item.id,
"mode-item-active": activeModeID === item.id,
})}
>
<View
@ -137,19 +143,21 @@ function Index({
</View>
<View className="mode-info">
<View className="mode-info-title">{item.modeName}</View>
<View className="mode-info-time">{item.modeTime}</View>
<View className="mode-info-time">
{item.modeTimeStr}
</View>
<View
className={classnames("mode-info-select", {
"is-select": activeID === item.id,
"is-select": activeModeID === item.id,
})}
>
{activeID === item.id && (
{activeModeID === item.id && (
<View className="mode-info-select-point"></View>
)}
</View>
</View>
{activeID === item.id && (
{activeModeID === item.id && (
<View className="mode-pic">
<Image src={item.modeBanner} mode="aspectFill" />
</View>
@ -162,7 +170,7 @@ function Index({
)}
{YimeishList.length > 0 &&
(ModeType === "all" || ModeType === "yimeish") && (
(ModeType === "all" || ModeType === "yimeish" || isPop) && (
<ScrollView
className="mode-list-box"
scrollX={true}
@ -177,7 +185,7 @@ function Index({
id={"yimeish_" + item.id}
onClick={yimeishClick.bind(this, item)}
className={classnames("mode-item", {
"mode-item-active": activeID === item.id,
"mode-item-active": activeModeID === item.id,
})}
>
<View
@ -189,19 +197,21 @@ function Index({
</View>
<View className="mode-info">
<View className="mode-info-title">{item.modeName}</View>
<View className="mode-info-time">{item.modeTime}</View>
<View className="mode-info-time">
{item.modeTimeStr}
</View>
<View
className={classnames("mode-info-select", {
"is-select": activeID === item.id,
"is-select": activeModeID === item.id,
})}
>
{activeID === item.id && (
{activeModeID === item.id && (
<View className="mode-info-select-point"></View>
)}
</View>
</View>
{activeID === item.id && (
{activeModeID === item.id && (
<View className="mode-pic">
<Image src={item.modeBanner} mode="aspectFill" />
</View>

41
src/pages/iotCarePlan/iotCarePlan.less
Unescape Escape View File

@ -30,23 +30,46 @@
.video-or-image {
display: block;
width: 690rpx;
height: 690rpx;
height: 640rpx;
border-radius: 30rpx;
}
.iot-device {
width: 690rpx;
height: 100rpx;
height: 150rpx;
display: flex;
align-items: center;
.item {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
justify-content: center;
.device-time {
font-size: 26rpx;
color: #000;
font-weight: 400;
.time {
font-size: 30rpx;
font-weight: 800;
}
}
.line {
width: 1rpx;
height: 50rpx;
background: #dddddd;
margin-left: 69rpx;
margin-right: 60rpx;
}
.border-right {
border-right: 1px solid #ddd;
.electricity-box {
display: flex;
flex-direction: column;
.item {
display: flex;
align-items: center;
justify-content: left;
height: 50rpx;
.label {
width: 154rpx;
font-size: 26rpx;
color: #000;
margin-right: 14rpx;
}
}
}
}
.msg-tips {

899
src/pages/iotCarePlan/iotCarePlan.tsx
View File

File diff suppressed because it is too large Load Diff

16
src/utils/request.js
Unescape Escape View File

@ -59,14 +59,14 @@ export const Ajax = (params) => {
return;
}
if (res.statusCode !== 200) {
Taro.showModal({
title: "提示",
content: String("错误码：" + res.statusCode),
showCancel: false,
});
return false;
}
// if (res.statusCode !== 200) {
// Taro.showModal({
// title: "提示",
// content: String("错误码：" + res.statusCode),
// showCancel: false,
// });
// return false;
// }
if (res.data.code === 500) {
let msg = "系统异常，请联系管理人员";

Write Preview
Loading…
Cancel
Save