diff --git a/gold-system/.env.development b/gold-system/.env.development index cc08b56..e9f1785 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,5 +1,5 @@ -#VITE_API_BASE='http://54.251.137.151:10704/' +# VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.232:8080/' \ No newline at end of file +# VITE_API_BASE='http://192.168.8.220:8080/' diff --git a/gold-system/.env.production b/gold-system/.env.production index fbdcae2..a2ba8da 100644 --- a/gold-system/.env.production +++ b/gold-system/.env.production @@ -1,2 +1,7 @@ # VITE_API_BASE='http://54.251.137.151:10702/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' \ No newline at end of file +<<<<<<< HEAD +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' +======= +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' +# VITE_API_BASE='http://192.168.8.220:8080/' +>>>>>>> zry diff --git a/gold-system/.env.test b/gold-system/.env.test index cc08b56..37c921a 100644 --- a/gold-system/.env.test +++ b/gold-system/.env.test @@ -1,5 +1,13 @@ +<<<<<<< HEAD #VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://192.168.8.94:8080/' VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' # VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.232:8080/' \ No newline at end of file +# VITE_API_BASE='http://192.168.8.232:8080/' +======= +# VITE_API_BASE='http://54.251.137.151:10704/' +# VITE_API_BASE='http://192.168.8.94:8080/' +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' +# VITE_API_BASE='http://54.251.137.151:10704/' +# VITE_API_BASE='http://192.168.8.220:8080/' +>>>>>>> zry diff --git a/gold-system/src/views/consume/allConsume.vue b/gold-system/src/views/consume/allConsume.vue index a102473..8acbcf7 100644 --- a/gold-system/src/views/consume/allConsume.vue +++ b/gold-system/src/views/consume/allConsume.vue @@ -284,15 +284,14 @@ const getGoods = async function () { try { // 发送POST请求 const result = await request({ - url: '/product', + url: '/product/findProductName', data: {} }) // 将响应结果存储到响应式数据中 - console.log('请求成功', result) + console.log('请求成功product', result) // 存储全部数据 goods.value = result.data - console.log('allData', allData.value) - console.log('地区', area.value) + console.log('goods 数据', goods.value) // 修改日志输出 } catch (error) { console.log('请求失败', error) // 在这里可以处理错误逻辑，比如显示错误提示等 @@ -344,11 +343,12 @@ const handleCurrentChange = function (val) { style="width: 240px" clearable > + diff --git a/gold-system/src/views/login.vue b/gold-system/src/views/login.vue index d218e38..e1f3aa1 100644 --- a/gold-system/src/views/login.vue +++ b/gold-system/src/views/login.vue @@ -49,7 +49,7 @@ const login = async function () { result.data.permission == '2' || result.data.permission == '3' ) { - router.push('/usergold') + router.push('/workspace') } else if (result.data.permission == '4') { router.push('/noPermission') } diff --git a/gold-system/src/views/managerecharge/activity.vue b/gold-system/src/views/managerecharge/activity.vue index ca9dce1..d7c5fce 100644 --- a/gold-system/src/views/managerecharge/activity.vue +++ b/gold-system/src/views/managerecharge/activity.vue @@ -61,22 +61,26 @@ const get = async function (val) { activity.value.endDate = null } - console.log('搜索参数', getObj.value) + const requestData = { + pageNum: getObj.value.pageNum, + pageSize: getObj.value.pageSize, + activity: { + ...activity.value, + activityName: activity.value.activityName, + status: activity.value.status + } + }; + console.log('搜索参数', requestData) // 发送POST请求 const result = await request({ url: '/recharge/activity/select', method: 'post', - data: { - pageNum: getObj.value.pageNum, - pageSize: getObj.value.pageSize, - activity: { - ...activity.value, - activityName: activity.value.activityName, - status: activity.value.status - } - } + data: requestData }) + // 打印响应数据 + console.log('响应数据', result); + // 将响应结果存储到响应式数据中 console.log('请求成功', result) // 存储表格数据 @@ -87,7 +91,7 @@ const get = async function (val) { console.log('total', total.value) } catch (error) { console.log('请求失败', error) -ElMessage.error('请求失败') + ElMessage.error('请求失败') } } // 搜索 @@ -110,6 +114,81 @@ onMounted(async function () { await getAdminData() get() }) +// 定义控制对话框显示的变量，并初始化为 false +const addActivityVisible = ref(false) + +// 定义 addActivity 方法 +const addActivity = () => { + console.log('点击了新增活动按钮'); + // 更新 addActivityVisible 的值为 true，显示对话框 + addActivityVisible.value = true; +}; + +// 关闭对话框的方法 +const closeAddActivityVisible = () => { + addActivityVisible.value = false; +}; + +// 处理每页显示数量变化 +const handlePageSizeChange = function (val) { + getObj.value.pageSize = val + get() +} + +// 处理当前页码变化 +const handleCurrentChange = function (val) { + getObj.value.pageNum = val + get() +} + +// 定义提交方法 +const throttledAdd = async () => { + try { + // 过滤掉 'add' 字段 + const { add, ...validData } = addObj.value; + + // 发送 POST 请求提交表单数据 + const result = await request({ + url: '/recharge/activity/add', // 假设这是新增活动的接口 + method: 'post', + data: validData + }) + console.log('新增活动成功', result) + ElMessage.success('新增活动成功') + // 关闭对话框 + closeAddActivityVisible() + // 重新获取数据 + get() + } catch (error) { + console.log('新增活动失败', error) + ElMessage.error('新增活动失败') + } +} + +// 删除确认方法 +const delConfirm = async (row) => { + try { + delObj.value = row + // 发送删除请求 + const result = await request({ + url: '/recharge/activity/delete', // 假设这是删除活动的接口 + method: 'post', + data: delObj.value + }) + console.log('删除活动成功', result) + ElMessage.success('删除活动成功') + // 重新获取数据 + get() + } catch (error) { + console.log('删除活动失败', error) + ElMessage.error('删除活动失败') + } +} + +// 删除方法 +const del = (row) => { + delObj.value = row +}