Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao

pages/campsite/home/home.wxml

@@ -81,7 +81,7 @@
 
 
     <!-- 滚动图片 -->
     <!-- 滚动图片 -->
     <!-- 无活动 -->
     <!-- 无活动 -->
-    <view class="activity-empty" wx:if="{{childActivity.length === 0}}">
+    <view class="activity-empty" wx:if="{{true}}">
         <block>
         <block>
             <image src="{{appResourcesBase + 'campsite/empty.png'}}"></image>
             <image src="{{appResourcesBase + 'campsite/empty.png'}}"></image>
         </block>
         </block>

pages/play/movie-detail/movie-detail.wxml

@@ -56,7 +56,7 @@
         </view>
         </view>
     </view>
     </view>
     <!-- 无场次 -->
     <!-- 无场次 -->
-    <view class="show-end col align-c" wx:if="{{showList[0].length === 0 && showList[1].length === 0}}">
+    <view class="show-end col align-c" wx:if="{{statusList.length === 0}}">
         <image src="/image/no-movie.png"></image>
         <image src="/image/no-movie.png"></image>
         <text>观影已结束，请期待后续排片</text>
         <text>观影已结束，请期待后续排片</text>
     </view>
     </view>

pages/play/movie/movie.wxml

@@ -141,7 +141,7 @@
                             </view>
                             </view>
                         </view>
                         </view>
                         <view class="movie-label">
                         <view class="movie-label">
-                            <text>{{item.keyword}}</text>
+                            <text wx:if="{{item.keyword}}">{{item.keyword}}</text>
                         </view>
                         </view>
                         <view class="movie-free" wx:if="{{item.priceType === 1}}">
                         <view class="movie-free" wx:if="{{item.priceType === 1}}">
                             <text>{{item.priceDiscount === 0 ? '免费' : '￥' + item.priceDiscount}}</text>
                             <text>{{item.priceDiscount === 0 ? '免费' : '￥' + item.priceDiscount}}</text>

pages/play/service-detail/service-detail.wxml

@@ -287,7 +287,7 @@
         </view>
         </view>
     </view>
     </view>
 
 
-    <view class="commodity">
+    <view class="commodity-movie">
         <!-- 详情标题，分享，位置 -->
         <!-- 详情标题，分享，位置 -->
         <view class="commodity-title movie-title row align-c">
         <view class="commodity-title movie-title row align-c">
             <text>{{info.title}}</text>
             <text>{{info.title}}</text>
@@ -316,12 +316,12 @@
         </view>
         </view>
 
 
         <!-- 背景 -->
         <!-- 背景 -->
-        <view class="">
-
+        <view class="movie-bg">
+            <image src="{{resourcesBase + 'play/service/service-movie.png'}}"></image>
         </view>
         </view>
 
 
         <!-- 热映影片 -->
         <!-- 热映影片 -->
-        <view class="commodity-card">
+        <view class="commodity-movie-card">
             <view class="movie-card-title row con-b align-e">
             <view class="movie-card-title row con-b align-e">
                 <text>热映影片</text>
                 <text>热映影片</text>
                 <text bindtap="onMovieAll">查看全部</text>
                 <text bindtap="onMovieAll">查看全部</text>

pages/play/service-detail/service-detail.wxss

@@ -146,6 +146,11 @@
 
 
 
 
 /* 二期整理样式 */
 /* 二期整理样式 */
+.commodity-movie {
+    position: relative;
+    height: 1380rpx;
+}
+
 .commodity-title {
 .commodity-title {
     width: 670rpx;
     width: 670rpx;
     min-height: 76rpx;
     min-height: 76rpx;
@@ -199,10 +204,20 @@
 }
 }
 
 
 /* 近期活动，文创商品 */
 /* 近期活动，文创商品 */
+.commodity-movie-card {
+    position: absolute;
+    top: 420rpx;
+}
+
 .commodity-card-title {
 .commodity-card-title {
     margin-top: 80rpx;
     margin-top: 80rpx;
     padding: 0 40rpx;
     padding: 0 40rpx;
 }
 }
+.movie-bg image{
+    width: 750rpx;
+    height: 620rpx;
+}
+
 .movie-card-title {
 .movie-card-title {
     margin-top:160rpx;
     margin-top:160rpx;
     padding: 0 40rpx;
     padding: 0 40rpx;