魏志佳 5 years ago
parent
commit
6b8c9e5c85
1 changed files with 0 additions and 7 deletions
  1. 0 7
      src/views/modules/Statistics/materialRank.vue

+ 0 - 7
src/views/modules/Statistics/materialRank.vue

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