From a724a1acad504a7b4a63f909ba3c6b54991184b3 Mon Sep 17 00:00:00 2001 From: SjS Date: Tue, 6 May 2025 19:52:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=8C=E5=96=84=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=80=80=E6=AC=BE=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/bst/lightingNum.js | 9 ++ src/router/index.js | 6 + src/views/bst/device/deviceDetail.vue | 31 +---- src/views/bst/device/index.vue | 16 ++- src/views/bst/lightingNum/index.vue | 130 +++++++++++---------- src/views/bst/part/index.vue | 2 +- src/views/bst/refund/index.vue | 21 +++- src/views/bst/store/StoreLink.vue | 31 +++++ src/views/bst/store/index.vue | 54 +++------ src/views/bst/store/storeDetail.vue | 160 ++++++++++++++++++++++++++ src/views/system/user/UserLink.vue | 2 +- 11 files changed, 323 insertions(+), 139 deletions(-) create mode 100644 src/views/bst/store/StoreLink.vue create mode 100644 src/views/bst/store/storeDetail.vue diff --git a/src/api/bst/lightingNum.js b/src/api/bst/lightingNum.js index be10247..941a9e0 100644 --- a/src/api/bst/lightingNum.js +++ b/src/api/bst/lightingNum.js @@ -42,3 +42,12 @@ export function delLightingNum(id) { method: 'delete' }) } + +// 赠送爆用户灯次数 +export function giftLightingNum(data) { + return request({ + url: '/bst/lightingNum/giftLightingNum', + method: 'put', + data: data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 9aa0fd3..d8e3d98 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -110,6 +110,12 @@ export const constantRoutes = [ name: 'DeviceView', meta: { title: '设备详情' } }, + { + path: 'store/:storeId?', + component: () => import('@/views/bst/store/storeDetail.vue'), + name: 'StoreView', + meta: { title: '店铺详情详情' } + }, ] }, { diff --git a/src/views/bst/device/deviceDetail.vue b/src/views/bst/device/deviceDetail.vue index b520cf0..2468cf1 100644 --- a/src/views/bst/device/deviceDetail.vue +++ b/src/views/bst/device/deviceDetail.vue @@ -196,19 +196,8 @@ - - + @@ -237,6 +226,7 @@ import {refreshIot} from "@/api/bst/deviceIot"; import {getDevice} from "@/api/bst/device"; import {switchDevice} from "@/api/bst/deviceIot"; import UserLink from "@/views/system/user/UserLink.vue"; +import StoreLink from "@/views/bst/store/StoreLink.vue"; export default { name: 'DeviceView', @@ -249,6 +239,7 @@ export default { 'model_type', ], components: { + StoreLink, UserLink, DotStatus, LineField, @@ -410,22 +401,6 @@ export default { }) }) }, - handleUnbindAgent() { - this.$confirm('是否强制解绑该代理商?', '警告', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.loading = true; - unbindAgent(this.deviceData.deviceId).then(res => { - if (res.code === 200) { - this.$message.success("操作成功"); - } - }).finally(() => { - this.getDevice(); - }) - }) - }, handleSwitch(open) { this.$confirm(`是否确认强制${open ? '开启' : '关闭'}设备?`, '警告', { confirmButtonText: '确定', diff --git a/src/views/bst/device/index.vue b/src/views/bst/device/index.vue index dcc15df..8d1f3b1 100644 --- a/src/views/bst/device/index.vue +++ b/src/views/bst/device/index.vue @@ -112,9 +112,6 @@ - - - @@ -141,7 +138,7 @@ type="text" icon="el-icon-view" @click="handleSee(scope.row)" - v-hasPermi="['system:device:detail']" + v-has-permi="['bst:device:detail']" >详情 ({}) + } + }, components: {DeviceSn, FormCol}, data() { return { @@ -297,6 +300,7 @@ export default { wxs: null, lastRecoverTime: null }, + // 表单参数 form: {}, // 表单校验 @@ -320,6 +324,10 @@ export default { }; }, created() { + this.queryParams = { + ...this.queryParams, + ...this.query + } this.getList(); this.getModelList(); }, diff --git a/src/views/bst/lightingNum/index.vue b/src/views/bst/lightingNum/index.vue index f185e8d..96f7409 100644 --- a/src/views/bst/lightingNum/index.vue +++ b/src/views/bst/lightingNum/index.vue @@ -63,13 +63,13 @@ diff --git a/src/views/bst/store/index.vue b/src/views/bst/store/index.vue index 1cabee3..8277c70 100644 --- a/src/views/bst/store/index.vue +++ b/src/views/bst/store/index.vue @@ -25,38 +25,6 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/src/views/system/user/UserLink.vue b/src/views/system/user/UserLink.vue index b8f853f..9282530 100644 --- a/src/views/system/user/UserLink.vue +++ b/src/views/system/user/UserLink.vue @@ -1,5 +1,5 @@