mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-10 11:26:43 +08:00
Merge branch 'dev'
This commit is contained in:
@@ -240,10 +240,11 @@ export default {
|
||||
},
|
||||
crateQrcode(){
|
||||
this.qr = new QRCode('qrcode', {
|
||||
width: 80,
|
||||
height: 80, // 高度
|
||||
width: 150,
|
||||
height: 150, // 高度
|
||||
text: this.qrcode // 二维码内容
|
||||
});
|
||||
this.qr._el.title = '';
|
||||
},
|
||||
showCommentsTotal(total){
|
||||
this.commentsTtoal=total;
|
||||
@@ -465,8 +466,8 @@ export default {
|
||||
vertical-align:bottom;
|
||||
}
|
||||
.qrcode{
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
width: 150px;
|
||||
height: 150px;
|
||||
display: inline-block;
|
||||
margin: 1px;
|
||||
img {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
</div> -->
|
||||
<div class="xcontent portal-content">
|
||||
<div class="xrow" style="display: flex;justify-content: space-between;">
|
||||
<div style="flex: 1;" class="xcol content-div">
|
||||
<div style="flex: 1;" class="xcol content-div">
|
||||
<el-row class="search-div">
|
||||
<div class="searchbar" v-if="searchTags.length > 0">
|
||||
<div style="line-height: 30px;">
|
||||
@@ -117,7 +117,7 @@
|
||||
<el-row class="order-div" v-if="listType == 1">
|
||||
<span class="quyer-tag">
|
||||
<el-button type="text" class="order-class" @click="orderChange('studys')" :class="{ actice: course.orderField == 'studys' }">最热</el-button>
|
||||
<el-button type="text" class="order-class" @click="orderChange('id')" :class="{ actice: course.orderField == 'id' }">最新</el-button>
|
||||
<el-button type="text" class="order-class" @click="orderChange('publishTime')" :class="{ actice: course.orderField == 'publishTime' }">最新</el-button>
|
||||
</span>
|
||||
<!-- <span v-if="isFind" style="padding-left:10px;">本次搜索出 {{courseList.length}} 条结果</span> -->
|
||||
<!-- <span class="more"></span> -->
|
||||
@@ -194,7 +194,7 @@
|
||||
<!-- <div class="pagination-div"><el-pagination background layout="prev, pager, next" :total="pager.total"></el-pagination></div> -->
|
||||
</div>
|
||||
<div style="width: 245px;margin-left: 5px;">
|
||||
|
||||
|
||||
<div>
|
||||
|
||||
<div id="fixd-box">
|
||||
|
||||
@@ -531,13 +531,14 @@ export default {
|
||||
},
|
||||
crateQrcode(){
|
||||
this.qr = new QRCode('qrcode', {
|
||||
width: 80,
|
||||
height: 80, // 高度
|
||||
width: 150,
|
||||
height: 150, // 高度
|
||||
text: this.qrcode // 二维码内容
|
||||
// render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
|
||||
// background: '#f0f'
|
||||
// foreground: '#ff0'
|
||||
});
|
||||
this.qr._el.title = '';
|
||||
},
|
||||
...mapActions({
|
||||
getResOwnerTree:'resOwner/getResOwnerTree',
|
||||
|
||||
Reference in New Issue
Block a user