From d7c95a7d713d8895aa2e22ebb5175d761a07ec31 Mon Sep 17 00:00:00 2001
From: Lufaneng <Lufaneng@foxmail.com>
Date: Sun, 28 Sep 2025 21:16:58 +0800
Subject: [PATCH] 1

---
 package.json                               |    4 +-
 pages.json                                 |    3 +-
 pages/consumption/consumption.vue          |  669 +++++----
 pages/login/login.vue                      |   24 +-
 pages/mine/mine.vue                        |  124 +-
 pages/order/order.vue                      |  210 +--
 pagesA/generate-record/generate-record.vue |    9 +-
 pagesA/generate-record/new_file.js         |   40 +
 pagesA/recharge/recharge.vue               | 1431 ++++++++++----------
 9 files changed, 1316 insertions(+), 1198 deletions(-)
 create mode 100644 pagesA/generate-record/new_file.js

diff --git a/package.json b/package.json
index a991c4f..53f2a2d 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "lift-wechat",
+  "name": "lift-drawing-wechat",
   "version": "1.0.0",
   "description": "电梯图纸生成",
   "main": "main.js",
@@ -10,7 +10,7 @@
     "commit": "git-cz"
   },
   "keywords": [
-    "卡叔电梯"
+    "智能电梯图纸生成"
   ],
   "author": "Lufaneng",
   "license": "MIT",
