Merge branch 'dev_grass_20190108' into test6.8.6
Showing
1 changed file
with
4 additions
and
4 deletions
@@ -23,8 +23,8 @@ | @@ -23,8 +23,8 @@ | ||
23 | 23 | ||
24 | </style> | 24 | </style> |
25 | </head> | 25 | </head> |
26 | -<body class="easyui-layout" > | ||
27 | -<div region="north" style="height: 200px;"> | 26 | +<body class="easyui-layout" fit="true" style="overflow-y: scroll" > |
27 | +<div region="north" style="height: 20%;"> | ||
28 | <script> | 28 | <script> |
29 | document.write(addHead('种草管理', '内容管理')); | 29 | document.write(addHead('种草管理', '内容管理')); |
30 | </script> | 30 | </script> |
@@ -51,8 +51,8 @@ | @@ -51,8 +51,8 @@ | ||
51 | 51 | ||
52 | </div></div> | 52 | </div></div> |
53 | 53 | ||
54 | -<div region="center" id="activityList" style="margin-left: 20px"> | ||
55 | - <table id="activityListTable"></table> | 54 | +<div region="center" id="activityList" style="margin-left: 20px" > |
55 | + <table id="activityListTable" ></table> | ||
56 | </div> | 56 | </div> |
57 | 57 | ||
58 | </body> | 58 | </body> |
-
Please register or login to post a comment