From fa0246d1e5710b1b695f388c14cda4e2a6f8c336 Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Fri, 11 Sep 2026 14:09:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(equipment):=20=E5=B7=B2=E9=85=8D=E5=AF=B9?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=A1=8C=E6=8C=89=E9=92=AE=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BB=85=E8=BF=90=E7=BB=B4=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 miniprogram/pages/equipment/equipment.less | 54 +++++++++++++++-------
 miniprogram/pages/equipment/equipment.wxml | 46 +++++++++++-------
 2 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/miniprogram/pages/equipment/equipment.less b/miniprogram/pages/equipment/equipment.less
index 7dabe06..2e6907d 100644
--- a/miniprogram/pages/equipment/equipment.less
+++ b/miniprogram/pages/equipment/equipment.less
@@ -83,26 +83,46 @@
             }
         }
 
-        /* 描边按钮（蓝色/红色） */
-        .ops-btn {
-            width: 180rpx;
+        .section-right {
             height: 48rpx;
-            border-radius: 8rpx;
-            font-size: 24rpx;
-            line-height: 44rpx;
-            text-align: center;
-            box-sizing: border-box;
-            flex-shrink: 0;
-        }
+            display: flex;
+            flex-wrap: nowrap;
 
-        .ops-btn--blue {
-            border: 2rpx solid #1385FA;
-            color: #1385FA;
-        }
+            .section-right-red {
+                height: 48rpx;
+                padding: 0 15rpx;
+                border-radius: 8rpx;
+                font-size: 24rpx;
+                line-height: 44rpx;
+                box-sizing: border-box;
+                border: 2rpx solid #F24439;
+                color: #F24439;
+            }
 
-        .ops-btn--red {
-            border: 2rpx solid #F24439;
-            color: #F24439;
+            .section-right-blue {
+                height: 48rpx;
+                display: flex;
+                flex-wrap: nowrap;
+                align-items: center;
+                padding: 0 15rpx;
+                border-radius: 8rpx;
+                background-color: #1385FA;
+
+                > view:nth-child(1) {
+                    width: 32rpx;
+                    height: 32rpx;
+                    display: flex;
+                    align-items: center;
+                    margin-right: 6rpx;
+                }
+
+                > view:nth-child(2) {
+                    color: #FFFFFF;
+                    height: 24rpx;
+                    font-size: 24rpx;
+                    line-height: 24rpx;
+                }
+            }
         }
     }
 
diff --git a/miniprogram/pages/equipment/equipment.wxml b/miniprogram/pages/equipment/equipment.wxml
index 72c5bdc..55e5d07 100644
--- a/miniprogram/pages/equipment/equipment.wxml
+++ b/miniprogram/pages/equipment/equipment.wxml
@@ -13,17 +13,27 @@
     </view>
 
     <!-- 已配对设备行 -->
-	<block wx:if="{{ operationsEngineer }}">
-    	<view class="section-bar">
-			<view class="section-left">
-				<view class="bt-icon">
-					<image src="/images/equipment/bluetooth.png"/>
-				</view>
-				<view class="section-title">已配对设备</view>
-			</view>
-            <view class="ops-btn ops-btn--red" bind:tap="onUnpairAll">取消全部配对</view>
-		</view>
-	</block>
+    <view class="section-bar">
+        <view class="section-left">
+            <view class="bt-icon">
+                <image src="/images/equipment/bluetooth.png"/>
+            </view>
+            <view class="section-title">已配对设备</view>
+        </view>
+        <view class="section-right">
+            <block wx:if="{{ operationsEngineer }}">
+                <view class="section-right-red" bind:tap="onUnpairAll">取消全部配对</view>
+            </block>
+            <block wx:else>
+                <view class="section-right-blue" bind:tap="onTapAdd">
+                    <view>
+                        <image src="/images/addBtn.png"/>
+                    </view>
+                    <view>添加设备</view>
+                </view>
+            </block>
+        </view>
+    </view>
 
     <!-- 设备列表 -->
 	<!-- <view class="device">
@@ -86,7 +96,7 @@
                         <view>
                             <image src="/images/equipment/users.png"/>
                         </view>
-                        <view>用户({{ item.userNum }})</view>
+                        <view>用户管理({{ item.userNum }})</view>
                     </view>
                     <block wx:if="{{item.status}}">
                         <view class="device-action-btn" bind:tap="onTapDataRetransfer">
@@ -105,12 +115,14 @@
     </block>
 
     <!-- 添加设备按钮 -->
-    <view class="add-btn" bind:tap="onTapAdd">
-        <view class="add-icon">
-            <image src="/images/addBtn.png"/>
+    <block wx:if="{{ operationsEngineer }}">
+        <view class="add-btn" bind:tap="onTapAdd">
+            <view class="add-icon">
+                <image src="/images/addBtn.png"/>
+            </view>
+            <view class="add-text">添加设备</view>
         </view>
-        <view class="add-text">绑定设备</view>
-    </view>
+    </block>
 
     <equipment-dialog show="{{ loadingShow }}" title="{{ loadingTitle }}" content="{{ loadingContent }}"
                       bind:close="onCloseLoading"/>