开关

page_user/sbdetail.vue

@@ -1476,7 +1476,20 @@
 						break
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
 						this.ver_dataflag = 3
-						console.log("1收到设备发来的自定义数据结果：", options.data)
+						let arrobj = this.parseStringToObject(options.data)
+						let data ={
+							v:arrobj.bat,
+							S:arrobj.sw,
+							mac:this.qrResult,
+							time:arrobj.time,
+							version:arrobj.ver
+						}
+						this.$u.put(`/app/device/bltSyncIot`,data).then(res => {
+							if(res.code == 200){
+								// console.log(data);
+							}
+						})
+						console.log("1收到设备发来的自定义数据结果：", options.data,arrobj)
 						break
 					case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
 						if (options.result) {
@@ -1488,6 +1501,29 @@
 						break
 				}
 			},
+			parseStringToObject(str) {
+			    // 去掉末尾的空字符串（如果有）
+			    const parts = str.split('@').filter(part => part.trim() !== '');
+			
+			    const result = {};
+			
+			    parts.forEach(part => {
+			        // 如果包含冒号，按 key:value 解析
+			        if (part.includes(':')) {
+			            const [key, value] = part.split(':');
+			            result[key.trim()] = value.trim();
+			        } else {
+			            // 如果不包含冒号，按 keyvalue 解析
+			            const key = part.match(/[a-zA-Z]+/)?.[0]; // 提取字母部分
+			            const value = part.match(/\d+/)?.[0]; // 提取数字部分
+			            if (key && value !== undefined) {
+			                result[key.trim()] = value.trim();
+			            }
+			        }
+			    });
+			
+			    return result;
+			}
 		}
 	}
 </script>

page_user/yetx.vue

@@ -6,7 +6,7 @@
 		<view class="top_box">
 			<view class="tip">账户余额(元)</view>
 			<view class="txt">
-				￥{{userinfo.balance == undefined ? '' : Number(userinfo.balance) + Number(userinfo.waitBonusAmount)}} <text style="margin-left: 20rpx;">{{'待结算(￥' + waitBonusAmount + ')'}}</text>
+				￥{{userinfo.balance == undefined ? '' : userinfo.balance}} <text style="margin-left: 20rpx;">{{'待结算(￥' + waitBonusAmount + ')'}}</text>
 			</view>
 			<view class="tip" style="display: flex;justify-content: space-between;align-items: center;">
 				<text>累计提现：￥{{userinfo.withDrawlAmount == undefined ? '' : userinfo.withDrawlAmount}}</text>