diff --git a/src/instrument/pages/instrument/instrument.tsx b/src/instrument/pages/instrument/instrument.tsx index b9fb4de..bf0c88e 100644 --- a/src/instrument/pages/instrument/instrument.tsx +++ b/src/instrument/pages/instrument/instrument.tsx @@ -371,7 +371,7 @@ export default class Instrument extends Component { msg("绑定成功"); setTimeout(() => { setStorageSync("instrument_detail", JSON.stringify(channelInfo)); - go("/pages/instrument/intro?id=" + channelInfo.id); + go("/instrument/pages/instrument/intro?id=" + channelInfo.id); }, 1000); } else if (res.data.code === 202) { this.changeBindBox(); @@ -403,7 +403,7 @@ export default class Instrument extends Component { msg("绑定成功"); setStorageSync("instrument_detail", JSON.stringify(channelInfo)); setTimeout(() => { - go("/pages/instrument/intro?id=" + channelInfo.id); + go("/instrument/pages/instrument/intro?id=" + channelInfo.id); }, 1000); } else if (res.data.code === 202) { this.changeBindBox(); @@ -529,7 +529,7 @@ export default class Instrument extends Component { confirm={this.closeDev} /> */} { /> - - - 仪器绑定 - + + + 仪器绑定 + 请参考图片指引,扫描或输入产品序列号 - 完成花至美容仪绑定 + 完成花至美容仪绑定 - + {inputType === 1 ? ( - - - + + + 需要绑定的仪器 @@ -624,10 +624,10 @@ export default class Instrument extends Component { {equipmentList.length > 0 && equipmentList.map((item, index) => { @@ -641,11 +641,11 @@ export default class Instrument extends Component { onClick={this.onSelectChange.bind(this, item)} > - {item.name} + {item.name} ); })} @@ -659,8 +659,8 @@ export default class Instrument extends Component { )} - - + + { onClick={this.onTabTap.bind(this, 1)} > 手写输入绑定 - + {channelInfo.isScanCode === 1 && ( { onClick={this.onTabTap.bind(this, 2)} > 扫码绑定 - + )} @@ -686,38 +686,38 @@ export default class Instrument extends Component { {inputType == 1 && ( - - - - + + + + 填写序列号 * - - 查看序列号位置 + + 查看序列号位置 - + - - - + + + 上传序列号照片 * @@ -725,20 +725,20 @@ export default class Instrument extends Component { {channelInfo.serialImage && ( )} {!channelInfo.serialImage && ( )} @@ -748,10 +748,10 @@ export default class Instrument extends Component { )} - + {inputType == 1 && ( 确认绑定 @@ -759,9 +759,9 @@ export default class Instrument extends Component { )} {inputType == 2 && ( - + 扫码绑定 diff --git a/src/instrument/pages/instrument_manage/index.tsx b/src/instrument/pages/instrument_manage/index.tsx index b48b52c..1586ece 100644 --- a/src/instrument/pages/instrument_manage/index.tsx +++ b/src/instrument/pages/instrument_manage/index.tsx @@ -92,17 +92,17 @@ export default class InstrumentManage extends Component { setStorageSync("instrument_detail", item); let bindid = item.id; - go("/pages/instrument/intro?id=" + bindid); + go("/instrument/pages/instrument/intro?id=" + bindid); }; goBind = (item) => { let bindid = item.id; - go("/pages/instrument/instrument?isOnly=true&id=" + bindid); // 只显示当前仪器内容 + go("/instrument/pages/instrument/instrument?isOnly=true&id=" + bindid); // 只显示当前仪器内容 }; goBindInfo = (item) => { // let bindid = item.id; setStorageSync("instrument_detail", item); - go("/pages/instrument_detail/index"); + go("/instrument/pages/instrument_detail/index"); }; lesgobuy = (item) => { diff --git a/src/pages/activity/activity.tsx b/src/pages/activity/activity.tsx index 1e79580..c3334bf 100644 --- a/src/pages/activity/activity.tsx +++ b/src/pages/activity/activity.tsx @@ -44,7 +44,7 @@ export default class Activity extends Component { return ( {name} - 待开发 + 请先绑定仪器 ); } diff --git a/src/pages/detect/detect.tsx b/src/pages/detect/detect.tsx index 73b9a75..dca2502 100644 --- a/src/pages/detect/detect.tsx +++ b/src/pages/detect/detect.tsx @@ -44,7 +44,7 @@ export default class Detect extends Component { return ( {name} - 待开发 + 请先绑定仪器 ); } diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index f36d4f7..c02499b 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -420,7 +420,7 @@ class Index extends Component { }; GetSiteAddTag = async (id) => { - go("/recoding/pages/moisture_test_report/moisture_test_report") + go("/recoding/pages/moisture_test_report/moisture_test_report"); let res = await GetSiteAddTag(id); if (res.data.code === 200) { console.log("点击自动上报,不需要逻辑处理"); @@ -441,7 +441,7 @@ class Index extends Component { msg("您已绑定所有设备"); return; } - go("/pages/instrument/instrument"); + go("/instrument/pages/instrument/instrument"); } }; @@ -493,7 +493,7 @@ class Index extends Component { const { url } = e.currentTarget.dataset; if (this.isRegister()) { - if (url === "/pages/instrument/instrument") { + if (url === "/instrument/pages/instrument/instrument") { let { data } = await InstrumentInfo.unbindingInstrumentInfoList(); console.log(data, "查看未绑定设备"); if (data.data.length === 0) { @@ -781,7 +781,7 @@ class Index extends Component { if (res.data.code === 200) { console.log("res.data.data", res.data.data); if (res.data.data.length > 0) { - go("/pages/instrument/intro??customBack=true&id=" + id); + go("/instrument/pages/instrument/intro??customBack=true&id=" + id); } else { this.bindingInstrumentList(); } @@ -1349,7 +1349,7 @@ class Index extends Component { 前往护理 { } let isInstrumentJump = Taro.getStorageSync("isInstrumentJump"); if (isInstrumentJump === "true") { - go("/pages/instrument/instrument"); + go("/instrument/pages/instrument/instrument"); } else { Taro.switchTab({ url: "/pages/user/user",