From 05c4cf3aa5563a220920ecee0c321de972d72330 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Mon, 27 Oct 2025 16:22:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(specialArea):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=B5=A0=E5=93=81=E4=B8=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../special-area-wrapper.vue                  |  3 +-
 pages/bonus/index.vue                         | 18 +++++---
 pages/mine/index.vue                          | 41 ++++++++++++++++++-
 pages/pay/index.vue                           |  2 +-
 pages/specialArea/list.vue                    |  2 +-
 pages/userData/index.vue                      |  4 +-
 util/specialAreaMap.js                        |  2 +-
 7 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/components/area-product-list/special-area-wrapper.vue b/components/area-product-list/special-area-wrapper.vue
index 3220d2f..297a0fd 100644
--- a/components/area-product-list/special-area-wrapper.vue
+++ b/components/area-product-list/special-area-wrapper.vue
@@ -34,7 +34,7 @@
         ></area-product-list>
       </view>
     </view>
-    <!-- 重消 -->
+    <!-- 赠送 -->
     <view key="rescission" v-if="rescissionList.length > 0" class="goods-flexs">
       <view class="goods-view">
         <area-product-list
@@ -106,6 +106,7 @@ export default {
     this.getAreaListById(REGIEST_AREA.id, this.registList)
     this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
     this.getAreaListById(HALF_PRICE_AREA.id, this.halfPriceList)
+    this.getAreaListById(REISSUE_AREA.id, this.rescissionList)
   },
   methods: {
     getAreaListById(areaId, list) {
diff --git a/pages/bonus/index.vue b/pages/bonus/index.vue
index 60b9772..b5a0699 100644
--- a/pages/bonus/index.vue
+++ b/pages/bonus/index.vue
@@ -60,11 +60,19 @@
               </view>
             </view>
           </view>
-          <view class="card-footer">
-            <text class="subtotal-label">小计(¥)</text>
-            <text class="subtotal-value">{{
-              dailyBonus.retailRealSubtotal || '0.00'
-            }}</text>
+          <view>
+            <view class="card-footer">
+              <text class="subtotal-label">小计(¥)</text>
+              <text class="subtotal-value">{{
+                dailyBonus.retailRealSubtotal || '0.00'
+              }}</text>
+            </view>
+            <view class="card-footer">
+              <text class="subtotal-label">赠送积分</text>
+              <text class="subtotal-value" style="color: #000">{{
+                dailyBonus.backPoints || '-'
+              }}</text>
+            </view>
           </view>
         </view>
       </template>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index b8403e3..a344e54 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -18,6 +18,11 @@
         <view class="user-details">
           <view class="user-name-and-level">
             <text class="user-name">{{ userInfo.memberCode }}</text>
+            <!-- 会员等级显示 -->
+            <view class="member-level-badge" :class="memberLevelClass">
+              <text class="member-level-text">{{ memberLevelText }}</text>
+            </view>
+            <!-- 原有的pkAwardsVal显示 -->
             <view
               v-show="userInfo.pkAwardsVal !== '无' && userInfo.pkAwardsVal"
               class="svip-badge"
@@ -369,6 +374,14 @@ export default {
         decimal: parts.length > 1 ? `.${parts[1]}` : '',
       }
     },
+    // 会员等级文本
+    memberLevelText() {
+      return this.userInfo.pkGradeVal || '会员'
+    },
+    // 会员等级样式类名
+    memberLevelClass() {
+      return 'member-level-normal'
+    },
   },
 
   methods: {
@@ -774,12 +787,14 @@ export default {
 .user-name-and-level {
   display: flex;
   align-items: center;
-  gap: 16rpx;
+  gap: 12rpx;
+  flex-wrap: wrap;
 
   .user-name {
     font-size: 36rpx;
     font-weight: bold;
     color: #fff;
+    margin-right: 8rpx;
   }
 
   .svip-badge {
@@ -794,6 +809,30 @@ export default {
       0 1px 2px rgba(0, 0, 0, 0.15);
     border: 1rpx solid #c8a000;
   }
+
+  // 会员等级徽章基础样式
+  .member-level-badge {
+    padding: 4rpx 12rpx;
+    border-radius: 50px;
+    font-size: 20rpx;
+    font-weight: 600;
+    box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
+    border: 1rpx solid;
+
+    .member-level-text {
+      font-weight: 600;
+    }
+  }
+
+  // 会员等级统一样式
+  .member-level-normal {
+    background: linear-gradient(145deg, #e8f4fd, #d1e7f7);
+    color: #2c5aa0;
+    border-color: #7bb3e0;
+    box-shadow:
+      inset 0 1px 1px rgba(255, 255, 255, 0.6),
+      0 2rpx 4rpx rgba(43, 90, 160, 0.15);
+  }
 }
 
 .awards-container {
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index e2f03e5..54d029e 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -92,7 +92,7 @@
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount5 > 0">
-              <view class="tTit">{{ '重消账户' }}</view>
+              <view class="tTit">赠送积分</view>
               <view class="lan">
                 <view>
                   {{ payDetail.account5 | numberToCurrency | isLocal }}
diff --git a/pages/specialArea/list.vue b/pages/specialArea/list.vue
index 2f3fba5..240c90c 100644
--- a/pages/specialArea/list.vue
+++ b/pages/specialArea/list.vue
@@ -290,7 +290,7 @@ export default {
       })
     })
     // 获取国家
-    this.getJScountry()
+    // this.getJScountry()
     this.$nextTick(() => {
       this.$refs.cart.getCar()
     })
diff --git a/pages/userData/index.vue b/pages/userData/index.vue
index bf2423e..eda996c 100644
--- a/pages/userData/index.vue
+++ b/pages/userData/index.vue
@@ -68,12 +68,12 @@
 								{{userInfo.settleCountryName}}
 							</view>
 				</view> -->
-      <!-- <view class="index-view">
+      <view class="index-view">
         <view class="user-name">会员等级</view>
         <view class="user-right">
           {{ userInfo.pkGradeVal }}
         </view>
-      </view> -->
+      </view>
 
       <view class="index-view">
         <view class="user-name">荣誉奖衔</view>
diff --git a/util/specialAreaMap.js b/util/specialAreaMap.js
index bc1c0d0..30f680b 100644
--- a/util/specialAreaMap.js
+++ b/util/specialAreaMap.js
@@ -11,7 +11,7 @@ export const UPGRADE_AREA = {
 
 export const REISSUE_AREA = {
   id: 44,
-  name: '重消专区',
+  name: '赠品专区',
 }
 export const REPURCHASE_AREA = {
   id: 43,