Merge branch 'master' of D:\播智教育\2020\benyi with conflicts.

ruoyi-ui/src/views/benyi_train/video_study/index.vue

@@ -171,11 +171,17 @@ export default {
       return data;
     },
     /** 查询培训列表 */
-    getList() {
+   async getList() {
       this.loading = true;
+        let videobuffer="";
+        await downLoadVideoUrl("/profile/video/lg4y3idmDCEme_eu6FzAAoOdcyS2.mp4").then((res)=>{
+          videobuffer=res;
+          console.log(videobuffer);
+        })
       listVideo(this.queryParams).then((response) => {
         this.videoList = response.rows;
         this.playerOptions = response.rows.map((ele) => {
+          console.log(ele.videourl);
           return {
             autoplay: false,
             muted: true,
@@ -186,8 +192,8 @@ export default {
               {
                 type: ele.filetype,
                 // mp4
-                src: ele.videourl
-                // src: downLoadVideoUrl(ele.videourl),
+                // src: ele.videourl
+                src: videobuffer.request.response,
               },
             ],
             notSupportedMessage: "此视频暂无法播放，请稍后再试",