From d43406380ca4a05c4370ec60866bfb3186a7d81e Mon Sep 17 00:00:00 2001
From: 18631081161 <2088094923@qq.com>
Date: Mon, 13 Apr 2026 13:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/membership.ts                   |   4 +
 admin/src/api/user.ts                         |   5 +
 admin/src/views/membership/index.vue          |  34 +-
 admin/src/views/user/index.vue                |  48 ++-
 .../Controllers/AdminMembershipController.cs  |  42 +++
 .../Controllers/AdminUserController.cs        |  26 ++
 .../04/e53a68070b074ac1a8499b561a14a88e.webp  | Bin 0 -> 4440 bytes
 .../04/e97edbd766a34b23a757693aee0f62b9.webp  | Bin 0 -> 7212 bytes
 mobile/components/GiftPointsPopup.vue         |  35 +--
 mobile/i18n/en.js                             |   2 +-
 mobile/i18n/zh-CN.js                          |   2 +-
 mobile/i18n/zh-TW.js                          |   2 +-
 mobile/pages.json                             |   4 +
 mobile/pages/coupons/coupons.vue              | 291 +++++++++++++-----
 mobile/pages/index/index.vue                  |  38 +++
 mobile/pages/mine/mine.vue                    |  21 +-
 mobile/pages/points/points.vue                |  95 ++++--
 mobile/pages/stamps/stamps.vue                |  59 ++++
 mobile/static/ic_back2.png                    | Bin 0 -> 640 bytes
 mobile/static/ic_integral.png                 | Bin 0 -> 2385 bytes
 20 files changed, 566 insertions(+), 142 deletions(-)
 create mode 100644 backend/src/VendingMachine.Api/wwwroot/uploads/2026/04/e53a68070b074ac1a8499b561a14a88e.webp
 create mode 100644 backend/src/VendingMachine.Api/wwwroot/uploads/2026/04/e97edbd766a34b23a757693aee0f62b9.webp
 create mode 100644 mobile/static/ic_back2.png
 create mode 100644 mobile/static/ic_integral.png

diff --git a/admin/src/api/membership.ts b/admin/src/api/membership.ts
index 943839d5..d3797dab 100644
--- a/admin/src/api/membership.ts
+++ b/admin/src/api/membership.ts
@@ -5,6 +5,10 @@ export function getMembershipProducts() {
   return request.get('/membership/products')
 }
 
+export function createMembershipProduct(data: any) {
+  return request.post('/membership/products', data)
+}
+
 export function updateMembershipProduct(id: string, data: any) {
   return request.put(`/membership/products/${id}`, data)
 }
diff --git a/admin/src/api/user.ts b/admin/src/api/user.ts
index 827ff5b9..89ea982c 100644
--- a/admin/src/api/user.ts
+++ b/admin/src/api/user.ts
@@ -17,3 +17,8 @@ export function setUserMembership(uid: string, data: {
 }) {
   return request.put(`/user/${uid}/membership`, data)
 }
+
+// 修改用户积分
+export function updateUserPoints(uid: string, points: number) {
+  return request.put(`/user/${uid}/points`, { points })
+}
diff --git a/admin/src/views/membership/index.vue b/admin/src/views/membership/index.vue
index 99fab075..ea8d581c 100644
--- a/admin/src/views/membership/index.vue
+++ b/admin/src/views/membership/index.vue
@@ -1,5 +1,9 @@
 <template>
   <div class="membership-manage">
+    <div class="toolbar">
+      <el-button type="primary" @click="handleAdd">新增会员商品</el-button>
+    </div>
+
     <el-table :data="productList" border style="width: 100%">
       <el-table-column label="会员类型" width="120" align="center">
         <template #default="{ row }">
@@ -27,10 +31,13 @@
     </el-table>
 
     <!-- 编辑弹窗 -->
-    <el-dialog v-model="dialogVisible" title="编辑会员商品" width="620px" destroy-on-close>
+    <el-dialog v-model="dialogVisible" :title="isEdit ? '编辑会员商品' : '新增会员商品'" width="620px" destroy-on-close>
       <el-form :model="form" label-width="130px">
-        <el-form-item label="会员类型">
-          <el-input :model-value="form.type === 'Monthly' ? '单月会员' : '订阅会员'" disabled />
+        <el-form-item label="会员类型" required>
+          <el-select v-model="form.type" style="width: 100%" :disabled="isEdit">
+            <el-option label="单月会员" value="Monthly" />
+            <el-option label="订阅会员" value="Subscription" />
+          </el-select>
         </el-form-item>
         <el-form-item label="价格" required>
           <el-input-number v-model="form.price" :min="0.01" :precision="2" style="width: 100%" />
