1

pages/order/order.vue

@@ -274,17 +274,197 @@
 		})
 	}
 
-	// 支付订单
+	// 微信支付
-	const payOrder = (order) => {
+	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: 'wxc504638e03981812',
+						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; // 后端返回的H5支付链接
+			window.location.href = payUrl;
+			return {
+				success: true,
+				redirect: true
+			};
+		}
+		// #endif
+	};
+
+	// 支付宝支付（仅H5环境）
+	const alipayPay = async (orderInfo) => {
+		// #ifdef H5
+		// H5支付宝支付
+		const payUrl = orderInfo.payUrl; // 后端返回的支付宝H5支付链接
+		window.location.href = payUrl;
+		return {
+			success: true,
+			redirect: true
+		};
+		// #endif
+	};
+
+	function showModalAsync(options) {
+		return new Promise((resolve, reject) => {
 			uni.showModal({
+				...options,
+				success: (res) => {
+					resolve(res); // 将用户操作结果传递给 await
+				},
+				fail: (err) => {
+					reject(err); // 处理失败情况
+				}
+			});
+		});
+	}
+
+	// 支付订单
+	const payOrder = async (order) => {
+		try {
+			uni.showLoading({
+				title: "正在处理支付...",
+			});
+
+			// 根据订单的支付渠道调用对应的支付方法
+			let paymentResult;
+			
+			if (order.pay_channel === "wxpay") {
+				const res = await uni.login({
+					provider: 'weixin'
+				})
+				const orderResult = await RPC.post('/membership/order/pay_by_wechat_mini', {
+					code: res.code,
+					"order_no": order.order_no
+				})
+				uni.showLoading({
+					title: "正在跳转微信支付...",
+				});
+				console.log('orderResult', orderResult)
+				paymentResult = await wechatPay(orderResult);
+			} else if (order.pay_channel === "alipay") {
+				const orderResult = await RPC.post('/membership/order/pay_by_alipay', {
+					order_no: order.order_no
+				})
+				uni.showLoading({
+					title: "正在跳转支付宝...",
+				});
+				paymentResult = await alipayPay(orderResult);
+			} else if (order.pay_channel === 'wallet') {
+				const res = await showModalAsync({
 					title: '确认支付',
-			content: '确定继续支付这个订单吗？',
+					content: '确认使用钱包余额支付？'
-			success: async (res) => {
+				});
+
+				// 同步判断逻辑
 				if (res.confirm) {
+					paymentResult = await RPC.post('/membership/order/pay_by_wallet', {
+						order_no: order.order_no
+					})
+					console.log('paymentResult', paymentResult)
+				} else if (res.cancel) {
+					console.log('用户点击了取消');
+					paymentResult = { success: false }
+				}
+			}
 
+			uni.hideLoading();
+			console.log('paymentResult', paymentResult)
+			
+			// 处理支付结果
+			if (paymentResult?.success) {
+				if (paymentResult.redirect) {
+					// H5跳转支付，不需要额外处理
+					uni.showToast({
+						title: "正在跳转支付页面...",
+						icon: "loading",
+						duration: 2000,
+					});
+				} else {
+					// 支付成功
+					setTimeout(() => {
+						uni.showToast({
+							title: "支付成功",
+							icon: "success",
+						});
+						// 更新订单状态
+						const index = list.value.findIndex(item => item.id === order.id)
+						if (index !== -1) {
+							list.value[index].status = 'paid'
 						}
+						// 刷新订单列表
+						setTimeout(() => {
+							getList()
+						}, 500)
+					}, 1000)
+				}
+			}
+		} catch (error) {
+			uni.hideLoading();
+			console.error("支付失败:", error);
+			let errorMessage = "支付失败，请重试";
+			if (error.message === "用户取消支付") {
+				errorMessage = "支付已取消";
+			} else if (error.message) {
+				errorMessage = error.message;
+			} else if (error) {
+				errorMessage = error
+			}
+
+			uni.showToast({
+				title: errorMessage,
+				icon: "none",
+			});
 		}
-		})
 	}
 	
 	const page = ref(1)

pagesA/generate-record/generate-record.vue

@@ -3,12 +3,8 @@
 		<!-- 生成记录列表 -->
 		<view class="record-list">
 			<uv-swipe-action>
-        <uv-swipe-action-item
+				<uv-swipe-action-item @click="delItem(record)" :options="options" v-for="record in list"
-          @click="delItem(record)"
+					:key="record.ID">
-          :options="options"
-          v-for="record in list"
-          :key="record.id"
-        >
 					<view class="record-item">
 						<!-- 记录信息 -->
 						<view class="record-info">
