diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 6013d2d..dc058e1 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -89,9 +89,31 @@ class Index extends Component { // 横幅轮播 bannerList: [], bannerCurrent: 0, - // 绑定仪器弹窗 + + /** 绑定仪器 */ isVisibleBinding: false, typeBinding: 0, + serial: "", // 仪器序列号 + instrumentInfo: { + bindingStatus: 2, + createBy: null, + createTime: "2024-01-19 17:46:10", + exportFields: [], + id: 4, + instrumentId: 82, + instrumentIdArray: null, + instrumentName: "研发测试FR380", + instrumentSerialIdList: [], + queryInstrumentIds: null, + remark: null, + serial: "1959895", + source: "导入", + status: 0, + updateBy: null, + updateTime: null, + validStatus: 1, + }, + /** 绑定仪器 End */ }; } @@ -338,8 +360,6 @@ class Index extends Component { // 是否扫码进入小程序 isSancQrcodeEnter = async () => { let instance = Taro.getCurrentInstance(); - console.log("instance", instance); - console.log("instance.router?.params", instance.router?.params); let q = instance.router?.params?.q; if (q) { // 扫码进入强制重新登录 @@ -373,14 +393,34 @@ class Index extends Component { confirmBinding() { this.setState({ isVisibleBinding: false }); } - + // 根据扫码的序列号获取仪器信息 getInstrumentInfoBySerial = async () => { let url = this.$instance.router?.params?.q; if (url) { - let urlObj = new URL(url); - let params = new URLSearchParams(url); - let { data } = await InstrumentInfo.getInstrumentInfoBySerial(); - console.log("Data", data); + let _url = decodeURIComponent(url); + if (_url.indexOf("?")) { + let ids = _url.split("?"); + if (ids.length > 1) { + let serial = ids[1]; + let { data } = await InstrumentInfo.getInstrumentInfoBySerial({ + serial: serial, + }); + if (data.code === 200) { + console.log("Data", data); + this.setState({ serial }); + } + } + } + } + }; + // 绑定仪器 + bindingInstrument = async () => { + let { serial } = this.state; + let { data } = await InstrumentInfo.binding({ + serial: serial, + }); + if (data.code === 200) { + console.log("binding", data); } }; // InstrumentInfo diff --git a/src/store/features/globalStore.js b/src/store/features/globalStore.js index 7b8fab6..48ff825 100644 --- a/src/store/features/globalStore.js +++ b/src/store/features/globalStore.js @@ -5,7 +5,7 @@ import { createSlice } from "@reduxjs/toolkit"; const globalStoreReducer = createSlice({ name: "globalStore", // store的名字 initialState: { - domain: "https://flossom.yq-h5.cn/prod-api/", // 请求地址 + domain: "https://flossom.yq-h5.cn/prod-api", // 请求地址 // domain: "http://192.168.10.147:8080", // 请求地址 // 是否首次进入首页 isShowIndexFlag: false, diff --git a/src/utils/Interface.js b/src/utils/Interface.js index b0a2dd9..ba29354 100644 --- a/src/utils/Interface.js +++ b/src/utils/Interface.js @@ -235,7 +235,8 @@ export const InstrumentInfo = { // 根据序列号获取仪器信息 return Ajax({ url: - "/instrument/getInstrumentInfoBySerial" + paramsToUrlQueryString(data), + "/hzwx/instrument/getInstrumentInfoBySerial" + + paramsToUrlQueryString(data), data, method: "get", }); @@ -243,7 +244,7 @@ export const InstrumentInfo = { binding: (data) => { // 绑定仪器 return Ajax({ - url: "/instrument/binding" + paramsToUrlQueryString(data), + url: "/hzwx/instrument/binding" + paramsToUrlQueryString(data), data, method: "get", }); @@ -251,7 +252,7 @@ export const InstrumentInfo = { exchangeBinding: (data) => { // 更换绑定仪器 return Ajax({ - url: "/instrument/exchangeBinding" + paramsToUrlQueryString(data), + url: "/hzwx/instrument/exchangeBinding" + paramsToUrlQueryString(data), data, method: "get", }); @@ -259,7 +260,8 @@ export const InstrumentInfo = { bindingInstrumentList: (data) => { // 获取当前用户:已绑定仪器列表 return Ajax({ - url: "/instrument/bindingInstrumentList" + paramsToUrlQueryString(data), + url: + "/hzwx/instrument/bindingInstrumentList" + paramsToUrlQueryString(data), data, method: "get", }); @@ -268,7 +270,7 @@ export const InstrumentInfo = { // 获取当前用户:未绑定仪器列表 return Ajax({ url: - "/instrument/unbindingInstrumentInfoList" + + "/hzwx/instrument/unbindingInstrumentInfoList" + paramsToUrlQueryString(data), data, method: "get", @@ -277,7 +279,7 @@ export const InstrumentInfo = { manualCodeBinding: (data) => { // 用户手动绑定仪器 return Ajax({ - url: "/instrument/manualCodeBinding", + url: "/hzwx/instrument/manualCodeBinding", data, method: "post", }); @@ -293,7 +295,7 @@ export const InstrumentInfo = { firstNurseInfo: (data) => { // 根据仪器ID:获取仪器的初次护理信息 return Ajax({ - url: "/instrument/firstNurseInfo" + paramsToUrlQueryString(data), + url: "/hzwx/instrument/firstNurseInfo" + paramsToUrlQueryString(data), data, method: "get", }); @@ -301,7 +303,7 @@ export const InstrumentInfo = { modeInfo: (data) => { // 根据仪器ID:获取仪器模式 return Ajax({ - url: "/instrument/modeInfo" + paramsToUrlQueryString(data), + url: "/hzwx/instrument/modeInfo" + paramsToUrlQueryString(data), data, method: "get", }); diff --git a/src/utils/traoAPI.js b/src/utils/traoAPI.js index f02acf5..1804676 100644 --- a/src/utils/traoAPI.js +++ b/src/utils/traoAPI.js @@ -281,7 +281,7 @@ export const requestPayment = (data) => { }); }; -// 存 +// 本地缓存 存 const originSetStorageSync = Taro.setStorageSync; export const setStorageSync = function (key, data, expires) { // 如果没有传第三个有效期参数,就还是用原来的方法 @@ -294,7 +294,7 @@ export const setStorageSync = function (key, data, expires) { originSetStorageSync(key, { data, expires: expires }); }; -// 取 +// 本地缓存 取 const originGetStorageSymc = Taro.getStorageSync; export const getStorageSync = function (key) { const data = originGetStorageSymc(key);