Merge branch 'master' of http://git.shengws.com/xmg123/micro_vue

src/scrm_pages/micro/micro.vue

@@ -894,7 +894,7 @@ import { link } from 'fs';
 
    .modesix{
       width:100%;
-      height: 100%;
+      min-height: 200px;
       /* border: solid 1px red; */
       margin-bottom: 5px;
       overflow: hidden;
@@ -913,7 +913,7 @@ import { link } from 'fs';
    .modeseven{
       position: relative;
       width:100%;
-      height: 100%;
+      min-height: 200px;
       margin-bottom: 5px;
       overflow: hidden;
     }