@@ -190,18 +190,11 @@
pageShow: false,
-<<<<<<< HEAD
loading:false,
//是否打开视频
Videovisible:false,
videoUrl:'',
}
-=======
- //是否打开视频
- Videovisible: false,
- videoUrl: '',
- }
->>>>>>> 81e3a68bd5f963a5db03ff0b44816fcb351003e9
},
methods: {
moment,