@@ -72,7 +79,7 @@
 import { ref, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import ImageUpload from '@/components/ImageUpload.vue'
-import { getMembershipProducts, updateMembershipProduct } from '@/api/membership'
+import { getMembershipProducts, createMembershipProduct, updateMembershipProduct } from '@/api/membership'
 
 // 会员商品数据类型
 interface ProductItem {
@@ -91,6 +98,7 @@ interface ProductItem {
 
 const productList = ref<ProductItem[]>([])
 const dialogVisible = ref(false)
+const isEdit = ref(false)
 const submitting = ref(false)
 const editingId = ref('')
 
@@ -118,8 +126,17 @@ async function loadProducts() {
   }
 }
 
+// 新增
+function handleAdd() {
+  isEdit.value = false
+  editingId.value = ''
+  form.value = defaultForm()
+  dialogVisible.value = true
+}
+
 // 编辑
 function handleEdit(row: ProductItem) {
+  isEdit.value = true
   editingId.value = row.id
   form.value = {
     type: row.type,
@@ -140,7 +157,11 @@ function handleEdit(row: ProductItem) {
 async function handleSubmit() {
   submitting.value = true
   try {
-    await updateMembershipProduct(editingId.value, form.value)
+    if (isEdit.value) {
+      await updateMembershipProduct(editingId.value, form.value)
+    } else {
+      await createMembershipProduct(form.value)
+    }
     ElMessage.success('保存成功')
     dialogVisible.value = false
     await loadProducts()
@@ -160,4 +181,7 @@ onMounted(() => {
 .membership-manage {
   padding: 20px;
 }
+.toolbar {
+  margin-bottom: 16px;
+}
 </style>
diff --git a/admin/src/views/user/index.vue b/admin/src/views/user/index.vue
index 2368d76a..d3dfa946 100644
--- a/admin/src/views/user/index.vue
+++ b/admin/src/views/user/index.vue
@@ -65,7 +65,10 @@
           <el-descriptions-item label="会员到期时间">
             {{ userDetail.membershipExpireAt ? formatDate(userDetail.membershipExpireAt) : '-' }}
           </el-descriptions-item>
-          <el-descriptions-item label="积分余额">{{ userDetail.pointsBalance }}</el-descriptions-item>
+          <el-descriptions-item label="积分余额">
+            <span>{{ userDetail.pointsBalance }}</span>
+            <el-button size="small" type="primary" link style="margin-left: 8px" @click="openEditPoints">编辑</el-button>
+          </el-descriptions-item>
           <el-descriptions-item label="注册时间">{{ formatDate(userDetail.createdAt) }}</el-descriptions-item>
           <el-descriptions-item label="语言">{{ userDetail.language }}</el-descriptions-item>
         </el-descriptions>
@@ -101,6 +104,19 @@
       </template>
     </el-dialog>
 
+    <!-- 编辑积分弹窗 -->
+    <el-dialog v-model="editPointsVisible" title="编辑积分" width="400px" destroy-on-close>
+      <el-form label-width="80px">
+        <el-form-item label="积分值">
+          <el-input-number v-model="editPointsValue" :min="0" style="width: 100%" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="editPointsVisible = false">取消</el-button>
+        <el-button type="primary" :loading="editPointsLoading" @click="handleUpdatePoints">确定</el-button>
+      </template>
+    </el-dialog>
+
     <!-- 设置会员弹窗 -->
     <el-dialog v-model="membershipVisible" title="设为会员" width="420px" destroy-on-close>
       <el-form label-width="90px">
@@ -125,7 +141,7 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getUsers, getUserDetail, setUserMembership } from '@/api/user'
+import { getUsers, getUserDetail, setUserMembership, updateUserPoints } from '@/api/user'
 
 // 用户列表项
 interface UserItem {
@@ -245,6 +261,34 @@ async function handleCancelMembership(row: UserItem) {
   }
 }
 
+// 编辑积分相关
+const editPointsVisible = ref(false)
+const editPointsValue = ref(0)
+const editPointsLoading = ref(false)
+
+function openEditPoints() {
+  editPointsValue.value = userDetail.value?.pointsBalance || 0
+  editPointsVisible.value = true
+}
+
+async function handleUpdatePoints() {
+  if (!userDetail.value) return
+  editPointsLoading.value = true
+  try {
+    await updateUserPoints(userDetail.value.uid, editPointsValue.value)
+    ElMessage.success('积分已更新')
+    editPointsVisible.value = false
+    // 刷新详情
+    const res: any = await getUserDetail(userDetail.value.uid)
+    userDetail.value = res.data || null
+    await loadUsers()
+  } catch {
+    // 错误已由拦截器处理
+  } finally {
+    editPointsLoading.value = false
+  }
+}
+
 onMounted(() => {
   loadUsers()
 })
diff --git a/backend/src/VendingMachine.Api/Controllers/AdminMembershipController.cs b/backend/src/VendingMachine.Api/Controllers/AdminMembershipController.cs
index 01c8ea66..6d414428 100644
--- a/backend/src/VendingMachine.Api/Controllers/AdminMembershipController.cs
+++ b/backend/src/VendingMachine.Api/Controllers/AdminMembershipController.cs
@@ -30,6 +30,31 @@ public class AdminMembershipController : ControllerBase
         return Ok(new { success = true, data = products });
     }
 
+    /// <summary>
+    /// 创建会员商品
+    /// </summary>
+    [HttpPost("products")]
+    public async Task<IActionResult> CreateProduct([FromBody] CreateProductRequest request)
+    {
+        var product = new VendingMachine.Domain.Entities.MembershipProduct
+        {
+            Id = Guid.NewGuid().ToString("N")[..12],
+            Type = Enum.TryParse<VendingMachine.Domain.Entities.MembershipType>(request.Type, true, out var t) ? t : VendingMachine.Domain.Entities.MembershipType.Monthly,
+            Price = request.Price,
+            Currency = request.Currency,
+            DurationDays = request.DurationDays,
+            GoogleProductId = request.GoogleProductId,
+            AppleProductId = request.AppleProductId,
+            DescriptionZhCn = request.DescriptionZhCn,
+            DescriptionZhTw = request.DescriptionZhTw,
+            DescriptionEn = request.DescriptionEn
+        };
+
+        _db.MembershipProducts.Add(product);
+        await _db.SaveChangesAsync();
+        return Ok(new { success = true, data = product });
+    }
+
     /// <summary>
     /// 更新会员商品（价格、时长、宣传图、商品 ID 等）
     /// </summary>
@@ -68,3 +93,20 @@ public class UpdateProductRequest
     public string DescriptionZhTw { get; set; } = string.Empty;
     public string DescriptionEn { get; set; } = string.Empty;
 }
+
+
+/// <summary>
+/// 创建会员商品请求体
+/// </summary>
+public class CreateProductRequest
+{
+    public string Type { get; set; } = "Monthly";
+    public decimal Price { get; set; }
+    public string Currency { get; set; } = "TWD";
+    public int DurationDays { get; set; } = 30;
+    public string GoogleProductId { get; set; } = string.Empty;
+    public string AppleProductId { get; set; } = string.Empty;
+    public string DescriptionZhCn { get; set; } = string.Empty;
+    public string DescriptionZhTw { get; set; } = string.Empty;
+    public string DescriptionEn { get; set; } = string.Empty;
+}
diff --git a/backend/src/VendingMachine.Api/Controllers/AdminUserController.cs b/backend/src/VendingMachine.Api/Controllers/AdminUserController.cs
index 04941480..77481c93 100644
--- a/backend/src/VendingMachine.Api/Controllers/AdminUserController.cs
+++ b/backend/src/VendingMachine.Api/Controllers/AdminUserController.cs
@@ -94,6 +94,22 @@ public class AdminUserController : ControllerBase
         return Ok(new { success = true, message = request.IsMember ? "已设为会员" : "已取消会员" });
     }
 
+    /// <summary>
+    /// 修改用户积分
+    /// </summary>
+    [HttpPut("{uid}/points")]
+    public async Task<IActionResult> UpdatePoints(string uid, [FromBody] UpdatePointsRequest request)
+    {
+        var user = await _db.Users.FirstOrDefaultAsync(u => u.Uid == uid);
+        if (user == null)
+            return NotFound(new { success = false, message = "用户不存在" });
+
+        user.PointsBalance = request.Points;
+        await _db.SaveChangesAsync();
+
+        return Ok(new { success = true, message = "积分已更新", data = new { pointsBalance = user.PointsBalance } });
+    }
+
     /// <summary>
     /// 获取用户详情
     /// </summary>
@@ -145,3 +161,13 @@ public class SetMembershipRequest
     /// <summary>到期时间（可选）</summary>
     public DateTime? ExpireAt { get; set; }
 }
+
+
+/// <summary>
+/// 修改积分请求
+/// </summary>
+public class UpdatePointsRequest
+{
+    /// <summary>设置的积分值</summary>
+    public int Points { get; set; }
+}
diff --git a/backend/src/VendingMachine.Api/wwwroot/uploads/2026/04/e53a68070b074ac1a8499b561a14a88e.webp b/backend/src/VendingMachine.Api/wwwroot/uploads/2026/04/e53a68070b074ac1a8499b561a14a88e.webp
new file mode 100644
index 0000000000000000000000000000000000000000..3c01a9ed903a223a2c886ed269e3fe8f5723da9e
GIT binary patch
literal 4440
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

literal 0
HcmV?d00001

diff --git a/backend/src/VendingMachine.Api/wwwroot/uploads/2026/04/e97edbd766a34b23a757693aee0f62b9.webp b/backend/src/VendingMachine.Api/wwwroot/uploads/2026/04/e97edbd766a34b23a757693aee0f62b9.webp
new file mode 100644
index 0000000000000000000000000000000000000000..5eaeb56de4657893ed06c76c73ad6e816dd8e042
GIT binary patch
literal 7212
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

literal 0
HcmV?d00001

diff --git a/mobile/components/GiftPointsPopup.vue b/mobile/components/GiftPointsPopup.vue
index 4f644da7..705bb331 100644
--- a/mobile/components/GiftPointsPopup.vue
+++ b/mobile/components/GiftPointsPopup.vue
@@ -75,10 +75,7 @@ async function handleGift() {
 <style scoped>
 .popup-mask {
   position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
+  top: 0; left: 0; right: 0; bottom: 0;
   background-color: rgba(0, 0, 0, 0.5);
   display: flex;
   align-items: center;
@@ -87,7 +84,7 @@ async function handleGift() {
 }
 
 .popup-content {
-  width: 600rpx;
+  width: 620rpx;
   background-color: #ffffff;
   border-radius: 24rpx;
   padding: 40rpx;
@@ -99,21 +96,22 @@ async function handleGift() {
   color: #333;
   text-align: center;
   display: block;
-  margin-bottom: 30rpx;
+  margin-bottom: 36rpx;
 }
 
 .popup-body {
-  margin-bottom: 40rpx;
+  margin-bottom: 36rpx;
 }
 
 .popup-input {
   width: 100%;
-  height: 80rpx;
-  border: 1rpx solid #e0e0e0;
-  border-radius: 12rpx;
-  padding: 0 24rpx;
+  height: 88rpx;
+  border: 2rpx solid #c0c8b8;
+  border-radius: 16rpx;
+  padding: 0 28rpx;
   font-size: 28rpx;
-  margin-bottom: 20rpx;
+  color: #333;
+  margin-bottom: 24rpx;
   box-sizing: border-box;
 }
 
@@ -124,27 +122,28 @@ async function handleGift() {
 
 .btn {
   flex: 1;
-  height: 80rpx;
-  border-radius: 40rpx;
+  height: 84rpx;
+  border-radius: 12rpx;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
 .cancel-btn {
-  background-color: #f5f5f5;
+  background-color: #ffffff;
+  border: 2rpx solid #6b7c5e;
 }
 
 .confirm-btn {
-  background-color: #007aff;
+  background-color: #6b7c5e;
 }
 
 .btn-text {
-  font-size: 28rpx;
+  font-size: 30rpx;
 }
 
 .cancel-text {
-  color: #666;
+  color: #6b7c5e;
 }
 
 .confirm-text {
diff --git a/mobile/i18n/en.js b/mobile/i18n/en.js
index cf5c147b..2e02760f 100644
--- a/mobile/i18n/en.js
+++ b/mobile/i18n/en.js
@@ -81,7 +81,7 @@ export default {
   mine: {
     title: 'Me',
     loginBtn: 'Login',
-    points: 'Points',
+    points: 'My Points',
     giftPoints: 'Gift Points',
     myCoupons: 'My Coupons',
     switchLang: 'Language',
diff --git a/mobile/i18n/zh-CN.js b/mobile/i18n/zh-CN.js
index 6e337ddb..c0c86280 100644
--- a/mobile/i18n/zh-CN.js
+++ b/mobile/i18n/zh-CN.js
@@ -81,7 +81,7 @@ export default {
   mine: {
     title: '我的',
     loginBtn: '点击登录',
-    points: '积分',
+    points: '我的积分',
     giftPoints: '赠送积分',
     myCoupons: '我的优惠券',
     switchLang: '切换语言',
diff --git a/mobile/i18n/zh-TW.js b/mobile/i18n/zh-TW.js
index e4511a0b..e362bb2e 100644
--- a/mobile/i18n/zh-TW.js
+++ b/mobile/i18n/zh-TW.js
@@ -81,7 +81,7 @@ export default {
   mine: {
     title: '我的',
     loginBtn: '點擊登入',
-    points: '積分',
+    points: '我的積分',
     giftPoints: '贈送積分',
     myCoupons: '我的優惠券',
     switchLang: '切換語言',
diff --git a/mobile/pages.json b/mobile/pages.json
index bd0ad3d5..35038b77 100644
--- a/mobile/pages.json
+++ b/mobile/pages.json
@@ -3,6 +3,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "首页"
 			}
 		},
@@ -22,6 +23,7 @@
 		{
 			"path": "pages/stamps/stamps",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "节日印花"
 			}
 		},
@@ -35,12 +37,14 @@
 		{
 			"path": "pages/points/points",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "我的积分"
 			}
 		},
 		{
 			"path": "pages/coupons/coupons",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "我的优惠券"
 			}
 		},
diff --git a/mobile/pages/coupons/coupons.vue b/mobile/pages/coupons/coupons.vue
index e8997453..2afba65d 100644
--- a/mobile/pages/coupons/coupons.vue
+++ b/mobile/pages/coupons/coupons.vue
@@ -1,37 +1,69 @@
 <template>
   <view class="coupons-page">
-    <!-- Tab切换 -->
-    <view class="tab-bar">
-      <view
-        v-for="tab in tabs"
-        :key="tab.value"
-        class="tab-item"
-        :class="{ active: currentTab === tab.value }"
-        @click="switchTab(tab.value)"
-      >
-        <text class="tab-text">{{ t(tab.label) }}</text>
+    <!-- 自定义导航栏 -->
+    <view class="custom-nav" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="nav-inner">
+        <view class="nav-back" @click="goBack">
+          <image class="back-icon" src="/static/ic_back2.png" mode="aspectFit" />
+        </view>
+        <text class="nav-title">{{ t('coupons.title') }}</text>
+        <view class="nav-placeholder" />
       </view>
     </view>
 
-    <!-- 优惠券列表 -->
-    <view class="coupon-list">
-      <view
-        v-for="coupon in coupons"
-        :key="coupon.couponId"
-        class="coupon-item"
-      >
-        <CouponCard :coupon="coupon" :redeemed="true" />
-        <!-- 状态标识 -->
-        <view v-if="coupon.status === 'used'" class="status-badge used">
-          <text class="status-text">{{ t('coupons.usedLabel') }}</text>
-        </view>
-        <view v-if="coupon.status === 'expired'" class="status-badge expired">
-          <text class="status-text">{{ t('coupons.expiredLabel') }}</text>
+    <!-- 页面内容 -->
+    <view :style="{ paddingTop: (statusBarHeight + 44) + 'px' }">
+      <!-- Tab切换 -->
+      <view class="tab-bar">
+        <view
+          v-for="tab in tabs"
+          :key="tab.value"
+          class="tab-item"
+          :class="{ active: currentTab === tab.value }"
+          @click="switchTab(tab.value)"
+        >
+          <text class="tab-text">{{ t(tab.label) }}</text>
+          <view v-if="currentTab === tab.value" class="tab-line" />
         </view>
       </view>
 
-      <!-- 空状态 -->
-      <EmptyState v-if="!loading && coupons.length === 0" text="暂无优惠券" />
+      <!-- 优惠券列表 -->
+      <view class="coupon-list">
+        <view
+          v-for="coupon in coupons"
+          :key="coupon.couponId"
+          class="coupon-card"
+        >
+          <image
+            class="coupon-bg"
+            :src="currentTab === 'available' ? '/static/ic_coupon_bg.png' : '/static/ic_coupon_used_bg.png'"
+            mode="aspectFill"
+          />
+          <view class="coupon-inner">
+            <view class="coupon-info">
+              <text class="coupon-name">{{ coupon.name }}</text>
+              <view class="coupon-detail-row">
+                <text class="coupon-dot">●</text>
+                <text class="coupon-detail-label">{{ t('couponCard.expireLabel') }}</text>
+                <text class="coupon-detail-value highlight">{{ formatExpire(coupon.expireAt) }}</text>
+              </view>
+              <view class="coupon-detail-row">
+                <text class="coupon-dot">●</text>
+                <text class="coupon-detail-label">{{ t('couponCard.conditionLabel') }}</text>
+                <text class="coupon-detail-value highlight">{{ coupon.pointsCost ?? 0 }}{{ t('couponCard.pointsUnit') }}</text>
+              </view>
+            </view>
+            <view class="coupon-action" v-if="currentTab === 'available'">
+              <view class="redeem-btn" @click="onUse(coupon)">
+                <text class="redeem-btn-text">{{ t('couponCard.redeemBtn') }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 空状态 -->
+        <EmptyState v-if="!loading && coupons.length === 0" text="暂无优惠券" />
+      </view>
     </view>
   </view>
 </template>
@@ -40,11 +72,17 @@
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { getMyCoupons } from '../../api/coupon.js'
-import CouponCard from '../../components/CouponCard.vue'
 import EmptyState from '../../components/EmptyState.vue'
 
 const { t } = useI18n()
 
+// 状态栏高度
+const statusBarHeight = ref(0)
+try {
+  const sysInfo = uni.getSystemInfoSync()
+  statusBarHeight.value = sysInfo.statusBarHeight || 0
+} catch (e) {}
+
 // Tab配置
 const tabs = [
   { label: 'coupons.availableTab', value: 'available' },
@@ -56,6 +94,11 @@ const currentTab = ref('available')
 const coupons = ref([])
 const loading = ref(false)
 
+// 返回上一页
+function goBack() {
+  uni.navigateBack()
+}
+
 // 加载优惠券列表
 async function loadCoupons() {
   loading.value = true
@@ -77,6 +120,18 @@ function switchTab(tab) {
   loadCoupons()
 }
 
+// 格式化到期时间
+function formatExpire(dateStr) {
+  if (!dateStr) return t('couponCard.noLimit')
+  const d = new Date(dateStr)
+  return `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日`
+}
+
+// 使用优惠券
+function onUse(coupon) {
+  uni.showToast({ title: '请在购买时使用', icon: 'none' })
+}
+
 // 初始加载
 loadCoupons()
 </script>
@@ -84,87 +139,153 @@ loadCoupons()
 <style scoped>
 .coupons-page {
   min-height: 100vh;
-  background-color: #f5f5f5;
+  background-color: #f5f0e8;
 }
 
+/* 自定义导航栏 */
+.custom-nav {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 100;
+  background-color: #DBDBDB;
+}
+.nav-inner {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 24rpx;
+}
+.nav-back {
+  width: 60rpx;
+  height: 44px;
+  display: flex;
+  align-items: center;
+}
+.back-icon {
+  width: 40rpx;
+  height: 40rpx;
+}
+.nav-title {
+  font-size: 34rpx;
+  font-weight: 600;
+  color: #333;
+}
+.nav-placeholder {
+  width: 60rpx;
+}
+
+/* Tab栏 */
 .tab-bar {
   display: flex;
   background-color: #ffffff;
-  border-bottom: 1rpx solid #f0f0f0;
 }
-
 .tab-item {
   flex: 1;
   height: 88rpx;
   display: flex;
+  flex-direction: column;
   align-items: center;
   justify-content: center;
   position: relative;
 }
-
-.tab-item.active::after {
-  content: '';
-  position: absolute;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  width: 60rpx;
-  height: 4rpx;
-  background-color: #007aff;
-  border-radius: 2rpx;
-}
-
 .tab-text {
   font-size: 28rpx;
-  color: #666;
+  color: #999;
+}
+.tab-item.active .tab-text {
+  color: #333;
+  font-weight: 500;
+}
+.tab-line {
+  position: absolute;
+  bottom: 0;
+  width: 48rpx;
+  height: 6rpx;
+  background-color: #333;
+  border-radius: 3rpx;
 }
 
-.tab-item.active .tab-text {
-  color: #007aff;
+/* 优惠券列表 */
+.coupon-list {
+  padding: 24rpx 24rpx;
+}
+.coupon-card {
+  position: relative;
+  margin-bottom: 20rpx;
+  border-radius: 20rpx;
+  overflow: hidden;
+}
+.coupon-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.coupon-inner {
+  position: relative;
+  z-index: 1;
+  padding: 32rpx;
+  display: flex;
+  flex-direction: column;
+  min-height: 240rpx;
+}
+.coupon-info {
+  flex: 1;
+}
+.coupon-name {
+  font-size: 34rpx;
+  color: #333;
+  font-weight: 600;
+  display: block;
+  margin-left: 28rpx;
+  margin-bottom: 16rpx;
+}
+.coupon-detail-row {
+  display: flex;
+  align-items: center;
+  margin-left: 28rpx;
+  margin-bottom: 8rpx;
+}
+.coupon-dot {
+  font-size: 14rpx;
+  color: #D9DED7;
+  margin-right: 10rpx;
+}
+.coupon-detail-label {
+  font-size: 24rpx;
+  color: #666;
+}
+.coupon-detail-value {
+  font-size: 24rpx;
+  color: #666;
+}
+.coupon-detail-value.highlight {
+  color: #c9a96e;
   font-weight: 500;
 }
 
-.coupon-list {
-  padding: 20rpx 24rpx;
+/* 兑换按钮 */
+.coupon-action {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 16rpx;
 }
-
-.coupon-item {
-  position: relative;
-  margin-bottom: 20rpx;
+.redeem-btn {
+  background: linear-gradient(135deg, #d4a855, #c9a96e);
+  border-radius: 28rpx;
+  width: 172rpx;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
-
-.status-badge {
-  position: absolute;
-  top: 20rpx;
-  right: 20rpx;
-  padding: 6rpx 16rpx;
-  border-radius: 8rpx;
-}
-
-.status-badge.used {
-  background-color: rgba(153, 153, 153, 0.15);
-}
-
-.status-badge.expired {
-  background-color: rgba(255, 59, 48, 0.1);
-}
-
-.status-text {
-  font-size: 22rpx;
-}
-
-.status-badge.used .status-text {
-  color: #999;
-}
-
-.status-badge.expired .status-text {
-  color: #ff3b30;
-}
-
-.empty-tip {
-  text-align: center;
-  padding: 60rpx;
+.redeem-btn-text {
   font-size: 28rpx;
-  color: #999;
+  color: #ffffff;
+  white-space: nowrap;
 }
 </style>
diff --git a/mobile/pages/index/index.vue b/mobile/pages/index/index.vue
index 75d5c50a..eb4de173 100644
--- a/mobile/pages/index/index.vue
+++ b/mobile/pages/index/index.vue
@@ -1,5 +1,14 @@
 <template>
 	<view class="home-page">
+		<!-- 自定义导航栏 -->
+		<view class="custom-nav" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="nav-inner">
+				<text class="nav-title">首页</text>
+			</view>
+		</view>
+
+		<!-- 页面内容 -->
+		<view :style="{ paddingTop: (statusBarHeight + 44) + 'px' }">
 		<!-- Banner轮播图 -->
 		<view class="banner-wrap">
 			<swiper class="banner-swiper" autoplay circular indicator-dots indicator-color="rgba(255,255,255,0.4)"
@@ -83,6 +92,7 @@
 
 		<!-- 会员二维码弹窗 -->
 		<QrcodePopup :visible="showQrcode" @close="showQrcode = false" />
+		</view>
 	</view>
 </template>
 
@@ -122,6 +132,13 @@
 	} = useI18n()
 	const userStore = useUserStore()
 
+	// 状态栏高度
+	const statusBarHeight = ref(0)
+	try {
+		const sysInfo = uni.getSystemInfoSync()
+		statusBarHeight.value = sysInfo.statusBarHeight || 0
+	} catch (e) {}
+
 	// 数据
 	const banners = ref([])
 	const entries = ref([])
@@ -264,6 +281,27 @@
 </script>
 
 <style scoped>
+	/* 自定义导航栏 */
+	.custom-nav {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 100;
+		background-color: #DBDBDB;
+	}
+	.nav-inner {
+		height: 44px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.nav-title {
+		font-size: 34rpx;
+		font-weight: 600;
+		color: #333;
+	}
+
 	.home-page {
 		min-height: 100vh;
 		background-color: #f5f0e8;
diff --git a/mobile/pages/mine/mine.vue b/mobile/pages/mine/mine.vue
index 8df34106..8e73a041 100644
--- a/mobile/pages/mine/mine.vue
+++ b/mobile/pages/mine/mine.vue
@@ -33,7 +33,9 @@
     <!-- 积分区域 -->
     <view v-if="userStore.isLoggedIn" class="points-card" @click="goPoints">
       <view class="points-left">
-        <image class="points-icon" src="/static/ic_stamp.png" mode="aspectFit" />
+        <view class="points-icon-wrap">
+          <image class="points-icon" src="/static/ic_integral.png" mode="aspectFit" />
+        </view>
         <text class="points-label">{{ t('mine.points') }}</text>
       </view>
       <text class="points-value">{{ balance }}</text>
@@ -165,6 +167,8 @@ async function handleLogout() {
   showLogoutConfirm.value = false
   await userStore.logout()
   balance.value = 0
+  // 清除所有页面栈，返回首页
+  uni.reLaunch({ url: '/pages/index/index' })
 }
 
 // 页面导航
@@ -277,11 +281,20 @@ onMounted(() => {
   display: flex;
   align-items: center;
 }
-.points-icon {
-  width: 48rpx;
-  height: 48rpx;
+.points-icon-wrap {
+  width: 72rpx;
+  height: 72rpx;
+  border-radius: 50%;
+  background-color: #f5f0e8;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   margin-right: 16rpx;
 }
+.points-icon {
+  width: 40rpx;
+  height: 40rpx;
+}
 .points-label {
   font-size: 30rpx;
   color: #333;
diff --git a/mobile/pages/points/points.vue b/mobile/pages/points/points.vue
index df13a00b..daabeb63 100644
--- a/mobile/pages/points/points.vue
+++ b/mobile/pages/points/points.vue
@@ -1,5 +1,18 @@
 <template>
   <view class="points-page">
+    <!-- 自定义导航栏 -->
+    <view class="custom-nav" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="nav-inner">
+        <view class="nav-back" @click="goBack">
+          <text class="nav-back-icon">‹</text>
+        </view>
+        <text class="nav-title">{{ t('points.title') }}</text>
+        <view class="nav-placeholder" />
+      </view>
+    </view>
+
+    <!-- 页面内容 -->
+    <view :style="{ paddingTop: (statusBarHeight + 44) + 'px' }">
     <!-- Tab切换 -->
     <view class="tab-bar">
       <view
@@ -33,10 +46,7 @@
           <text class="record-source">{{ record.source }}</text>
           <text class="record-time">{{ formatTime(record.createdAt) }}</text>
         </view>
-        <text
-          class="record-amount"
-          :class="{ earn: currentTab === 'earn', spend: currentTab === 'spend' }"
-        >
+        <text class="record-amount">
           {{ currentTab === 'earn' ? '+' : '-' }}{{ record.amount }}
         </text>
       </view>
@@ -50,6 +60,7 @@
         <text>{{ t('common.noMore') }}</text>
       </view>
     </scroll-view>
+    </view>
   </view>
 </template>
 
@@ -61,6 +72,17 @@ import EmptyState from '../../components/EmptyState.vue'
 
 const { t } = useI18n()
 
+// 状态栏高度
+const statusBarHeight = ref(0)
+try {
+  const sysInfo = uni.getSystemInfoSync()
+  statusBarHeight.value = sysInfo.statusBarHeight || 0
+} catch (e) {}
+
+function goBack() {
+  uni.navigateBack()
+}
+
 const currentTab = ref('earn')
 const records = ref([])
 const page = ref(1)
@@ -82,8 +104,8 @@ async function loadRecords(isLoadMore = false) {
 
   try {
     const fetchFn = currentTab.value === 'earn' ? getEarnRecords : getSpendRecords
-    const res = await fetchFn({ page: page.value, pageSize })
-    const list = res.data?.records || res.data || []
+    const res = await fetchFn({ page: page.value, size: pageSize })
+    const list = res.data?.items || res.data?.records || res.data || []
 
     if (isLoadMore) {
       records.value = [...records.value, ...list]
@@ -124,15 +146,48 @@ loadRecords()
 <style scoped>
 .points-page {
   min-height: 100vh;
-  background-color: #f5f5f5;
+  background-color: #ffffff;
   display: flex;
   flex-direction: column;
 }
 
+/* 自定义导航栏 */
+.custom-nav {
+  position: fixed;
+  top: 0; left: 0; right: 0;
+  z-index: 100;
+  background-color: #DBDBDB;
+}
+.nav-inner {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 16rpx;
+}
+.nav-back {
+  width: 60rpx;
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.nav-back-icon {
+  font-size: 48rpx;
+  color: #333;
+}
+.nav-title {
+  font-size: 34rpx;
+  font-weight: 600;
+  color: #333;
+}
+.nav-placeholder {
+  width: 60rpx;
+}
+
 .tab-bar {
   display: flex;
   background-color: #ffffff;
-  border-bottom: 1rpx solid #f0f0f0;
 }
 
 .tab-item {
@@ -152,33 +207,30 @@ loadRecords()
   transform: translateX(-50%);
   width: 60rpx;
   height: 4rpx;
-  background-color: #007aff;
+  background-color: #333;
   border-radius: 2rpx;
 }
 
 .tab-text {
   font-size: 30rpx;
-  color: #666;
+  color: #999;
 }
 
 .tab-item.active .tab-text {
-  color: #007aff;
+  color: #333;
   font-weight: 500;
 }
 
 .record-list {
   flex: 1;
-  padding: 20rpx 24rpx;
 }
 
 .record-item {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  background-color: #ffffff;
-  padding: 28rpx 30rpx;
-  border-radius: 12rpx;
-  margin-bottom: 16rpx;
+  padding: 30rpx 32rpx;
+  border-bottom: 1rpx solid #f0f0f0;
 }
 
 .record-info {
@@ -194,7 +246,7 @@ loadRecords()
 }
 
 .record-time {
-  font-size: 22rpx;
+  font-size: 24rpx;
   color: #999;
   display: block;
 }
@@ -202,14 +254,7 @@ loadRecords()
 .record-amount {
   font-size: 32rpx;
   font-weight: 600;
-}
-
-.record-amount.earn {
-  color: #4caf50;
-}
-
-.record-amount.spend {
-  color: #ff3b30;
+  color: #333;
 }
 
 .loading-tip {
diff --git a/mobile/pages/stamps/stamps.vue b/mobile/pages/stamps/stamps.vue
index ebb77ec3..8e28bfdf 100644
--- a/mobile/pages/stamps/stamps.vue
+++ b/mobile/pages/stamps/stamps.vue
@@ -1,5 +1,18 @@
 <template>
   <view class="stamps-page">
+    <!-- 自定义导航栏 -->
+    <view class="custom-nav" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="nav-inner">
+        <view class="nav-back" @click="goBack">
+          <text class="nav-back-icon">‹</text>
+        </view>
+        <text class="nav-title">{{ t('stamps.title') }}</text>
+        <view class="nav-placeholder" />
+      </view>
+    </view>
+
+    <!-- 页面内容 -->
+    <view :style="{ paddingTop: (statusBarHeight + 44) + 'px' }">
     <!-- 印花Banner图 -->
     <view class="banner-wrap">
       <image
@@ -63,6 +76,7 @@
       @confirm="onRedeemConfirm"
       @cancel="showRedeem = false"
     />
+    </view>
   </view>
 </template>
 
@@ -80,6 +94,17 @@ import EmptyState from '../../components/EmptyState.vue'
 const { t } = useI18n()
 const userStore = useUserStore()
 
+// 状态栏高度
+const statusBarHeight = ref(0)
+try {
+  const sysInfo = uni.getSystemInfoSync()
+  statusBarHeight.value = sysInfo.statusBarHeight || 0
+} catch (e) {}
+
+function goBack() {
+  uni.navigateBack()
+}
+
 // 数据
 const bannerUrl = ref('')
 const stampCoupons = ref([])
@@ -155,6 +180,40 @@ onMounted(() => {
   background-color: #f5f0e8;
 }
 
+/* 自定义导航栏 */
+.custom-nav {
+  position: fixed;
+  top: 0; left: 0; right: 0;
+  z-index: 100;
+  background-color: #DBDBDB;
+}
+.nav-inner {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 16rpx;
+}
+.nav-back {
+  width: 60rpx;
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.nav-back-icon {
+  font-size: 48rpx;
+  color: #333;
+}
+.nav-title {
+  font-size: 34rpx;
+  font-weight: 600;
+  color: #333;
+}
+.nav-placeholder {
+  width: 60rpx;
+}
+
 /* Banner */
 .banner-wrap {
   padding: 24rpx 24rpx 0;
diff --git a/mobile/static/ic_back2.png b/mobile/static/ic_back2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6766acf966d711f2d8893b3911c14c3a72701598
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq001rk001rs1^@s6SGg-U0006tNkl<ZcmeF#
zze@sP7zc2FgdBLQ(9m#0Ls*#TAwmsp5wx^71`REZL5=kX1U0tx2ejD`I1~gbNJGxH
z1uhK^f}(vN;l%qP-o5v}&mmkqPu}}>_xkbaxl=EdSka#t&i#*zD;`(eX9d_>rBEnr
zR4SEg(=;y(!_a&>UAwWui^Za$Y1%s!x2aU>A(zY5u)T&19BgnxXEK>Oga&dN$z<{X
z)!&{D0{&uwmrA8gC)#ojhr>T>JIJGQc)48ON~hD*9<xeYz{zBC*>1OgtZ|S>rEo%{
zm+NSWbtj6@&1Uo7Iq!F@434YDjw&?0I3@6EwYmrNr;17wno>HP(Btv=6^rXgTZC<o
z`NgEdxzO|iq``4LK18M8u&B~XWBqAJffE|5y&zq0;WFC;>(3%IJPI`FL&2j$hk{3m
z7KQ`8i-TEv8qa5o#jRr7%|5^hcZwO;iHNzYFmK~H-ggMWvHCC4D~|K|yz6r4wPV;h
zA$YIXd&CoeAf2(V>w1j?F9h#)yMunee*|@8cp*5ziB6{jdvthV_&gpbD}AV<srgje
zHlg68q{^e`Pq^`+;e@B2=f+EcM}e0H=f+EgbK<4Lx$sKh9C&4L)p(_FKlp4mdrtcW
zP33R`ExFFS?sCyF%aR37hz0n;Xf%4JzXwe=IKeDDZeyHbe1ne(CT@CuVLNcJ!bwN?
zR;%^YXf*EdZRwllM3NmYg7i8jhI>^-<(x>xReF4{y|VCs00030|GG9<>Hq)$21!Ig
aR09B6;zw*zJ=-||0000<MNUMnLSTZ4?koua

literal 0
HcmV?d00001

diff --git a/mobile/static/ic_integral.png b/mobile/static/ic_integral.png
new file mode 100644
index 0000000000000000000000000000000000000000..521bea020b128e6d87615ac0b6e89c10e75f8327
GIT binary patch
literal 2385
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
D<!g}_

literal 0
HcmV?d00001