diff --git a/pages.json b/pages.json
index 12f408c..6bb8f4b 100644
--- a/pages.json
+++ b/pages.json
@@ -49,7 +49,8 @@
 		"needLogin": true,
     	"style" : 
     	{
-    		"navigationBarTitleText" : "我的"
+    		"navigationBarTitleText" : "我的",
+			"enablePullDownRefresh":true
     	}
     },
 	{
diff --git a/pages/consumption/consumption.vue b/pages/consumption/consumption.vue
index 3ea124d..0aa75fe 100644
--- a/pages/consumption/consumption.vue
+++ b/pages/consumption/consumption.vue
@@ -1,379 +1,316 @@
 <template>
-  <view class="container">
-    <!-- 顶部筛选标签 -->
-    <view class="filter-tabs">
-      <view
-        class="tab-item"
-        :class="{ active: activeTab === 'all' }"
-        @click="switchTab('all')"
-      >
-        全部
-      </view>
-      <view
-        class="tab-item"
-        :class="{ active: activeTab === 'generate' }"
-        @click="switchTab('generate')"
-      >
-        生成
-      </view>
-      <view
-        class="tab-item"
-        :class="{ active: activeTab === 'member' }"
-        @click="switchTab('member')"
-      >
-        会员
-      </view>
-      <view
-        class="tab-item"
-        :class="{ active: activeTab === 'other' }"
-        @click="switchTab('other')"
-      >
-        其他
-      </view>
-    </view>
-
-    <!-- 消费记录列表 -->
-    <view class="consumption-list">
-      <view
-        class="consumption-item"
-        v-for="item in filteredConsumptions"
-        :key="item.id"
-      >
-        <!-- 消费项目和金额 -->
-        <view class="item-header">
-          <view class="item-title">{{ item.title }}</view>
-          <view
-            class="item-amount"
-            :class="{
+	<view class="container">
+		<!-- 顶部筛选标签 -->
+		<uv-sticky bgColor="#fff" offsetTop="0">
+			<div class="tabBox">
+				<div class="tabItem" :class="{selected:active==='全部'}" @click="switchTab('全部')">全部</div>
+				<div class="tabItem" :class="{selected:active==='生成'}" @click="switchTab('生成')">生成</div>
+				<div class="tabItem" :class="{selected:active==='会员'}" @click="switchTab('会员')">会员</div>
+			</div>
+		</uv-sticky>
+		<!-- 消费记录列表 -->
+		<view class="consumption-list">
+			<view class="consumption-item" v-for="item in list" :key="item.id">
+				<!-- 消费项目和金额 -->
+				<view class="item-header">
+					<view class="item-title">{{ item.type }}</view>
+					<view class="item-amount" :class="{
               positive: item.amount > 0,
               negative: item.amount < 0,
-            }"
-          >
-            {{ item.amount > 0 ? "+" : "-" }}¥{{
+            }">
+						{{ item.amount > 0 ? "+" : "-" }}¥{{
               Math.abs(item.amount).toFixed(2)
             }}
-          </view>
-        </view>
-
-        <!-- 消费详情 -->
-        <view class="item-details">
-          <view class="detail-row">
-            <text class="detail-label">消费编号:</text>
-            <text class="detail-value">{{ item.consumptionNumber }}</text>
-          </view>
-          <view class="detail-row">
-            <text class="detail-label">消费时间:</text>
-            <text class="detail-value">{{ item.consumptionTime }}</text>
-          </view>
-          <view class="balance-row">
-            <view class="balance-item">
-              <text class="balance-label">账前金额:</text>
-              <text class="balance-value">
-                ¥{{ item.beforeBalance.toFixed(2) }}
-              </text>
-            </view>
-            <view class="balance-item">
-              <text class="balance-label">账后金额:</text>
-              <text class="balance-value">
-                ¥{{ item.afterBalance.toFixed(2) }}
-              </text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 空状态 -->
-    <view v-if="filteredConsumptions.length === 0" class="empty-state">
-      <u-icon name="file-text" size="60" color="#ccc"></u-icon>
-      <text class="empty-text">暂无消费记录</text>
-    </view>
-
-    <!-- 加载更多 -->
-    <view v-if="hasMore && filteredConsumptions.length > 0" class="load-more">
-      <u-button
-        type="default"
-        size="small"
-        :loading="loading"
-        @click="loadMore"
-      >
-        {{ loading ? "加载中..." : "加载更多" }}
-      </u-button>
-    </view>
-  </view>
+					</view>
+				</view>
+
+				<!-- 消费详情 -->
+				<view class="item-details">
+					<view class="detail-row">
+						<text class="detail-label">消费编号:</text>
+						<text class="detail-value">{{ item.order_no }}</text>
+					</view>
+					<view class="detail-row">
+						<text class="detail-label">消费时间:</text>
+						<text class="detail-value">{{ item.finished_at ? dayjs(item.finished_at * 1000).format('YYYY-MM-DD HH:mm:ss') :'' }}</text>
+					</view>
+					<view class="balance-row">
+						<view class="balance-item">
+							<text class="balance-label">账前金额:</text>
+							<text class="balance-value">
+								¥{{ item.balance_before_cents / 100 }}
+							</text>
+						</view>
+						<view class="balance-item">
+							<text class="balance-label">账后金额:</text>
+							<text class="balance-value">
+								¥{{ item.balance_after_cents / 100 }}
+							</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 空状态 -->
+		<view v-if="list.length === 0 && loadingStatus !== 'loading'" class="empty-state">
+			<u-icon name="file-text" size="60" color="#ccc"></u-icon>
+			<text class="empty-text">暂无消费记录</text>
+		</view>
+		<uv-load-more v-else :status="loadingStatus" />
+
+	</view>
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from "vue";
-import { onShow } from "@dcloudio/uni-app";
-import { useAuthStore, useUserStore } from "@/store";
-import HeaderCustom from "/components/HeaderCustom/HeaderCustom.vue";
-import RPC from "@/utils/request";
-
-const authStore = useAuthStore();
-const userStore = useUserStore();
-
-// 响应式数据
-const activeTab = ref("all");
-const loading = ref(false);
-const hasMore = ref(true);
-const consumptions = ref([
-  {
-    id: 1,
-    title: "乘客电梯图纸生成",
-    amount: -30.0,
-    consumptionNumber: "CONS20230516024",
-    consumptionTime: "2025-05-16 14:30:22",
-    beforeBalance: 1250.0,
-    afterBalance: 1220.0,
-    type: "generate",
-  },
-  {
-    id: 2,
-    title: "货运电梯图纸生成",
-    amount: -45.0,
-    consumptionNumber: "CONS20230516024",
-    consumptionTime: "2025-05-16 14:30:22",
-    beforeBalance: 1295.0,
-    afterBalance: 1250.0,
-    type: "generate",
-  },
-  {
-    id: 3,
-    title: "包年会员订阅",
-    amount: -45.0,
-    consumptionNumber: "CONS20230516024",
-    consumptionTime: "2025-05-16 14:30:22",
-    beforeBalance: 1295.0,
-    afterBalance: 1250.0,
-    type: "member",
-  },
-  {
-    id: 4,
-    title: "账户充值",
-    amount: 1000.0,
-    consumptionNumber: "CONS20230516024",
-    consumptionTime: "2025-05-16 14:30:22",
-    beforeBalance: 1795.0,
-    afterBalance: 2795.0,
-    type: "other",
-  },
-]);
-
-// 计算过滤后的消费记录
-const filteredConsumptions = computed(() => {
-  if (activeTab.value === "all") {
-    return consumptions.value;
-  }
-  return consumptions.value.filter((item) => item.type === activeTab.value);
-});
-
-// 切换标签
-const switchTab = (tab) => {
-  activeTab.value = tab;
-};
-
-// 加载更多数据
-const loadMore = async () => {
-  if (loading.value) return;
-
-  loading.value = true;
-  try {
-    // 模拟API调用
-    // const result = await RPC.get('/api/consumptions', {
-    //   page: currentPage.value + 1,
-    //   type: activeTab.value
-    // })
-
-    // 模拟加载延迟
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-
-    // 模拟没有更多数据
-    hasMore.value = false;
-
-    uni.showToast({
-      title: "没有更多数据了",
-      icon: "none",
-    });
-  } catch (error) {
-    console.error("加载更多失败:", error);
-    uni.showToast({
-      title: "加载失败，请重试",
-      icon: "none",
-    });
-  } finally {
-    loading.value = false;
-  }
-};
-
-// 加载消费记录
-const loadConsumptions = async () => {
-  try {
-    // 调用获取消费记录API
-    // const result = await RPC.get('/api/consumptions', {
-    //   type: activeTab.value
-    // })
-    // consumptions.value = result.data
-  } catch (error) {
-    console.error("加载消费记录失败:", error);
-    uni.showToast({
-      title: "加载失败，请重试",
-      icon: "none",
-    });
-  }
-};
-
-// 下拉刷新
-const onRefresh = async () => {
-  hasMore.value = true;
-  await loadConsumptions();
-};
-
-onMounted(() => {
-  loadConsumptions();
-});
-
-onShow(() => {
-  // 页面显示时刷新数据
-  loadConsumptions();
-});
+	import {
+		computed,
+		onMounted,
+		ref
+	} from "vue";
+	import {
+		onShow,
+		onReachBottom
+	} from "@dcloudio/uni-app";
+	import {
+		useAuthStore,
+		useUserStore
+	} from "@/store";
+	import HeaderCustom from "/components/HeaderCustom/HeaderCustom.vue";
+	import RPC from "@/utils/request";
+	import dayjs from "dayjs";
+
+	const authStore = useAuthStore();
+	const userStore = useUserStore();
+	
+	const active = ref('全部')
+
+	const list = ref([{
+			id: 1,
+			title: "乘客电梯图纸生成",
+			amount: -30.0,
+			consumptionNumber: "CONS20230516024",
+			consumptionTime: "2025-05-16 14:30:22",
+			beforeBalance: 1250.0,
+			afterBalance: 1220.0,
+			type: "generate",
+		},
+		{
+			id: 2,
+			title: "货运电梯图纸生成",
+			amount: -45.0,
+			consumptionNumber: "CONS20230516024",
+			consumptionTime: "2025-05-16 14:30:22",
+			beforeBalance: 1295.0,
+			afterBalance: 1250.0,
+			type: "generate",
+		},
+		{
+			id: 3,
+			title: "包年会员订阅",
+			amount: -45.0,
+			consumptionNumber: "CONS20230516024",
+			consumptionTime: "2025-05-16 14:30:22",
+			beforeBalance: 1295.0,
+			afterBalance: 1250.0,
+			type: "member",
+		},
+		{
+			id: 4,
+			title: "账户充值",
+			amount: 1000.0,
+			consumptionNumber: "CONS20230516024",
+			consumptionTime: "2025-05-16 14:30:22",
+			beforeBalance: 1795.0,
+			afterBalance: 2795.0,
+			type: "other",
+		},
+	]);
+	
+	const switchTab = (tab) => {
+		list.value = []
+		active.value = tab
+		page.value = 1
+		if(tab === '全部') {
+			typeParams.value = ''
+		}
+		if(tab === '生成') {
+			typeParams.value = '生成'
+		}
+		if(tab === '会员') {
+			typeParams.value = '会员'
+		}
+		getList()
+	}
+	const page = ref(1)
+	const typeParams = ref('')
+	const loadingStatus = ref('loadmore')
+	const count = ref(0);
+	// 加载消费记录
+	const getList = () => {
+		uni.showLoading();
+		RPC.post('/wallet/txns/list', {
+			user_id: userStore.userInfo.id,
+			page:page.value,
+			size:20,
+			type:typeParams.value
+		}).then(res => {
+			list.value = [...list.value, ...res.list];
+			count.value = res.total;
+			if (list.value.length >= count.value) {
+			  loadingStatus.value = "nomore";
+			} else {
+			  loadingStatus.value = "loadmore";
+			}
+		}).catch(() => {
+			loadingStatus.value = "loadmore";
+		}).finally(() => {
+			uni.hideLoading();
+		})
+	}
+
+
+	onMounted(() => {
+	
+	});
+	
+	onReachBottom(() => {
+	  if (list.value.length >= count.value || loadingStatus.value === "loading")
+	    return;
+	  console.log("上拉加载:");
+	  loadingStatus.value = "loading";
+	  page.value = ++page.value;
+	  getList();
+	});
+
+	onShow(() => {
+		// 页面显示时刷新数据
+		list.value = []
+		page.value = 1
+		active.value = '全部'
+		typeParams.value = ''
+		getList();
+	});
 </script>
 
 <style lang="scss" scoped>
-.container {
-  font-size: 14px;
-  min-height: 100vh;
-  background-color: #f8f8f8;
-}
-
-.filter-tabs {
-  display: flex;
-  background: white;
-  padding: 0 16px;
-  border-bottom: 1px solid #e5e5e5;
-
-  .tab-item {
-    flex: 1;
-    text-align: center;
-    padding: 16px 0;
-    color: #666;
-    font-size: 14px;
-    position: relative;
-
-    &.active {
-      color: #4285f4;
-      font-weight: 500;
-
-      &::after {
-        content: "";
-        position: absolute;
-        bottom: 0;
-        left: 50%;
-        transform: translateX(-50%);
-        width: 20px;
-        height: 2px;
-        background: #4285f4;
-        border-radius: 1px;
-      }
-    }
-  }
-}
-
-.consumption-list {
-  padding: 16px;
-
-  .consumption-item {
-    background: white;
-    border-radius: 12px;
-    padding: 16px;
-    margin-bottom: 12px;
-
-    .item-header {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 12px;
-
-      .item-title {
-        font-size: 16px;
-        color: #333;
-        font-weight: 500;
-      }
-
-      .item-amount {
-        font-size: 16px;
-        font-weight: bold;
-
-        &.positive {
-          color: #52c41a;
-        }
-
-        &.negative {
-          color: #ff4d4f;
-        }
-      }
-    }
-
-    .item-details {
-      .detail-row {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 6px;
-
-        .detail-label {
-          color: #999;
-          font-size: 13px;
-        }
-
-        .detail-value {
-          color: #666;
-          font-size: 13px;
-        }
-      }
-
-      .balance-row {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 8px;
-
-        .balance-item {
-          display: flex;
-          align-items: center;
-          gap: 4px;
-
-          .balance-label {
-            color: #999;
-            font-size: 13px;
-          }
-
-          .balance-value {
-            color: #333;
-            font-size: 13px;
-            font-weight: 500;
-          }
-        }
-      }
-    }
-  }
-}
-
-.empty-state {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 80px 20px;
-
-  .empty-text {
-    color: #999;
-    font-size: 14px;
-    margin-top: 16px;
-  }
-}
+	.container {
+		font-size: 14px;
+		min-height: 100vh;
+		background-color: #f8f8f8;
+	}
+	
+	.tabBox {
+		height: 50px;
+		background-color: #fff;
+		display: flex;
+	
+		.tabItem {
+			height: 100%;
+			font-weight: 600;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex: 1;
+	
+			&.selected {
+				color: #5479ED;
+				border-bottom: 1px solid #5479ED;
+			}
+		}
+	}
+
+	.consumption-list {
+		padding: 16px;
+
+		.consumption-item {
+			background: white;
+			border-radius: 12px;
+			padding: 16px;
+			margin-bottom: 12px;
+
+			.item-header {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-bottom: 12px;
+
+				.item-title {
+					font-size: 16px;
+					color: #333;
+					font-weight: 500;
+				}
+
+				.item-amount {
+					font-size: 16px;
+					font-weight: bold;
+
+					&.positive {
+						color: #52c41a;
+					}
+
+					&.negative {
+						color: #ff4d4f;
+					}
+				}
+			}
+
+			.item-details {
+				.detail-row {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 6px;
+
+					.detail-label {
+						color: #999;
+						font-size: 13px;
+					}
+
+					.detail-value {
+						color: #666;
+						font-size: 13px;
+					}
+				}
+
+				.balance-row {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 8px;
+
+					.balance-item {
+						display: flex;
+						align-items: center;
+						gap: 4px;
+
+						.balance-label {
+							color: #999;
+							font-size: 13px;
+						}
+
+						.balance-value {
+							color: #333;
+							font-size: 13px;
+							font-weight: 500;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.empty-state {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 80px 20px;
+
+		.empty-text {
+			color: #999;
+			font-size: 14px;
+			margin-top: 16px;
+		}
+	}
 
-.load-more {
-  padding: 20px;
-  text-align: center;
-}
 </style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 3d9f53a..69762f5 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -604,19 +604,19 @@
 	onMounted(() => {
 		checkEnvironment();
 
-		// #ifdef MP-WEIXIN
-		// 检查是否是微信授权回调
-		const urlParams = new URLSearchParams(window.location.search);
-		const code = urlParams.get("code");
-		const from = urlParams.get("from");
-		console.log('from',from)
-		if (from && from === 'h5') {
-			handleWechatH5Callback(code);
-		}
+		// // #ifdef MP-WEIXIN
+		// // 检查是否是微信授权回调
+		// const urlParams = new URLSearchParams(window.location.search);
+		// const code = urlParams.get("code");
+		// const from = urlParams.get("from");
+		// console.log('from',from)
+		// if (from && from === 'h5') {
+		// 	handleWechatH5Callback(code);
+		// }
 
-		// 可选：初始化微信JS-SDK
-		// initWechatJSSDK();
-		// #endif
+		// // 可选：初始化微信JS-SDK
+		// // initWechatJSSDK();
+		// // #endif
 	});
 </script>
 
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index e85ea44..48ffb2b 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -16,7 +16,9 @@
 					</view>
 					<view class="user-id">用户ID: {{userStore.userInfo.id}}</view>
 					<view class="membership">
-						会员等级: 年会员 (有效期至: 2026-05-15)
+						会员等级: <span v-if="memberInfo.is_vip">{{memberInfo.plan?.name}} (有效期至:
+							{{memberInfo.end_at ? dayjs(memberInfo.end_at * 1000).format('YYYY-MM-DD') : ''}})</span><span
+							v-else>无</span>
 					</view>
 				</view>
 			</view>
@@ -31,7 +33,7 @@
 				<view class="balance-header">
 					<view class="balance-label">账户余额</view>
 				</view>
-				<view class="balance-amount">¥50.00</view>
+				<view class="balance-amount">¥{{memberInfo.wallet_balance || 0}}</view>
 			</div>
 			<uv-button type="primary" color="#fff" customStyle="color:#000;width:90px" shape="circle" @click="recharge">
 				充值
@@ -45,7 +47,7 @@
 					:key="item.id" @click="selectPlan(item)">
 					<view class="tag" v-if="item.tags">{{item.tags}}</view>
 					<view class="plan-name">{{item.name}}</view>
-					<view class="plan-price">¥{{item.price_cents}}</view>
+					<view class="plan-price">¥{{item.price}}</view>
 				</view>
 				<!--        <view
           class="membership-item"
@@ -122,7 +124,8 @@
 		onMounted
 	} from "vue";
 	import {
-		onShow
+		onShow,
+		onPullDownRefresh
 	} from "@dcloudio/uni-app";
 	import HeaderCustom from "/components/HeaderCustom/HeaderCustom.vue";
 	import {
@@ -130,11 +133,32 @@
 		useUserStore
 	} from "@/store";
 	import RPC from "@/utils/request";
+	import dayjs from 'dayjs'
 
 	const modal = ref(null);
 	const authStore = useAuthStore();
 	const userStore = useUserStore();
 
+	const balance = ref(null)
+	// const getBalance = () => {
+	// 	RPC.post('/wallet/balance', {
+	// 		user_id: userStore.userInfo.id
+	// 	}).then(res => {
+	// 		balance.value = res.balance_cents || 0
+	// 	})
+	// }
+	const memberInfo = ref({})
+	const getMemberInfo = () => {
+		uni.showLoading();
+		RPC.post('/membership/user/info', {
+			user_id: userStore.userInfo.id
+		}).then(res => {
+			memberInfo.value = res || {}
+		}).finally(() => {
+			uni.hideLoading();
+		})
+	}
+
 	// 响应式数据
 	const selectedPlan = ref("");
 	const selectedPayment = ref("wxpay"); // 默认选中微信支付
@@ -153,7 +177,6 @@
 			selectedPlan.value = planList.value[0] ? planList.value[0].id : ''
 		})
 	}
-	getPlanList()
 	// 选择会员套餐
 	const selectPlan = (plan) => {
 		selectedPlan.value = plan.id;
@@ -213,7 +236,7 @@
 			return new Promise((resolve, reject) => {
 				WeixinJSBridge.invoke(
 					"getBrandWCPayRequest", {
-						appId: orderInfo.appId,
+						appId: 'wxc504638e03981812',
 						timeStamp: orderInfo.timeStamp,
 						nonceStr: orderInfo.nonceStr,
 						package: orderInfo.package,
@@ -246,6 +269,20 @@
 		// #endif
 	};
 
+	function showModalAsync(options) {
+		return new Promise((resolve, reject) => {
+			uni.showModal({
+				...options,
+				success: (res) => {
+					resolve(res); // 将用户操作结果传递给 await
+				},
+				fail: (err) => {
+					reject(err); // 处理失败情况
+				}
+			});
+		});
+	}
+
 	// 支付宝支付（仅H5环境）
 	const alipayPay = async (orderInfo) => {
 		// #ifdef H5
@@ -320,28 +357,45 @@
 			// 3. 根据支付方式调用对应的支付方法
 			let paymentResult;
 			if (selectedPayment.value === "wxpay") {
-				const orderResult = await RPC.post('/membership/order/pay_by_wechat', {
+				const res = await uni.login({
+					provider: 'weixin'
+				})
+				const orderResult = await RPC.post('/membership/order/pay_by_wechat_mini', {
+					code: res.code,
 					"order_no": orderNum.order_no
 				})
 				uni.showLoading({
 					title: "正在跳转微信支付...",
 				});
-				if (1 == 1) {
-					console.log('orderResult', orderResult)
-					return
-				}
-				paymentResult = await wechatPay(orderResult.wechatPayInfo);
+				console.log('orderResult', orderResult)
+				paymentResult = await wechatPay(orderResult);
 			} else if (selectedPayment.value === "alipay") {
 				uni.showLoading({
 					title: "正在跳转支付宝...",
 				});
 				paymentResult = await alipayPay(orderResult.alipayInfo);
+			} else if (selectedPayment.value === 'wallet') {
+				const res = await showModalAsync({
+					title: '确认支付',
+					content: '确认使用钱包余额支付？'
+				});
+
+				// 同步判断逻辑
+				if (res.confirm) {
+					paymentResult = await RPC.post('/membership/order/pay_by_wallet', {
+						order_no: orderNum.order_no
+					})
+					console.log('paymentResult', paymentResult)
+				} else if (res.cancel) {
+					console.log('用户点击了取消');
+					paymentResult={success:false}
+				}
 			}
 
 			uni.hideLoading();
-
+			console.log('paymentResult111',paymentResult)
 			// 4. 处理支付结果
-			if (paymentResult.success) {
+			if (paymentResult?.success) {
 				if (paymentResult.redirect) {
 					// H5跳转支付，不需要额外处理
 					uni.showToast({
@@ -351,21 +405,27 @@
 					});
 				} else {
 					// 支付成功
-					uni.showToast({
-						title: "支付成功",
-						icon: "success",
-					});
+					setTimeout(() => {
+						uni.showToast({
+							title: "支付成功",
+							icon: "success",
+						});
+						setTimeout(()=>{
+							getMemberInfo()
+						},500)
+					}, 1000)
+					// getMemberInfo()
 
 					// 延迟跳转到订单页面或刷新用户信息
-					setTimeout(() => {
-						// 可以跳转到订单详情页面
-						uni.navigateTo({
-							url: `/pages/order-detail/order-detail?orderId=${orderResult.orderId}`,
-						});
-
-						// 或者刷新当前页面的用户信息
-						// loadUserInfo();
-					}, 1500);
+					// setTimeout(() => {
+					// 可以跳转到订单详情页面
+					// uni.navigateTo({
+					// 	url: `/pages/order-detail/order-detail?orderId=${orderResult.orderId}`,
+					// });
+
+					// 或者刷新当前页面的用户信息
+					// loadUserInfo();
+					// }, 1500);
 				}
 			}
 		} catch (error) {
@@ -484,12 +544,20 @@
 	// 页面挂载时处理支付回调和环境检查
 	onMounted(() => {
 		checkEnvironment();
-		handlePaymentCallback();
+		getPlanList()
+		// handlePaymentCallback();
 	});
 
 	// 页面显示时也检查支付回调（从其他页面返回时）
 	onShow(() => {
 		handlePaymentCallback();
+		// getBalance()
+		getMemberInfo()
+	});
+	onPullDownRefresh(() => {
+		getPlanList()
+		// getBalance()
+		getMemberInfo()
 	});
 </script>
 
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 9eb9e50..8327f18 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -2,22 +2,28 @@
 	<view class="container">
 		<uv-sticky bgColor="#fff" offsetTop="0">
 			<div class="tabBox">
-				<div class="tabItem" :class="{selected:active==='全部'}" @click="() => active = '全部'">全部</div>
-				<div class="tabItem" :class="{selected:active==='已支付'}" @click="() => active = '已支付'">已支付</div>
-				<div class="tabItem" :class="{selected:active==='待支付'}" @click="() => active = '待支付'">待支付</div>
+				<div class="tabItem" :class="{selected:active==='全部'}" @click="switchTab('全部')">全部</div>
+				<div class="tabItem" :class="{selected:active==='会员购买'}" @click="switchTab('会员购买')">会员购买</div>
+				<div class="tabItem" :class="{selected:active==='钱包充值'}" @click="switchTab('钱包充值')">钱包充值</div>
 			</div>
 		</uv-sticky>
 		<!-- 订单列表 -->
 		<view class="order-list">
-			<view class="order-item" v-for="order in filteredOrders" :key="order.id">
+			<view class="order-item" v-for="order in list" :key="order.id">
 				<!-- 订单头部 -->
 				<view class="order-header">
 					<view class="order-info">
-						<text class="order-number">订单编号: {{ order.orderNumber }}</text>
-						<view class="order-type-tag">复制</view>
+						<text class="order-number">订单编号: {{ order.order_no }}</text>
+						<view class="order-type-tag" @click="copyOrderNo(order.order_no)">复制</view>
 					</view>
-					<view class="order-status" :class="order.status">
-						{{ order.statusText }}
+					<view class="order-status" :class="{paid:order.status === 'paid',pending:order.status === 'created' || order.status === 'pending',
+					cancelled:order.status === 'failed' || order.status === 'canceled' || order.status === 'refunded'}">
+						<span v-if="order.status === 'created'">待付款</span>
+						<span v-if="order.status === 'pending'">待支付</span>
+						<span v-if="order.status === 'paid'">已支付</span>
+						<span v-if="order.status === 'failed'">支付失败</span>
+						<span v-if="order.status === 'canceled'">已取消</span>
+						<span v-if="order.status === 'refunded'">已退款</span>
 					</view>
 				</view>
 
@@ -25,50 +31,58 @@
 				<view class="order-details">
 					<view class="detail-row">
 						<text class="label">用户名称:</text>
-						<text class="value">{{ order.userName }}</text>
+						<text class="value">{{ order.user_name }}</text>
 					</view>
 					<view class="detail-row">
 						<text class="label">用户ID:</text>
-						<text class="value">{{ order.userId }}</text>
+						<text class="value">{{ order.user_id }}</text>
 					</view>
 					<view class="detail-row">
 						<text class="label">订单类型:</text>
-						<text class="value">{{ order.orderType }}</text>
+						<text class="value">{{ order.order_type }}</text>
 					</view>
 					<view class="detail-row">
 						<text class="label">订单金额:</text>
 						<text class="value price">¥{{ order.amount }}</text>
+					</view>
+					<view class="detail-row">
+						<text class="label">支付渠道:</text>
+						<text class="value">
+							<template v-if="order.pay_channel === 'wallet'">钱包</template>
+							<template v-if="order.pay_channel === 'wxpay'">微信</template>
+							<template v-if="order.pay_channel === 'alipay'">支付宝</template>
+						</text>
 					</view>
-					<view class="detail-row" v-if="order.discount > 0">
+	<!-- 				<view class="detail-row" v-if="order.discount > 0">
 						<text class="label">折扣金额:</text>
 						<text class="value discount">-¥{{ order.discount }}</text>
-					</view>
-					<view class="detail-row">
+					</view> -->
+			<!-- 		<view class="detail-row">
 						<text class="label">实付金额:</text>
 						<text class="value final-price">¥{{ order.finalAmount }}</text>
-					</view>
+					</view> -->
 					<view class="detail-row">
-						<text class="label">{{ order.status === 'pending' ? '创建时间:' : '支付时间:' }}</text>
-						<text class="value">{{ order.payTime }}</text>
+						<text class="label">创建时间</text>
+						<text class="value">{{ order.created_at ? dayjs(order.created_at * 1000).format('YYYY-MM-DD HH:mm:ss') :'' }}</text>
 					</view>
 				</view>
 
 				<!-- 订单操作 -->
-				<view class="order-actions">
+				<view class="order-actions" v-if="order.status === 'pending' || order.status === 'created'">
 					<div>
-						<div class="countdown-text" v-if="order.status === 'pending'">支付剩余时间: {{ order.countdown }}
-						</div>
+						<!-- <div class="countdown-text" v-if="order.status === 'pending'">支付剩余时间: {{ order.countdown }}
+						</div> -->
 					</div>
 					<div class="buttonBox">
-						<template v-if="order.status === 'pending'">
-							<uv-button type="default" size="small" @click="cancelOrder(order)">
+						<template v-if="order.status === 'pending' || order.status === 'created'">
+							<uv-button type="error" size="small" @click="cancelOrder(order)">
 								取消订单
 							</uv-button>
-							<uv-button type="error" size="small" @click="payOrder(order)">
+							<uv-button type="primary" size="small" @click="payOrder(order)">
 								去支付
 							</uv-button>
 						</template>
-						<template v-else>
+<!-- 						<template v-else>
 
 							<uv-button type="default" size="small" @click="deleteOrder(order)">
 								删除订单
@@ -76,40 +90,18 @@
 							<uv-button type="primary" color="#3F70FF" size="small" @click="viewOrderDetail(order)">
 								查看详情
 							</uv-button>
-						</template>
+						</template> -->
 					</div>
 				</view>
-
-				<!-- 待支付订单底部 -->
-				<!-- 				<view v-if="order.status === 'pending'" class="pending-footer">
-					<view class="countdown">
-						<text class="countdown-text">支付剩余时间: {{ order.countdown }}</text>
-					</view>
-					<view class="pending-actions">
-						<uv-button 
-							type="default" 
-							size="large"
-							@click="cancelOrder(order)"
-						>
-							取消订单
-						</uv-button>
-						<uv-button 
-							type="error" 
-							size="large"
-							@click="payOrder(order)"
-						>
-							去支付
-						</uv-button>
-					</view>
-				</view> -->
 			</view>
 		</view>
 
 		<!-- 空状态 -->
-		<view v-if="filteredOrders.length === 0" class="empty-state">
+		<view v-if="list.length === 0 && loadingStatus !== 'loading'" class="empty-state">
 			<u-icon name="file-text" size="60" color="#ccc"></u-icon>
 			<text class="empty-text">暂无订单记录</text>
-		</view>
+		</view>
+		<uv-load-more v-else :status="loadingStatus" />
 	</view>
 </template>
 
@@ -120,7 +112,8 @@
 		ref
 	} from "vue";
 	import {
-		onShow
+		onShow,
+		onReachBottom
 	} from "@dcloudio/uni-app";
 	import {
 		useAuthStore,
@@ -128,14 +121,26 @@
 	} from "@/store";
 	import HeaderCustom from '/components/HeaderCustom/HeaderCustom.vue'
 	import RPC from "@/utils/request";
+	import dayjs from "dayjs";
+	
 	const active = ref('全部')
 
 	const authStore = useAuthStore()
-	const userStore = useUserStore()
+	const userStore = useUserStore()
+	
+	const copyOrderNo = (orderNo) => {
+	  uni.setClipboardData({
+	    data: orderNo,
+	    success: () => {
+	      uni.showToast({
+	        title: '订单号已复制',
+	        icon: 'success'
+	      })
+	    }
+	  })
+	}
 
-	// 响应式数据
-	const activeTab = ref('all')
-	const orders = ref([{
+	const list = ref([{
 			id: 1,
 			orderNumber: 'ORD20230515001',
 			typeLabel: '续费',
@@ -183,17 +188,17 @@
 		}
 	])
 
-	// 计算过滤后的订单
-	const filteredOrders = computed(() => {
-		if (activeTab.value === 'all') {
-			return orders.value
-		}
-		return orders.value.filter(order => order.type === activeTab.value)
-	})
-
 	// 切换标签
 	const switchTab = (tab) => {
-		activeTab.value = tab
+		list.value = []
+		active.value = tab
+		page.value = 1
+		if(tab === '全部') {
+			typeParams.value = ''
+		} else {
+			typeParams.value = tab
+		}
+		getList()
 	}
 
 	// 查看订单详情
@@ -212,13 +217,12 @@
 				if (res.confirm) {
 					try {
 						// 调用取消订单API
-						// await RPC.post('/api/order/cancel', { orderId: order.id })
+						await RPC.post('/membership/order/cancel', { order_no: order.order_no })
 
 						// 更新订单状态
-						const index = orders.value.findIndex(item => item.id === order.id)
+						const index = list.value.findIndex(item => item.id === order.id)
 						if (index !== -1) {
-							orders.value[index].status = 'cancelled'
-							orders.value[index].statusText = '已取消'
+							list.value[index].status = 'canceled'
 						}
 
 						uni.showToast({
@@ -272,33 +276,63 @@
 
 	// 支付订单
 	const payOrder = (order) => {
-		uni.navigateTo({
-			url: `/pages/payment/payment?orderId=${order.id}`
+		uni.showModal({
+			title: '确认支付',
+			content: '确定继续支付这个订单吗？',
+			success: async (res) => {
+				if (res.confirm) {
+					
+				}
+			}
 		})
 	}
-
-	// 加载订单数据
-	const loadOrders = async () => {
-		try {
-			// 调用获取订单列表API
-			// const result = await RPC.get('/api/orders')
-			// orders.value = result.data
-		} catch (error) {
-			console.error('加载订单失败:', error)
-			uni.showToast({
-				title: '加载失败，请重试',
-				icon: 'none'
-			})
-		}
+	
+	const page = ref(1)
+	const typeParams = ref('')
+	const loadingStatus = ref('loadmore')
+	const count = ref(0);
+	const getList = () => {
+		uni.showLoading();
+		RPC.post('/membership/order/list', {
+			user_id: userStore.userInfo.id,
+			page:page.value,
+			order_type:typeParams.value,
+			size:20
+		}).then(res => {
+			list.value = [...list.value, ...res.list];
+			count.value = res.total;
+			if (list.value.length >= count.value) {
+			  loadingStatus.value = "nomore";
+			} else {
+			  loadingStatus.value = "loadmore";
+			}
+		}).catch(() => {
+			loadingStatus.value = "loadmore";
+		}).finally(() => {
+			uni.hideLoading();
+		})
 	}
 
 	onMounted(() => {
-		loadOrders()
-	})
+		
+	})
+	
+	onReachBottom(() => {
+	  if (list.value.length >= count.value || loadingStatus.value === "loading")
+	    return;
+	  console.log("上拉加载:");
+	  loadingStatus.value = "loading";
+	  page.value = ++page.value;
+	  getList();
+	});
 
 	onShow(() => {
-		// 页面显示时刷新订单列表
-		loadOrders()
+		// 页面显示时刷新订单列表
+		list.value = []
+		page.value = 1
+		active.value = '全部'
+		typeParams.value = ''
+		getList()
 	})
 </script>
 
diff --git a/pagesA/generate-record/generate-record.vue b/pagesA/generate-record/generate-record.vue
index 4f78ace..f16e877 100644
--- a/pagesA/generate-record/generate-record.vue
+++ b/pagesA/generate-record/generate-record.vue
@@ -74,7 +74,7 @@
     </view>
 
     <!-- 加载更多 -->
-    <uv-load-more :status="loadingStatus" @loadmore="loadmore" />
+    <uv-load-more v-else :status="loadingStatus" @loadmore="loadmore" />
   </view>
 </template>
 
@@ -128,7 +128,7 @@ const downloadRecord = (record) => {
   // #ifdef MP-WEIXIN
   // 小程序和App端使用uni.downloadFile
   uni.downloadFile({
-    url: 'https://ksdt-1255846884.cos.ap-shanghai.myqcloud.com/lift-result/2025/09/24/d6180add4cd94875a1854a4febce8966.pdf',
+    url: record.result_url,
     success: (res) => {
       console.log(res);
       if (res.statusCode === 200) {
@@ -200,6 +200,7 @@ const deleteRecord = (record) => {
 
 // 加载生成记录
 const loadRecords = async () => {
+  uni.showLoading();
   loadingStatus.value = "loading";
   RPC.post("/planned_list", { page: page.value, page_size: 20 })
     .then((res) => {
@@ -213,7 +214,9 @@ const loadRecords = async () => {
     })
     .catch(() => {
       loadingStatus.value = "loadmore";
-    });
+    }).finally(() => {
+		uni.hideLoading();
+	});
 };
 
 // 刷新数据
diff --git a/pagesA/generate-record/new_file.js b/pagesA/generate-record/new_file.js
new file mode 100644
index 0000000..2c0e9be
--- /dev/null
+++ b/pagesA/generate-record/new_file.js
@@ -0,0 +1,40 @@
+订单列表的
+
+"id":             it.ID,                         // 订单ID
+            "order_no":       it.OrderNo,                    // 订单号（M=会员订单，R=充值订单）
+            "user_id":        it.UserID,                     // 用户ID
+            "user_name":      userNameMap[it.UserID],        // 用户名
+            "plan_id":        it.PlanID,                     // 套餐ID（充值订单为0）
+            "plan_name":      planName,                      // 套餐名称（充值订单固定为“钱包充值”）
+            "order_type":     it.OrderType,                  // 订单类型：会员购买/钱包充值（中文）
+            "amount_cents":   it.AmountCents.ToInt64(),      // 订单金额（分）
+            "amount":         it.AmountCents.String(),       // 订单金额（元，字符串，保留两位小数）
+            "pay_channel":    it.PayChannel,                 // 支付渠道：wallet|wxpay|alipay|other
+            "status":         it.Status,                     // 订单状态：created|paid|canceled|refunded
+            "pay_time":       it.PayTime,                    // 支付时间（Unix 时间戳，秒）
+            "transaction_id": it.TransactionID,              // 第三方交易号/平台流水号
+            "remark":         it.Remark,                     // 备注
+            "created_at":     it.CreatedAt,                  // 创建时间（Unix 时间戳，秒）
+            "updated_at":     it.UpdatedAt,                  // 更新时间（Unix 时间戳，秒）
+
+
+消费列表
+
+"id":                   it.ID,                                         // 流水ID
+   "user_id":              it.UserID,                                      // 用户ID
+   "user_name":            userName,                                       // 用户名
+   "type":                 it.Type,                                        // 交易类型：recharge(充值)|purchase(消费)
+   "amount_cents":         it.AmountCents.ToInt64(),                       // 金额（分）
+   "amount":               it.AmountCents.String(),                        // 金额（元，字符串，保留两位小数）
+   "related_order_id":     it.RelatedOrderID,                              // 关联的订单ID（可为空）
+   "order_no":             it.OrderNo,                                     // 关联订单号（M* 会员订单 / R* 充值订单）
+   "pay_channel":          it.PayChannel,                                  // 支付渠道：wallet|wxpay|alipay|other
+   "status":               it.Status,                                      // 交易状态：success|failed|pending
+   "remark":               it.Remark,                                      // 备注
+   "balance_before_cents": it.BalanceBeforeCents.ToInt64(),                // 变动前余额（分）
+   "balance_after_cents":  it.BalanceAfterCents.ToInt64(),                 // 变动后余额（分）
+   "finished_at":          it.FinishedAt,                                  // 完成时间（Unix 时间戳，秒）
+   "external_txn_id":      it.ExternalTxnID,                               // 外部交易号（第三方平台返回）
+   "currency":             it.Currency,                                    // 币种（默认 CNY）
+   "created_at":           it.CreatedAt,                                   // 创建时间（Unix 时间戳，秒）
+  })
\ No newline at end of file
diff --git a/pagesA/recharge/recharge.vue b/pagesA/recharge/recharge.vue
index b46f07c..a2cebdc 100644
--- a/pagesA/recharge/recharge.vue
+++ b/pagesA/recharge/recharge.vue
@@ -1,699 +1,734 @@
-<template>
-  <view class="container">
-    <!-- 顶部余额显示 -->
-    <view class="balance-section">
-      <view class="balance-card">
-        <view class="balance-info">
-          <view class="balance-label">当前余额</view>
-          <view class="balance-amount">¥{{ currentBalance }}</view>
-        </view>
-        <view class="balance-icon">
-          <uv-icon name="empty-coupon" color="#4285f4" size="40"></uv-icon>
-        </view>
-      </view>
-    </view>
-
-    <!-- 充值金额选择 -->
-    <view class="recharge-section">
-      <view class="section-title">选择充值金额</view>
-      <view class="amount-grid">
-        <view 
-          class="amount-item" 
-          :class="{ active: selectedAmount === item.value }"
-          v-for="item in rechargeAmounts" 
-          :key="item.value"
-          @click="selectAmount(item.value)"
-        >
-          <view class="amount-value">¥{{ item.value }}</view>
-          <!-- <view v-if="item.bonus" class="amount-bonus">送{{ item.bonus }}元</view> -->
-        </view>
-      </view>
-      
-      <!-- 自定义金额 -->
-      <view class="custom-amount">
-        <view class="custom-label">自定义金额</view>
-        <view class="custom-input">
-          <text class="currency">¥</text>
-          <input 
-            class="amount-input" 
-            v-model="customAmount" 
-            type="number" 
-            placeholder="请输入充值金额"
-            @input="onCustomAmountInput"
-          />
-        </view>
-        <view class="amount-tips">充值金额范围：¥1 - ¥50000</view>
-      </view>
-    </view>
-
-    <!-- 支付方式 -->
-    <view class="payment-section">
-      <view class="section-title">选择支付方式</view>
-      <view class="payment-list">
-        <!-- 微信支付 -->
-        <view 
-          class="payment-item" 
-          :class="{ active: selectedPayment === 'wechat' }"
-          @click="selectPayment('wechat')"
-        >
-          <view class="payment-info">
-            <uv-icon name="weixin-fill" color="#07c160" size="28"></uv-icon>
-            <view class="payment-details">
-              <view class="payment-name">微信支付</view>
-              <view class="payment-desc">安全快捷，支持零钱和银行卡</view>
-            </view>
-          </view>
-          <uv-icon 
-            name="checkmark-circle-fill" 
-            :color="selectedPayment === 'wechat' ? '#4285f4' : '#ccc'" 
-            size="20"
-          ></uv-icon>
-        </view>
-        
-        <!-- 支付宝支付 - 仅H5显示 -->
-        <view 
-          v-if="showAlipay"
-          class="payment-item" 
-          :class="{ active: selectedPayment === 'alipay' }"
-          @click="selectPayment('alipay')"
-        >
-          <view class="payment-info">
-            <uv-icon name="/static/imgs/alipay.png" color="#1677ff" size="28"></uv-icon>
-            <view class="payment-details">
-              <view class="payment-name">支付宝</view>
-              <view class="payment-desc">便民生活，轻松支付</view>
-            </view>
-          </view>
-          <uv-icon 
-            name="checkmark-circle-fill" 
-            :color="selectedPayment === 'alipay' ? '#4285f4' : '#ccc'" 
-            size="20"
-          ></uv-icon>
-        </view>
-      </view>
-    </view>
-
-    <!-- 充值说明 -->
-    <view class="notice-section">
-      <view class="section-title">充值说明</view>
-      <view class="notice-list">
-        <view class="notice-item">
-          <uv-icon name="info-circle" color="#999" size="16"></uv-icon>
-          <text class="notice-text">充值金额将实时到账，可用于购买会员服务</text>
-        </view>
-        <view class="notice-item">
-          <uv-icon name="info-circle" color="#999" size="16"></uv-icon>
-          <text class="notice-text">充值金额不可提现，请根据需要合理充值</text>
-        </view>
-        <view class="notice-item">
-          <uv-icon name="info-circle" color="#999" size="16"></uv-icon>
-          <text class="notice-text">如有疑问，请联系客服处理</text>
-        </view>
-      </view>
-    </view>
-
-    <!-- 底部充值按钮 -->
-    <view class="bottom-section">
-      <view class="recharge-info">
-        <text class="recharge-text">充值金额：¥{{ finalAmount }}</text>
-        <!-- <text v-if="bonusAmount > 0" class="bonus-text">（含赠送¥{{ bonusAmount }}）</text> -->
-      </view>
-      <uv-button 
-        type="primary" 
-        size="large" 
-        @click="confirmRecharge"
-        :loading="recharging"
-        :disabled="finalAmount <= 0"
-      >
-        立即充值
-      </uv-button>
-    </view>
-  </view>
-</template>
-
-<script setup>
-import { ref, computed, onMounted } from "vue";
-import { onShow } from "@dcloudio/uni-app";
-import { useAuthStore, useUserStore } from "@/store";
-import RPC from "@/utils/request";
-
-const authStore = useAuthStore();
-const userStore = useUserStore();
-
-// 响应式数据
-const currentBalance = ref(50.00);
-const selectedAmount = ref(0);
-const customAmount = ref('');
-const selectedPayment = ref('wechat');
-const recharging = ref(false);
-const showAlipay = ref(true);
-
-// 充值金额选项
-const rechargeAmounts = ref([
-  { value: 10, bonus: 0 },
-  { value: 50, bonus: 0 },
-  { value: 100, bonus: 0 },
-  { value: 200, bonus: 0 },
-  { value: 500, bonus: 0 },
-  { value: 1000, bonus: 0 }
-]);
-
-// 计算最终充值金额
-const finalAmount = computed(() => {
-  if (customAmount.value && parseFloat(customAmount.value) > 0) {
-    return parseFloat(customAmount.value);
-  }
-  return selectedAmount.value;
-});
-
-// 计算赠送金额
-const bonusAmount = computed(() => {
-  if (selectedAmount.value > 0) {
-    const selected = rechargeAmounts.value.find(item => item.value === selectedAmount.value);
-    return selected ? selected.bonus : 0;
-  }
-  return 0;
-});
-
-// 选择充值金额
-const selectAmount = (amount) => {
-  selectedAmount.value = amount;
-  customAmount.value = '';
-};
-
-// 自定义金额输入
-const onCustomAmountInput = () => {
-  selectedAmount.value = 0;
-  
-  // 限制输入范围
-  const amount = parseFloat(customAmount.value);
-  if (amount > 50000) {
-    customAmount.value = '50000';
-    uni.showToast({
-      title: '充值金额不能超过50000元',
-      icon: 'none'
-    });
-  }
-};
-
-// 选择支付方式
-const selectPayment = (payment) => {
-  selectedPayment.value = payment;
-};
-
-// 检查环境
-const checkEnvironment = () => {
-  // #ifdef MP-WEIXIN
-  // 微信小程序环境，隐藏支付宝选项
-  showAlipay.value = false;
-  selectedPayment.value = 'wechat';
-  // #endif
-  
-  // #ifdef H5
-  // H5环境，显示所有支付选项
-  showAlipay.value = true;
-  // 如果在微信浏览器内，默认选择微信支付
-  const ua = navigator.userAgent.toLowerCase();
-  const isWechat = ua.indexOf('micromessenger') !== -1;
-  selectedPayment.value = isWechat ? 'wechat' : 'alipay';
-  // #endif
-};
-
-// 微信支付
-const wechatPay = async (orderInfo) => {
-  // #ifdef MP-WEIXIN
-  // 微信小程序支付
-  try {
-    const paymentResult = await uni.requestPayment({
-      provider: 'wxpay',
-      timeStamp: orderInfo.timeStamp,
-      nonceStr: orderInfo.nonceStr,
-      package: orderInfo.package,
-      signType: orderInfo.signType,
-      paySign: orderInfo.paySign
-    });
-    
-    console.log('微信支付成功:', paymentResult);
-    return { success: true, data: paymentResult };
-  } catch (error) {
-    console.error('微信支付失败:', error);
-    if (error.errMsg === 'requestPayment:fail cancel') {
-      throw new Error('用户取消支付');
-    }
-    throw new Error('微信支付失败');
-  }
-  // #endif
-
-  // #ifdef H5
-  // H5微信支付
-  if (typeof WeixinJSBridge !== 'undefined') {
-    return new Promise((resolve, reject) => {
-      WeixinJSBridge.invoke('getBrandWCPayRequest', {
-        appId: orderInfo.appId,
-        timeStamp: orderInfo.timeStamp,
-        nonceStr: orderInfo.nonceStr,
-        package: orderInfo.package,
-        signType: orderInfo.signType,
-        paySign: orderInfo.paySign
-      }, (res) => {
-        if (res.err_msg === 'get_brand_wcpay_request:ok') {
-          resolve({ success: true, data: res });
-        } else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
-          reject(new Error('用户取消支付'));
-        } else {
-          reject(new Error('微信支付失败'));
-        }
-      });
-    });
-  } else {
-    // 不在微信环境，跳转到支付页面
-    const payUrl = orderInfo.mwebUrl;
-    window.location.href = payUrl;
-    return { success: true, redirect: true };
-  }
-  // #endif
-};
-
-// 支付宝支付（仅H5环境）
-const alipayPay = async (orderInfo) => {
-  // #ifdef H5
-  // H5支付宝支付
-  const payUrl = orderInfo.payUrl;
-  window.location.href = payUrl;
-  return { success: true, redirect: true };
-  // #endif
-};
-
-// 确认充值
-const confirmRecharge = async () => {
-  if (finalAmount.value <= 0) {
-    uni.showToast({
-      title: '请选择充值金额',
-      icon: 'none'
-    });
-    return;
-  }
-
-  if (finalAmount.value < 1) {
-    uni.showToast({
-      title: '充值金额不能少于1元',
-      icon: 'none'
-    });
-    return;
-  }
-
-  if (!selectedPayment.value) {
-    uni.showToast({
-      title: '请选择支付方式',
-      icon: 'none'
-    });
-    return;
-  }
-
-  recharging.value = true;
-
-  try {
-    // 创建充值订单参数
-    const orderParams = {
-      type: 'recharge',
-      amount: finalAmount.value,
-      bonusAmount: bonusAmount.value,
-      paymentMethod: selectedPayment.value,
-      userId: userStore.userInfo?.id || 'mock_user_id',
-      // #ifdef MP-WEIXIN
-      platform: 'mp-weixin',
-      // #endif
-      // #ifdef H5
-      platform: 'h5',
-      // #endif
-    };
-
-    uni.showLoading({
-      title: '正在创建订单...'
-    });
-
-    // 调用后端创建充值订单API
-    // const orderResult = await RPC.post('/api/recharge/create', orderParams);
-    
-    // 模拟创建订单返回的数据
-    const orderResult = {
-      orderId: 'RECHARGE_' + Date.now(),
-      amount: orderParams.amount,
-      // 微信支付参数
-      wechatPayInfo: {
-        appId: 'wx1234567890',
-        timeStamp: String(Date.now()),
-        nonceStr: 'random_string_' + Date.now(),
-        package: 'prepay_id=wx_prepay_id_123456',
-        signType: 'RSA',
-        paySign: 'mock_pay_sign_123456',
-        mwebUrl: 'https://wx.tenpay.com/cgi-bin/mmpayweb-bin/checkmweb?prepay_id=wx_prepay_id_123456'
-      },
-      // 支付宝支付参数
-      alipayInfo: {
-        payUrl: 'https://openapi.alipay.com/gateway.do?mock_recharge_url'
-      }
-    };
-
-    uni.hideLoading();
-
-    // 根据支付方式调用对应的支付方法
-    let paymentResult;
-    
-    if (selectedPayment.value === 'wechat') {
-      uni.showLoading({
-        title: '正在跳转微信支付...'
-      });
-      paymentResult = await wechatPay(orderResult.wechatPayInfo);
-    } else if (selectedPayment.value === 'alipay') {
-      uni.showLoading({
-        title: '正在跳转支付宝...'
-      });
-      paymentResult = await alipayPay(orderResult.alipayInfo);
-    }
-
-    uni.hideLoading();
-
-    // 处理支付结果
-    if (paymentResult.success) {
-      if (paymentResult.redirect) {
-        // H5跳转支付
-        uni.showToast({
-          title: '正在跳转支付页面...',
-          icon: 'loading',
-          duration: 2000
-        });
-      } else {
-        // 支付成功
-        uni.showToast({
-          title: '充值成功',
-          icon: 'success'
-        });
-
-        // 更新余额
-        currentBalance.value += finalAmount.value + bonusAmount.value;
-        
-        // 重置选择
-        selectedAmount.value = 0;
-        customAmount.value = '';
-
-        // 延迟返回上一页
-        setTimeout(() => {
-          uni.navigateBack();
-        }, 1500);
-      }
-    }
-
-  } catch (error) {
-    uni.hideLoading();
-    console.error('充值失败:', error);
-    
-    let errorMessage = '充值失败，请重试';
-    if (error.message === '用户取消支付') {
-      errorMessage = '支付已取消';
-    } else if (error.message) {
-      errorMessage = error.message;
-    }
-    
-    uni.showToast({
-      title: errorMessage,
-      icon: 'none'
-    });
-  } finally {
-    recharging.value = false;
-  }
-};
-
-// 处理支付回调
-const handlePaymentCallback = () => {
-  // #ifdef H5
-  const urlParams = new URLSearchParams(window.location.search);
-  const orderId = urlParams.get('orderId');
-  const payResult = urlParams.get('payResult');
-  
-  if (orderId && payResult) {
-    // 清理URL参数
-    const url = new URL(window.location);
-    url.searchParams.delete('orderId');
-    url.searchParams.delete('payResult');
-    window.history.replaceState({}, document.title, url.pathname + url.search);
-    
-    // 检查支付结果
-    if (payResult === 'success') {
-      uni.showToast({
-        title: '充值成功',
-        icon: 'success'
-      });
-      
-      // 刷新余额
-      loadUserBalance();
-      
-      // 重置选择
-      selectedAmount.value = 0;
-      customAmount.value = '';
-    } else {
-      uni.showToast({
-        title: '充值失败或取消',
-        icon: 'none'
-      });
-    }
-  }
-  // #endif
-};
-
-// 加载用户余额
-const loadUserBalance = async () => {
-  try {
-    // 调用获取用户余额API
-    // const result = await RPC.get('/api/user/balance');
-    // currentBalance.value = result.data.balance;
-  } catch (error) {
-    console.error('加载余额失败:', error);
-  }
-};
-
-onMounted(() => {
-  checkEnvironment();
-  loadUserBalance();
-  handlePaymentCallback();
-});
-
-onShow(() => {
-  handlePaymentCallback();
-});
-</script>
-
-<style lang="scss" scoped>
-.container {
-  min-height: 100vh;
-  background-color: #f8f8f8;
-  padding-bottom: 120px;
-}
-
-.balance-section {
-  padding: 20px 16px;
-  background: linear-gradient(135deg, #4285f4 0%, #6fa8f5 100%);
-  
-  .balance-card {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    background: rgba(255, 255, 255, 0.1);
-    border-radius: 12px;
-    padding: 20px;
-    
-    .balance-info {
-      .balance-label {
-        color: rgba(255, 255, 255, 0.8);
-        font-size: 14px;
-        margin-bottom: 8px;
-      }
-      
-      .balance-amount {
-        color: white;
-        font-size: 32px;
-        font-weight: bold;
-      }
-    }
-    
-    .balance-icon {
-      opacity: 0.8;
-    }
-  }
-}
-
-.recharge-section,
-.payment-section,
-.notice-section {
-  margin: 16px;
-  background: white;
-  border-radius: 12px;
-  padding: 20px;
-  
-  .section-title {
-    font-size: 16px;
-    font-weight: bold;
-    color: #333;
-    margin-bottom: 16px;
-  }
-}
-
-.amount-grid {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 12px;
-  margin-bottom: 20px;
-  
-  .amount-item {
-    background: #f8f9fa;
-    border: 2px solid transparent;
-    border-radius: 8px;
-    padding: 16px 8px;
-    text-align: center;
-    transition: all 0.3s;
-    
-    &.active {
-      border-color: #4285f4;
-      background-color: #f0f7ff;
-    }
-    
-    .amount-value {
-      font-size: 18px;
-      font-weight: bold;
-      color: #333;
-      margin-bottom: 4px;
-    }
-    
-    .amount-bonus {
-      font-size: 12px;
-      color: #ff4d4f;
-    }
-  }
-}
-
-.custom-amount {
-  .custom-label {
-    font-size: 14px;
-    color: #666;
-    margin-bottom: 12px;
-  }
-  
-  .custom-input {
-    display: flex;
-    align-items: center;
-    background: #f8f9fa;
-    border-radius: 8px;
-    padding: 0 16px;
-    margin-bottom: 8px;
-    
-    .currency {
-      font-size: 18px;
-      color: #333;
-      margin-right: 8px;
-    }
-    
-    .amount-input {
-      flex: 1;
-      height: 48px;
-      font-size: 16px;
-      border: none;
-      background: transparent;
-    }
-  }
-  
-  .amount-tips {
-    font-size: 12px;
-    color: #999;
-  }
-}
-
-.payment-list {
-  .payment-item {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 16px;
-    border: 1px solid #e5e5e5;
-    border-radius: 8px;
-    margin-bottom: 12px;
-    transition: all 0.3s;
-    
-    &.active {
-      border-color: #4285f4;
-      background-color: #f0f7ff;
-    }
-    
-    &:last-child {
-      margin-bottom: 0;
-    }
-    
-    .payment-info {
-      display: flex;
-      align-items: center;
-      gap: 12px;
-      
-      .payment-details {
-        .payment-name {
-          font-size: 16px;
-          color: #333;
-          margin-bottom: 4px;
-        }
-        
-        .payment-desc {
-          font-size: 12px;
-          color: #999;
-        }
-      }
-    }
-  }
-}
-
-.notice-list {
-  .notice-item {
-    display: flex;
-    align-items: flex-start;
-    gap: 8px;
-    margin-bottom: 12px;
-    
-    &:last-child {
-      margin-bottom: 0;
-    }
-    
-    .notice-text {
-      flex: 1;
-      font-size: 13px;
-      color: #666;
-      line-height: 1.4;
-    }
-  }
-}
-
-.bottom-section {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background: white;
-  padding: 16px;
-  border-top: 1px solid #e5e5e5;
-  
-  .recharge-info {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-bottom: 12px;
-    
-    .recharge-text {
-      font-size: 16px;
-      color: #333;
-      font-weight: 500;
-    }
-    
-    .bonus-text {
-      font-size: 14px;
-      color: #ff4d4f;
-      margin-left: 4px;
-    }
-  }
-}
+<template>
+	<view class="container">
+		<!-- 顶部余额显示 -->
+		<view class="balance-section">
+			<view class="balance-card">
+				<view class="balance-info">
+					<view class="balance-label">当前余额</view>
+					<view class="balance-amount">¥{{ memberInfo.wallet_balance || 0 }}</view>
+				</view>
+				<view class="balance-icon">
+					<uv-icon name="empty-coupon" color="#4285f4" size="40"></uv-icon>
+				</view>
+			</view>
+		</view>
+
+		<!-- 充值金额选择 -->
+		<view class="recharge-section">
+			<view class="section-title">选择充值金额</view>
+			<view class="amount-grid">
+				<view class="amount-item" :class="{ active: selectedAmount === item.value }"
+					v-for="item in rechargeAmounts" :key="item.value" @click="selectAmount(item.value)">
+					<view class="amount-value">¥{{ item.value }}</view>
+					<!-- <view v-if="item.bonus" class="amount-bonus">送{{ item.bonus }}元</view> -->
+				</view>
+			</view>
+
+			<!-- 自定义金额 -->
+			<view class="custom-amount">
+				<view class="custom-label">自定义金额</view>
+				<view class="custom-input">
+					<text class="currency">¥</text>
+					<input class="amount-input" v-model="customAmount" type="digit" placeholder="请输入充值金额"
+						@input="onCustomAmountInput" />
+				</view>
+				<!-- <view class="amount-tips">充值金额范围：¥0.01 - ¥50000</view> -->
+			</view>
+		</view>
+
+		<!-- 支付方式 -->
+		<view class="payment-section">
+			<view class="section-title">选择支付方式</view>
+			<view class="payment-list">
+				<!-- 微信支付 -->
+				<view class="payment-item" :class="{ active: selectedPayment === 'wechat' }"
+					@click="selectPayment('wechat')">
+					<view class="payment-info">
+						<uv-icon name="weixin-fill" color="#07c160" size="28"></uv-icon>
+						<view class="payment-details">
+							<view class="payment-name">微信支付</view>
+							<view class="payment-desc">安全快捷，支持零钱和银行卡</view>
+						</view>
+					</view>
+					<uv-icon name="checkmark-circle-fill" :color="selectedPayment === 'wechat' ? '#4285f4' : '#ccc'"
+						size="20"></uv-icon>
+				</view>
+
+				<!-- 支付宝支付 - 仅H5显示 -->
+				<view v-if="showAlipay" class="payment-item" :class="{ active: selectedPayment === 'alipay' }"
+					@click="selectPayment('alipay')">
+					<view class="payment-info">
+						<uv-icon name="/static/imgs/alipay.png" color="#1677ff" size="28"></uv-icon>
+						<view class="payment-details">
+							<view class="payment-name">支付宝</view>
+							<view class="payment-desc">便民生活，轻松支付</view>
+						</view>
+					</view>
+					<uv-icon name="checkmark-circle-fill" :color="selectedPayment === 'alipay' ? '#4285f4' : '#ccc'"
+						size="20"></uv-icon>
+				</view>
+			</view>
+		</view>
+
+		<!-- 充值说明 -->
+		<view class="notice-section">
+			<view class="section-title">充值说明</view>
+			<view class="notice-list">
+				<view class="notice-item">
+					<uv-icon name="info-circle" color="#999" size="16"></uv-icon>
+					<text class="notice-text">充值金额将实时到账，可用于购买会员服务</text>
+				</view>
+				<view class="notice-item">
+					<uv-icon name="info-circle" color="#999" size="16"></uv-icon>
+					<text class="notice-text">充值金额不可提现，请根据需要合理充值</text>
+				</view>
+				<view class="notice-item">
+					<uv-icon name="info-circle" color="#999" size="16"></uv-icon>
+					<text class="notice-text">如有疑问，请联系客服处理</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部充值按钮 -->
+		<view class="bottom-section">
+			<view class="recharge-info">
+				<text class="recharge-text">充值金额：¥{{ finalAmount }}</text>
+				<!-- <text v-if="bonusAmount > 0" class="bonus-text">（含赠送¥{{ bonusAmount }}）</text> -->
+			</view>
+			<uv-button type="primary" size="large" @click="confirmRecharge" :loading="recharging"
+				:disabled="finalAmount <= 0">
+				立即充值
+			</uv-button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		computed,
+		onMounted
+	} from "vue";
+	import {
+		onShow
+	} from "@dcloudio/uni-app";
+	import {
+		useAuthStore,
+		useUserStore
+	} from "@/store";
+	import RPC from "@/utils/request";
+
+	const authStore = useAuthStore();
+	const userStore = useUserStore();
+	
+	const memberInfo = ref({})
+	const getMemberInfo = () => {
+		uni.showLoading();
+		RPC.post('/membership/user/info', {
+			user_id: userStore.userInfo.id
+		}).then(res => {
+			memberInfo.value = res || {}
+		}).finally(() => {
+			uni.hideLoading();
+		})
+	}
+
+	// 响应式数据
+	const currentBalance = ref(0);
+	const selectedAmount = ref(0);
+	const customAmount = ref('');
+	const selectedPayment = ref('wechat');
+	const recharging = ref(false);
+	const showAlipay = ref(true);
+
+	// 充值金额选项
+	const rechargeAmounts = ref([{
+			value: 10,
+			bonus: 0
+		},
+		{
+			value: 50,
+			bonus: 0
+		},
+		{
+			value: 100,
+			bonus: 0
+		},
+		{
+			value: 200,
+			bonus: 0
+		},
+		{
+			value: 500,
+			bonus: 0
+		},
+		{
+			value: 1000,
+			bonus: 0
+		}
+	]);
+
+	// 计算最终充值金额
+	const finalAmount = computed(() => {
+		if (customAmount.value && parseFloat(customAmount.value) > 0) {
+			return parseFloat(customAmount.value);
+		}
+		return selectedAmount.value;
+	});
+
+	// 计算赠送金额
+	const bonusAmount = computed(() => {
+		if (selectedAmount.value > 0) {
+			const selected = rechargeAmounts.value.find(item => item.value === selectedAmount.value);
+			return selected ? selected.bonus : 0;
+		}
+		return 0;
+	});
+
+	// 选择充值金额
+	const selectAmount = (amount) => {
+		selectedAmount.value = amount;
+		customAmount.value = '';
+	};
+
+	// 自定义金额输入
+	const onCustomAmountInput = () => {
+		selectedAmount.value = 0;
+
+		// 限制输入范围
+		const amount = parseFloat(customAmount.value);
+		if (amount > 50000) {
+			customAmount.value = '50000';
+			uni.showToast({
+				title: '充值金额不能超过50000元',
+				icon: 'none'
+			});
+		}
+	};
+
+	// 选择支付方式
+	const selectPayment = (payment) => {
+		selectedPayment.value = payment;
+	};
+
+	// 检查环境
+	const checkEnvironment = () => {
+		// #ifdef MP-WEIXIN
+		// 微信小程序环境，隐藏支付宝选项
+		showAlipay.value = false;
+		selectedPayment.value = 'wechat';
+		// #endif
+
+		// #ifdef H5
+		// H5环境，显示所有支付选项
+		showAlipay.value = true;
+		// 如果在微信浏览器内，默认选择微信支付
+		const ua = navigator.userAgent.toLowerCase();
+		const isWechat = ua.indexOf('micromessenger') !== -1;
+		selectedPayment.value = isWechat ? 'wechat' : 'alipay';
+		// #endif
+	};
+
+	// 微信支付
+	const wechatPay = async (orderInfo) => {
+		// #ifdef MP-WEIXIN
+		// 微信小程序支付
+		try {
+			const paymentResult = await uni.requestPayment({
+				provider: 'wxpay',
+				timeStamp: orderInfo.timeStamp,
+				nonceStr: orderInfo.nonceStr,
+				package: orderInfo.package,
+				signType: orderInfo.signType,
+				paySign: orderInfo.paySign
+			});
+
+			console.log('微信支付成功:', paymentResult);
+			return {
+				success: true,
+				data: paymentResult
+			};
+		} catch (error) {
+			console.error('微信支付失败:', error);
+			if (error.errMsg === 'requestPayment:fail cancel') {
+				throw new Error('用户取消支付');
+			}
+			throw new Error('微信支付失败');
+		}
+		// #endif
+
+		// #ifdef H5
+		// H5微信支付
+		if (typeof WeixinJSBridge !== 'undefined') {
+			return new Promise((resolve, reject) => {
+				WeixinJSBridge.invoke('getBrandWCPayRequest', {
+					appId: orderInfo.appId,
+					timeStamp: orderInfo.timeStamp,
+					nonceStr: orderInfo.nonceStr,
+					package: orderInfo.package,
+					signType: orderInfo.signType,
+					paySign: orderInfo.paySign
+				}, (res) => {
+					if (res.err_msg === 'get_brand_wcpay_request:ok') {
+						resolve({
+							success: true,
+							data: res
+						});
+					} else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
+						reject(new Error('用户取消支付'));
+					} else {
+						reject(new Error('微信支付失败'));
+					}
+				});
+			});
+		} else {
+			// 不在微信环境，跳转到支付页面
+			const payUrl = orderInfo.mwebUrl;
+			window.location.href = payUrl;
+			return {
+				success: true,
+				redirect: true
+			};
+		}
+		// #endif
+	};
+
+	// 支付宝支付（仅H5环境）
+	const alipayPay = async (orderInfo) => {
+		// #ifdef H5
+		// H5支付宝支付
+		const payUrl = orderInfo.payUrl;
+		window.location.href = payUrl;
+		return {
+			success: true,
+			redirect: true
+		};
+		// #endif
+	};
+
+	// 确认充值
+	const confirmRecharge = async () => {
+		if (finalAmount.value <= 0) {
+			uni.showToast({
+				title: '请选择充值金额',
+				icon: 'none'
+			});
+			return;
+		}
+
+		// if (finalAmount.value < 1) {
+		// 	uni.showToast({
+		// 		title: '充值金额不能少于1元',
+		// 		icon: 'none'
+		// 	});
+		// 	return;
+		// }
+
+		if (!selectedPayment.value) {
+			uni.showToast({
+				title: '请选择支付方式',
+				icon: 'none'
+			});
+			return;
+		}
+
+		recharging.value = true;
+
+		try {
+			// 创建充值订单参数
+			// const orderParams = {
+			//   type: 'recharge',
+			//   amount: finalAmount.value,
+			//   bonusAmount: bonusAmount.value,
+			//   paymentMethod: selectedPayment.value,
+			//   userId: userStore.userInfo?.id || 'mock_user_id',
+			//   // #ifdef MP-WEIXIN
+			//   platform: 'mp-weixin',
+			//   // #endif
+			//   // #ifdef H5
+			//   platform: 'h5',
+			//   // #endif
+			// };
+
+			uni.showLoading({
+				title: '正在创建订单...'
+			});
+
+			// 调用后端创建充值订单API
+			const orderNum = await RPC.post('/wallet/recharge', {
+				user_id: userStore.userInfo.id,
+				amount_cents: finalAmount.value * 100,
+				pay_channel: selectedPayment.value
+			})
+			console.log('orderNum', orderNum)
+			// 模拟创建订单返回的数据
+			// const orderResult = {
+			//   orderId: 'RECHARGE_' + Date.now(),
+			//   amount: orderParams.amount,
+			//   // 微信支付参数
+			//   wechatPayInfo: {
+			//     appId: 'wx1234567890',
+			//     timeStamp: String(Date.now()),
+			//     nonceStr: 'random_string_' + Date.now(),
+			//     package: 'prepay_id=wx_prepay_id_123456',
+			//     signType: 'RSA',
+			//     paySign: 'mock_pay_sign_123456',
+			//     mwebUrl: 'https://wx.tenpay.com/cgi-bin/mmpayweb-bin/checkmweb?prepay_id=wx_prepay_id_123456'
+			//   },
+			//   // 支付宝支付参数
+			//   alipayInfo: {
+			//     payUrl: 'https://openapi.alipay.com/gateway.do?mock_recharge_url'
+			//   }
+			// };
+
+			uni.hideLoading();
+
+			// 根据支付方式调用对应的支付方法
+			let paymentResult;
+
+			if (selectedPayment.value === 'wechat') {
+				const res = await uni.login({
+					provider: 'weixin'
+				})
+				const orderResult = await RPC.post('/membership/order/pay_by_wechat_mini', {
+					code: res.code,
+					"order_no": orderNum.order_no
+				})
+				uni.showLoading({
+					title: "正在跳转微信支付...",
+				});
+				console.log('orderResult', orderResult)
+				paymentResult = await wechatPay(orderResult);
+			} else if (selectedPayment.value === 'alipay') {
+				uni.showLoading({
+					title: '正在跳转支付宝...'
+				});
+				paymentResult = await alipayPay(orderResult.alipayInfo);
+			}
+
+			uni.hideLoading();
+
+			// 处理支付结果
+			if (paymentResult.success) {
+				if (paymentResult.redirect) {
+					// H5跳转支付
+					uni.showToast({
+						title: '正在跳转支付页面...',
+						icon: 'loading',
+						duration: 2000
+					});
+				} else {
+					// 支付成功
+					uni.showToast({
+						title: '充值成功',
+						icon: 'success'
+					});
+
+					// 重置选择
+					selectedAmount.value = 0;
+					customAmount.value = '';
+					// setTimeout(() => {
+					// 	getMemberInfo()
+					// },1000)
+
+					// 延迟返回上一页
+					setTimeout(() => {
+						uni.navigateBack();
+					}, 1500);
+				}
+			}
+
+		} catch (error) {
+			uni.hideLoading();
+			console.error('充值失败:', error);
+
+			let errorMessage = '充值失败，请重试';
+			if (error.message === '用户取消支付') {
+				errorMessage = '支付已取消';
+			} else if (error.message) {
+				errorMessage = error.message;
+			}
+
+			uni.showToast({
+				title: errorMessage,
+				icon: 'none'
+			});
+		} finally {
+			recharging.value = false;
+		}
+	};
+
+	// 处理支付回调
+	const handlePaymentCallback = () => {
+		// #ifdef H5
+		const urlParams = new URLSearchParams(window.location.search);
+		const orderId = urlParams.get('orderId');
+		const payResult = urlParams.get('payResult');
+
+		if (orderId && payResult) {
+			// 清理URL参数
+			const url = new URL(window.location);
+			url.searchParams.delete('orderId');
+			url.searchParams.delete('payResult');
+			window.history.replaceState({}, document.title, url.pathname + url.search);
+
+			// 检查支付结果
+			if (payResult === 'success') {
+				uni.showToast({
+					title: '充值成功',
+					icon: 'success'
+				});
+
+				// 刷新余额
+				loadUserBalance();
+
+				// 重置选择
+				selectedAmount.value = 0;
+				customAmount.value = '';
+			} else {
+				uni.showToast({
+					title: '充值失败或取消',
+					icon: 'none'
+				});
+			}
+		}
+		// #endif
+	};
+
+	// 加载用户余额
+	const loadUserBalance = async () => {
+		try {
+			// 调用获取用户余额API
+			// const result = await RPC.get('/api/user/balance');
+			// currentBalance.value = result.data.balance;
+		} catch (error) {
+			console.error('加载余额失败:', error);
+		}
+	};
+
+	onMounted(() => {
+		checkEnvironment();
+		// loadUserBalance();
+		// handlePaymentCallback();
+	});
+
+	onShow(() => {
+		handlePaymentCallback();
+		getMemberInfo()
+	});
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		min-height: 100vh;
+		background-color: #f8f8f8;
+		padding-bottom: 120px;
+	}
+
+	.balance-section {
+		padding: 20px 16px;
+		background: linear-gradient(135deg, #4285f4 0%, #6fa8f5 100%);
+
+		.balance-card {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			background: rgba(255, 255, 255, 0.1);
+			border-radius: 12px;
+			padding: 20px;
+
+			.balance-info {
+				.balance-label {
+					color: rgba(255, 255, 255, 0.8);
+					font-size: 14px;
+					margin-bottom: 8px;
+				}
+
+				.balance-amount {
+					color: white;
+					font-size: 32px;
+					font-weight: bold;
+				}
+			}
+
+			.balance-icon {
+				opacity: 0.8;
+			}
+		}
+	}
+
+	.recharge-section,
+	.payment-section,
+	.notice-section {
+		margin: 16px;
+		background: white;
+		border-radius: 12px;
+		padding: 20px;
+
+		.section-title {
+			font-size: 16px;
+			font-weight: bold;
+			color: #333;
+			margin-bottom: 16px;
+		}
+	}
+
+	.amount-grid {
+		display: grid;
+		grid-template-columns: repeat(3, 1fr);
+		gap: 12px;
+		margin-bottom: 20px;
+
+		.amount-item {
+			background: #f8f9fa;
+			border: 2px solid transparent;
+			border-radius: 8px;
+			padding: 16px 8px;
+			text-align: center;
+			transition: all 0.3s;
+
+			&.active {
+				border-color: #4285f4;
+				background-color: #f0f7ff;
+			}
+
+			.amount-value {
+				font-size: 18px;
+				font-weight: bold;
+				color: #333;
+				margin-bottom: 4px;
+			}
+
+			.amount-bonus {
+				font-size: 12px;
+				color: #ff4d4f;
+			}
+		}
+	}
+
+	.custom-amount {
+		.custom-label {
+			font-size: 14px;
+			color: #666;
+			margin-bottom: 12px;
+		}
+
+		.custom-input {
+			display: flex;
+			align-items: center;
+			background: #f8f9fa;
+			border-radius: 8px;
+			padding: 0 16px;
+			margin-bottom: 8px;
+
+			.currency {
+				font-size: 18px;
+				color: #333;
+				margin-right: 8px;
+			}
+
+			.amount-input {
+				flex: 1;
+				height: 48px;
+				font-size: 16px;
+				border: none;
+				background: transparent;
+			}
+		}
+
+		.amount-tips {
+			font-size: 12px;
+			color: #999;
+		}
+	}
+
+	.payment-list {
+		.payment-item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 16px;
+			border: 1px solid #e5e5e5;
+			border-radius: 8px;
+			margin-bottom: 12px;
+			transition: all 0.3s;
+
+			&.active {
+				border-color: #4285f4;
+				background-color: #f0f7ff;
+			}
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			.payment-info {
+				display: flex;
+				align-items: center;
+				gap: 12px;
+
+				.payment-details {
+					.payment-name {
+						font-size: 16px;
+						color: #333;
+						margin-bottom: 4px;
+					}
+
+					.payment-desc {
+						font-size: 12px;
+						color: #999;
+					}
+				}
+			}
+		}
+	}
+
+	.notice-list {
+		.notice-item {
+			display: flex;
+			align-items: flex-start;
+			gap: 8px;
+			margin-bottom: 12px;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			.notice-text {
+				flex: 1;
+				font-size: 13px;
+				color: #666;
+				line-height: 1.4;
+			}
+		}
+	}
+
+	.bottom-section {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: white;
+		padding: 16px;
+		border-top: 1px solid #e5e5e5;
+
+		.recharge-info {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-bottom: 12px;
+
+			.recharge-text {
+				font-size: 16px;
+				color: #333;
+				font-weight: 500;
+			}
+
+			.bonus-text {
+				font-size: 14px;
+				color: #ff4d4f;
+				margin-left: 4px;
+			}
+		}
+	}
 </style>
\ No newline at end of file