From f45f0ac1072bad9b865af9003460128673b48b9e Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Sat, 26 Apr 2025 17:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=87=E8=8A=B1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/http.interceptor.js | 2 +-
page_user/lanya.vue | 10 ++++++++--
page_user/upload.vue | 19 ++++++++++++++-----
pages/my.vue | 7 +++++--
4 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 77dc897..a34a139 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -21,7 +21,7 @@ const install = (Vue, vm) => {
// });
Vue.prototype.$u.http.setConfig({
baseUrl: 'https://yxd.ccttiot.com/prod-api',
- // baseUrl: 'http://192.168.0.101:8081',
+ // baseUrl: 'http://192.168.0.100:8081',
loadingText: '努力加载中~',
loadingTime: 800,
// 设置自定义头部content-type
diff --git a/page_user/lanya.vue b/page_user/lanya.vue
index 2f856f3..aa0f015 100644
--- a/page_user/lanya.vue
+++ b/page_user/lanya.vue
@@ -25,6 +25,9 @@
MAC：{{item.mac == undefined ? item.name.slice(-12) : item.mac}}
+
+ 信号：{{item.ssid == undefined ? '--' : item.ssid}}
+
已添加
@@ -166,7 +169,7 @@
pre: this.currentDevice.pre,
deviceName: this.customDeviceName
}
-
+ console.log(data,'参数');
this.$u.post(`/app/bandDevice`, data).then((res) => {
if (res.code == 200) {
uni.showToast({
@@ -179,6 +182,7 @@
uni.navigateBack()
}, 2000)
} else {
+ console.log(res,'报错');
uni.showToast({
title: res.msg,
icon: 'none',
@@ -228,6 +232,7 @@
updatedDevicesList.forEach(val => {
const mac = val.name.slice(-12);
const pre = val.name.slice(0, 5);
+ const ssid = val.RSSI
const matched = that.getpipei(pre);
const userid = val.userId || null;
that.jiaohuaqi.push({
@@ -235,7 +240,8 @@
modelName: matched.modelName,
modelPicture: matched.picture,
pre: pre,
- userId: userid
+ userId: userid,
+ ssid:ssid
});
console.log(that.jiaohuaqi, '2222');
});
diff --git a/page_user/upload.vue b/page_user/upload.vue
index b5c8c8c..aac7eb6 100644
--- a/page_user/upload.vue
+++ b/page_user/upload.vue
@@ -23,11 +23,20 @@
-
- 固件更新
-
-
- 可更新
+
+
+ 固件更新
+
+ 可更新
+
+
+
+
+ 当前版本：{{ver == null ? '请连接蓝牙获取当前版本' : ver}}
+
+
+ 最新版本：{{version == null ? '' : version}}
+
diff --git a/pages/my.vue b/pages/my.vue
index 8c3b040..a0641ea 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -44,7 +44,7 @@
关于我们
-
+
退出登录
@@ -62,7 +62,8 @@
userobj:{},
imageSrc:'',
token:'',
- picdomain:''
+ picdomain:'',
+ logoflag:true
}
},
// 分享到好友（会话）
@@ -95,7 +96,9 @@
if (res.code == 200) {
this.userobj = res.data
this.imageSrc = res.data.avatar
+ this.logoflag = false
}else if(res.code == 401){
+ this.logoflag = true
uni.showModal({
title: '提示',
content: '您还未登录，是否前去登录？',