From 8dffc3795b58654828f5935a885a14be9bf3809e Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Wed, 25 Dec 2024 09:57:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=20=E8=AE=BE=E6=96=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common/common.js | 2 +- src/api/system/equipment.js | 44 ++ src/api/system/product.js | 44 ++ src/api/system/refundApplication.js | 44 ++ src/assets/icons/svg/product.svg | 1 + src/components/GroupTitle/index.vue | 25 ++ src/components/LineField/index.vue | 76 ++++ src/views/system/clean/index.vue | 10 +- src/views/system/device/index.vue | 4 +- src/views/system/equipment/index.vue | 374 +++++++++++++++++ src/views/system/product/index.vue | 363 +++++++++++++++++ src/views/system/refundApplication/index.vue | 384 ++++++++++++++++++ .../user/user/components/UserConfigDialog.vue | 164 ++++++++ .../components/UserDailyRechargeReport.vue | 64 +++ .../user/user/components/userAccount.vue | 75 ++++ src/views/user/user/components/userDevice.vue | 92 +++++ .../user/components/userRechargeReport.vue | 98 +++++ src/views/user/user/index.vue | 72 +++- 18 files changed, 1911 insertions(+), 25 deletions(-) create mode 100644 src/api/system/equipment.js create mode 100644 src/api/system/product.js create mode 100644 src/api/system/refundApplication.js create mode 100644 src/assets/icons/svg/product.svg create mode 100644 src/components/GroupTitle/index.vue create mode 100644 src/components/LineField/index.vue create mode 100644 src/views/system/equipment/index.vue create mode 100644 src/views/system/product/index.vue create mode 100644 src/views/system/refundApplication/index.vue create mode 100644 src/views/user/user/components/UserConfigDialog.vue create mode 100644 src/views/user/user/components/UserDailyRechargeReport.vue create mode 100644 src/views/user/user/components/userAccount.vue create mode 100644 src/views/user/user/components/userDevice.vue create mode 100644 src/views/user/user/components/userRechargeReport.vue diff --git a/src/api/common/common.js b/src/api/common/common.js index 24e2ea8..d9db599 100644 --- a/src/api/common/common.js +++ b/src/api/common/common.js @@ -19,7 +19,7 @@ export function getDistrictList() { // 转二维码 export function getQrCodeText(data) { - let url = `https://dianche.chuantewulian.cn?sn=`+data.sn; + let url = `https://testcha.chuangtewl.com?sn=`+data.sn; return url; } diff --git a/src/api/system/equipment.js b/src/api/system/equipment.js new file mode 100644 index 0000000..f565848 --- /dev/null +++ b/src/api/system/equipment.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询设施列表 +export function listEquipment(query) { + return request({ + url: '/system/equipment/list', + method: 'get', + params: query + }) +} + +// 查询设施详细 +export function getEquipment(equipmentId) { + return request({ + url: '/system/equipment/' + equipmentId, + method: 'get' + }) +} + +// 新增设施 +export function addEquipment(data) { + return request({ + url: '/system/equipment', + method: 'post', + data: data + }) +} + +// 修改设施 +export function updateEquipment(data) { + return request({ + url: '/system/equipment', + method: 'put', + data: data + }) +} + +// 删除设施 +export function delEquipment(equipmentId) { + return request({ + url: '/system/equipment/' + equipmentId, + method: 'delete' + }) +} diff --git a/src/api/system/product.js b/src/api/system/product.js new file mode 100644 index 0000000..04f2b2c --- /dev/null +++ b/src/api/system/product.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询商品列表列表 +export function listProduct(query) { + return request({ + url: '/system/product/list', + method: 'get', + params: query + }) +} + +// 查询商品列表详细 +export function getProduct(productId) { + return request({ + url: '/system/product/' + productId, + method: 'get' + }) +} + +// 新增商品列表 +export function addProduct(data) { + return request({ + url: '/system/product', + method: 'post', + data: data + }) +} + +// 修改商品列表 +export function updateProduct(data) { + return request({ + url: '/system/product', + method: 'put', + data: data + }) +} + +// 删除商品列表 +export function delProduct(productId) { + return request({ + url: '/system/product/' + productId, + method: 'delete' + }) +} diff --git a/src/api/system/refundApplication.js b/src/api/system/refundApplication.js new file mode 100644 index 0000000..137d140 --- /dev/null +++ b/src/api/system/refundApplication.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询退款申请列表 +export function listRefundApplication(query) { + return request({ + url: '/system/refundApplication/list', + method: 'get', + params: query + }) +} + +// 查询退款申请详细 +export function getRefundApplication(applicationId) { + return request({ + url: '/system/refundApplication/' + applicationId, + method: 'get' + }) +} + +// 新增退款申请 +export function addRefundApplication(data) { + return request({ + url: '/system/refundApplication', + method: 'post', + data: data + }) +} + +// 修改退款申请 +export function updateRefundApplication(data) { + return request({ + url: '/system/refundApplication', + method: 'put', + data: data + }) +} + +// 删除退款申请 +export function delRefundApplication(applicationId) { + return request({ + url: '/system/refundApplication/' + applicationId, + method: 'delete' + }) +} diff --git a/src/assets/icons/svg/product.svg b/src/assets/icons/svg/product.svg new file mode 100644 index 0000000..756675b --- /dev/null +++ b/src/assets/icons/svg/product.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/GroupTitle/index.vue b/src/components/GroupTitle/index.vue new file mode 100644 index 0000000..8bb93e1 --- /dev/null +++ b/src/components/GroupTitle/index.vue @@ -0,0 +1,25 @@ + + + + + diff --git a/src/components/LineField/index.vue b/src/components/LineField/index.vue new file mode 100644 index 0000000..3f42817 --- /dev/null +++ b/src/components/LineField/index.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/views/system/clean/index.vue b/src/views/system/clean/index.vue index f6468af..795078a 100644 --- a/src/views/system/clean/index.vue +++ b/src/views/system/clean/index.vue @@ -145,9 +145,9 @@ - - - + + + @@ -220,16 +220,14 @@ export default { // 字段列表 columns: [ {key: 'cleanId', visible: true, label: 'id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'userId', visible: true, label: '用户id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'userName', visible: true, label: '保洁员姓名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'userPhone', visible: true, label: '电话', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'roomId', visible: true, label: '房间id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'roomName', visible: true, label: '房间名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'startTime', visible: true, label: '开始时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, {key: 'endTime', visible: true, label: '结束时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, - {key: 'merchantId', visible: true, label: '商户id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'merchantRealName', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, ], // 排序方式 orderSorts: ['ascending', 'descending', null], diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index 54c1dd0..a786311 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -516,7 +516,7 @@ export default { {key: 'qrText', visible: true, label: '二维码', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'mac', visible: true, label: 'MAC-1', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'mac2', visible: true, label: 'MAC-2', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'deviceNo', visible: true, label: 'SN', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'sn', visible: true, label: 'SN', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'deviceName', visible: true, label: '设备名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'model', visible: true, label: '设备型号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'version', visible: true, label: '版本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, @@ -660,7 +660,7 @@ export default { }, // 二维码文本 qrCodeText(device) { - let url = `https://dianche.chuantewulian.cn?sn=`+device.deviceNo; + let url = `https://testcha.chuangtewl.com?sn=`+device.sn; console.log("url------",url) return url; }, diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue new file mode 100644 index 0000000..58f8539 --- /dev/null +++ b/src/views/system/equipment/index.vue @@ -0,0 +1,374 @@ + + + diff --git a/src/views/system/product/index.vue b/src/views/system/product/index.vue new file mode 100644 index 0000000..1bc54be --- /dev/null +++ b/src/views/system/product/index.vue @@ -0,0 +1,363 @@ + + + diff --git a/src/views/system/refundApplication/index.vue b/src/views/system/refundApplication/index.vue new file mode 100644 index 0000000..dc4803e --- /dev/null +++ b/src/views/system/refundApplication/index.vue @@ -0,0 +1,384 @@ + + + diff --git a/src/views/user/user/components/UserConfigDialog.vue b/src/views/user/user/components/UserConfigDialog.vue new file mode 100644 index 0000000..4b708f1 --- /dev/null +++ b/src/views/user/user/components/UserConfigDialog.vue @@ -0,0 +1,164 @@ + + + diff --git a/src/views/user/user/components/UserDailyRechargeReport.vue b/src/views/user/user/components/UserDailyRechargeReport.vue new file mode 100644 index 0000000..4a33d4a --- /dev/null +++ b/src/views/user/user/components/UserDailyRechargeReport.vue @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/user/user/components/userAccount.vue b/src/views/user/user/components/userAccount.vue new file mode 100644 index 0000000..b645145 --- /dev/null +++ b/src/views/user/user/components/userAccount.vue @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/user/user/components/userDevice.vue b/src/views/user/user/components/userDevice.vue new file mode 100644 index 0000000..b84a04c --- /dev/null +++ b/src/views/user/user/components/userDevice.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/views/user/user/components/userRechargeReport.vue b/src/views/user/user/components/userRechargeReport.vue new file mode 100644 index 0000000..3f0a6bb --- /dev/null +++ b/src/views/user/user/components/userRechargeReport.vue @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/user/user/index.vue b/src/views/user/user/index.vue index 60a41f3..fadd27c 100644 --- a/src/views/user/user/index.vue +++ b/src/views/user/user/index.vue @@ -7,7 +7,7 @@ @@ -99,6 +99,38 @@ > + + + 取 消 + + + @@ -259,12 +294,16 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus,bandSystemUser } from "@/api/user/user"; import { getToken } from "@/utils/auth"; import { listUser as getSysUserList } from "@/api/system/user"; +import UserConfigDialog from '@/views/user/user/components/UserConfigDialog.vue'; export default { name: "User", - dicts: ['sys_normal_disable', 'sys_user_sex','et_user_is_authentication','rl_user_type'], + components: {UserConfigDialog }, + dicts: ['sys_normal_disable', 'sys_user_sex','et_user_is_authentication','ss_user_type'], data() { return { + showConfigDialog: false, + row: {}, // 当前row // 遮罩层 loading: true, // 选中数组 @@ -384,6 +423,10 @@ export default { }); }, methods: { + handleUpdateRisk(row) { + this.row = row; + this.showConfigDialog = true; + }, /** 查询用户列表 */ getList() { this.loading = true; @@ -474,9 +517,6 @@ export default { case "handleResetPwd": this.handleResetPwd(row); break; - case "handleBandSysUser": - this.handleBandSysUser(row); - break; default: break; } @@ -496,16 +536,16 @@ export default { }).catch(() => {}); }, /** 绑定系统用户 */ - handleBandSysUser(row){ - this.reset(); - const userId = row.userId || this.ids; - getSysUserList({userType:"00",pageSize:9999,pageNum:1}).then(response => { - this.sysUserOptions = response.rows; - this.form.userId = userId; - this.open2 = true; - this.title = "绑定系统用户"; - }); - }, + // handleBandSysUser(row){ + // this.reset(); + // const userId = row.userId || this.ids; + // getSysUserList({userType:"00",pageSize:9999,pageNum:1}).then(response => { + // this.sysUserOptions = response.rows; + // this.form.userId = userId; + // this.open2 = true; + // this.title = "绑定系统用户"; + // }); + // }, /** 新增按钮操作 */ handleAdd() { this.reset();