mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-11 03:46:44 +08:00
Merge branch 'dev'
This commit is contained in:
@@ -240,10 +240,11 @@ export default {
|
|||||||
},
|
},
|
||||||
crateQrcode(){
|
crateQrcode(){
|
||||||
this.qr = new QRCode('qrcode', {
|
this.qr = new QRCode('qrcode', {
|
||||||
width: 80,
|
width: 150,
|
||||||
height: 80, // 高度
|
height: 150, // 高度
|
||||||
text: this.qrcode // 二维码内容
|
text: this.qrcode // 二维码内容
|
||||||
});
|
});
|
||||||
|
this.qr._el.title = '';
|
||||||
},
|
},
|
||||||
showCommentsTotal(total){
|
showCommentsTotal(total){
|
||||||
this.commentsTtoal=total;
|
this.commentsTtoal=total;
|
||||||
@@ -465,8 +466,8 @@ export default {
|
|||||||
vertical-align:bottom;
|
vertical-align:bottom;
|
||||||
}
|
}
|
||||||
.qrcode{
|
.qrcode{
|
||||||
width: 80px;
|
width: 150px;
|
||||||
height: 80px;
|
height: 150px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin: 1px;
|
margin: 1px;
|
||||||
img {
|
img {
|
||||||
|
|||||||
@@ -117,7 +117,7 @@
|
|||||||
<el-row class="order-div" v-if="listType == 1">
|
<el-row class="order-div" v-if="listType == 1">
|
||||||
<span class="quyer-tag">
|
<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('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>
|
||||||
<!-- <span v-if="isFind" style="padding-left:10px;">本次搜索出 {{courseList.length}} 条结果</span> -->
|
<!-- <span v-if="isFind" style="padding-left:10px;">本次搜索出 {{courseList.length}} 条结果</span> -->
|
||||||
<!-- <span class="more"></span> -->
|
<!-- <span class="more"></span> -->
|
||||||
|
|||||||
@@ -531,13 +531,14 @@ export default {
|
|||||||
},
|
},
|
||||||
crateQrcode(){
|
crateQrcode(){
|
||||||
this.qr = new QRCode('qrcode', {
|
this.qr = new QRCode('qrcode', {
|
||||||
width: 80,
|
width: 150,
|
||||||
height: 80, // 高度
|
height: 150, // 高度
|
||||||
text: this.qrcode // 二维码内容
|
text: this.qrcode // 二维码内容
|
||||||
// render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
|
// render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
|
||||||
// background: '#f0f'
|
// background: '#f0f'
|
||||||
// foreground: '#ff0'
|
// foreground: '#ff0'
|
||||||
});
|
});
|
||||||
|
this.qr._el.title = '';
|
||||||
},
|
},
|
||||||
...mapActions({
|
...mapActions({
|
||||||
getResOwnerTree:'resOwner/getResOwnerTree',
|
getResOwnerTree:'resOwner/getResOwnerTree',
|
||||||
|
|||||||
Reference in New Issue
Block a user