From 9dcb9669aa4957317f6b62569af3fabfba95465a Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Fri, 31 Dec 2021 10:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/company.js                       |  7 +++++++
 src/api/jlmap3d/assets3d.js              |  2 +-
 src/views/system/companyManage/index.vue | 25 ++++++++++++++----------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/api/company.js b/src/api/company.js
index d7f0ce9c2..03d20ac50 100644
--- a/src/api/company.js
+++ b/src/api/company.js
@@ -309,3 +309,10 @@ export function getUserDuration(params) {
         params
     });
 }
+/** 获取单位二维码 */
+export function getCompanyQrCode(orgId) {
+    return request({
+        url: `/api/company/${orgId}/qrCode`,
+        method: 'get'
+    });
+}
diff --git a/src/api/jlmap3d/assets3d.js b/src/api/jlmap3d/assets3d.js
index 4c9a14a97..1c6a47494 100644
--- a/src/api/jlmap3d/assets3d.js
+++ b/src/api/jlmap3d/assets3d.js
@@ -4,7 +4,7 @@ const publicPath = process.env.VUE_APP_PRO == 'local' ? '' : '/cbtc';
 
 export const JL3D_LOCAL_STATIC = publicPath+"/static";
 const BASE_UPLOAD_API = store.state.user.uploadUrl;
-export const BASE_ASSET_API = this.$store.user.state.resourcesUrl;
+// export const BASE_ASSET_API = this.$store.user.state.resourcesUrl;
 // console.log(JL3D_LOCAL_STATIC);
 // console.log(BASE_UPLOAD_API);
 // console.log(BASE_ASSET_API);
diff --git a/src/views/system/companyManage/index.vue b/src/views/system/companyManage/index.vue
index 3e2691031..6b52d581d 100644
--- a/src/views/system/companyManage/index.vue
+++ b/src/views/system/companyManage/index.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { getCompanyListPaging, deleteCompany } from '@/api/company';
+import { getCompanyListPaging, deleteCompany, getCompanyQrCode } from '@/api/company';
 import EditCompany from './add';
 import QrCode from '@/components/QrCode';
 import { ProjectList } from '@/scripts/ProjectConfig';
@@ -126,15 +126,20 @@ export default {
             this.$router.push({ path: `/system/companyManage/orgDetail`, query: { orgId: row.id } });
         },
         handleGenerateQrCode(index, row) {
-            let state = 2;
-            if (process.env.NODE_ENV === 'production') {
-                state = 3;
-            }
-            const param = {
-                url: `https://joylink.club/oss/joylink/company?state=${state}_${row.id}`,
-                title: '单位二维码'
-            };
-            this.$refs.qrCode.doShow(param);
+            // let state = 2;
+            // if (process.env.NODE_ENV === 'production') {
+            //     state = 3;
+            // }
+            getCompanyQrCode(row.id).then(resp => {
+                const param = {
+                    url: resp.data,
+                    title: '单位二维码'
+                };
+                this.$refs.qrCode.doShow(param);
+            }).catch(() => {
+                this.$message.error('获取单位二维码失败！');
+            });
+
         }
     }
 };