diff --git a/pages/serve/bagCheck/index.vue b/pages/serve/bagCheck/index.vue index 1a02923..c4d3887 100644 --- a/pages/serve/bagCheck/index.vue +++ b/pages/serve/bagCheck/index.vue @@ -41,10 +41,12 @@ } if (result.data.length != 0) { + // 如果有未完成订单,直接跳转到归还页面 uni.redirectTo({ url: `/pages/device/return?deviceNo=${option.deviceNo}` }); } else { + // 如果没有未完成订单,跳转到设备详情页面进行租借 uni.redirectTo({ url: `/pages/device/detail?deviceNo=${option.deviceNo}` }); diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index f7056ed..22051fa 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -6874,9 +6874,9 @@ function initOnError() { }; } function initRuntimeSocketService() { - const hosts = "10.8.0.5,192.168.19.1,192.168.47.1,192.168.10.240,127.0.0.1"; + const hosts = "192.168.1.16,192.168.19.1,192.168.47.1,127.0.0.1"; const port = "8090"; - const id = "mp-weixin_kSUXuu"; + const id = "mp-weixin_TE3u0h"; const lazy = typeof swan !== "undefined"; let restoreError = lazy ? () => { } : initOnError(); diff --git a/unpackage/dist/dev/mp-weixin/pages/serve/bagCheck/index.js b/unpackage/dist/dev/mp-weixin/pages/serve/bagCheck/index.js index dd8338d..76f8f5e 100644 --- a/unpackage/dist/dev/mp-weixin/pages/serve/bagCheck/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/serve/bagCheck/index.js @@ -38,7 +38,7 @@ const _sfc_main = { title: "页面加载失败,请重试", icon: "none" }); - common_vendor.index.__f__("error", "at pages/serve/bagCheck/index.vue:58", "bagCheck onLoad error:", error); + common_vendor.index.__f__("error", "at pages/serve/bagCheck/index.vue:60", "bagCheck onLoad error:", error); } }, methods: {}