hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-10 03:16:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
daihh
2022-06-15 15:32:45 +08:00
parent 079fb81fca a262829f10
commit dee1b3656d
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/course/ManageList.vue
View File

@@ -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确保数据渲染

9
src/views/user/MyFavorites.vue
View File

@@ -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 {