diff --git a/src/api/system/store.js b/src/api/system/store.js index a2649a2..8ee63ab 100644 --- a/src/api/system/store.js +++ b/src/api/system/store.js @@ -10,10 +10,11 @@ export function listStore(query) { } // 查询店铺详细 -export function getStore(storeId) { +export function getStore(storeId,data) { return request({ url: '/system/store/' + storeId, - method: 'get' + method: 'get', + params: data }) } diff --git a/src/api/user/user.js b/src/api/user/user.js index 06bb0d7..ca41434 100644 --- a/src/api/user/user.js +++ b/src/api/user/user.js @@ -21,10 +21,11 @@ export function fastSearch(query) { // 查询用户详细 -export function getUser(userId) { +export function getUser(userId, query) { return request({ url: '/user/user/' + parseStrEmpty(userId), - method: 'get' + method: 'get', + params: query }) } diff --git a/src/views/system/device/device_detail.vue b/src/views/system/device/device_detail.vue index 3d1a90c..7e2affd 100644 --- a/src/views/system/device/device_detail.vue +++ b/src/views/system/device/device_detail.vue @@ -166,8 +166,7 @@ + class="link-type"> {{ deviceData.userName }} -- diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue index 79b00be..0bced3c 100644 --- a/src/views/system/equipment/index.vue +++ b/src/views/system/equipment/index.vue @@ -323,6 +323,7 @@ import {listStore} from "@/api/system/store"; import {listUser} from "@/api/system/user"; import QrCode from "@/components/QrCode/index.vue"; import { getDomain } from "@/api/common/common"; +import { deviceSwitch } from "@/api/system/device"; // 默认排序字段 const defaultSort = { @@ -415,6 +416,7 @@ export default { rules: { }, domain: '', // 域名 + oldForm: null }; }, created() { @@ -532,6 +534,7 @@ export default { const equipmentId = row.equipmentId || this.ids getEquipment(equipmentId).then(response => { this.form = response.data; + this.oldForm = { ...response.data }; this.open = true; this.title = "修改设施"; }); @@ -540,22 +543,43 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - if (this.form.equipmentId != null) { - updateEquipment(this.form).then(response => { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); + if (this.form.deviceId && + this.form.unlockMode !== this.oldForm?.unlockMode) { + const open = this.form.unlockMode === "2"; + deviceSwitch({ + deviceId: this.form.deviceId, + open: open + }).then(() => { + this.saveForm(); + }).catch(() => { + this.$modal.msgError("设备开关操作失败"); }); } else { - addEquipment(this.form).then(response => { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.getList(); - }); + this.saveForm(); } } }); }, + /** 保存表单 */ + saveForm() { + let data = { + ...this.form + }; + + if (this.form.equipmentId != null) { + updateEquipment(data).then(response => { + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); + }); + } else { + addEquipment(data).then(response => { + this.$modal.msgSuccess("新增成功"); + this.open = false; + this.getList(); + }); + } + }, /** 删除按钮操作 */ handleDelete(row) { const equipmentIds = row.equipmentId || this.ids; diff --git a/src/views/system/hallEqu/index.vue b/src/views/system/hallEqu/index.vue index 7483168..06c6a4c 100644 --- a/src/views/system/hallEqu/index.vue +++ b/src/views/system/hallEqu/index.vue @@ -574,9 +574,14 @@ export default { } return feeRules.map(rule => rule.explain).filter(Boolean).join('，'); }, - /** 跳转到详情页面 */ + /** 查看详情按钮操作 */ handleDetail(row) { - this.$router.push(`/system/equipmentDetail/index/${row.roomId}`); + this.$router.push({ + path: `/system/equipmentDetail/index/${row.roomId}`, + query: { + type: 'equipment' + } + }); }, /** 获取套餐选项 */ getRuleOptions(merchantId) { diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 83d6f09..83aab3d 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -458,8 +458,8 @@ export default { /** 查询订单列表 */ getList() { this.loading = true; - console.log(this.userId,'this.userId'); - console.log(this.merchantId,'this.merchantId'); + // console.log(this.userId,'this.userId'); + // console.log(this.merchantId,'this.merchantId'); listOrder(this.queryParams).then(response => { this.orderList = response.rows; this.total = response.total; diff --git a/src/views/system/order/order_detail.vue b/src/views/system/order/order_detail.vue index 3b2295f..f916d59 100644 --- a/src/views/system/order/order_detail.vue +++ b/src/views/system/order/order_detail.vue @@ -1,171 +1,193 @@ @@ -93,7 +93,7 @@
+ @change="handleDateRangeChange" />
@@ -461,10 +461,36 @@ export default { }); }, + handleDateRangeChange(dates) { + if (!dates) { + // 如果清空日期，使用默认7天 + const end = new Date(); + const start = new Date(); + start.setDate(start.getDate() - 7); + this.dateRange = [this.formatDate(start), this.formatDate(end)]; + } else { + // dates 是一个数组 [startDate, endDate] + this.dateRange = dates; + } + + // 使用 getDetail 方法获取数据 + this.getDetail(); + }, + getDetail() { + // 构建请求参数 + const params = { + startDate: this.dateRange[0], + endDate: this.dateRange[1] + }; + this.loading = true; - getUser(this.$route.params.userId).then(response => { + getUser(this.$route.params.userId, params).then(response => { this.detail = response.data; + // 初始化收入趋势图表 + this.$nextTick(() => { + this.initDailyChart(); + }); }).finally(() => { this.loading = false; }); @@ -534,20 +560,36 @@ export default { }, loadDailyReport() { - this.dailyReportData = Array.from({ length: 7 }, (_, i) => { - const date = new Date(); - date.setDate(date.getDate() - i); - return { - date: this.formatDate(date), - rechargeAmount: Math.floor(Math.random() * 10000), - consumeAmount: Math.floor(Math.random() * 8000), - orderCount: Math.floor(Math.random() * 100) - }; - }).reverse(); + if (!this.dateRange) return; + + // 格式化日期参数 + const [startDate, endDate] = this.dateRange; + + // 获取用户数据，传入日期参数 + getUser(this.$route.params.userId, { + startDate, + endDate + }).then(response => { + this.detail = response.data; + this.$nextTick(() => { + this.initDailyChart(); + }); + }); + }, + + initDailyChart() { + if (!this.dailyChart) { + this.dailyChart = echarts.init(this.$refs.dailyChart); + } + + // 使用 API 返回的数据 + const days = this.detail.inComeList.map(item => item.day.substring(5)); // 只显示 MM-dd + const incomes = this.detail.inComeList.map(item => item.orderIncome); + const orderNums = this.detail.inComeList.map(item => item.orderNum); const option = { title: { - text: '日报表统计' + text: '收入统计' }, tooltip: { trigger: 'axis', @@ -556,7 +598,7 @@ export default { } }, legend: { - data: ['充值金额', '消费金额', '订单数'] + data: ['收入金额'] }, grid: { left: '3%', @@ -566,47 +608,45 @@ export default { }, xAxis: { type: 'category', - data: this.dailyReportData.map(item => item.date) + boundaryGap: true, + data: days, + axisLabel: { + rotate: 45 + } }, - yAxis: [ - { - type: 'value', - name: '金额', - axisLabel: { - formatter: '{value} 元' - } + yAxis: { + type: 'value', + axisLabel: { + formatter: '{value}元' }, - { - type: 'value', - name: '订单数', - axisLabel: { - formatter: '{value}' + splitLine: { + show: true, + lineStyle: { + type: 'dashed' } } - ], + }, series: [ { - name: '充值金额', + name: '收入金额', type: 'bar', - data: this.dailyReportData.map(item => item.rechargeAmount) - }, - { - name: '消费金额', - type: 'bar', - data: this.dailyReportData.map(item => item.consumeAmount) - }, - { - name: '订单数', - type: 'line', - yAxisIndex: 1, - data: this.dailyReportData.map(item => item.orderCount) + itemStyle: { + normal: { + color: '#409EFF', + barBorderRadius: [4, 4, 0, 0] + } + }, + data: incomes, + label: { + show: true, + position: 'top', + formatter: '{c}元' + } } ] }; - if (this.dailyChart) { - this.dailyChart.setOption(option); - } + this.dailyChart.setOption(option); }, loadMonthlyReport() { @@ -827,7 +867,7 @@ export default { } .report-container { - padding: 15px; + padding: 15px 15px 15px 0; } .filter-section {