Merge branch 'dev'

src/views/portal/course/Detail.vue

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

src/views/portal/course/Index.vue

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

src/views/portal/course/Micro.vue

@@ -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',