From 79bd7adb8a2c00bbab4107426ae26efe4c78f737 Mon Sep 17 00:00:00 2001 From: 15233722133 <15233722133@163.com> Date: Mon, 6 Jul 2026 10:39:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E7=8E=B0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 +- pages/home/pay/withdraw.vue | 95 +++++++++++++++++++++++------- pages/public/versions/versions.vue | 3 +- sheep/config/index.js | 11 ++-- 4 files changed, 83 insertions(+), 30 deletions(-) diff --git a/manifest.json b/manifest.json index 289e26a..bfad589 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "优购商城", "appid" : "__UNI__8B19741", "description" : "", - "versionName" : "1.5.2", - "versionCode" : 152, + "versionName" : "1.5.5", + "versionCode" : 155, "transformPx" : false, "app-plus" : { "privacy" : { diff --git a/pages/home/pay/withdraw.vue b/pages/home/pay/withdraw.vue index 55a8e64..c1cd465 100644 --- a/pages/home/pay/withdraw.vue +++ b/pages/home/pay/withdraw.vue @@ -17,9 +17,26 @@ {{ v.title }} - + + @@ -135,6 +152,24 @@ let dataObj = ref({ price: 0, }); +const getBankCardNo = (bank) => { + return bank?.bankCardId ?? bank?.cardNumber ?? ''; +}; + +const isAccountAutofilled = ref(false); +const maskBankCardNo = (cardNo) => { + const digits = String(cardNo || '').replace(/\s+/g, ''); + if (!digits) return ''; + const last4 = digits.slice(-4); + return `**** **** **** ${last4}`; +}; +const setAutofillAccount = (cardNo) => { + const digits = String(cardNo || '').replace(/\s+/g, ''); + dataObj.value.userAccount = maskBankCardNo(digits); + dataObj.value.bankCardId = digits; + isAccountAutofilled.value = !!digits; +}; + let point = ref(0); const getData = () => { UserApi.getUserInfo().then((res) => { @@ -188,7 +223,7 @@ const submit = () => { return; } if (!dataObj.value.userAccount) { - sheep.$helper.toast('请输入账号账号'); + sheep.$helper.toast('请输入银行账号'); return; } if (!dataObj.value.bankName) { @@ -205,10 +240,14 @@ const submit = () => { } let obj = JSON.parse(JSON.stringify(dataObj.value)); obj.price = obj.price * 100; + const cardNo = String(obj.bankCardId || obj.userAccount || '').trim(); + if (cardNo) { + obj.bankCardId = cardNo; + obj.cardNumber = cardNo; + } api.createBrokerageWithdraw(obj).then((res) => { if (res.code === 0) { dataObj.value = { - type: 2, transferChannelCode: 'wx_lite', price: 0, }; @@ -266,40 +305,52 @@ const blur = () => { return; } }; -const inputChange = (e, v) => { - let obj = { - bankNo: e.detail.value, - }; - if (v.value == 'userAccount') { - api.getBank(obj).then((res) => { - if (res.code === 0) { - console.log(res); - dataObj.value.bankName = res.data; - } - }); - } +const onUserAccountFocus = () => { + if (!isAccountAutofilled.value) return; + isAccountAutofilled.value = false; + dataObj.value.userAccount = ''; + dataObj.value.bankCardId = ''; +}; +const onUserAccountInput = (e) => { + const raw = typeof e === 'string' ? e : e?.detail?.value; + const value = String(raw || ''); + dataObj.value.userAccount = value; + dataObj.value.bankCardId = value; + isAccountAutofilled.value = false; + if (!value) return; + const requestNo = value; + api.getBank({ bankNo: value }).then((res) => { + if (String(dataObj.value.bankCardId || '') !== requestNo) return; + if (res.code !== 0) return; + if (!res.data) return; + console.log(res); + dataObj.value.bankName = res.data; + }); }; let bankList = ref([]); let bankText = ref([]); const getBankList = () => { api.getBankList({}).then((res) => { if (res.code === 0) { + bankText.value = []; + bankList.value = []; res.data.forEach((item) => { - // 取银行卡后四位 - item.text = `${item.bankName}(${item.cardNumber.slice(-4)})`; + const cardNo = String(getBankCardNo(item) || ''); + item.text = `${item.bankName}(${cardNo.slice(-4)})`; bankText.value.push(item.text); }); bankList.value = res.data; if (res?.data?.length) { let obj = res.data[0]; + const cardNo = getBankCardNo(obj); dataObj.value = { ...dataObj.value, userName: obj.trueName, - userAccount: obj.cardNumber, bankName: obj.bankName, bankAddress: obj.bankAddress, }; + setAutofillAccount(cardNo); } } }); @@ -311,12 +362,14 @@ const select = () => { tapIndex }) => { let obj = bankList.value[tapIndex]; + const cardNo = getBankCardNo(obj); dataObj.value = { ...dataObj.value, userName: obj.trueName, - userAccount: obj.cardNumber, bankName: obj.bankName, + bankAddress: obj.bankAddress, }; + setAutofillAccount(cardNo); }, fail: (error) => { }, }); diff --git a/pages/public/versions/versions.vue b/pages/public/versions/versions.vue index 115130b..df1f4c4 100644 --- a/pages/public/versions/versions.vue +++ b/pages/public/versions/versions.vue @@ -6,6 +6,7 @@ 最新版本号: {{ newversion }} 当前版本号: {{ version }} + 更新最新版本 @@ -29,7 +30,7 @@ import { ref, onMounted } from 'vue' import { createHotUpdate, downloadAndOpenApk } from '@/utils/hotUpdate' import { getAndroidAppUrl, gethotupdatelist } from '@/sheep/api/index/index' - +// import { baseUrl } from '@/sheep/config'; const newversion = ref('') const version = ref('') const appVersion = ref('') diff --git a/sheep/config/index.js b/sheep/config/index.js index de659ed..f2165ee 100644 --- a/sheep/config/index.js +++ b/sheep/config/index.js @@ -4,12 +4,11 @@ const { version } = packageInfo; // 开发环境配置 export let baseUrl; -// if (process.env.NODE_ENV === 'development') { -// baseUrl = import.meta.env.SHOPRO_DEV_BASE_URL; -// } else { -// baseUrl = import.meta.env.SHOPRO_BASE_URL; -// } -baseUrl = import.meta.env.SHOPRO_DEV_BASE_URL; +if (process.env.NODE_ENV === 'development') { + baseUrl = import.meta.env.SHOPRO_DEV_BASE_URL; +} else { + baseUrl = import.meta.env.SHOPRO_BASE_URL || import.meta.env.SHOPRO_DEV_BASE_URL; +} if (typeof baseUrl === 'undefined') { console.error('请检查.env配置文件是否存在'); } else {