Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Educationvideo.vue

@@ -22,9 +22,9 @@
         <div v-loading="loading" class="Content">
             <ul class="videoUl">
                 <li v-for="(item,index) in dataList" :key="index">
-                    <div @click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv">
-                        <img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="min-height:199px;width:100%" :src="item.Cover" alt="">
-                        <img v-else style="height:199px;width:100%" src="../assets/img/hotel/biefu.png" alt="">
+                    <div :style="{backgroundImage: 'url(' + item.background + ')', backgroundSize:'cover'}"  @click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv">
+                        <!-- <img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="min-height:199px;width:100%" :src="item.Cover" alt="">
+                        <img v-else style="height:199px;width:100%" src="../assets/img/hotel/biefu.png" alt=""> -->
                         <div class="backDiv">
                           <span class="iconfont icon-ico_bofang"></span>
                           <!-- <div @click.prevent="goUrl1('EducationvideoList',$event)" class="icon">
@@ -171,10 +171,15 @@ export default {
                 this.nodata=true;
               }
               else{
+                data.forEach(item=>{
+                  let lastUrl="?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
+                  item.background=item.VideoAddress+lastUrl;
+                })
                 this.dataList = this.dataList.concat(data)
               }
               
               this.total = res.data.data.count;
+              console.log("this.dataList",this.dataList)
             }
           }
         );

src/components/EducationvideoList.vue

@@ -19,9 +19,9 @@
         <div v-loading="loading" class="Content">
             <ul class="videoUl">
                  <li v-for="(item,index) in dataList" :key="index">
-                    <div @click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv">
-                        <img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="min-height: 199px;width:100%" :src="item.Cover" alt="">
-                        <img v-else style="height:199px;width:100%" src="../assets/img/hotel/biefu.png" alt="">
+                    <div :style="{backgroundImage: 'url(' + item.background + ')', backgroundSize:'cover'}" @click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv">
+                        <!-- <img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="min-height: 199px;width:100%" :src="item.Cover" alt="">
+                        <img v-else style="height:199px;width:100%" src="../assets/img/hotel/biefu.png" alt=""> -->
                         <div class="backDiv">
                           <span class="iconfont icon-ico_bofang"></span>
                           <div class="icon">
@@ -88,8 +88,16 @@
         <el-form-item style="display:inline-block;" label="标题" prop="Name">
             <el-input style="width:220px" v-model="addMsg.Name"></el-input>
         </el-form-item>
-        <el-form-item style="display:inline-block"  label="标签" prop="Name">
-            <el-input style="width:220px" v-model="addMsg.Label"></el-input>
+        <el-form-item style="display:inline-block"  label="标签" prop="Label">
+            <!-- <el-input style="width:220px" v-model="addMsg.Label"></el-input> -->
+             <el-select style="width:220px" v-model="addMsg.Label" placeholder="请选择状态">
+                <el-option label="酒店" value="酒店"></el-option>
+                <el-option label="景点" value="景点"></el-option>
+                <el-option label="餐食" value="餐食"></el-option>
+                <el-option label="交通" value="交通"></el-option>
+                <el-option label="专辑" value="专辑"></el-option>
+                <el-option label="其他" value="其他"></el-option>
+            </el-select>
         </el-form-item>
         <el-form-item style="display:inline-block"  label="状态" prop="VideoStatus">
             <el-select style="width:220px" v-model="addMsg.VideoStatus" placeholder="请选择状态">
@@ -192,6 +200,9 @@ export default {
             Name: [
                 { required: true, message: '请输入标题', trigger: 'blur' },
             ],
+            Label: [
+                { required: true, message: '请选择标签', trigger: 'change' }
+            ],
             VideoStatus: [
                  { required: true, message: '请选择状态', trigger: 'change' }
             ],
@@ -314,6 +325,10 @@ export default {
                         this.nodata=true;
                     }
                     else{
+                        data.forEach(item=>{
+                            let lastUrl="?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
+                            item.background=item.VideoAddress+lastUrl;
+                        })
                         this.dataList = this.dataList.concat(data)
                     }
 
@@ -370,6 +385,11 @@ export default {
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
             if (valid) {
+                let Label=this.addMsg.Label;
+                if (['酒店','景点','餐食','交通','专辑','其他'].indexOf(Label) == -1) {
+                    this.Error("请选择正确的标签！");
+                    return;
+                }
                 if(this.addMsg.VideoAddress==''){
                     this.Error("请上传视频！");
                     return;