From ff88e6d96d279fe995bb176947c86cd766aa6545 Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Tue, 25 Nov 2025 10:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=8C=E4=BD=8D=E7=AE=A1=E7=90=86=E8=89=B2?=
 =?UTF-8?q?=E7=B3=BB=E4=BF=AE=E6=94=B90.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/memorial/nfcPairing.vue | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/pages/memorial/nfcPairing.vue b/pages/memorial/nfcPairing.vue
index da31607..7f6e7f1 100644
--- a/pages/memorial/nfcPairing.vue
+++ b/pages/memorial/nfcPairing.vue
@@ -21,10 +21,11 @@
           <view class="nfc-status-header">
             <view :class="['status-dot', nfcEnabled ? 'online' : 'offline']" />
             <text class="nfc-status-title">{{ nfcStatusText }}</text>
-          </view>
-          <view v-if="nfcError" class="nfc-error-text">
-            <!--            <text class="error-content">{{ nfcError }}</text>-->
-            <text class="error-content">请打开NFC</text>
+
+            <view v-if="nfcError" class="nfc-error-text">
+              <!--            <text class="error-content">{{ nfcError }}</text>-->
+              <text class="error-content">请打开NFC</text>
+            </view>
           </view>
         </view>
         <view :class="{ ready: !!cardNo }" class="card-box">
@@ -79,13 +80,14 @@
           class="memorial-info-section"
         >
           <view class="field readonly">
-            <text class="label">区域名称</text>
-            <text class="unit-value">{{ memorialInfo.regionName || "-" }}</text>
-          </view>
-          <view class="field readonly">
-            <text class="label">编码</text>
-            <text class="unit-value">{{ memorialInfo.code || "-" }}</text>
+            <text class="label">区域编码</text>
+
+            <text class="unit-value"
+              >{{ memorialInfo.regionName || "-"
+              }}{{ memorialInfo.code || "-" }}
+            </text>
           </view>
+
           <view class="field readonly">
             <text class="label">MAC 地址</text>
             <text class="unit-value">{{ memorialInfo.mac || "-" }}</text>
@@ -938,7 +940,7 @@ export default {
 
 <style lang="scss" scoped>
 .page {
-  min-height: 100vh;
+  //min-height: 100vh;
   width: 100%;
   padding-bottom: 40rpx;
   box-sizing: border-box;
@@ -1023,7 +1025,6 @@ export default {
 }
 
 .nfc-error-text {
-  margin-top: 12rpx;
   padding: 12rpx;
   background: #fef0f0;
   border-radius: 8rpx;
@@ -1086,7 +1087,7 @@ export default {
 
 .text-btn {
   font-size: 26rpx;
-  color: #4a90e2;
+  color: #c7a26d;
 }
 
 .field {
@@ -1102,9 +1103,9 @@ export default {
 .memorial-info-section {
   margin-bottom: 24rpx;
   padding: 24rpx;
-  background: linear-gradient(135deg, #f0f9ff 0%, #e0f2fe 100%);
+  background: linear-gradient(135deg, #f0f9ff 0%, #c7a26d 100%);
   border-radius: 16rpx;
-  border-left: 4rpx solid #4a90e2;
+  border-left: 4rpx solid #c7a26d;
 }
 
 .memorial-info-section .field.readonly {
@@ -1147,7 +1148,7 @@ export default {
 .primary-btn {
   height: 96rpx;
   border-radius: 16rpx;
-  background: linear-gradient(135deg, #f0b400, #f08400);
+  background: linear-gradient(135deg, #c7a26d, #c7a26d);
   color: #fff;
   font-size: 30rpx;
   font-weight: 600;