代码合并问题处理

src/pages/home/index.vue

@@ -68,6 +68,7 @@
           </div>
           <div v-if="item.componentCode == 'transverse-label' && item.componentInfo.visible == 1">
 			      <transverse-label :datas="item" :componentIndex="index"></transverse-label>
+          </div>
           <div v-if="item.componentCode == 'photo-gallery' && item.componentInfo.visible == 1">
 			      <photo-gallery :datas="item"></photo-gallery>
           </div>
@@ -75,21 +76,7 @@
 			      <live-broadcast :datas="item"></live-broadcast>
           </div>
         </div>
-
-      <bottomCont></bottomCont>
-    <!-- </scroll-view> -->
-    <!-- <image
-      src="http://cdn.mayi888.com/public/jpg/33ff0efc-96b5-4044-a65a-07799dfe98e1.jpg?x-oss-process=image/resize,limit_1,w_750"
-    ></image>
-    <van-button type="primary">按钮</van-button>
-    -->
-    <!-- ----瀑布流开始---- -->
-    <!-- <waterfall-flow id="waterfallFlow"></waterfall-flow> -->
-    <!-- ----瀑布流结束---- -->
-    <!-- <banner id="banner" :datas="componentsList[0]"></banner>
-    <div class="domain">abc
-
-      <van-button type="primary">按钮</van-button> -->
+        <bottomCont></bottomCont>
       </div>
     <share-popup></share-popup>
   </div>