diff --git a/gold-system/src/views/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue index 74e2b6e..9e6f30b 100644 --- a/gold-system/src/views/audit/rechargeAudit.vue +++ b/gold-system/src/views/audit/rechargeAudit.vue @@ -30,7 +30,7 @@ const columnOptions = ref([ // 默认显示 const defaultColumns = ['username', 'jwcode', 'area', 'activityName', 'rechargeGold', 'rechargeWay', 'paidGold', 'freeGold', - 'remark', 'payWay', 'rechargeVoucher', 'name', 'status', 'reson', 'rechargeTime', 'createTime', 'operation', ] + 'remark', 'payWay', 'rechargeVoucher', 'name', 'status', 'reson', 'rechargeTime', 'createTime' ] const selectedColumns = ref([...defaultColumns]) //这是获取用户信息的接口 const adminData = ref({}) @@ -646,9 +646,9 @@ const trimJwCode = () => { -
- 显示列: - +
+ 请选择您想看到的数据: +
diff --git a/gold-system/src/views/consume/addConsume.vue b/gold-system/src/views/consume/addConsume.vue index 09689a6..0d969b9 100644 --- a/gold-system/src/views/consume/addConsume.vue +++ b/gold-system/src/views/consume/addConsume.vue @@ -39,6 +39,7 @@ const addConsume = ref({ rechargeCoin: 0, taskCoin: 0, updateType: "1", + indexName:"", //这个是指标字段,后面绑定 }); // 这是添加消费信息的接口 const add = async function () { @@ -130,6 +131,18 @@ const rules = reactive({ { required: true, message: "消费金币总数不能为空", trigger: "blur" }, { validator: checkFreeGoldRadio, trigger: "blur" }, ], + indexName: [ + { + validator: (rule, value, callback) => { + if (isHC.value === 1 && !value) { + callback(new Error("请选择指标")); + } else { + callback(); + } + }, + trigger: ["change", "blur"], + }, + ] }); //这是重置方法 const delteConsume = function () { @@ -305,17 +318,22 @@ const getIndexs = async function (type) { const isHC = ref(0); const handleProductSelect = (productName) => { // 根据商品名称获取对应的商品信息 - indexs.value.productName = productName; - if (productName == "homilychart") { + // indexs.value.productName = productName;为什么直接绑定??? + if (productName === "homilychart") { isHC.value = 1; + addConsume.value.productName = "homilychart"; // 商品名 + addConsume.value.indexName = ""; // 指标名 } else { isHC.value = 0; + addConsume.value.productName = productName; + addConsume.value.indexName = ""; } }; const indexs = ref([]); -const handleIndexSelect = (indexName) => { - indexs.value.productName = "homilychart" + indexName; - console.log("选择的指标是", indexs.value.productName); +const handleIndexSelect = () => { + if (isHC.value === 1 && addConsume.value.indexName) { + addConsume.value.productName = "homilychart" + addConsume.value.indexName; + } }; // 挂载 @@ -388,12 +406,13 @@ const handleSelectBlur = (value) => { />
- + + 查询 - 重置 + 查询
diff --git a/gold-system/src/views/recharge/addRecharge.vue b/gold-system/src/views/recharge/addRecharge.vue index 22d6c10..b78cb46 100644 --- a/gold-system/src/views/recharge/addRecharge.vue +++ b/gold-system/src/views/recharge/addRecharge.vue @@ -84,7 +84,7 @@ const add = async function () { addRecharge.value.rechargeVoucher = '' addRecharge.value.rechargeWay = '客服充值' addRecharge.value.freeGold = '' - addRecharge.value.rechargeGold = 1 + addRecharge.value.rechargeGold = null addRecharge.value.paidGold = '' imageUrl.value = '' Rate.value = null