diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 397c07a..474f936 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -555,6 +555,7 @@ export default { // Add Form Fields common_add: { + orderStatus: "Order Status", jwcode: "Homily ID", jwcodePlaceholder: "Enter Homily ID", originalChinese: "Chinese", diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index b86ace0..05777c5 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -626,6 +626,7 @@ export default { receiveArea: "到账地区", receiveAreaPlaceholder: "请选择到账地区", price: "原价", + orderStatus: "订单状态", goodsNamePlaceholder: "请选择商品", 使用红包: "使用红包", 不使用红包: "不使用红包", diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue index b5faeed..9f4994e 100644 --- a/src/views/recharge/gold/addCoinRecharge.vue +++ b/src/views/recharge/gold/addCoinRecharge.vue @@ -77,11 +77,12 @@ const recharge = ref({ // 用来写的 cookie 的 key const WriteCookies = ref(null) // 用来写的 cookie 的 value -const WriteCookiesTime = ref(null) +const WriteCookiesVale = ref(null) // 用来读的 cookie 的 key const ReadCookies = ref(null) // 用来读的 cookie 的 value -const ReadCookiesTime = ref(null) +const ReadCookiesValue = ref({}) +const orderStatus = ref('') // 这是添加充值信息的接口 const add = async function () { try { @@ -107,12 +108,7 @@ const add = async function () { console.log('开始添加充值信息', recharge.value) //存一下 用户的jwcode - // 拼接 jwcode:permanentGold:freeGold - WriteCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}` - //value 为充值时间 - WriteCookiesTime.value = recharge.value.payTime - // 设置cookies,用户jwcode为key,value也是jwcode,过期时间为1天 - Cookies.set(WriteCookies.value, WriteCookiesTime.value, {expires: 1, path: '/'}); + // 发送POST请求 addDisabled.value = true const result = await API({ @@ -120,6 +116,17 @@ const add = async function () { data: formattedRecharge }) addDisabled.value = false + if(result.code == 200){ + // 拼接 jwcode:permanentGold:freeGold + WriteCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}` + //value 为充值时间 + WriteCookiesVale.value = JSON.stringify({ + payTime: recharge.value.payTime, + orderCode: result.data + }); + // 设置cookies,用户jwcode为key,value也是jwcode,过期时间为1天 + Cookies.set(WriteCookies.value, WriteCookiesVale.value, {expires: 1, path: '/'}); + } if (result.code === 0) { ElMessage.error(result.msg) return @@ -187,6 +194,25 @@ const FirstRechargeDialogVisibleCancel = () => { user.value = {} }; +const historyOrder = ref({}) +// 查询订单号对应的状态 +const selectByOrderCode = async function (data) { + try { + const result = await API({ + url: '/recharge/selectByOrderCode', + data: data, + headers: { + 'Content-Type': 'text/plain;charset=utf-8' + }, + }) + if(result.code == 200){ + historyOrder.value = result.data + } + } catch (error) { + console.log('请求失败', error) + // 在这里可以处理错误逻辑,比如显示错误提示等 + } +} // 添加充值信息前的按钮点击事件,进行表单验证和用户确认操作 const addBefore = () => { // 为未输入的金币字段设置默认值 @@ -251,14 +277,34 @@ const addBefore = () => { // 拼接 jwcode:permanentGold:freeGold ReadCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}` + console.log('ReadCookies',ReadCookies.value); + // 获取cookie - const cookie = Cookies.get(ReadCookies.value) - console.log("time", WriteCookiesTime.value) - // 格式化时间 - ReadCookiesTime.value = moment(cookie).format('YYYY-MM-DD HH:mm:ss') - console.log('cookie', cookie) - // 如果存在cookie,显示确认对话框;否则直接进入充值确认 - if (cookie) { + const cookieValue = Cookies.get(ReadCookies.value); + if (cookieValue) { + // 解析为对象 + const rechargeInfo = JSON.parse(cookieValue); + console.log('充值时间:', rechargeInfo.payTime); + console.log('订单号:', rechargeInfo.orderCode); + ReadCookiesValue.value = { + ...rechargeInfo, + } + } + if (Object.keys(ReadCookiesValue.value).length > 0) { + await selectByOrderCode(ReadCookiesValue.value.orderCode) + if(historyOrder.value.type == 0 ){ + if(historyOrder.value.auditStatus == 0){ + orderStatus.value = '待审核' + }else if(historyOrder.value.auditStatus == 1){ + if(historyOrder.value.isRefund == 1){ + orderStatus.value = '已退款' + }else{ + orderStatus.value = '已通过' + } + }else if(historyOrder.value.auditStatus == 2){ + orderStatus.value = '已驳回' + } + } RechargeDialogVisible.value = true; } else { FirstRechargeDialogVisible.value = true; @@ -845,6 +891,10 @@ onMounted(() => {
{{ $t('common_add.similarRechargeRecords') }}
- · {{ ReadCookiesTime }} {{ $t('common_add.rechargePermanentGold') }}: {{ recharge.permanentGold }} - {{ $t('common_add.freeGold') }}: {{ recharge.freeGold }}({{ $t('common_add.operator') }}:{{ adminData.adminName }}) + · {{ moment(ReadCookiesValue.payTime).format('YYYY-MM-DD HH:mm:ss') }} {{ $t('common_add.rechargePermanentGold') }}: {{ recharge.permanentGold }} + {{ $t('common_add.freeGold') }}: {{ recharge.freeGold }} {{ $t('common_add.orderStatus')}}: {{ orderStatus }}({{ $t('common_add.operator') }}:{{ adminData.adminName }}){{ $t('common_add.continueOperation') }}