Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_front

src/views/activity/Detail1.vue

@@ -127,6 +127,7 @@ export default {
     overflow: hidden;
     background-color: #27272b;
     margin-right: 10px;
+    flex-shrink: 0;
 
     div {
         font-size: 12px;
@@ -156,7 +157,8 @@ export default {
     .bottom(9px);
 
     /deep/.van-button {
-        width: 132px;
+        max-width: 132px;
+        flex-grow: 1;
         &.van-button--disabled {
             background: #303133;
             color: @text3;