From 94a35fbe49ed0f4a9309cea17b0c4c57d6a2a1a9 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 9 Sep 2025 13:24:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/refund/gold/addCoinRefund.vue | 39 ++++++++++----------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue index 6c743c7..38c9b4b 100644 --- a/src/views/refund/gold/addCoinRefund.vue +++ b/src/views/refund/gold/addCoinRefund.vue @@ -41,8 +41,8 @@ const addRefund = ref({ sumGold: 0, remark: '', adminId: null, - orderCode: '' - + orderCode: '', + type: 0 }) // 取消按钮 @@ -70,8 +70,11 @@ const add = async function () { // 更新 refundModel addRefund.value.refundModel = parseInt(addRe.value.typeR); - - + if (addRefund.value.refundType = '商品退款') { + addRefund.value.type === 1 + } else { + addRefund.value.type === 0 + } // 对提交的金币数乘以 100 const processedRefund = { ...addRefund.value, @@ -254,30 +257,10 @@ const getUser = async function (jwcode) { // 退款类型，写死为商品退款 -const refundType = ref([{ value: '商品退款', label: '商品退款' }]); - -// 获取退款类型 -// const getRefundTypes = async function () { -// try { -// // 发送请求获取退款类型 -// const result = await API({ -// url: '/refund/refundType', //这里应该写上一个退款类型的接口 -// data: {} }) -// console.log('退款类型请求成功', result) -// // 检查返回的数据是否为数组 -// if (Array.isArray(result.data)) { -// // 将字符串数组转换为 { value, label } 格式 -// refundType.value = result.data.map(item => ({ value: item, label: item })); -// } else { -// console.error('退款类型数据格式错误', result) -// ElMessage.error('退款类型数据格式错误，请联系管理员') -// } -// console.log('退款类型', refundType.value) -// } catch (error) { -// console.log('退款类型请求失败', error) -// } -// } - +const refundType = ref([ + { value: '商品退款', label: '商品退款' }, + { value: '金币退款', label: '金币退款' } +]); // 根据精网号查询商品 const goodsName = ref([]) // 存储所有商品信息 From 6978acbab558fbedfb9eb5316719620b3b721b6a Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 9 Sep 2025 13:34:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=80=89=E7=B1=BB=E5=9E=8B=E8=B0=83?= =?UTF-8?q?=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/refund/gold/addCoinRefund.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue index 38c9b4b..f5eb8d2 100644 --- a/src/views/refund/gold/addCoinRefund.vue +++ b/src/views/refund/gold/addCoinRefund.vue @@ -466,12 +466,12 @@ onMounted(async function () { - + 查询 - + From 991ffda085f72282065661a36f24b09a4eb32bc9 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 9 Sep 2025 13:40:58 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=AD=89=E4=BA=8E=E7=AD=89=E4=BA=8E?= =?UTF-8?q?=E7=AD=89=E4=BA=8E=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/refund/gold/addCoinRefund.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue index f5eb8d2..36d7c90 100644 --- a/src/views/refund/gold/addCoinRefund.vue +++ b/src/views/refund/gold/addCoinRefund.vue @@ -278,11 +278,18 @@ const getGoods = async function (jwcode) { orderCodes.value = [] return; } - + console.log('=======================',addRefund.value.refundType) + if (addRefund.value.refundType === '商品退款') { + addRefund.value.type = 1 + } else { + addRefund.value.type = 0 + } try { const result = await API({ url: '/refund/selectGoods', - data: { jwcode: addRefund.value.jwcode } + data: { jwcode: addRefund.value.jwcode, + type: addRefund.value.type + } }) if (Array.isArray(result.data)) { From 2c19a32d0f10f1ce630d7e2ea02b4b0e58f64311 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 9 Sep 2025 14:16:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=AD=89=E4=BA=8E=E7=AD=89=E4=BA=8E?= =?UTF-8?q?=E7=AD=89=E4=BA=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/refund/gold/addCoinRefund.vue | 61 ++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue index 36d7c90..71a96ef 100644 --- a/src/views/refund/gold/addCoinRefund.vue +++ b/src/views/refund/gold/addCoinRefund.vue @@ -63,17 +63,19 @@ const cancel = function () { addRe.value.typeR = '0' } - +const show = function(){ + console.log('===================================',addRefund.value.refundType) +} // 这是添加退款信息的接口 const add = async function () { try { // 更新 refundModel addRefund.value.refundModel = parseInt(addRe.value.typeR); - if (addRefund.value.refundType = '商品退款') { - addRefund.value.type === 1 + if (addRefund.value.refundType === '商品退款') { + addRefund.value.type = 1 } else { - addRefund.value.type === 0 + addRefund.value.type = 0 } // 对提交的金币数乘以 100 const processedRefund = { @@ -89,6 +91,7 @@ const add = async function () { url: '/refund/add', data: processedRefund }) + addDisabled.value = false if (result.code === 0) { ElMessage.error(result.msg) @@ -467,7 +470,7 @@ onMounted(async function () { From 704e748d5530a52779a5f0d46a95f4b7347400c5 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 9 Sep 2025 15:33:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/refund/gold/addCoinRefund.vue | 174 ++++++++++++++++++++------------ 1 file changed, 107 insertions(+), 67 deletions(-) diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue index 71a96ef..1795349 100644 --- a/src/views/refund/gold/addCoinRefund.vue +++ b/src/views/refund/gold/addCoinRefund.vue @@ -3,26 +3,24 @@ import { computed, onMounted, reactive, ref, watch } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import API from '@/util/http.js' import moment from 'moment' -// import _ from 'lodash' +import {useAdminStore} from "@/store/index.js"; +import {storeToRefs} from "pinia"; +import {findMenuById, permissionMapping} from "@/utils/menuTreePermission.js" +import { ta } from 'element-plus/es/locales.mjs'; + +const adminStore = useAdminStore(); +const {adminData, menuTree} = storeToRefs(adminStore); const addRe = ref({ typeR: '0' }) +const tableData = ref([]) +const pagination = ref({ + pageNum: 1, + pageSize: 10, + total: 0 +}) - -//这是获取用户信息的接口 -const adminData = ref({}) -const getAdminData = async function () { - try { - const result = await API({ url: '/admin/userinfo', data: {} }) - adminData.value = result - addRefund.value.adminId = adminData.value.id - console.log('请求成功', result) - console.log('用户信息', user.value) - } catch (error) { - console.log('请求失败', error) - } -} // 精网号去空格 const trimJwCode = () => { if (addRefund.value.jwcode) { @@ -63,8 +61,8 @@ const cancel = function () { addRe.value.typeR = '0' } -const show = function(){ - console.log('===================================',addRefund.value.refundType) +const show = function () { + console.log('===================================', addRefund.value.refundType) } // 这是添加退款信息的接口 const add = async function () { @@ -281,19 +279,25 @@ const getGoods = async function (jwcode) { orderCodes.value = [] return; } - console.log('=======================',addRefund.value.refundType) + console.log('=======================', addRefund.value.refundType) if (addRefund.value.refundType === '商品退款') { - addRefund.value.type = 1 - } else { - addRefund.value.type = 0 - } + addRefund.value.type = 1 + } else { + addRefund.value.type = 0 + } try { const result = await API({ url: '/refund/selectGoods', - data: { jwcode: addRefund.value.jwcode, + data: { + jwcode: addRefund.value.jwcode, type: addRefund.value.type - } + } }) + tableData.value = result.data + if (result.data.length === 0) { + ElMessage.error('该用户没有商品订单') + return + } if (Array.isArray(result.data)) { // 存储完整商品数据 @@ -459,14 +463,13 @@ watch(calculatedRechargeGoods, (newVal) => { addRefund.value.sumGold = newVal console.log('计算的总金币', newVal) }) +const handlePageSizeChange = function (val) { + pagination.value.pageSize = val +} +const handleCurrentChange = function (val) { + pagination.value.pageNum = val +} - -// 挂载 -onMounted(async function () { - await getAdminData() - // await getRefundTypes() - // await getGoods() -})