Merge branch 'aigc' of https://git.nianxx.cn/zoujing/YGChatCS into home3.0
# Conflicts: # src/pages-aigc/recharge/components/CustomAmountCard/index.vue # src/pages-aigc/recharge/components/RechargeFooter/index.vue # src/pages-aigc/recharge/components/RechargePackageList/index.vue # src/pages-aigc/recharge/recharge.vue # src/pages-aigc/useTemplate/useTemplate.vue
This commit is contained in:
@@ -0,0 +1,53 @@
|
||||
<template>
|
||||
<view :class="['custom-card', { 'is-selected': selected }]" @tap="emit('select')">
|
||||
<text class="custom-title">自选金额</text>
|
||||
|
||||
<label class="custom-input-wrap">
|
||||
<text class="custom-currency">¥</text>
|
||||
<input
|
||||
class="custom-input"
|
||||
type="number"
|
||||
:maxlength="6"
|
||||
:value="modelValue"
|
||||
@focus="emit('select')"
|
||||
@input="handleInput"
|
||||
/>
|
||||
</label>
|
||||
|
||||
<view class="custom-hint">
|
||||
<text>请输入整数金额</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
const props = defineProps({
|
||||
modelValue: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
selected: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(["update:modelValue", "select"]);
|
||||
const MAX_CUSTOM_AMOUNT = 999999;
|
||||
|
||||
const handleInput = (event) => {
|
||||
const rawValue = event?.detail?.value ?? event?.target?.value ?? "";
|
||||
const amountText = String(rawValue).trim();
|
||||
const value = /^\d*$/.test(amountText)
|
||||
? amountText
|
||||
? String(Math.min(Number(amountText), MAX_CUSTOM_AMOUNT))
|
||||
: ""
|
||||
: props.modelValue;
|
||||
emit("select");
|
||||
emit("update:modelValue", value);
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
@import "./styles/index.scss";
|
||||
</style>
|
||||
85
src/pages-aigc/recharge/components/RechargeFooter/index.vue
Normal file
85
src/pages-aigc/recharge/components/RechargeFooter/index.vue
Normal file
@@ -0,0 +1,85 @@
|
||||
<template>
|
||||
<view class="recharge-footer">
|
||||
<view class="recharge-agreement" :class="{ 'is-disabled': !agreementReady }">
|
||||
<CheckBox :model-value="agreed" @update:model-value="handleAgreementChange">
|
||||
<text class="recharge-agreement-text">我已阅读并同意</text>
|
||||
<text class="recharge-agreement-link" @tap.stop="handleViewAgreement">《积分充值协议》</text>
|
||||
</CheckBox>
|
||||
</view>
|
||||
|
||||
<view class="recharge-payment-row">
|
||||
<text class="recharge-gain">
|
||||
支付金额 <text class="recharge-gain-value">¥{{ formattedPrice }}</text>
|
||||
</text>
|
||||
|
||||
<view
|
||||
class="recharge-pay-button"
|
||||
:class="{ 'is-disabled': payDisabled }"
|
||||
@tap="handlePay"
|
||||
>
|
||||
{{ loading ? "支付中..." : "立即支付" }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed } from "vue";
|
||||
import CheckBox from "@/components/CheckBox/index.vue";
|
||||
|
||||
const props = defineProps({
|
||||
price: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
loading: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
agreed: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
agreementReady: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(["pay", "update:agreed", "view-agreement"]);
|
||||
|
||||
const formattedPrice = computed(() => {
|
||||
const price = Number(props.price);
|
||||
if (!Number.isFinite(price) || price < 0) return "0.00";
|
||||
|
||||
return price.toLocaleString("zh-CN", {
|
||||
minimumFractionDigits: 2,
|
||||
maximumFractionDigits: 2,
|
||||
});
|
||||
});
|
||||
const payDisabled = computed(() => {
|
||||
return props.loading || props.price <= 0 || !props.agreed || !props.agreementReady;
|
||||
});
|
||||
|
||||
const handleAgreementChange = (value) => {
|
||||
if (!props.agreementReady) {
|
||||
emit("view-agreement");
|
||||
return;
|
||||
}
|
||||
|
||||
emit("update:agreed", value);
|
||||
};
|
||||
|
||||
const handleViewAgreement = () => {
|
||||
emit("view-agreement");
|
||||
};
|
||||
|
||||
const handlePay = () => {
|
||||
if (props.loading || props.price <= 0) return;
|
||||
emit("pay");
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
@import "./styles/index.scss";
|
||||
</style>
|
||||
@@ -0,0 +1,46 @@
|
||||
<template>
|
||||
<view class="package-section">
|
||||
<text class="package-title">优惠充值</text>
|
||||
|
||||
<view class="package-list">
|
||||
<view
|
||||
v-for="item in packages"
|
||||
:key="getPackageKey(item)"
|
||||
:class="['package-card', { 'is-selected': getPackageKey(item) === selectedKey }]"
|
||||
@tap="emit('select', item)"
|
||||
>
|
||||
<view class="package-copy">
|
||||
<text class="package-points">{{ item.rechargePoints }}积分</text>
|
||||
<text class="package-origin">充值金额</text>
|
||||
</view>
|
||||
|
||||
<text class="package-price">¥{{ formatPrice(item.expectedAmountFen) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { formatFenAmount } from "../../utils/virtualRecharge.js";
|
||||
|
||||
defineProps({
|
||||
packages: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
selectedKey: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(["select"]);
|
||||
|
||||
const formatPrice = (amountFen) => formatFenAmount(amountFen);
|
||||
|
||||
const getPackageKey = (item) => String(item?.optionCode || "");
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
@import "./styles/index.scss";
|
||||
</style>
|
||||
463
src/pages-aigc/recharge/recharge.vue
Normal file
463
src/pages-aigc/recharge/recharge.vue
Normal file
@@ -0,0 +1,463 @@
|
||||
<template>
|
||||
<view class="aigc-recharge-page">
|
||||
<TopNavBar
|
||||
title="积分充值"
|
||||
title-align="left"
|
||||
background="transparent"
|
||||
title-color="#172033"
|
||||
back-icon-color="#172033"
|
||||
:align-with-menu-button="true"
|
||||
:z-index="3"
|
||||
@back="handleBack"
|
||||
/>
|
||||
|
||||
<view class="aigc-recharge-content">
|
||||
<BalanceCard
|
||||
:points="balancePoints"
|
||||
@ledger="handleOpenLedger"
|
||||
/>
|
||||
|
||||
<RechargePackageList
|
||||
:packages="rechargeOptions"
|
||||
:selected-key="selectedRechargeKey"
|
||||
@select="handleSelectRechargeOption"
|
||||
/>
|
||||
|
||||
<CustomAmountCard
|
||||
v-model="customAmount"
|
||||
:selected="rechargeMode === 'custom'"
|
||||
@select="handleSelectCustomAmount"
|
||||
/>
|
||||
|
||||
<RechargeFooter
|
||||
:price="payPrice"
|
||||
:loading="paying"
|
||||
:agreed="agreementAccepted"
|
||||
:agreement-ready="agreementReady"
|
||||
@update:agreed="agreementAccepted = $event"
|
||||
@view-agreement="handleViewAgreement"
|
||||
@pay="handlePay"
|
||||
/>
|
||||
</view>
|
||||
|
||||
<AgreePopup
|
||||
:visible="agreementVisible"
|
||||
title="积分充值协议"
|
||||
:agreement="agreementContent"
|
||||
@close="agreementVisible = false"
|
||||
/>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, ref } from "vue";
|
||||
import { onHide, onLoad, onShow, onUnload } from "@dcloudio/uni-app";
|
||||
import TopNavBar from "@/components/TopNavBar/index.vue";
|
||||
import { useCurrentCredit } from "@/pages-aigc/hooks/useCurrentCredit.js";
|
||||
import AgreePopup from "@/pages/login/components/AgreePopup/index.vue";
|
||||
import { getPointsTopUpAgreement } from "@/request/api/AigcApi.js";
|
||||
import {
|
||||
confirmVirtualRechargeOrder,
|
||||
createVirtualRechargeOrder,
|
||||
getVirtualRechargeOptions,
|
||||
getVirtualRechargeOrder,
|
||||
} from "@/request/api/VirtualRechargeApi.js";
|
||||
import BalanceCard from "./components/BalanceCard/index.vue";
|
||||
import CustomAmountCard from "./components/CustomAmountCard/index.vue";
|
||||
import RechargeFooter from "./components/RechargeFooter/index.vue";
|
||||
import RechargePackageList from "./components/RechargePackageList/index.vue";
|
||||
import {
|
||||
getPendingVirtualRechargeOrderNo,
|
||||
removePendingVirtualRechargeOrderNo,
|
||||
setPendingVirtualRechargeOrderNo,
|
||||
} from "./services/pendingVirtualRecharge.js";
|
||||
import {
|
||||
getWechatClientPlatform,
|
||||
getWechatLoginCode,
|
||||
requestWechatVirtualPayment,
|
||||
} from "./services/wechatVirtualPayment.js";
|
||||
import {
|
||||
buildVirtualRechargeOrderPayload,
|
||||
classifyVirtualRechargeStatus,
|
||||
normalizeVirtualPaymentOrder,
|
||||
VIRTUAL_RECHARGE_STATUS_KIND,
|
||||
} from "./utils/virtualRecharge.js";
|
||||
|
||||
const ORDER_QUERY_INTERVAL = 2000;
|
||||
const MAX_ORDER_QUERY_ATTEMPTS = 5;
|
||||
|
||||
const { pointBalance: balancePoints, fetchCurrentCredit } = useCurrentCredit();
|
||||
const rechargeOptions = ref([]);
|
||||
const selectedRechargeOption = ref(null);
|
||||
const customAmount = ref("");
|
||||
const rechargeMode = ref("package");
|
||||
const paying = ref(false);
|
||||
const reconciling = ref(false);
|
||||
const agreementAccepted = ref(false);
|
||||
const agreementContent = ref("");
|
||||
const agreementLoading = ref(false);
|
||||
const agreementVisible = ref(false);
|
||||
|
||||
let orderQueryTimer = null;
|
||||
let orderQueryResolver = null;
|
||||
let pageVisible = false;
|
||||
|
||||
const agreementReady = computed(() => Boolean(agreementContent.value.trim()));
|
||||
|
||||
const selectedRechargeKey = computed(() => {
|
||||
if (rechargeMode.value !== "package") return "";
|
||||
return String(selectedRechargeOption.value?.optionCode || "");
|
||||
});
|
||||
|
||||
const payPrice = computed(() => {
|
||||
if (rechargeMode.value === "custom") {
|
||||
const amount = Number(customAmount.value);
|
||||
return Number.isInteger(amount) ? amount : 0;
|
||||
}
|
||||
|
||||
const amountFen = Number(selectedRechargeOption.value?.expectedAmountFen);
|
||||
return Number.isInteger(amountFen) && amountFen > 0 ? amountFen / 100 : 0;
|
||||
});
|
||||
|
||||
const showToast = (title, icon = "none") => {
|
||||
uni.showToast({ title, icon });
|
||||
};
|
||||
|
||||
const clearOrderQueryTimer = () => {
|
||||
if (orderQueryTimer) {
|
||||
clearTimeout(orderQueryTimer);
|
||||
orderQueryTimer = null;
|
||||
}
|
||||
if (orderQueryResolver) {
|
||||
orderQueryResolver(false);
|
||||
orderQueryResolver = null;
|
||||
}
|
||||
};
|
||||
|
||||
const waitForNextOrderQuery = () => {
|
||||
if (!pageVisible) return Promise.resolve(false);
|
||||
|
||||
return new Promise((resolve) => {
|
||||
orderQueryResolver = resolve;
|
||||
orderQueryTimer = setTimeout(() => {
|
||||
orderQueryTimer = null;
|
||||
orderQueryResolver = null;
|
||||
resolve(pageVisible);
|
||||
}, ORDER_QUERY_INTERVAL);
|
||||
});
|
||||
};
|
||||
|
||||
const fetchRechargeOptions = async () => {
|
||||
try {
|
||||
const res = await getVirtualRechargeOptions();
|
||||
if (res?.code === 0 && Array.isArray(res.data)) {
|
||||
rechargeOptions.value = res.data;
|
||||
if (rechargeMode.value === "package") {
|
||||
selectedRechargeOption.value = res.data[0] || null;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
rechargeOptions.value = [];
|
||||
selectedRechargeOption.value = null;
|
||||
} catch (error) {
|
||||
console.error("获取虚拟支付充值档位失败", error);
|
||||
rechargeOptions.value = [];
|
||||
selectedRechargeOption.value = null;
|
||||
}
|
||||
};
|
||||
|
||||
const fetchPointsTopUpAgreement = async (showError = false) => {
|
||||
if (agreementLoading.value) return false;
|
||||
|
||||
agreementLoading.value = true;
|
||||
try {
|
||||
const res = await getPointsTopUpAgreement();
|
||||
const content = typeof res?.data === "string" ? res.data.trim() : "";
|
||||
if (res?.code === 0 && content) {
|
||||
agreementContent.value = content;
|
||||
return true;
|
||||
}
|
||||
|
||||
agreementContent.value = "";
|
||||
agreementAccepted.value = false;
|
||||
if (showError) showToast(res?.msg || "协议加载失败,请重试");
|
||||
} catch (error) {
|
||||
console.error("获取积分充值协议失败", error);
|
||||
agreementContent.value = "";
|
||||
agreementAccepted.value = false;
|
||||
if (showError) showToast("协议加载失败,请重试");
|
||||
} finally {
|
||||
agreementLoading.value = false;
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
const finishOrderByStatus = async (orderData) => {
|
||||
const statusKind = classifyVirtualRechargeStatus(orderData?.status);
|
||||
|
||||
if (statusKind === VIRTUAL_RECHARGE_STATUS_KIND.PAID) {
|
||||
removePendingVirtualRechargeOrderNo();
|
||||
await fetchCurrentCredit();
|
||||
showToast("充值成功", "success");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (statusKind === VIRTUAL_RECHARGE_STATUS_KIND.REFUNDED) {
|
||||
removePendingVirtualRechargeOrderNo();
|
||||
await fetchCurrentCredit();
|
||||
showToast("充值订单已退款");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (statusKind === VIRTUAL_RECHARGE_STATUS_KIND.FAILED) {
|
||||
removePendingVirtualRechargeOrderNo();
|
||||
showToast("充值订单异常,请重新发起支付");
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
const getPaymentErrorMessage = (error) => {
|
||||
switch (Number(error?.errCode)) {
|
||||
case -2:
|
||||
return "已取消支付";
|
||||
case -4:
|
||||
return "支付被微信风控拦截";
|
||||
case -15007:
|
||||
return "微信登录状态已过期,请重新发起支付";
|
||||
default:
|
||||
return "支付失败,请重试";
|
||||
}
|
||||
};
|
||||
|
||||
const reconcileVirtualRechargeOrder = async (
|
||||
rechargeOrderNo,
|
||||
{ clientPaymentError = null, showPendingToast = true } = {}
|
||||
) => {
|
||||
if (reconciling.value || !rechargeOrderNo) return "skipped";
|
||||
|
||||
reconciling.value = true;
|
||||
let latestOrder = null;
|
||||
|
||||
try {
|
||||
let confirmArgs = {};
|
||||
try {
|
||||
const wxLoginCode = await getWechatLoginCode();
|
||||
confirmArgs = { wxLoginCode };
|
||||
} catch (error) {
|
||||
console.warn("刷新微信登录凭证失败,将使用现有服务端会话确认订单", error);
|
||||
}
|
||||
|
||||
try {
|
||||
const confirmRes = await confirmVirtualRechargeOrder(
|
||||
rechargeOrderNo,
|
||||
confirmArgs
|
||||
);
|
||||
if (confirmRes?.code === 0 && confirmRes.data) {
|
||||
latestOrder = confirmRes.data;
|
||||
if (await finishOrderByStatus(latestOrder)) return "terminal";
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("服务端确认虚拟支付订单失败", error);
|
||||
}
|
||||
|
||||
if (Number(clientPaymentError?.errCode) === -2 && latestOrder?.status === "UNPAID") {
|
||||
removePendingVirtualRechargeOrderNo();
|
||||
showToast("已取消支付");
|
||||
return "cancelled";
|
||||
}
|
||||
|
||||
for (let attempt = 0; attempt < MAX_ORDER_QUERY_ATTEMPTS; attempt += 1) {
|
||||
const shouldContinue = await waitForNextOrderQuery();
|
||||
if (!shouldContinue) return "paused";
|
||||
|
||||
try {
|
||||
const queryRes = await getVirtualRechargeOrder(rechargeOrderNo);
|
||||
if (queryRes?.code === 0 && queryRes.data) {
|
||||
latestOrder = queryRes.data;
|
||||
if (await finishOrderByStatus(latestOrder)) return "terminal";
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("查询虚拟支付充值订单失败", error);
|
||||
}
|
||||
}
|
||||
|
||||
if (clientPaymentError && latestOrder?.status === "UNPAID") {
|
||||
removePendingVirtualRechargeOrderNo();
|
||||
showToast(getPaymentErrorMessage(clientPaymentError));
|
||||
return "client-failed";
|
||||
}
|
||||
|
||||
if (showPendingToast) {
|
||||
showToast("支付结果确认中,请稍后返回查看");
|
||||
}
|
||||
return "pending";
|
||||
} finally {
|
||||
reconciling.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
const recoverPendingVirtualRechargeOrder = async () => {
|
||||
const rechargeOrderNo = getPendingVirtualRechargeOrderNo();
|
||||
if (!rechargeOrderNo || paying.value || reconciling.value) return;
|
||||
|
||||
paying.value = true;
|
||||
uni.showLoading({ title: "正在确认支付结果...", mask: true });
|
||||
try {
|
||||
await reconcileVirtualRechargeOrder(rechargeOrderNo);
|
||||
} finally {
|
||||
uni.hideLoading();
|
||||
paying.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
const handleBack = () => {
|
||||
const pages = getCurrentPages();
|
||||
if (pages.length > 1) uni.navigateBack();
|
||||
};
|
||||
|
||||
const handleOpenLedger = () => {
|
||||
uni.navigateTo({
|
||||
url: "/pages-aigc/pointsDetails/pointsDetails",
|
||||
fail: () => showToast("积分明细"),
|
||||
});
|
||||
};
|
||||
|
||||
const handleSelectRechargeOption = (option) => {
|
||||
rechargeMode.value = "package";
|
||||
selectedRechargeOption.value = option;
|
||||
customAmount.value = "";
|
||||
};
|
||||
|
||||
const handleSelectCustomAmount = () => {
|
||||
rechargeMode.value = "custom";
|
||||
selectedRechargeOption.value = null;
|
||||
};
|
||||
|
||||
const handleViewAgreement = async () => {
|
||||
if (agreementReady.value) {
|
||||
agreementVisible.value = true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (agreementLoading.value) {
|
||||
showToast("协议加载中,请稍候");
|
||||
return;
|
||||
}
|
||||
|
||||
const loaded = await fetchPointsTopUpAgreement(true);
|
||||
if (loaded) agreementVisible.value = true;
|
||||
};
|
||||
|
||||
const validateRechargeSelection = () => {
|
||||
if (rechargeMode.value === "package") {
|
||||
if (!String(selectedRechargeOption.value?.optionCode || "").trim()) {
|
||||
throw new Error("请选择充值档位");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const amountText = String(customAmount.value || "").trim();
|
||||
const amount = Number(amountText);
|
||||
if (!/^\d{1,6}$/.test(amountText) || amount < 1 || amount > 999999) {
|
||||
throw new Error("请输入1至999999的整数充值金额");
|
||||
}
|
||||
};
|
||||
|
||||
const handlePay = async () => {
|
||||
if (paying.value) return;
|
||||
|
||||
try {
|
||||
validateRechargeSelection();
|
||||
} catch (error) {
|
||||
showToast(error.message);
|
||||
return;
|
||||
}
|
||||
|
||||
if (agreementLoading.value) {
|
||||
showToast("协议加载中,请稍候");
|
||||
return;
|
||||
}
|
||||
if (!agreementReady.value) {
|
||||
showToast("协议加载失败,请重试");
|
||||
return;
|
||||
}
|
||||
if (!agreementAccepted.value) {
|
||||
showToast("请先阅读并同意积分充值协议");
|
||||
return;
|
||||
}
|
||||
|
||||
paying.value = true;
|
||||
clearOrderQueryTimer();
|
||||
uni.showLoading({ title: "正在发起支付...", mask: true });
|
||||
|
||||
try {
|
||||
const clientPlatform = getWechatClientPlatform();
|
||||
const wxLoginCode = await getWechatLoginCode();
|
||||
const createOrderPayload = buildVirtualRechargeOrderPayload({
|
||||
mode: rechargeMode.value,
|
||||
rechargeOptionCode: selectedRechargeOption.value?.optionCode,
|
||||
rechargeAmount: customAmount.value,
|
||||
wxLoginCode,
|
||||
clientPlatform,
|
||||
});
|
||||
const createRes = await createVirtualRechargeOrder(createOrderPayload);
|
||||
|
||||
if (createRes?.code !== 0 || !createRes.data) {
|
||||
throw new Error(createRes?.msg || "充值下单失败,请重试");
|
||||
}
|
||||
|
||||
const paymentOrder = normalizeVirtualPaymentOrder(createRes.data);
|
||||
setPendingVirtualRechargeOrderNo(paymentOrder.rechargeOrderNo);
|
||||
uni.hideLoading();
|
||||
|
||||
let clientPaymentError = null;
|
||||
try {
|
||||
await requestWechatVirtualPayment(paymentOrder);
|
||||
} catch (error) {
|
||||
clientPaymentError = error;
|
||||
}
|
||||
|
||||
pageVisible = true;
|
||||
uni.showLoading({ title: "正在确认支付结果...", mask: true });
|
||||
await reconcileVirtualRechargeOrder(paymentOrder.rechargeOrderNo, {
|
||||
clientPaymentError,
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("虚拟支付积分充值失败", error);
|
||||
showToast(error?.message || "充值下单失败,请重试");
|
||||
} finally {
|
||||
uni.hideLoading();
|
||||
paying.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
onLoad(() => {
|
||||
agreementAccepted.value = false;
|
||||
fetchRechargeOptions();
|
||||
fetchPointsTopUpAgreement();
|
||||
});
|
||||
|
||||
onShow(() => {
|
||||
pageVisible = true;
|
||||
fetchCurrentCredit();
|
||||
recoverPendingVirtualRechargeOrder();
|
||||
});
|
||||
|
||||
onHide(() => {
|
||||
pageVisible = false;
|
||||
clearOrderQueryTimer();
|
||||
});
|
||||
|
||||
onUnload(() => {
|
||||
pageVisible = false;
|
||||
clearOrderQueryTimer();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
@import "./styles/index.scss";
|
||||
</style>
|
||||
26
src/pages-aigc/recharge/services/pendingVirtualRecharge.js
Normal file
26
src/pages-aigc/recharge/services/pendingVirtualRecharge.js
Normal file
@@ -0,0 +1,26 @@
|
||||
import { currentClientType } from "@/constant/base.js";
|
||||
|
||||
const PENDING_VIRTUAL_RECHARGE_ORDER_KEY = `${currentClientType()}_AIGC_PENDING_VIRTUAL_RECHARGE_ORDER`;
|
||||
|
||||
const getStorageApi = () => (typeof uni !== "undefined" ? uni : null);
|
||||
|
||||
export function getPendingVirtualRechargeOrderNo(storage = getStorageApi()) {
|
||||
const orderNo = storage?.getStorageSync?.(PENDING_VIRTUAL_RECHARGE_ORDER_KEY);
|
||||
return typeof orderNo === "string" ? orderNo.trim() : "";
|
||||
}
|
||||
|
||||
export function setPendingVirtualRechargeOrderNo(orderNo, storage = getStorageApi()) {
|
||||
const normalizedOrderNo = String(orderNo || "").trim();
|
||||
if (!normalizedOrderNo) {
|
||||
throw new Error("待确认充值订单号不能为空");
|
||||
}
|
||||
|
||||
return storage?.setStorageSync?.(
|
||||
PENDING_VIRTUAL_RECHARGE_ORDER_KEY,
|
||||
normalizedOrderNo
|
||||
);
|
||||
}
|
||||
|
||||
export function removePendingVirtualRechargeOrderNo(storage = getStorageApi()) {
|
||||
return storage?.removeStorageSync?.(PENDING_VIRTUAL_RECHARGE_ORDER_KEY);
|
||||
}
|
||||
102
src/pages-aigc/recharge/services/wechatVirtualPayment.js
Normal file
102
src/pages-aigc/recharge/services/wechatVirtualPayment.js
Normal file
@@ -0,0 +1,102 @@
|
||||
import {
|
||||
normalizeVirtualPaymentOrder,
|
||||
normalizeWechatClientPlatform,
|
||||
} from "../utils/virtualRecharge.js";
|
||||
|
||||
const MIN_VIRTUAL_PAYMENT_SDK_VERSION = "2.19.2";
|
||||
|
||||
const getWechatApi = () => {
|
||||
// #ifdef MP-WEIXIN
|
||||
if (typeof wx !== "undefined") return wx;
|
||||
// #endif
|
||||
return null;
|
||||
};
|
||||
|
||||
export function compareVersion(versionA, versionB) {
|
||||
const versionsA = String(versionA || "").split(".");
|
||||
const versionsB = String(versionB || "").split(".");
|
||||
const length = Math.max(versionsA.length, versionsB.length);
|
||||
|
||||
while (versionsA.length < length) versionsA.push("0");
|
||||
while (versionsB.length < length) versionsB.push("0");
|
||||
|
||||
for (let index = 0; index < length; index += 1) {
|
||||
const numberA = Number.parseInt(versionsA[index], 10) || 0;
|
||||
const numberB = Number.parseInt(versionsB[index], 10) || 0;
|
||||
if (numberA > numberB) return 1;
|
||||
if (numberA < numberB) return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
export function assertWechatVirtualPaymentCapability(wechatApi = getWechatApi()) {
|
||||
if (!wechatApi) {
|
||||
throw new Error("当前环境不支持微信虚拟支付");
|
||||
}
|
||||
|
||||
const appBaseInfo =
|
||||
typeof wechatApi.getAppBaseInfo === "function"
|
||||
? wechatApi.getAppBaseInfo()
|
||||
: wechatApi.getSystemInfoSync?.() || {};
|
||||
const versionSupported =
|
||||
compareVersion(appBaseInfo?.SDKVersion, MIN_VIRTUAL_PAYMENT_SDK_VERSION) >= 0;
|
||||
const apiSupported =
|
||||
typeof wechatApi.requestVirtualPayment === "function" &&
|
||||
(versionSupported || wechatApi.canIUse?.("requestVirtualPayment"));
|
||||
|
||||
if (!apiSupported) {
|
||||
throw new Error("当前微信版本不支持微信虚拟支付");
|
||||
}
|
||||
}
|
||||
|
||||
export function getWechatClientPlatform(wechatApi = getWechatApi()) {
|
||||
assertWechatVirtualPaymentCapability(wechatApi);
|
||||
const deviceInfo =
|
||||
typeof wechatApi.getDeviceInfo === "function"
|
||||
? wechatApi.getDeviceInfo()
|
||||
: wechatApi.getSystemInfoSync?.() || {};
|
||||
const clientPlatform = normalizeWechatClientPlatform(deviceInfo?.platform);
|
||||
|
||||
if (!clientPlatform) {
|
||||
throw new Error("当前客户端平台不支持微信虚拟支付");
|
||||
}
|
||||
|
||||
return clientPlatform;
|
||||
}
|
||||
|
||||
export function getWechatLoginCode(wechatApi = getWechatApi()) {
|
||||
if (!wechatApi || typeof wechatApi.login !== "function") {
|
||||
return Promise.reject(new Error("当前环境无法获取微信登录凭证"));
|
||||
}
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
wechatApi.login({
|
||||
success: (result) => {
|
||||
const code = String(result?.code || "").trim();
|
||||
if (code) {
|
||||
resolve(code);
|
||||
return;
|
||||
}
|
||||
reject(new Error("微信登录凭证获取失败"));
|
||||
},
|
||||
fail: () => reject(new Error("微信登录凭证获取失败")),
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
export function requestWechatVirtualPayment(paymentData, wechatApi = getWechatApi()) {
|
||||
assertWechatVirtualPaymentCapability(wechatApi);
|
||||
const order = normalizeVirtualPaymentOrder(paymentData);
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
wechatApi.requestVirtualPayment({
|
||||
signData: order.signData,
|
||||
paySig: order.paySig,
|
||||
signature: order.signature,
|
||||
mode: order.mode,
|
||||
success: resolve,
|
||||
fail: reject,
|
||||
});
|
||||
});
|
||||
}
|
||||
136
src/pages-aigc/recharge/utils/virtualRecharge.js
Normal file
136
src/pages-aigc/recharge/utils/virtualRecharge.js
Normal file
@@ -0,0 +1,136 @@
|
||||
const ALLOWED_CLIENT_PLATFORMS = new Set([
|
||||
"ANDROID",
|
||||
"HARMONY",
|
||||
"WINDOWS",
|
||||
"IOS",
|
||||
]);
|
||||
|
||||
const REQUIRED_PAYMENT_ORDER_FIELDS = [
|
||||
"rechargeOrderNo",
|
||||
"paymentOrderNo",
|
||||
"signData",
|
||||
"paySig",
|
||||
"signature",
|
||||
];
|
||||
|
||||
export const VIRTUAL_RECHARGE_STATUS_KIND = Object.freeze({
|
||||
PAID: "paid",
|
||||
REFUNDED: "refunded",
|
||||
FAILED: "failed",
|
||||
PENDING: "pending",
|
||||
UNKNOWN: "unknown",
|
||||
});
|
||||
|
||||
export function normalizeWechatClientPlatform(platform) {
|
||||
const normalizedPlatform = String(platform || "").toLowerCase();
|
||||
const platformMap = {
|
||||
android: "ANDROID",
|
||||
ios: "IOS",
|
||||
ohos: "HARMONY",
|
||||
ohos_pc: "HARMONY",
|
||||
windows: "WINDOWS",
|
||||
};
|
||||
|
||||
return platformMap[normalizedPlatform] || "";
|
||||
}
|
||||
|
||||
export function buildVirtualRechargeOrderPayload({
|
||||
mode,
|
||||
rechargeOptionCode,
|
||||
rechargeAmount,
|
||||
wxLoginCode,
|
||||
clientPlatform,
|
||||
} = {}) {
|
||||
const normalizedLoginCode = String(wxLoginCode || "").trim();
|
||||
const normalizedPlatform = String(clientPlatform || "").trim().toUpperCase();
|
||||
|
||||
if (!normalizedLoginCode) {
|
||||
throw new Error("微信登录凭证无效");
|
||||
}
|
||||
|
||||
if (!ALLOWED_CLIENT_PLATFORMS.has(normalizedPlatform)) {
|
||||
throw new Error("当前客户端平台不支持微信虚拟支付");
|
||||
}
|
||||
|
||||
const commonPayload = {
|
||||
wxLoginCode: normalizedLoginCode,
|
||||
clientPlatform: normalizedPlatform,
|
||||
};
|
||||
|
||||
if (mode === "package") {
|
||||
const normalizedOptionCode = String(rechargeOptionCode || "").trim();
|
||||
if (!normalizedOptionCode) {
|
||||
throw new Error("请选择充值档位");
|
||||
}
|
||||
|
||||
return {
|
||||
rechargeOptionCode: normalizedOptionCode,
|
||||
...commonPayload,
|
||||
};
|
||||
}
|
||||
|
||||
if (mode === "custom") {
|
||||
const amountText = String(rechargeAmount ?? "").trim();
|
||||
if (!/^\d{1,6}$/.test(amountText)) {
|
||||
throw new Error("充值金额必须为1至999999的整数");
|
||||
}
|
||||
|
||||
const normalizedAmount = Number(amountText);
|
||||
if (normalizedAmount < 1 || normalizedAmount > 999999) {
|
||||
throw new Error("充值金额必须为1至999999的整数");
|
||||
}
|
||||
|
||||
return {
|
||||
rechargeAmount: normalizedAmount,
|
||||
...commonPayload,
|
||||
};
|
||||
}
|
||||
|
||||
throw new Error("请选择充值方式");
|
||||
}
|
||||
|
||||
export function normalizeVirtualPaymentOrder(orderData) {
|
||||
const normalizedOrder = orderData && typeof orderData === "object" ? orderData : {};
|
||||
const hasRequiredFields = REQUIRED_PAYMENT_ORDER_FIELDS.every((field) => {
|
||||
return typeof normalizedOrder[field] === "string" && normalizedOrder[field].trim();
|
||||
});
|
||||
|
||||
if (!hasRequiredFields || normalizedOrder.mode !== "short_series_coin") {
|
||||
throw new Error("虚拟支付订单参数错误");
|
||||
}
|
||||
|
||||
return {
|
||||
rechargeOrderNo: normalizedOrder.rechargeOrderNo,
|
||||
paymentOrderNo: normalizedOrder.paymentOrderNo,
|
||||
mode: normalizedOrder.mode,
|
||||
signData: normalizedOrder.signData,
|
||||
paySig: normalizedOrder.paySig,
|
||||
signature: normalizedOrder.signature,
|
||||
};
|
||||
}
|
||||
|
||||
export function classifyVirtualRechargeStatus(status) {
|
||||
switch (status) {
|
||||
case "PAID":
|
||||
return VIRTUAL_RECHARGE_STATUS_KIND.PAID;
|
||||
case "REFUNDED":
|
||||
return VIRTUAL_RECHARGE_STATUS_KIND.REFUNDED;
|
||||
case "CREATE_FAILED":
|
||||
case "PAYMENT_ABNORMAL":
|
||||
return VIRTUAL_RECHARGE_STATUS_KIND.FAILED;
|
||||
case "CREATING":
|
||||
case "UNPAID":
|
||||
return VIRTUAL_RECHARGE_STATUS_KIND.PENDING;
|
||||
default:
|
||||
return VIRTUAL_RECHARGE_STATUS_KIND.UNKNOWN;
|
||||
}
|
||||
}
|
||||
|
||||
export function formatFenAmount(amountFen) {
|
||||
const normalizedAmount = Number(amountFen);
|
||||
if (!Number.isInteger(normalizedAmount) || normalizedAmount < 0) {
|
||||
return "0.00";
|
||||
}
|
||||
|
||||
return (normalizedAmount / 100).toFixed(2);
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 123 KiB |
@@ -1,12 +1,6 @@
|
||||
<template>
|
||||
<uni-popup
|
||||
ref="popupRef"
|
||||
type="bottom"
|
||||
background-color="transparent"
|
||||
mask-background-color="rgba(0, 0, 0, 0)"
|
||||
:safe-area="false"
|
||||
:is-mask-click="false"
|
||||
>
|
||||
<uni-popup ref="popupRef" type="bottom" background-color="transparent" mask-background-color="rgba(0, 0, 0, 0)"
|
||||
:safe-area="false" :is-mask-click="false">
|
||||
<view class="photo-confirm-drawer">
|
||||
<view class="photo-confirm-close" @tap="emit('close')">
|
||||
<uni-icons type="closeempty" size="30" color="#8fa2ba" />
|
||||
@@ -33,12 +27,11 @@
|
||||
|
||||
<script setup>
|
||||
import { nextTick, onMounted, ref } from "vue";
|
||||
import defaultAvatar from "../../assets/xiaoqi-avatar.png";
|
||||
|
||||
defineProps({
|
||||
avatarSrc: {
|
||||
type: String,
|
||||
default: defaultAvatar,
|
||||
default: '',
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
<template>
|
||||
<view class="aigc-use-template-page">
|
||||
<AigcTopBar :points="pointBalance" @back="handleBack" @history="handleHistory" />
|
||||
<AigcTopBar :points="pointBalance" recharge-label="充值" @back="handleBack" @history="handleHistory"
|
||||
@recharge="handleRecharge" />
|
||||
|
||||
<view class="aigc-use-template-body">
|
||||
<view class="aigc-use-template-content">
|
||||
<TemplateVersionHero :template="currentTemplate" />
|
||||
|
||||
<GenerateConfirmPanel v-if="currentStep === 'generateConfirm'" :cost="currentCost"
|
||||
:balance="pointBalance" @generate="handleGenerate" />
|
||||
<GenerateConfirmPanel v-if="currentStep === 'generateConfirm'" :cost="currentCost" :balance="pointBalance"
|
||||
@generate="handleGenerate" @recharge="handleRecharge" />
|
||||
|
||||
<template v-else>
|
||||
<VersionOptionList :options="templateItems" :selected-value="selectedTemplateItemId"
|
||||
@@ -29,11 +30,11 @@
|
||||
@album="handlePickAlbum" />
|
||||
</view>
|
||||
<view v-if="currentStep === 'photoConfirm'" class="aigc-use-template-popup-host">
|
||||
<PhotoConfirmDrawer :avatar-src="selectedImageLocalPath || guideAvatar" @close="handleClosePhotoConfirm"
|
||||
<PhotoConfirmDrawer :avatar-src="selectedImageLocalPath" @close="handleClosePhotoConfirm"
|
||||
@confirm="handleConfirmPhoto" />
|
||||
</view>
|
||||
<PointInsufficientDialog v-if="pointDialogVisible" :cost="currentCost" :balance="pointBalance"
|
||||
@cancel="handleClosePointDialog" />
|
||||
@cancel="handleClosePointDialog" @recharge="handlePointRecharge" />
|
||||
<Privacy :visible="privacyVisible" :contract-name="privacyContractName" @agree="handlePrivacyAgree"
|
||||
@disagree="handlePrivacyDisagree" />
|
||||
</view>
|
||||
@@ -51,7 +52,6 @@ import {
|
||||
getAigcTemplateList,
|
||||
} from "@/request/api/AigcApi.js";
|
||||
import { updateImageFile } from "@/request/api/UpdateFile.js";
|
||||
import guideAvatar from "./assets/xiaoqi-avatar.png";
|
||||
import GenerateConfirmPanel from "./components/GenerateConfirmPanel/index.vue";
|
||||
import PhotoConfirmDrawer from "./components/PhotoConfirmDrawer/index.vue";
|
||||
import PhotoGuidePanel from "./components/PhotoGuidePanel/index.vue";
|
||||
@@ -164,6 +164,13 @@ const handleHistory = () => {
|
||||
});
|
||||
};
|
||||
|
||||
const handleRecharge = () => {
|
||||
uni.navigateTo({
|
||||
url: "/pages-aigc/recharge/recharge",
|
||||
fail: () => showPlaceholderToast("积分充值"),
|
||||
});
|
||||
};
|
||||
|
||||
const handleSelectTemplateItem = (option) => {
|
||||
if (!option?.templateItemId) return;
|
||||
|
||||
@@ -377,6 +384,10 @@ const handleClosePointDialog = () => {
|
||||
pointDialogVisible.value = false;
|
||||
};
|
||||
|
||||
const handlePointRecharge = () => {
|
||||
pointDialogVisible.value = false;
|
||||
handleRecharge();
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
44
src/request/api/VirtualRechargeApi.js
Normal file
44
src/request/api/VirtualRechargeApi.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from "../base/request";
|
||||
|
||||
const VIRTUAL_RECHARGE_BASE_PATH = "/hotelBiz/credit/virtual-recharge";
|
||||
|
||||
const getVirtualRechargeOrderPath = (rechargeOrderNo) => {
|
||||
const normalizedOrderNo = String(rechargeOrderNo || "").trim();
|
||||
if (!normalizedOrderNo) {
|
||||
throw new Error("积分充值订单号不能为空");
|
||||
}
|
||||
|
||||
return `${VIRTUAL_RECHARGE_BASE_PATH}/orders/${encodeURIComponent(normalizedOrderNo)}`;
|
||||
};
|
||||
|
||||
function getVirtualRechargeOptions() {
|
||||
return request.get(`${VIRTUAL_RECHARGE_BASE_PATH}/options`, {});
|
||||
}
|
||||
|
||||
function createVirtualRechargeOrder(args) {
|
||||
return request.post(`${VIRTUAL_RECHARGE_BASE_PATH}/orders`, args, {
|
||||
sensitive: true,
|
||||
});
|
||||
}
|
||||
|
||||
function confirmVirtualRechargeOrder(rechargeOrderNo, args = {}) {
|
||||
const wxLoginCode = String(args?.wxLoginCode || "").trim();
|
||||
const payload = wxLoginCode ? { wxLoginCode } : {};
|
||||
|
||||
return request.post(
|
||||
`${getVirtualRechargeOrderPath(rechargeOrderNo)}/confirm`,
|
||||
payload,
|
||||
{ sensitive: true }
|
||||
);
|
||||
}
|
||||
|
||||
function getVirtualRechargeOrder(rechargeOrderNo) {
|
||||
return request.get(getVirtualRechargeOrderPath(rechargeOrderNo), {});
|
||||
}
|
||||
|
||||
export {
|
||||
confirmVirtualRechargeOrder,
|
||||
createVirtualRechargeOrder,
|
||||
getVirtualRechargeOptions,
|
||||
getVirtualRechargeOrder,
|
||||
};
|
||||
@@ -14,6 +14,8 @@ const defaultConfig = {
|
||||
};
|
||||
|
||||
function request(url, args = {}, method = "POST", customConfig = {}) {
|
||||
const { sensitive = false, ...requestCustomConfig } = customConfig;
|
||||
customConfig = requestCustomConfig;
|
||||
const appStore = useAppStore();
|
||||
// 判断 url 是否以 http 开头
|
||||
if (!/^http/.test(url)) {
|
||||
@@ -53,7 +55,11 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
|
||||
header,
|
||||
};
|
||||
|
||||
console.log(`\n\n请求接口: ${url}, \n请求参数: ${JSON.stringify(args)}, \n请求头: ${JSON.stringify(config)}\n\n`);
|
||||
if (sensitive) {
|
||||
console.log(`\n\n请求接口: ${url}, \n敏感请求参数和请求头已隐藏\n\n`);
|
||||
} else {
|
||||
console.log(`\n\n请求接口: ${url}, \n请求参数: ${JSON.stringify(args)}, \n请求头: ${JSON.stringify(config)}\n\n`);
|
||||
}
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.request({
|
||||
@@ -62,7 +68,11 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
|
||||
method,
|
||||
...config,
|
||||
success: (res) => {
|
||||
console.log(`\n\n请求接口: ${url}, \n请求响应: ${JSON.stringify(res)}, \n\n`);
|
||||
if (sensitive) {
|
||||
console.log(`\n\n请求接口: ${url}, \n响应状态: ${res.statusCode || "unknown"}\n\n`);
|
||||
} else {
|
||||
console.log(`\n\n请求接口: ${url}, \n请求响应: ${JSON.stringify(res)}, \n\n`);
|
||||
}
|
||||
|
||||
resolve(res.data);
|
||||
if (res.statusCode && res.statusCode === 424) {
|
||||
|
||||
Reference in New Issue
Block a user