From c13539a9d4551f7d4f026e6189453e721f1abb80 Mon Sep 17 00:00:00 2001 From: Haiyi <1021441632@qq.com> Date: Mon, 27 Jun 2022 19:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.js | 2 +- src/pages/sampleComparison/index.tsx | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/common/constant.js b/src/common/constant.js index ffcd589..b3c4852 100644 --- a/src/common/constant.js +++ b/src/common/constant.js @@ -10,7 +10,7 @@ // export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境 // export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境 // export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞 -export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添 +export const BASE_URL = `http://192.168.1.7:50001/lymarket` // 添 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰 // CDN diff --git a/src/pages/sampleComparison/index.tsx b/src/pages/sampleComparison/index.tsx index 320c0c3..a71d7ab 100644 --- a/src/pages/sampleComparison/index.tsx +++ b/src/pages/sampleComparison/index.tsx @@ -1,9 +1,21 @@ import { Image, Text, Textarea, View } from "@tarojs/components" import Taro, { useDidShow, usePullDownRefresh, useRouter } from "@tarojs/taro"; +import { useBluetooth } from "@/use/contextBlueTooth" import classnames from "classnames"; import styles from './index.module.scss' export default () => { + const { state: colorState, measureAndGetLab } = useBluetooth() + const getLab = () => { + if (colorState.connected) { + measureAndGetLab() + } else { + Taro.showToast({ + title: '请链接设备', + icon: 'none' + }) + } + } return (