diff --git a/vue/gold-system/src/views/consume/addConsume.vue b/vue/gold-system/src/views/consume/addConsume.vue index bc43518..857ad96 100644 --- a/vue/gold-system/src/views/consume/addConsume.vue +++ b/vue/gold-system/src/views/consume/addConsume.vue @@ -334,17 +334,15 @@ function calculateCoins() { - + - 客户信息 - + 客户信息 +

{{ user.name }}

@@ -361,7 +359,7 @@ function calculateCoins() { - + {{ user.buyJb + user.free6 + user.free12 + user.coreJb }} diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue index e4203eb..ba60ff1 100644 --- a/vue/gold-system/src/views/recharge/addRecharge.vue +++ b/vue/gold-system/src/views/recharge/addRecharge.vue @@ -466,60 +466,59 @@ const closeBatchRechargeVisible = function () { // 批量充值初始化 const batchInit = function () { openBatchRechargeVisible(); -} -// +}; +// const addLine = function () { batchData.value.unshift({ line: ++i.value, showInput: true, }); -} -// +}; +// const handleSelectionChangebatch = function (val) { console.log("val===", val); batchDelObj.value = val; -} -// +}; +// const batchDel = function () { - ElMessageBox.confirm( - '确认批量删除吗？', - '批量删除', - { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - } - ) + ElMessageBox.confirm("确认批量删除吗？", "批量删除", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) .then(() => { console.log("batchDel===", batchDelObj.value); - batchData.value = batchData.value.filter(itemA => { return !batchDelObj.value.some(itemB => itemB.line == itemA.line) }) + batchData.value = batchData.value.filter((itemA) => { + return !batchDelObj.value.some((itemB) => itemB.line == itemA.line); + }); console.log("batchData===", batchData.value); ElMessage({ - type: 'success', - message: '操作成功', - }) + type: "success", + message: "操作成功", + }); }) .catch(() => { ElMessage({ - type: 'info', - message: '操作撤销', - }) - }) - -} -// + type: "info", + message: "操作撤销", + }); + }); +}; +// const del = function (row) { console.log("row===", row); delObj.value.line = row.line; -} +}; const delConfirm = function () { - batchData.value = batchData.value.filter(item => item.line != delObj.value.line) + batchData.value = batchData.value.filter( + (item) => item.line != delObj.value.line + ); console.log("batchData===", batchData.value); -} -// +}; +// const reset = function (row) { resetObj.value.line = row.line; -} +}; const resetConfirm = function () { for (let i = 0; i < batchData.value.length; i++) { if (batchData.value[i].line == resetObj.value.line) { @@ -529,36 +528,30 @@ const resetConfirm = function () { break; } } -} -// +}; +// const cancelBatch = function () { - ElMessageBox.confirm( - '确认取消吗？此操作将不会保存任何数据。', - '确认取消', - { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - } - ) + ElMessageBox.confirm("确认取消吗？此操作将不会保存任何数据。", "确认取消", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) .then(() => { - batchData.value = [ - { line: 1, showInput: true } - ]; + batchData.value = [{ line: 1, showInput: true }]; closeBatchRechargeVisible(); ElMessage({ - type: 'success', - message: '操作成功', - }) + type: "success", + message: "操作成功", + }); }) .catch(() => { ElMessage({ - type: 'info', - message: '操作撤销', - }) - }) -} -// + type: "info", + message: "操作撤销", + }); + }); +}; +// const calculatedRowFreeGold = function (row) { console.log("row===", row); let ratio = 0; @@ -578,9 +571,9 @@ const calculatedRowFreeGold = function (row) { batchData.value[i].freeGold = Math.ceil(paidGold / ratio); } break; - }; + } } -} +}; const calculatedRowRechargeGold = computed(() => { if (!addRecharge.value.rateId == 0) { @@ -597,13 +590,13 @@ const calculatedRowRechargeGold = computed(() => { watch(calculatedRowRechargeGold, (newVal) => { addRecharge.value.rechargeGold = Number(newVal); }); -// +// const batchAdd = function () { console.log("batchData===", batchData.value); if (batchData.value.length == 0) { ElMessage({ - type: 'error', - message: '至少需要输入一条数据！', + type: "error", + message: "至少需要输入一条数据！", }); return; } @@ -611,15 +604,23 @@ const batchAdd = function () { batchData.value[i].adminId = adminData.value.adminId; batchData.value[i].area = adminData.value.area; batchData.value[i].rechargeWay = "客服充值"; - if (batchData.value[i].jwcode == "" || batchData.value[i].jwcode == null - || batchData.value[i].activityId == "" || batchData.value[i].activityId == null - || batchData.value[i].paidGold == "" || batchData.value[i].paidGold == null - || batchData.value[i].rechargeGold == "" || batchData.value[i].rechargeGold == null - || batchData.value[i].payWay == "" || batchData.value[i].payWay == null - || batchData.value[i].rechargeTime == "" || batchData.value[i].rechargeTime == null) { + if ( + batchData.value[i].jwcode == "" || + batchData.value[i].jwcode == null || + batchData.value[i].activityId == "" || + batchData.value[i].activityId == null || + batchData.value[i].paidGold == "" || + batchData.value[i].paidGold == null || + batchData.value[i].rechargeGold == "" || + batchData.value[i].rechargeGold == null || + batchData.value[i].payWay == "" || + batchData.value[i].payWay == null || + batchData.value[i].rechargeTime == "" || + batchData.value[i].rechargeTime == null + ) { ElMessage({ - type: 'error', - message: '信息不能为空！请检查输入内容！', + type: "error", + message: "信息不能为空！请检查输入内容！", }); return; } @@ -627,29 +628,49 @@ const batchAdd = function () { console.log("batchData===", batchData.value); ElMessage({ - type: 'success', - message: '添加成功！', - }) + type: "success", + message: "添加成功！", + }); closeBatchRechargeVisible(); - -} +};