Merge branch 'master' of http://git.cc-lotus.info/service-platform/mobile-official into master

src/views/channel/detail.vue

@@ -69,7 +69,7 @@ export default {
       isleftarrow: '',
       // 返回
       navShow: true,
-      activeNames: [],
+      activeNames: ['1'],
       form: {},
       changeColor: 0,
       videoUrl: '',

src/views/channel/index.vue

@@ -101,7 +101,7 @@ export default {
 .main {
   .con {
     padding: 10px;
-    background: #f1f1f1;
+    // background: #f1f1f1;
     min-height: 620px;
     .list {
       padding: 10px;