diff --git a/vue/gold-system/src/views/consume/addConsume.vue b/vue/gold-system/src/views/consume/addConsume.vue index 0fced3a..5b1119c 100644 --- a/vue/gold-system/src/views/consume/addConsume.vue +++ b/vue/gold-system/src/views/consume/addConsume.vue @@ -82,8 +82,14 @@ const getUser = async function (jwcode) { // 存储表格数据 user.value = result.data.data[0]; console.log("用户信息", user.value); + if (result.data.code === 0) { + ElMessage.error(result.data.msg); + } else { + ElMessage.success(result.data.msg); + } } catch (error) { console.log("请求失败", error); + ElMessage.error("查询失败,请检查精网号是否正确"); // 在这里可以处理错误逻辑,比如显示错误提示等 } }; diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue index bb8f51a..aacd1a4 100644 --- a/vue/gold-system/src/views/consume/allConsume.vue +++ b/vue/gold-system/src/views/consume/allConsume.vue @@ -12,7 +12,7 @@ const detailVo = ref({}); // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 5, + pageSize: 10, }); //分页总条目 const total = ref(100); @@ -28,35 +28,36 @@ const area = ref([]); //标签页默认高亮选项 const activeName = ref("all"); -// 支付方式选项 -const payWay = [ +// 消费平台选项 +const consumePlatform = [ { - value: "微信", - label: "微信", + value: "HomilyLink", + label: "HomilyLink", }, { - value: "支付宝", - label: "支付宝", + value: "金币系统", + label: "金币系统", }, { - value: "银联", - label: "银联", + value: "ERP系统", + label: "ERP系统", }, { - value: "信用卡", - label: "信用卡", + value: "金币系统", + label: "金币系统", }, +]; +const consumeType = [ { - value: "借记卡", - label: "借记卡", + value: "购买商品", + label: "购买商品", }, ]; //表格高度 const tableHeight = computed(function () { - return (getObj.value.pageSize + 2) * 60 + "px"; + return (getObj.value.pageSize + 1) * 41 + "px"; }); - // 方法 // 搜索============================================================== // 搜索方法 @@ -98,12 +99,11 @@ const get = async function (val) { }; // 重置 const reset = function () { - detailVo.value.activityId = ""; - detailVo.value.payWay = ""; - detailVo.value.area = ""; + detailVo.value.goods = ""; + detailVo.value.consumePlatform = ""; + detailVo.value.consumeType = ""; detailVo.value.startDate = ""; detailVo.value.endDate = ""; - get(); }; // 今天 const getToday = function () { @@ -157,30 +157,6 @@ const get7Days = function () { console.log("getTime", getTime.value); get(); }; -//全部充值明细 -const adminAll = function () { - console.log("adminAll"); - detailVo.value.status = ""; - get(); -}; -//待审核充值明细 -const adminWait = function () { - detailVo.value.status = 0; - get(); - console.log("adminWait"); -}; -//已通过充值明细 -const adminPass = function () { - detailVo.value.status = 1; - get(); - console.log("adminPass"); -}; -//已驳回充值明细 -const adminReject = function () { - detailVo.value.status = 2; - get(); - console.log("adminReject"); -}; //点击标签页 const handleClick = function (tab, event) { if (tab.props.name === "all") { @@ -193,52 +169,41 @@ const handleClick = function (tab, event) { adminReject(); } }; -// 获取活动名称 -const getActivity = async function () { - try { - // 发送POST请求 - const result = await axios.post( - "http://192.168.8.93:10010/recharge/activity/select", - {} - ); - // 将响应结果存储到响应式数据中 - console.log("请求成功", result); - // 存储表格数据 - activity.value = result.data.data; - console.log("activity", activity.value); - } catch (error) { - console.log("请求失败", error); - // 在这里可以处理错误逻辑,比如显示错误提示等 - } -}; -// 获取地区 -const getArea = async function () { - try { - // 发送POST请求 - const result = await axios.post( - "http://192.168.8.93:10010/recharge/recharge", - {} - ); - // 将响应结果存储到响应式数据中 - console.log("请求成功", result); - // 存储全部数据 - allData.value = result.data.data; - console.log("allData", allData.value); - // 分离并去重地区列表 - area.value = [...new Set(allData.value.map((item) => item.area))]; - console.log("地区", area.value); - } catch (error) { - console.log("请求失败", error); - // 在这里可以处理错误逻辑,比如显示错误提示等 - } -}; // 挂载 onMounted(async function () { await get(); getActivity(); await getArea(); }); + +// 验证跳转输入框的数字是否合法 +const checkNumber = function () { + if (typeof parseInt(getObj.value.pageNum) === "number") { + console.log( + "总共有多少页" + Math.ceil(total.value / getObj.value.pageSize) + ); + if ( + getObj.value.pageNum > 0 && + getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize) + ) { + console.log("输入的数字合法"); + get(); + } else { + //提示 + ElMessage({ + type: "error", + message: "请检查输入内容", + }); + } + } else { + //提示 + ElMessage({ + type: "error", + message: "请检查输入内容", + }); + } +};