From d1c1786829187841d02a6b6c2b1ddae27c1e6e42 Mon Sep 17 00:00:00 2001
From: XiaoMo <xiaomo.drip@gmail.com>
Date: Sat, 5 Jul 2025 14:57:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B5=E9=9D=A2):=20=E5=9C=A8=E6=B4=97?=
 =?UTF-8?q?=E6=B6=A4=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=98=BE=E7=A4=BA=E5=B9=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在洗涤页面数据中增加title字段，用于显示设备标题或设备编码
更新index页面请求接口时添加deviceData参数
---
 pages/index/index.js       | 2 +-
 pages/washing/washing.js   | 3 ++-
 pages/washing/washing.wxml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 3ac42ea..4ba9fba 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -90,7 +90,7 @@ Page({
     getData: function () {
         var a = this;
         // 获取首页数据
-        t.request('/v2/miniprogram/index/balance', {}, !0).then(function (e) {
+        t.request('/v2/miniprogram/index/balance', e.globalData.deviceData, !0).then(function (e) {
             a.setData({
                 user: e.data || [],
             });
diff --git a/pages/washing/washing.js b/pages/washing/washing.js
index d2021bc..2373d54 100644
--- a/pages/washing/washing.js
+++ b/pages/washing/washing.js
@@ -10,7 +10,8 @@ Page({
     agentname: '',
     devicecode: '',
     remainingTime: 0,
-    orderid: ''
+    orderid: '',
+    title: getApp().globalData.deviceData.title || getApp().globalData.deviceData.devicecode
   },
 
   /**
diff --git a/pages/washing/washing.wxml b/pages/washing/washing.wxml
index bf361d5..d4a1cd9 100644
--- a/pages/washing/washing.wxml
+++ b/pages/washing/washing.wxml
@@ -2,7 +2,7 @@
   <view class="time">
     <text class="wangdian">{{agentname}}</text>
     <text class="mactime">{{countdown}}</text>
-    <text class="macid">{{devicecode}}</text>
+    <text class="macid">{{title}}</text>
 
   </view>
   <view class="spinner-container container1">