Merge branch 'feature/brand' into develop

@@ -6,8 +6,8 @@
             <hr>
             <hr>
             <div v-show="showMore" transition="brand-intro" v-bind:class="{ 'brand-short': !showMore }">{{ brandIntro.brandIntro }}</div>
             <div v-show="showMore" transition="brand-intro" v-bind:class="{ 'brand-short': !showMore }">{{ brandIntro.brandIntro }}</div>
         </div>
         </div>
-        <div class="expand" @click="introTrans()"></div>
-        <div class="collapse"></div>
+        <div v-if="!showMore" class="showmore expand" @click="introTrans()"></div>
+        <div v-else class="showmore collapse" @click="introTrans()"></div>
     </div>
     </div>
 </template>
 </template>
 <style>
 <style>
@@ -64,26 +64,23 @@
             }
             }
         }
         }
 
 
-        .expand {
+        .showmore {
             width: 60px;
             width: 60px;
             height: 60px;
             height: 60px;
-            background: url("/channel/expand.png") no-repeat;
             position: absolute;
             position: absolute;
             bottom: 20px;
             bottom: 20px;
             right: 5%;
             right: 5%;
         }
         }
 
 
+        .expand {
+            background: url("/channel/expand.png") no-repeat;
+        }
+
         .collapse {
         .collapse {
-            width: 60px;
-            height: 60px;
             background: url("/channel/collapse.png") no-repeat;
             background: url("/channel/collapse.png") no-repeat;
-            position: absolute;
-            bottom: 20px;
-            right: 5%;
-            display: none;
+
         }
         }
     }
     }
-
 </style>
 </style>
 <script>
 <script>
     const $ = require('yoho-jquery');
     const $ = require('yoho-jquery');