From 5b388717c2c3c5dcd150272321d51aedd28057d4 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Wed, 15 Jun 2022 15:22:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/MyFavorites.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue
index 5ffb8f16..7af80358 100644
--- a/src/views/user/MyFavorites.vue
+++ b/src/views/user/MyFavorites.vue
@@ -511,6 +511,9 @@ export default {
               return author.aid == item.question.sysCreateAid;
             });
             item = Object.assign(item, obj);
+            if(item.orgInfo){
+             item.orgInfo=cutFullName(obj.orgInfo,1);
+            }
             return item;
           });
         } else {
@@ -597,6 +600,9 @@ export default {
               return author.aid == item.cases.authorId;
             });
             item = Object.assign(item, obj);
+            if(item.orgInfo){
+             item.orgInfo=cutFullName(obj.orgInfo,1);
+            }
             return item;
           });
         } else {
@@ -636,6 +642,9 @@ export default {
               return author.aid == item.sysCreateAid;
             });
             item = Object.assign(item, obj);
+            if(item.orgInfo){
+             item.orgInfo=cutFullName(obj.orgInfo,1);
+            }
             return item;
           });
         } else {

From baef53cfc4566376d9777783247888237572a51a Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 15 Jun 2022 15:30:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84url=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/course/ManageList.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue
index 916e03ba..26ad5c4e 100644
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -203,7 +203,7 @@
     <el-dialog title="二维码" center :visible.sync="qrcodeShow" @close="closeCode" width="500px">
       <div style="height:250px;display: flex;flex-direction:column;justify-content: space-evenly;align-items: center;">
         <div id="qrcode" ref="qrcode"></div>
-        <el-input v-model="qrcode" id="text"></el-input>
+        <el-input v-model="pcDetailUrl" id="text"></el-input>
         <el-button type="primary" size="mini" @click="myCopy()">复制链接</el-button>
       </div>
 
@@ -330,6 +330,7 @@ export default {
       manageStudyData: {},
       expandDetails: true,
       qrcode: '',
+      pcDetailUrl:'',
       isExamine: 1,
       auditInfo: {
         pass: true,
@@ -666,15 +667,18 @@ export default {
     },
     showQrimage(row) {
       this.qrcodeShow = true;
-
+      
       let urlPre=window.location.protocol+'//'+window.location.host;
+      
       //动态的地址
-      urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl=';
+      //urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl=';
       //固定的地址
-      urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl=';
-      this.qrcode = urlPre+'/pages/resource/microDetail?id='+row.id;
+      let mobilePre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl=';
+      this.qrcode = mobilePre+'/pages/resource/microDetail?id='+row.id;
+      this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/micro?id='+row.id;
       if(row.type==20){
-        this.qrcode = urlPre+'/pages/resource/courseDetail?id='+row.id;
+        this.qrcode = mobilePre+'/pages/resource/courseDetail?id='+row.id;
+        this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/detail?id='+row.id;
       }
 
       // 使用$nextTick确保数据渲染