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 'boe_master' into 'master'

Browse Source 
Boe master

See merge request !10
This commit is contained in:
huangshengfa
2023-03-14 10:43:52 +08:00
parent 797a1e6003 b6aa10e7dc
commit e0b3773f0a
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -703,11 +703,11 @@ export default {
//动态的地址 //动态的地址
//urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl='; //urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl=';
//固定的地址 //固定的地址
let mobilePre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl='; let returnUrl=urlPre+'/mobile/pages/login/loading?returnUrl=/pages/study/courseStudy?id='+row.id;
this.qrcode = mobilePre+'/pages/resource/microDetail?id='+row.id; let mobilePre=urlPre+'/m?returnUrl=';
this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/micro?id='+row.id; this.qrcode = mobilePre+encodeURIComponent(returnUrl);
this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/studyindex?id='+row.id;
if(row.type==20){ if(row.type==20){
this.qrcode = mobilePre+'/pages/resource/courseDetail?id='+row.id;
this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/detail?id='+row.id; this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/detail?id='+row.id;
} }

9
src/views/portal/course/Detail.vue
View File

@@ -257,13 +257,10 @@ export default {
}, },
showQrimage(){ showQrimage(){
let urlPre=window.location.protocol+'//'+window.location.host; let urlPre=window.location.protocol+'//'+window.location.host;
let returnUrl='https://u.boe.com/mobile/pages/login/loading?returnUrl=/pages/resource/courseDetail?id='+this.courseInfo.id;
// this.qrcode = this.webBaseUrl+'/mobile/pages/resource/courseDetail?id='+this.courseInfo.id; let returnUrl=urlPre+'/mobile/pages/login/loading?returnUrl=/pages/study/courseStudy?id='+this.courseInfo.id;
returnUrl=encodeURIComponent(returnUrl); returnUrl=encodeURIComponent(returnUrl);
//urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl='; this.qrcode =urlPre+'/m?returnUrl='+returnUrl;
//this.qrcode = urlPre+'/pages/resource/courseDetail?id='+this.courseInfo.id;
//console.log(this.qrcode,'qrcode');
this.qrcode ='https://u.boe.com/m?returnUrl='+returnUrl;
this.$nextTick(() => { this.$nextTick(() => {
this.crateQrcode(); this.crateQrcode();
}); });

2
src/views/study/Courses.vue
View File

@@ -16,7 +16,7 @@
</el-select> </el-select>
</div> </div>
<el-select style="margin-left:12px" class="uc-select" v-model="status" clearable placeholder="学习进度"> <el-select style="margin-left:12px" class="uc-select" v-model="status" clearable placeholder="学习进度">
<el-option label="所有进度" value='0'></el-option> <el-option label="所有进度" value="0"></el-option>
<el-option label="未开始" :value="1"></el-option> <el-option label="未开始" :value="1"></el-option>
<el-option label="进行中" :value="2"></el-option> <el-option label="进行中" :value="2"></el-option>
<el-option label="已完成" :value="9"></el-option> <el-option label="已完成" :value="9"></el-option>