diff --git a/src/pages/index/index.less b/src/pages/index/index.less index 12513f1..cf1dd32 100644 --- a/src/pages/index/index.less +++ b/src/pages/index/index.less @@ -1015,3 +1015,37 @@ page { } } } + .custom-popup{ + background: none !important; +} +.van-popup { + border-radius: 30rpx; + .popBox { + // box-sizing: border-box; + // width: 670rpx; + // height: 840rpx; + // background: #ffffff; + // border-radius: 30rpx; + // position: relative; + // padding: 42rpx 30rpx 0; + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 670rpx; + height: 250rpx; + background: rgba(0,0,0,0.6); + border-radius: 30rpx; + position: relative; + text-align: center; + color: #ffff; + line-height: 250rpx; + opacity: 0.8; + .close_icon { + position: absolute; + width: 50rpx; + height: 50rpx; + top: 34rpx; + right: 34rpx; + } + + } +} \ No newline at end of file diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 70192a5..0cce1be 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -11,7 +11,7 @@ import { SwiperItem, RichText, } from "@tarojs/components"; - +import { Popup } from "@antmjs/vantui"; /*** redux ***/ import { connect } from "react-redux"; import { userRefresh, tokenRefresh } from "@/store/features/userInfo"; @@ -134,6 +134,7 @@ class Index extends Component { /** 已绑定仪器 */ instrument_detail: {}, + show: false, /* 已绑定仪器 END */ /** 蓝牙相关 */ @@ -162,11 +163,11 @@ class Index extends Component { } } - componentDidMount() {} + componentDidMount() { } componentWillUnmount() { // 页面卸载监听 - Taro.offAppHide((res) => {}); + Taro.offAppHide((res) => { }); this.$instance = null; } @@ -248,7 +249,7 @@ class Index extends Component { this.isSancQrcodeEnter(); } }, - fail: () => {}, + fail: () => { }, complete: () => { // 授权完成运行页面初始化 }, @@ -360,10 +361,16 @@ class Index extends Component { goRegister() { go("/pages/register/register"); } + // 查看所有设备是否绑定完 + Alldevice = () => { + console.log(this.state.isDisabledClickAddDevic, '查看'); + } // 新增设备 addNewDevice = () => { + if (this.isRegister("addNewDevice")) { + if (this.state.isDisabledClickAddDevice) { msg("您已绑定所有设备"); return; @@ -415,12 +422,32 @@ class Index extends Component { go(`/pages/recording/recording?param=${ViewAddInstrument}`); }; - gourl = (e) => { + gourl = async (e) => { + + console.log('添加新设备', e); - const { url } = e.currentTarget.dataset; if (this.isRegister()) { - go(url); + if (url === '/pages/instrument/instrument') { + let { data } = await InstrumentInfo.unbindingInstrumentInfoList(); + console.log(data, '查看未绑定设备'); + if(data.data.length === 0){ + this.setState( + { + show:true + } + ) + setTimeout(() => { + this.setState({ show: false }); + }, 1000); // 2秒后将 show 变量置为 false + }else{ + go(url); + } + + } else { + go(url); + } + } }; @@ -432,7 +459,7 @@ class Index extends Component { this.setState({ isShowSiteSwiper: false }); }; - bannerSwiperchange() {} + bannerSwiperchange() { } gobanner(item) { // 跳转类型:0无跳转、1跳转内部链接、3跳转外部链接、4跳转小程序、5导向视频号、6导向视频号直播间', @@ -480,11 +507,11 @@ class Index extends Component { mask: true, }); let { data: res } = await InstrumentInfo.bindingInstrumentList(); - console.log(res,'查看绑定的设备'); - + console.log(res, '查看绑定的设备'); + // Taro.hideLoading(); if (res.code === 200) { - if(res.data.length === 0){ + if (res.data.length === 0) { this.setState({ ViewAddInstrument: false }); } this.setState({ instrumentList: res.data }); @@ -739,7 +766,7 @@ class Index extends Component { // 跳转仪器介绍页 goNursing = (item) => { - + if (item.status === 0) { setStorageSync("instrument_detail", item); this.setState({ connectInstrument: item }); @@ -755,7 +782,7 @@ class Index extends Component { /** 蓝牙逻辑 */ bindBlockLeft() { - + if (!this.state.isRegisterBoolean) { //未注册授权 this.alertRegister(); @@ -944,6 +971,7 @@ class Index extends Component { }; render() { let { + show, isCommonError, commonErrorText, calendarComplete, @@ -1227,7 +1255,7 @@ class Index extends Component { src={require("../../img/black-add.png")} mode="aspectFill" /> - 添加新设备 + 添加新设备 @@ -1301,6 +1329,9 @@ class Index extends Component { + + 你已绑定所有设备 + ); } diff --git a/src/pages/instrument/instrument.less b/src/pages/instrument/instrument.less index cdda653..5755a25 100644 --- a/src/pages/instrument/instrument.less +++ b/src/pages/instrument/instrument.less @@ -393,3 +393,4 @@ margin-right: 60rpx; border-radius: 45rpx; color: #fff; } + \ No newline at end of file diff --git a/src/pages/instrument/instrument.tsx b/src/pages/instrument/instrument.tsx index 628db83..ae5996f 100644 --- a/src/pages/instrument/instrument.tsx +++ b/src/pages/instrument/instrument.tsx @@ -16,7 +16,7 @@ import { ScrollView, Canvas, } from "@tarojs/components"; - + import { InstrumentInfo } from "@/utils/Interface"; import { go, msg, setStorageSync } from "@/utils/traoAPI"; @@ -49,6 +49,7 @@ export default class Instrument extends Component { serialImage: "", serialCode: "", }, + show:true, equipmentList: [ { id: 1, @@ -243,6 +244,8 @@ export default class Instrument extends Component { // 未绑定列表 unbindingInstrumentInfoList = async () => { let { data } = await InstrumentInfo.unbindingInstrumentInfoList(); + console.log(data,'查看未绑定设备'); + if (data.code === 200) { if (data.data.length) { if (!this.isOnly) { @@ -316,7 +319,7 @@ export default class Instrument extends Component { instrumentId: channelInfo.id, }); Taro.hideLoading(); - if (res.data.code === 200) { + if (res.code === 200) { // this.bindingInstrument(); this.openBindingVisible(); } else if (res.data.code === 204 || res.data.code === 205) { @@ -414,6 +417,7 @@ export default class Instrument extends Component { isBindingError, isBindingError203, isBindingCheckError, + show, channelInfo, inputType, style, @@ -672,6 +676,7 @@ export default class Instrument extends Component { )} + ); } diff --git a/src/pages/instrument_manage/index.less b/src/pages/instrument_manage/index.less index 966e9bc..0eb86ad 100644 --- a/src/pages/instrument_manage/index.less +++ b/src/pages/instrument_manage/index.less @@ -83,7 +83,12 @@ page { } } } - + .backColer{ + background: linear-gradient(to bottom, #e3e3e3, #f8f8f8); + height: 211rpx; + padding: 0rpx 0rpx; + border-radius: 50px; + } .bind_cont { .title { text-align: center; diff --git a/src/pages/instrument_manage/index.tsx b/src/pages/instrument_manage/index.tsx index 4cc8bf2..9ee030b 100644 --- a/src/pages/instrument_manage/index.tsx +++ b/src/pages/instrument_manage/index.tsx @@ -184,7 +184,7 @@ export default class InstrumentManage extends Component { - + {item.name}