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

src/components/Educationvideo.vue

@@ -114,8 +114,10 @@ export default {
   },
   methods: {
     Search(){
-          this.dataList=[];
-          this.getList();
+        this.msg.pageIndex=1;
+        this.nodata=false;
+        this.dataList=[];
+        this.getList();
       },
       Setvideo(){
         this.videoDivState=false;
@@ -137,6 +139,8 @@ export default {
       },
       SelectLineId(id){
           this.dataList=[];
+          this.nodata=false;
+          this.msg.pageIndex=1;
           this.msg.LineId=id;
           this.getList();
       },

src/components/EducationvideoList.vue

@@ -14,6 +14,7 @@
                 <el-button @click="Search" slot="append" icon="el-icon-search"></el-button>
             </el-input>
             <el-button style="margin-left:20px" size="small" type="danger" @click="addList" round>新增</el-button>
+            <el-button style="margin-left:20px" size="small" type="primary" @click="goUrlHome" round>返回</el-button>
         </div>
         <div v-loading="loading" class="Content">
             <ul class="videoUl">
@@ -92,6 +93,7 @@
             <el-select style="width:220px" v-model="addMsg.VideoStatus" placeholder="请选择状态">
                 <el-option label="发布" :value="1"></el-option>
                 <el-option label="草稿" :value="2"></el-option>
+                <el-option label="撤回" :value="3"></el-option>
             </el-select>
         </el-form-item>
         <el-form-item style="display:inline-block"  label="线路" prop="LineId">
@@ -218,6 +220,8 @@ export default {
   },
   methods: {
       Search(){
+          this.msg.pageIndex=1;
+          this.nodata=false;
           this.dataList=[];
           this.getList();
       },
@@ -275,12 +279,16 @@ export default {
         //     });
         // },
         uploadFileBtn(file) {
+            if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'video/mov'].indexOf(file.file.type) == -1) {
+                this.Error("请上传正确的视频格式");
+                return;
+            }
             let newArr = [];
             newArr.push(file.file);
             let path = "/Sale/Uploadvideo/";
             this.uploadFile(path, newArr, x => {
                 this.addMsg.VideoAddress=this.baseurl+x.name;
-                let lastUrl="?x-oss-process=video/snapshot,t_1,f_jpg,w_290,h_195,m_fast";
+                let lastUrl="?x-oss-process=video/snapshot,t_9,f_jpg,w_290,h_195,m_fast";
                 this.addMsg.Cover=this.addMsg.VideoAddress+lastUrl;
             });
         },
@@ -322,6 +330,9 @@ export default {
                     this.apipost('Video_post_CancelVidelInfo', {VideoId:item.Id}, res => {
                     if (res.data.resultCode == 1) {
                         this.Success(res.data.message)
+                        this.dataList=[];
+                        this.msg.pageIndex=1;
+                        this.nodata=false;
                         this.getList()
                     }else{
                         this.Error(res.data.message)
@@ -342,6 +353,9 @@ export default {
                     this.apipost('Video_post_DelVidelInfo', {VideoId:item.Id}, res => {
                     if (res.data.resultCode == 1) {
                         this.Success(res.data.message)
+                        this.dataList=[];
+                        this.msg.pageIndex=1;
+                        this.nodata=false;
                         this.getList()
                     }else{
                         this.Error(res.data.message)
@@ -362,6 +376,9 @@ export default {
                     if (res.data.resultCode == 1) {
                         this.Success(res.data.message)
                         this.dialogVisible=false;
+                        this.dataList=[];
+                        this.msg.pageIndex=1;
+                        this.nodata=false;
                         this.getList()
                     }else{
                         this.Error(res.data.message)
@@ -384,6 +401,14 @@ export default {
             
             this.dialogVisible=true;
         },
+        goUrlHome(){
+            this.$router.push({
+                name:'Educationvideo',
+                query: {
+                    blank: "y"
+                }
+                });
+        },
         goUrl(path,item){
             this.videoDivState=true;
             this.thisVideoAddress=item.VideoAddress;