修改版本

config.js

@@ -1,8 +1,8 @@
 // 应用全局配置
 module.exports = {
   //baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  baseUrl: 'http://120.55.183.139:8090',
-  socketUrl: 'ws://120.55.183.139:8090/websocket',
+  baseUrl: 'https://ev.weguyun.com',
+  socketUrl: 'ws://ev.weguyun.com/websocket',
   imgUrl:'https://saomawzz.oss-cn-hangzhou.aliyuncs.com/chargerforeign',
   // 应用信息
   appInfo: {

locale/zh-Hans.json

@@ -33,7 +33,7 @@
 		"nopwd": "密码不能为空",
 		"pwdtip": "6位数字密码",
 		"pwdinput": "请输入操作密码",
-		"errpwd": "密码不能为空",
+		"errpwd": "密码有误",
 		"connecting": "设备连接中",
 		"tip": "提示"
 	},

manifest.json

@@ -2,8 +2,8 @@
     "name" : "用电助理",
     "appid" : "__UNI__60E8019",
     "description" : "",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/bluetooth/index/index.vue

@@ -137,7 +137,7 @@ import i18 from '@/utils/i18.js'
       },
       inputPwd(){
         if(!this.pwd ){
-          this.$modal.showToast(this.$t('buletooth.nopwd'));
+          this.$modal.showToast(this.$t('buletooth.errpwd'));
         }else{
           if(this.rightPwd && this.rightPwd === this.pwd){
            this.loginSuccess();
@@ -173,7 +173,7 @@ import i18 from '@/utils/i18.js'
               ecUI.hideLoading()
               getPwd();
               self.buleid = id;
-            },5000)
+            },2000)
             // uni.setStorageSync('blueid', id);
 						// ecBLE.stopBluetoothDevicesDiscovery();
             //
@@ -271,6 +271,9 @@ import i18 from '@/utils/i18.js'
 				ecBLE.onBluetoothDeviceFound(res => {
 					// if(res.id==="EC:22:05:13:78:49")
 					// console.log(`id:${res.id},name:${res.name},rssi:${res.rssi}`)
+          if(!res.name.startsWith('BT_')){
+            return;
+          }
 					for (const item of deviceListData) {
 						if (item.id === res.id) {
 							item.name = res.name

pages/weitiandi/bluetooth/status.vue

@@ -287,6 +287,7 @@ export default {
           this.$modal.showToast("密码不能为空");
         }else {
           setPwd(this.pwd);
+          this.oldPwd = this.pwd;
           this.$modal.showToast("密码修改成功");
           this.showPwd = false;
           this.showInitPwd = false;