Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

前端开发-罗建龙
2 parents 6a059ffd e1278e92
Showing 1 changed file with 10 additions and 3 deletions
pages/index/index/index.wxml
@@ -209,7 +209,7 @@
 	<!--幸运购-->
-		<view class="seckill" wx:if="{{luckGo_list && luckGo_list.length != 0}}">
+	<view class="seckill" wx:if="{{luckGo_list && luckGo_list.length != 0}}">
 			<navigator bindtap="go_url" data-remark="1"  data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none">
 				<view class="seckill-time">
 					<view class="classname flex ai_c">
@@ -375,7 +375,7 @@
 <!--是否是自定义-->
 <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}; padding-bottom: 10rpx">
   <!-- 置顶层 -->	
-  <view class="dis_top">
+  <view class="dis_top" style="position:fixed">
       <!-- 关注公众号的显示 -->
       <view id="off_top" wx:if="{{is_gz_h5}}"><official-account ></official-account></view>
@@ -392,7 +392,14 @@
 	  </block>	  
   </view>
   <!-- 撑开层 -->	
-  <view></view>
+  <view>
+      <block wx:for="{{template_arr}}" >
+          <block wx:if="{{item.content.is_top==1}}">
+          <view style="height:100rpx"></view>
+          </block>
+       </block>
+
+  </view>
   <block wx:for="{{template_arr}}" wx:key="{{index}}">
     <view>