Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod

src/page/content/display/content/details.vue

@@ -195,6 +195,7 @@
 </template>
 
 <script>
+let Base64 = require('js-base64').Base64
 export default {
   data() {
     const keyMap = {
@@ -232,6 +233,12 @@ export default {
         .then((res) => {
           if (res.data.resultCode === "200") {
             vm.contentData = res.data.data;
+            // console.log(vm.contentData.videoList)
+            const videos = vm.contentData.videoList
+            for(var i=0;i<videos.length;i++){
+              videos[i].fileUrl = Base64.decode(videos[i].intro)
+            }
+            vm.contentData.videoList = videos
             vm.contentData.imagesList = [];
             vm.contentData.dirList = [];
             vm.contentData.datumList.forEach((item) => {

src/page/content/learn/content/add.vue

@@ -189,6 +189,8 @@
 </template>
 
 <script>
+
+let Base64 = require('js-base64').Base64
 import uploadImg from "@/page/content/components/uploadVue/uploadImg";
 import videoDialog from "@/page/content/components/dialog/videoDialog";
 import audioPlay from "@/page/content/components/audioPlay";
@@ -273,13 +275,12 @@ export default {
   methods: {
     // 视频预览
     videoPreview(row) {
-      console.log(row)
-      console.log(row.videoList)
       this.$refs.videoDialog.dialogVisible = true;
-      this.$refs.videoDialog.videoList = row.videoList
-      // this.$refs.videoDialog.videoImg = row.cover;
-      // let videoList0 = row.videoList[0];
-      // this.$refs.videoDialog.videoSrc = videoList0 ? videoList0.fileUrl : "";
+        const videos = row.videoList
+        for(var i=0;i<videos.length;i++){
+          videos[i].fileUrl = Base64.decode(videos[i].intro)
+        }
+        this.$refs.videoDialog.videoList = videos
     },
     // 展板预览
     displayPreview(row) {

src/page/content/video/copyright/add.vue

@@ -9,7 +9,7 @@
            </div>
         <el-form
           :model="ruleForm"
-          :rules="rule"
+          :rules="rules"
           ref="ruleForm"
           label-width="140px"
           class="demo-form-inline party-form"
@@ -69,7 +69,7 @@
               ref="classForm"
               label-width="80px"
               label-position="top"
-              :rules="rules"
+              :rules="rule"
               id="ruleo"
               class="party-form"
             >