@@ -24,13 +20,10 @@
 						</view>
 
 						<!-- 状态标签 -->
-            <view
+						<view class="status-tag" :class="{
-              class="status-tag"
-              :class="{
                 completed: record.status == 4,
                 failed: record.status == 5,
-              }"
+              }">
-            >
 							<span v-if="record.status == 4">已完成</span>
 							<span v-else-if="record.status == 5">生成失败</span>
 							<span v-else>生成中</span>
@@ -38,27 +31,13 @@
 
 						<!-- 操作按钮 -->
 						<view class="record-actions">
-              <uv-button
+							<uv-button v-if="record.status === 4" type="primary" size="small"
-                v-if="record.status === 4"
+								@click="downloadRecord(record)">
-                type="primary"
+								<uv-icon name="download" size="14" color="white" style="margin-right: 4px"></uv-icon>
-                size="small"
-                @click="downloadRecord(record)"
-              >
-                <uv-icon
-                  name="download"
-                  size="14"
-                  color="white"
-                  style="margin-right: 4px"
-                ></uv-icon>
 								下载
 							</uv-button>
 							<uv-button v-else type="info" size="small" disabled>
-                <uv-icon
+								<uv-icon name="download" size="14" color="#aaa" style="margin-right: 4px"></uv-icon>
-                  name="download"
-                  size="14"
-                  color="#aaa"
-                  style="margin-right: 4px"
-                ></uv-icon>
 								下载
 							</uv-button>
 						</view>
@@ -79,32 +58,37 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from "vue";
+	import {
-import RPC from "@/utils/request";
+		ref,
-import dayjs from "dayjs";
+		onMounted
-import { onShow, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
+	} from "vue";
+	import RPC from "@/utils/request";
+	import dayjs from "dayjs";
+	import {
+		onShow,
+		onPullDownRefresh,
+		onReachBottom
+	} from "@dcloudio/uni-app";
 
-const options = ref([
+	const options = ref([{
-  {
 		text: "删除",
 		style: {
 			backgroundColor: "#f56c6c",
 		},
-  },
+	}, ]);
-]);
+	const delItem = (item) => {
-const delItem = (item) => {
 		console.log(item);
 		deleteRecord(item);
-};
+	};
-// 响应式数据
+	// 响应式数据
-const loading = ref(false);
+	const loading = ref(false);
-const loadingStatus = ref("loadmore");
+	const loadingStatus = ref("loadmore");
-const page = ref(1);
+	const page = ref(1);
-const list = ref([]);
+	const list = ref([]);
-const count = ref(0);
+	const count = ref(0);
 
-// 下载记录
+	// 下载记录
-const downloadRecord = (record) => {
+	const downloadRecord = (record) => {
 		uni.showLoading({
 			title: "准备下载...",
 		});
@@ -167,42 +151,38 @@ const downloadRecord = (record) => {
 			},
 		});
 		// #endif
-};
+	};
 
-// 删除记录
+	// 删除记录
-const deleteRecord = (record) => {
+	const deleteRecord = (record) => {
 		uni.showModal({
 			title: "确认删除",
 			content: "确定要删除这条生成记录吗？删除后无法恢复。",
 			success: (res) => {
 				if (res.confirm) {
-        // 从列表中移除记录
+					RPC.post('/planned_delete', {
-        const index = records.value.findIndex((item) => item.id === record.id);
+						id: record.ID
-        if (index !== -1) {
+					}).then(() => {
-          records.value.splice(index, 1);
+						list.value = list.value.filter((item) => item.ID !== record.ID);
-        }
-
 						uni.showToast({
 							title: "删除成功",
 							icon: "success",
 						});
-
+					})
-        // 实际项目中调用删除API
+					// 从列表中移除记录
-        // try {
-        //   await RPC.post('/api/generate-record/delete', { id: record.id })
-        // } catch (error) {
-        //   console.error('删除失败:', error)
-        // }
 				}
 			},
 		});
-};
+	};
 
