diff --git a/page_user/luru/bind_mac.vue b/page_user/luru/bind_mac.vue
index 39ca132..4aeeca8 100644
--- a/page_user/luru/bind_mac.vue
+++ b/page_user/luru/bind_mac.vue
@@ -53,7 +53,7 @@
确认添加
返回
- 去控制台
+ 去控制台
@@ -139,6 +139,7 @@ export default {
kashow: false,
kaname: "",
kaid: "",
+ isBandFromRoute: false,
};
},
onLoad(e) {
@@ -147,6 +148,7 @@ export default {
});
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
this.mac = e.mac;
+ this.isBandFromRoute = e.isBand == 1 || e.isBand === "1" || e.isBand === true;
this.findDevice();
this.isbands = false;
this.carstause = false;
diff --git a/page_user/luru/index.vue b/page_user/luru/index.vue
index b94021b..fc61afd 100644
--- a/page_user/luru/index.vue
+++ b/page_user/luru/index.vue
@@ -124,7 +124,7 @@ export default {
xBlufi.notifyStartDiscoverBle({ isStart: true });
setTimeout(() => {
xBlufi.notifyStartDiscoverBle({ isStart: false });
- if (this.devicesList.length == 0) {
+ if (this.devicesList.length === 0) {
this.tishiflag = true;
this.texts = "扫描完毕,请操作";
} else {
@@ -219,7 +219,10 @@ export default {
console.log(e);
let Bluetoothmac = e.name.substring(5);
uni.navigateTo({
- url: "/page_user/luru/bind_mac?mac=" + Bluetoothmac,
+ url:
+ "/page_user/luru/bind_mac?mac=" +
+ Bluetoothmac +
+ "&isBand=" + (e.isBand ? 1 : 0),
});
},
send() {
diff --git a/utils/request.js b/utils/request.js
index e760b38..4456d42 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -143,8 +143,8 @@ function handleResponseError(res, reject, options = {}) {
export function request(options = {}) {
return new Promise((resolve, reject) => {
// 获取token,优先使用本地存储的token,如果没有则使用临时token
- const localToken = uni.getStorageSync("token");
- let token = localToken;
+
+ let token = uni.getStorageSync("token");
// 如果本地没有token且启用了临时token,则使用临时token
if (!token && shouldUseTempToken() && !options.noToken) {