From dbc02056fbc11085c93025010b6efa0263a90cd8 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 12 Jan 2021 13:18:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=8D=95=E4=BD=8D=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/companyManage/index.vue | 6 +++++-
 src/views/teach/index.vue                | 6 ++++--
 src/views/trainingPlatform/demonList.vue | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/system/companyManage/index.vue b/src/views/system/companyManage/index.vue
index 9b279f4d5..78d498185 100644
--- a/src/views/system/companyManage/index.vue
+++ b/src/views/system/companyManage/index.vue
@@ -103,8 +103,12 @@ export default {
             this.$router.go(-1);
         },
         handleGenerateQrCode(index, row) {
+            let state = 2;
+            if (process.env.NODE_ENV === 'production') {
+                state = 1;
+            }
             const param = {
-                url: `companyName=${row.name}&&companyId=${row.id}`,
+                url: `https://joylink.club/oss/joylink/company?state=${state}_${row.id}`,
                 title: '单位二维码'
             };
             this.$refs.qrCode.doShow(param);
diff --git a/src/views/teach/index.vue b/src/views/teach/index.vue
index 454d72bfb..866e6a24c 100644
--- a/src/views/teach/index.vue
+++ b/src/views/teach/index.vue
@@ -50,7 +50,8 @@ export default {
             loading: false,
             project: '',
             mapId: '',
-            prdType: ''
+            prdType: '',
+            cityCode: ''
         };
     },
     computed: {
@@ -84,6 +85,7 @@ export default {
                         this.mapId = resp.data.mapId;
                         this.prdType = resp.data.prdType;
                         this.tableData = resp.data.lessonList;
+                        this.cityCode = resp.data.cityCode;
                     } else {
                         this.tableData = [];
                     }
@@ -129,7 +131,7 @@ export default {
             });
         },
         draftLessonManage() {
-            const query = {mapId: this.mapId, prdType: this.prdType, cityCode: this.$route.query.cityCode};
+            const query = {mapId: this.mapId, prdType: this.prdType, cityCode: this.cityCode};
             this.$router.push({ path: `/trainingPlatform/draftTeach/${this.$route.params.subSystem}`, query: query });
         },
         handleDelete(row) {
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index 6b9c2a717..95777bcd3 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -113,7 +113,7 @@ export default {
                         break;
                     case 'Lesson':
                         this.setLocalRoute(`${UrlConfig.trainingPlatform.teachHome}/${obj.id}`);
-                        router = { path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}?cityCode=${this.filterSelect}`};
+                        router = { path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}`};
                         this.toNextPage(isReplace, router);
                         break;
                     case 'Simulation':