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

src/page/STB/appversion/components/addDialog.vue

@@ -160,7 +160,6 @@ export default {
 </script>
 
 <style lang="less">
-@import "~@/style/dialog.less";
 .version-add {
   .el-upload-dragger {
     height: 120px;

src/page/STB/appversion/components/detailDialog.vue

@@ -31,7 +31,7 @@
       </el-form>
     </div>
     <div slot="footer" class="dialog-footer btn-group">
-      <el-button size="mini" type="primary" @click="close()">确定</el-button>
+      <el-button size="mini" type="primary" @click="close()">关 闭</el-button>
     </div>
   </el-dialog>
 </template>
@@ -58,7 +58,6 @@ export default {
 </script>
 
 <style lang="less">
-@import "~@/style/dialog.less";
 .version-detail {
   .input-item {
     font-size: 16px;

src/page/STB/appversion/index.vue

@@ -71,7 +71,7 @@
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="启用" placement="top">
-                  <el-button circle @click="ableBtn(scope.row)">
+                  <el-button circle :disabled="!!scope.row.isCurrent" @click="ableBtn(scope.row)">
                     <i class="icon-table icon-enable"></i>
                   </el-button>
                 </el-tooltip>

src/page/STB/base/components/dialog.vue

@@ -135,5 +135,4 @@ export default {
 </script>
 
 <style lang="less">
-@import "~@/style/dialog.less";
 </style>
\ No newline at end of file

src/page/STB/base/index.vue

@@ -147,5 +147,5 @@ export default {
 };
 </script>
 <style lang="less">
-@import "~@/style/table.less";
+// @import "~@/style/table.less";
 </style>
\ No newline at end of file

src/page/STB/interactive/index.vue

@@ -47,7 +47,10 @@
           <h5 class="title">{{ item.boardName }}</h5>
           <p>{{ item.content||'暂无内容' }}</p>
           <div class="img-box" v-if="item.images.length">
-            <img v-for="(j, idx) in item.images" :src="j" :key="idx" alt="" />
+            <a target="_blank" v-for="(j, idx) in item.images" :key="idx" :href="j.url">
+              <img  :src="j.cover" alt="" />
+            </a>
+            <!-- <img v-for="(j, idx) in item.images" :src="j" :key="idx" alt="" /> -->
           </div>
           <div class="img-box" v-if="!item.images.length">暂无数据</div>
           <div class="author">
@@ -126,14 +129,20 @@ export default {
             vm.tableData.forEach((item) => {
               item.images = item.images ? item.images.split(",") : [];
               item.images.forEach((result, index) => {
+                item.images[index] = {
+                  url:result
+                }
                 if (/\.(MP4|mp4)/.test(result)) {
-                  item.images[index] = require("@/assets/video-icon.png");
+                  item.images[index].cover = require("@/assets/video-icon.png");
                 } else if (/\.(MP3|mp3)/.test(result)) {
-                  item.images[index] = require("@/assets/audio-icon.png");
+                  item.images[index].cover = require("@/assets/audio-icon.png");
+                } else if(/\.(jpg|png|jpeg|bmp|gif)/.test(result)) {
+                  item.images[index].cover = result;
+                } else{
+                  item.images[index].cover = require("@/assets/default-img.jpeg");;
                 }
               });
             });
-
             vm.tableData = [...vm.tableData];
           } else {
             this.$message.error(res.data.message);
@@ -181,7 +190,6 @@ export default {
 };
 </script>
 <style lang="less">
-@import "~@/style/pagination.less";
 .interactive-wrapper {
   display: flex;
   .tree-box {

src/page/STB/operation/index.vue

@@ -192,5 +192,4 @@ export default {
 </script>
 <style lang="less">
 @import "~@/style/table.less";
-@import "~@/style/pagination.less";
 </style>
\ No newline at end of file

src/page/STB/pageCustom/index.vue

@@ -70,8 +70,8 @@
         </div>
       </div>
       <div class="btn-group footer-btn">
-        <el-button size="mini" @click="close">取 消</el-button>
-        <el-button size="mini" type="primary" @click="submitForm('editform')"
+        <el-button @click="close">取 消</el-button>
+        <el-button type="primary" @click="submitForm('editform')"
           >确定</el-button
         >
       </div>
@@ -234,8 +234,8 @@ export default {
     },
     // 修改当前项
     submitForm() {
-      this.updateCurrent(this.pageList[vm.radioPage].id, "tAppDirPic/update");
-      this.updateCurrent(this.runList[vm.radioRun].id, "tAppRunPic/update");
+      vm.radioPage && this.updateCurrent(this.pageList[vm.radioPage].id, "tAppDirPic/update");
+      vm.radioRun && this.updateCurrent(this.runList[vm.radioRun].id, "tAppRunPic/update");
     },
     updateCurrent(id, url) {
       let vm = this;
@@ -406,7 +406,7 @@ export default {
     padding-top: 20px;
     border-top: 1px solid #eee;
     .el-button {
-      padding: 0 20px;
+      width: 160px;
     }
   }
 }

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

@@ -203,7 +203,12 @@ export default {
       id: "",
       activeNames: ["1", "2", "3"],
       keyMap: keyMap,
-      contentData: {},
+      contentData: {
+        imagesList:[],
+        dirList:[],
+        videoList:[],
+        audioList:[]
+      },
       reviewData: {},
     };
   },

src/page/content/video/content/index.vue

@@ -189,8 +189,7 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer btn-group">
-        <el-button size="mini" type="primary" @click="close">确定</el-button>
-        <el-button size="mini" @click="close">取 消</el-button>
+        <el-button size="mini" type="primary" @click="close">关 闭</el-button>
       </div>
     </el-dialog>
   </div>