diff --git a/package-lock.json b/package-lock.json index 1ed04c3..0e1d0b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "node-sass": "^6.0.1", "nprogress": "^0.2.0", "pinyin": "^2.10.2", + "qrcodejs2": "^0.0.2", "vue": "2.5.16", "vue-router": "^3.0.1", "vuedraggable": "^2.17.0", @@ -15329,6 +15330,11 @@ "teleport": ">=0.2.0" } }, + "node_modules/qrcodejs2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz", + "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE=" + }, "node_modules/qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", @@ -34112,6 +34118,11 @@ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", "dev": true }, + "qrcodejs2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz", + "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE=" + }, "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", diff --git a/package.json b/package.json index 5be6a37..377e39c 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "node-sass": "^6.0.1", "nprogress": "^0.2.0", "pinyin": "^2.10.2", + "qrcodejs2": "^0.0.2", "vue": "2.5.16", "vue-router": "^3.0.1", "vuedraggable": "^2.17.0", diff --git a/src/api/auth/deviceCheck.js b/src/api/auth/deviceCheck.js new file mode 100644 index 0000000..d8c19a4 --- /dev/null +++ b/src/api/auth/deviceCheck.js @@ -0,0 +1,27 @@ +import axios from "../../utils/axios"; + +export function registerList(query) { + return axios({ + url: "/sale/device/registerList", + method: "get", + params: query + }); +} + + +export function check(data) { + return axios({ + url: "/sale/device/check", + method: "post", + data: data + }); +} + +export function deleterKey(data) { + return axios({ + url: "/sale/info/deleterKey", + method: "post", + data: data + }); +} + diff --git a/src/router/index.js b/src/router/index.js index 66c9891..24f785d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,6 +15,7 @@ import authAdmin from "../views/userManage/admin/authAdmin.vue"; import authRole from "../views/userManage/admin/authRole.vue"; import authPermissionRule from "../views/userManage/admin/authPermissionRule.vue"; import systemParamConfig from "../views/userManage/param/systemParamConfig.vue"; +import phoneRegisterManage from "../views/userManage/param/phoneRegisterManage.vue"; import systemPDFTemplate from "../views/userManage/param/systemPDFTemplate"; import systemPDFModule from "../views/userManage/param/systemPDFModule"; import thirdSysApi from "../views/userManage/param/ThirdSysApiUpload.vue"; @@ -228,7 +229,15 @@ export const asyncRouterMap = [ }, ] }, - + { + path: "phoneRegisterManage", + component: phoneRegisterManage, + name: "设备管理", + icon: "", + meta: { + authRule: ["admin/phoneRegisterManage"] + } + }, { path: "/systemParam", component: Empty, diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 0ecd14e..8bcedcf 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -130,16 +130,6 @@ - - - - - - - - - -