Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -10,7 +10,7 @@
 			<div
 				:class="
 					lpbData.cs.length == 0 && lpbData.zdys.length == 0
-						? 'bottom40 ljz-wrap'
+						? 'ljz-wrap'
 						: 'ljz-wrap'
 				"
 				v-show="lpbData.ljzs.length > 0"
@@ -21,13 +21,13 @@
 					ref="ljz"
 					v-for="(ljzs, ljzIndex) in lpbData.ljzs"
 					:key="ljzIndex"
-					:style="{'marginTop':ljzs.zdys.length > 0 ? '-30px':0}"
+					:style="{'marginTop':'30px'}"
 				>
 					<!-- <div  class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
 					<!-- 循环逻辑幢下的幢单元 -->
 					<div
 						class="ljz-zdy"
-						:style="{ 'min-height': ljzzdyHeight + 40 + 'px' }"
+						:style="{ 'min-height': ljzzdyHeight + 40 + 'px','marginRight':zdyIndex<(ljzs.zdys.length-1)?'20px':'0'}"
 						ref="ljzzdy"
 						v-show="ljzs.zdys.length > 0"
 						v-for="(zdys, zdyIndex) in ljzs.zdys"
@@ -724,7 +724,7 @@ export default {
 			height: auto;
 			overflow: hidden;
 			.ljz {
-				margin-bottom: 20px;
+				// margin-bottom: 20px;
 				display: table;
 				// position: relative;
 				// .ljz-zdy-wrap {
@@ -732,7 +732,6 @@ export default {
 				// 	display: table;
 				.ljz-zdy {
 					height: auto;
-					margin-right: 20px;
 					float: left;
 					position: relative;
 					.zdy-name {
@@ -779,6 +778,7 @@ export default {
 			height: auto;
 			overflow: hidden;
 			margin-bottom: 60px;
+			margin-top: 30px;
 			.zdy {
 				float: left;
 				margin-right: 20px;