diff --git a/pages/home/bankCard.vue b/pages/home/bankCard.vue index 83de9af..c9b872b 100644 --- a/pages/home/bankCard.vue +++ b/pages/home/bankCard.vue @@ -9,12 +9,26 @@ class="bank-card" :style="{ backgroundColor: getBankCardColor(v?.bankName) }" > + + + {{ v.bankName || "-" }} {{ v.trueName || "姓名" }} - **** **** **** {{ getCardLast4(v.cardNumber) }} + + + {{ getCardDisplayText(v) }} + + + + + @@ -35,7 +49,7 @@ - 添加银行卡 + {{ popupMode === "edit" ? "修改银行卡" : "添加银行卡" }} @@ -54,7 +68,7 @@ 银行卡号 - + 取消 确认 @@ -120,6 +134,61 @@ const getCardLast4 = (cardNumber) => { return str ? str.slice(-4) : "----"; }; +const getBankCardNo = (bank) => { + return bank?.bankCardId ?? bank?.cardNumber ?? ""; +}; + +const formatBankCardNo = (cardNumber) => { + const digits = String(cardNumber || "").replace(/\s+/g, ""); + if (!digits) return ""; + return digits.replace(/(.{4})/g, "$1 ").trim(); +}; + +const isValidBankCardNo = (cardNumber) => { + const digits = String(cardNumber || "").replace(/\s+/g, ""); + if (!/^\d+$/.test(digits)) return false; + if (digits.length < 12 || digits.length > 19) return false; + let sum = 0; + let shouldDouble = false; + for (let i = digits.length - 1; i >= 0; i -= 1) { + let digit = Number(digits[i]); + if (shouldDouble) { + digit *= 2; + if (digit > 9) digit -= 9; + } + sum += digit; + shouldDouble = !shouldDouble; + } + return sum % 10 === 0; +}; + +const visibleBankId = ref(null); +const getBankIdentity = (bank) => { + const id = bank?.id; + if (id !== undefined && id !== null && String(id)) return String(id); + const cardNo = getBankCardNo(bank); + return String(cardNo || ""); +}; + +const isCardVisible = (bank) => { + const key = getBankIdentity(bank); + return !!key && visibleBankId.value === key; +}; + +const toggleCardVisible = (bank) => { + const key = getBankIdentity(bank); + if (!key) return; + visibleBankId.value = visibleBankId.value === key ? null : key; +}; + +const getCardDisplayText = (bank) => { + const cardNo = getBankCardNo(bank); + if (!cardNo) return "**** **** **** ----"; + return isCardVisible(bank) + ? formatBankCardNo(cardNo) + : `**** **** **** ${getCardLast4(cardNo)}`; +}; + const getBankCardColor = (bankName) => { const name = String(bankName || ""); const fixed = [ @@ -161,64 +230,148 @@ const getBankList = async () => { let popupRef = ref(null); let submitting = ref(false); +let unbinding = ref(false); +const popupMode = ref("add"); const form = reactive({ + id: undefined, + userId: undefined, trueName: "", - cardNumber: "", + bankCardId: "", bankName: "", bankAddress: "", }); const resetForm = () => { + form.id = undefined; + form.userId = undefined; form.trueName = ""; - form.cardNumber = ""; + form.bankCardId = ""; form.bankName = ""; form.bankAddress = ""; }; -const openAddPopup = () => { - resetForm(); +const openPopup = (mode, bank = null) => { + popupMode.value = mode; + if (mode === "edit" && bank) { + form.id = bank?.id; + form.userId = bank?.userId; + form.trueName = bank?.trueName || ""; + form.bankCardId = getBankCardNo(bank) || ""; + form.bankName = bank?.bankName || ""; + form.bankAddress = bank?.bankAddress || ""; + } else { + resetForm(); + } popupRef.value?.open?.("center"); }; -const closeAddPopup = () => { +const closePopup = () => { popupRef.value?.close?.(); }; -const submitAddPopup = async () => { +const showActionSheetAsync = (itemList = []) => + new Promise((resolve) => { + uni.showActionSheet({ + itemList, + success: (res) => resolve(res), + fail: () => resolve(null), + }); + }); + +const showModalAsync = ({ title = "提示", content = "" } = {}) => + new Promise((resolve) => { + uni.showModal({ + title, + content, + success: (res) => resolve(res), + fail: () => resolve(null), + }); + }); + +const openBankMenu = async (bank) => { + const sheet = await showActionSheetAsync(["修改卡号", "解除绑定"]); + if (!sheet) return; + if (sheet.tapIndex === 0) { + openPopup("edit", bank); + return; + } + if (sheet.tapIndex !== 1) return; + + const id = bank?.id; + if (!id) return sheep.$helper.toast("银行卡信息异常,请刷新重试"); + const modalRes = await showModalAsync({ + title: "确认解绑", + content: "确定解除绑定该银行卡吗?", + }); + if (!modalRes?.confirm) return; + if (unbinding.value) return; + + unbinding.value = true; + const res = await payApi.unbindBank({ id }).catch(() => ({ code: -1 })); + unbinding.value = false; + + if (res.code === 0) { + if (visibleBankId.value === String(id)) { + visibleBankId.value = null; + } + sheep.$helper.toast("解绑成功"); + getBankList(); + } else { + sheep.$helper.toast(res.msg || "解绑失败"); + } +}; + +const submitPopup = async () => { if (submitting.value) return; const trueName = String(form.trueName || "").trim(); - const cardNumber = String(form.cardNumber || "").replace(/\s+/g, ""); + const bankCardId = String(form.bankCardId || "").replace(/\s+/g, ""); const bankName = String(form.bankName || "").trim(); const bankAddress = String(form.bankAddress || "").trim(); if (!trueName) return sheep.$helper.toast("请输入姓名"); - if (!cardNumber) return sheep.$helper.toast("请输入银行卡号"); + if (!bankCardId) return sheep.$helper.toast("请输入银行卡号"); + if (!isValidBankCardNo(bankCardId)) return sheep.$helper.toast("请输入正确的银行卡号"); if (!bankName) return sheep.$helper.toast("请输入开户行"); if (!bankAddress) return sheep.$helper.toast("请输入支行"); + if (popupMode.value === "edit" && !form.id) return sheep.$helper.toast("银行卡信息异常,请刷新重试"); submitting.value = true; - const res = await payApi - .addBank({ - trueName, - cardNumber, - bankName, - bankAddress, - }) - .catch(() => ({ code: -1 })); + const res = + popupMode.value === "edit" + ? await payApi + .updateBank({ + id: form.id, + ...(form.userId ? { userId: form.userId } : {}), + trueName, + bankCardId, + cardNumber: bankCardId, + bankName, + bankAddress, + }) + .catch(() => ({ code: -1 })) + : await payApi + .addBank({ + trueName, + bankCardId, + cardNumber: bankCardId, + bankName, + bankAddress, + }) + .catch(() => ({ code: -1 })); submitting.value = false; if (res.code === 0) { - closeAddPopup(); - sheep.$helper.toast("添加成功"); + closePopup(); + sheep.$helper.toast(popupMode.value === "edit" ? "修改成功" : "添加成功"); getBankList(); } else { - sheep.$helper.toast(res.msg || "添加失败"); + sheep.$helper.toast(res.msg || (popupMode.value === "edit" ? "修改失败" : "添加失败")); } }; const onAddBankCard = () => { - openAddPopup(); + openPopup("add"); }; onShow(() => { @@ -237,6 +390,18 @@ onShow(() => { margin-bottom: 26rpx; box-shadow: 0 10rpx 26rpx rgba(0, 0, 0, 0.12); color: #fff; + position: relative; +} + +.bank-card__menu { + position: absolute; + top: 14rpx; + right: 14rpx; + width: 60rpx; + height: 60rpx; + display: flex; + align-items: center; + justify-content: center; } .bank-card__title { @@ -266,6 +431,12 @@ onShow(() => { align-items: flex-end; } +.bank-card__mask-wrap { + position: relative; + width: 100%; + padding-right: 70rpx; +} + .bank-card__mask { font-size: 32rpx; letter-spacing: 1rpx; @@ -273,6 +444,23 @@ onShow(() => { white-space: pre; } +.bank-card__mask--visible { + white-space: pre-wrap; + word-break: break-all; +} + +.bank-card__eye { + position: absolute; + top: 50%; + right: 0; + transform: translateY(-50%); + width: 54rpx; + height: 54rpx; + display: flex; + align-items: center; + justify-content: center; +} + .add-card { background: rgba(255, 255, 255, 0.92); border-radius: 18rpx; diff --git a/sheep/api/home/pay.js b/sheep/api/home/pay.js index 432979a..d821624 100644 --- a/sheep/api/home/pay.js +++ b/sheep/api/home/pay.js @@ -109,6 +109,22 @@ export const addBank = (data) => { data, }) } +// 修改银行卡 /member/user/bank/update +export const updateBank = (data) => { + return request({ + url: '/member/user/bank/update', + method: 'PUT', + data, + }) +} +// 解绑银行卡 /member/user/bank/unbind +export const unbindBank = (params) => { + return request({ + url: '/member/user/bank/unbind', + method: 'DELETE', + params, + }) +} //获取待释放列表 export const getReleaseList = (params) => { return request({