From ad691563b76d57b1de33c67b39a8bfd671240ee1 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 7 Jun 2024 21:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- package.json | 1 + src/api/common/common.js | 6 +++ src/components/QrCode/index.vue | 64 +++++++++++++++++++++++++++++++ src/utils/wx.js | 2 +- src/views/system/area/index.vue | 18 +++++++++ src/views/system/dept/index.vue | 64 +++++++++++++++++++++++++++++++ src/views/system/device/index.vue | 13 +++---- 8 files changed, 161 insertions(+), 10 deletions(-) create mode 100644 src/components/QrCode/index.vue diff --git a/.env.development b/.env.development index 768d721..d74f104 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ VUE_APP_TITLE = 共享电动车管理系统 ENV = 'development' # 共享电动车管理系统/开发环境 -VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api' +# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api' +VUE_APP_BASE_API = 'http://localhost:8080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/package.json b/package.json index 79526eb..6f04923 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", "nprogress": "0.2.0", + "qrcode": "^1.5.3", "quill": "1.3.7", "screenfull": "5.0.2", "sortablejs": "1.10.2", diff --git a/src/api/common/common.js b/src/api/common/common.js index 8a8c714..24e2ea8 100644 --- a/src/api/common/common.js +++ b/src/api/common/common.js @@ -17,3 +17,9 @@ export function getDistrictList() { }) } +// 转二维码 +export function getQrCodeText(data) { + let url = `https://dianche.chuantewulian.cn?sn=`+data.sn; + return url; +} + diff --git a/src/components/QrCode/index.vue b/src/components/QrCode/index.vue new file mode 100644 index 0000000..1869e7a --- /dev/null +++ b/src/components/QrCode/index.vue @@ -0,0 +1,64 @@ + + + diff --git a/src/utils/wx.js b/src/utils/wx.js index d5e1bfd..3687bb3 100644 --- a/src/utils/wx.js +++ b/src/utils/wx.js @@ -6,7 +6,7 @@ export function getWxSchemeUrl(path, query) { } export function getWxIndexUrl(query) { - let url = `https://dianche.chuantewulian.cn/wxjump/index/action=device`; + let url = `https://dianche.chuantewulian.cn?sn=`; if (query != null ) { if (query instanceof Object) { query = tansParams(query).slice(0, -1); diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index b02cf27..e00c895 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -246,6 +246,24 @@ + + + + + {{ dict.label }} + + + + + + + {{ dict.label }} + + + + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 99c62f3..5831756 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -162,6 +162,69 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + +

支付相关

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
确 定 @@ -317,6 +380,7 @@ export default { this.$set(this.form, "areaIds", response.areaIds); this.open = true; this.title = "修改运营商"; + this.form.isProfitSharing = this.form.isProfitSharing === 'true'; listArea().then(response => { this.areaOptions = response.rows; }); diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index 987b82b..69df225 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -110,9 +110,6 @@ - - -