Merge branch 'master' into yb11.3

pages-user/myCollect.vue

@@ -77,11 +77,11 @@ export default {
                 },
                 {
                     name:'线上路演',
-                    val:2,
+                    val:3,
                 },
                 {
                     name:'视频社区',
-                    val:3,
+                    val:2,
                 },
             ],
             active:0,