Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/views/hall/dock/dockDetail.vue

@@ -280,7 +280,7 @@ p {
   width: 100%;
   text-align: center;
   z-index: 999;
-  height: 200px;
+  height: 172px;
   margin: 0 0 20px 0;
 }
 .style .top p:first-child {
@@ -292,7 +292,7 @@ p {
   color: #fff;
   position: absolute;
   width: 100%;
-  top: 150px;
+  top: 135px;
 }
 .style .main {
   min-height: 600px;