-// 加载生成记录
+	// 加载生成记录
-const loadRecords = async () => {
+	const loadRecords = async () => {
 		uni.showLoading();
 		loadingStatus.value = "loading";
-  RPC.post("/planned_list", { page: page.value, page_size: 20 })
+		RPC.post("/planned_list", {
+				page: page.value,
+				page_size: 20
+			})
 			.then((res) => {
 				list.value = [...list.value, ...res.list];
 				count.value = res.total;
@@ -217,14 +197,17 @@ const loadRecords = async () => {
 			}).finally(() => {
 				uni.hideLoading();
 			});
-};
+	};
 
-// 刷新数据
+	// 刷新数据
-onPullDownRefresh(() => {
+	onPullDownRefresh(() => {
 		list.value = [];
 		page.value = 1;
 		loadingStatus.value = "loading";
-  RPC.post("/planned_list", { page: page.value, page_size: 20 })
+		RPC.post("/planned_list", {
+				page: page.value,
+				page_size: 20
+			})
 			.then((res) => {
 				list.value = [...list.value, ...res.list];
 				count.value = res.total;
@@ -240,38 +223,38 @@ onPullDownRefresh(() => {
 			.finally(() => {
 				uni.stopPullDownRefresh();
 			});
-});
+	});
 
-onReachBottom(() => {
+	onReachBottom(() => {
 		loadmore();
-});
+	});
 
-const loadmore = () => {
+	const loadmore = () => {
 		if (list.value.length >= count.value || loadingStatus.value === "loading")
 			return;
 		console.log("上拉加载:");
 		loadingStatus.value = "loading";
 		page.value = ++page.value;
 		loadRecords();
-};
+	};
 
-onShow(() => {
+	onShow(() => {
 		// 页面显示时刷新数据
 		list.value = [];
 		page.value = 1;
 		loadRecords();
-});
+	});
 </script>
 
 <style lang="scss" scoped>
-.container {
+	.container {
 		font-size: 14px;
 		min-height: 100vh;
 		background-color: #f8f8f8;
 		padding: 16px;
-}
+	}
 
-.record-list {
+	.record-list {
 		.record-item {
 			background: white;
 			border-radius: 12px;
@@ -327,9 +310,9 @@ onShow(() => {
 				flex-shrink: 0;
 			}
 		}
-}
+	}
 
-.empty-state {
+	.empty-state {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -341,10 +324,10 @@ onShow(() => {
 			font-size: 14px;
 			margin-top: 16px;
 		}
-}
+	}
 
-.load-more {
+	.load-more {
 		padding: 20px;
 		text-align: center;
-}
+	}
 </style>

pagesA/generate-record/new_file.js

@@ -1,40 +0,0 @@
-订单列表的
-
-"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 时间戳，秒）
-  })

pagesA/recharge/recharge.vue

@@ -41,8 +41,8 @@
 			<view class="section-title">选择支付方式</view>
 			<view class="payment-list">
 				<!-- 微信支付 -->
-				<view class="payment-item" :class="{ active: selectedPayment === 'wechat' }"
+				<view class="payment-item" :class="{ active: selectedPayment === 'wxpay' }"
-					@click="selectPayment('wechat')">
+					@click="selectPayment('wxpay')">
 					<view class="payment-info">
 						<uv-icon name="weixin-fill" color="#07c160" size="28"></uv-icon>
 						<view class="payment-details">
@@ -50,7 +50,7 @@
 							<view class="payment-desc">安全快捷，支持零钱和银行卡</view>
 						</view>
 					</view>
-					<uv-icon name="checkmark-circle-fill" :color="selectedPayment === 'wechat' ? '#4285f4' : '#ccc'"
+					<uv-icon name="checkmark-circle-fill" :color="selectedPayment === 'wxpay' ? '#4285f4' : '#ccc'"
 						size="20"></uv-icon>
 				</view>
 
@@ -137,7 +137,7 @@
 	const currentBalance = ref(0);
 	const selectedAmount = ref(0);
 	const customAmount = ref('');
-	const selectedPayment = ref('wechat');
+	const selectedPayment = ref('wxpay');
 	const recharging = ref(false);
 	const showAlipay = ref(true);
 
@@ -216,7 +216,7 @@
 		// #ifdef MP-WEIXIN
 		// 微信小程序环境，隐藏支付宝选项
 		showAlipay.value = false;
-		selectedPayment.value = 'wechat';
+		selectedPayment.value = 'wxpay';
 		// #endif
 
 		// #ifdef H5
@@ -225,7 +225,7 @@
 		// 如果在微信浏览器内，默认选择微信支付
 		const ua = navigator.userAgent.toLowerCase();
 		const isWechat = ua.indexOf('micromessenger') !== -1;
-		selectedPayment.value = isWechat ? 'wechat' : 'alipay';
+		selectedPayment.value = isWechat ? 'wxpay' : 'alipay';
 		// #endif
 	};
 
@@ -386,7 +386,7 @@
 			// 根据支付方式调用对应的支付方法
 			let paymentResult;
 
-			if (selectedPayment.value === 'wechat') {
+			if (selectedPayment.value === 'wxpay') {
 				const res = await uni.login({
 					provider: 'weixin'
 				})