jufubao-movie 1.0.36 → 1.0.38-beta1

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -24,10 +24,10 @@
           <view class="cinema_name">{{cinemaInfo.cinema_name}}</view>
           <view class="cinema_address">{{cinemaInfo.address}}</view>
         </view>
-        <view class="cinema_tel" :style="{background: warningColor}" @click="toMapNav">
+        <view class="cinema_tel" :style="{background: warningColor}" @click.stop="toMapNav">
           <xd-font-icon icon="icondanghang" size="32"></xd-font-icon>
         </view>
-        <view class="cinema_tel" :style="{background: warningColor}" @click="makePhoneCall">
+        <view class="cinema_tel" :style="{background: warningColor}" @click.stop="makePhoneCall">
           <xd-font-icon icon="icondianhua" size="32"></xd-font-icon>
         </view>
       </view>
@@ -46,6 +46,7 @@
         </view>
       </view>
       <view v-else class="film_data_wrap">
+        <view v-if="filmInfo.poster" class="active_film_bg" :style="{backgroundImage:'url('+ filmInfo.poster +')'}"></view>
         <view class="film_list_swiper">
           <!-- #ifdef H5 -->
           <z-swiper
@@ -66,13 +67,21 @@
             </z-swiper-item>
           </z-swiper>
           <!-- #endif -->
-          <!-- #ifdef MP -->
-          <swiper class="swiper" :display-multiple-items="3" :current="curFilmIndex" @change="handleChange">
+          <!-- #ifdef MP-WEIXIN -->
+          <swiper
+            class="swiper"
+            style="height: 300rpx; width: 100%"
+            :display-multiple-items="3"
+            :current="curFilmIndex"
+            @change="handleChange"
+          >
             <swiper-item>
               <view></view>
             </swiper-item>
             <swiper-item v-for="(item,index) in list" :key="index">
-              <image class="image" :class="{swiper_active : curFilmIndex===index}" :src="item.poster" mode="aspectFit"></image>
+              <view class="image-box">
+                <image class="image" :class="{swiper_active : curFilmIndex===index}" :src="item.poster" mode="scaleToFill"></image>
+              </view>
             </swiper-item>
             <swiper-item>
               <view></view>
@@ -83,9 +92,7 @@
         <view v-if="filmInfo" class="film_info">
           <view class="film_name">{{filmInfo.show_name || ""}} <view v-if="filmInfo.remark" class="film_score">评分：{{filmInfo.remark}}</view></view>
           <view class="film_type_score">
-            <view class="film_type">
-              {{filmTypeAll}}
-            </view>
+            <view class="film_type">{{filmTypeAll}}</view>
           </view>
         </view>
       </view>
@@ -184,8 +191,11 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import XdTab from "@/components/XdTab/XdTab";
+  //#ifdef H5
   import ZSwiper from "@zebra-ui/swiper/components/z-swiper/z-swiper.vue"
   import ZSwiperItem from "@zebra-ui/swiper/components/z-swiper-item/z-swiper-item.vue"
+  //#endif
+
   const Color = require('color');
   import { mapState } from "vuex"
 
@@ -198,8 +208,10 @@
       XdCoins,
       XdNoticeBar,
       XdUnit,
+      //#ifdef H5
       ZSwiper,
       ZSwiperItem
+      //#endif
     },
     mixins: [componentsMixins,extsMixins,JfbMovieLineScheduleMixin],
     data() {
@@ -303,11 +315,13 @@
         })
       },
       toMapNav(){
-        const { latitude, longitude, address } = this.cinemaInfo;
+        const { latitude, longitude, address,cinema_name } = this.cinemaInfo;
+        console.warn(`toMapNav: ${JSON.stringify({latitude,longitude,address,cinema_name})}`);
+
         this.handleOpenLocation({
           latitude: latitude,
           longitude: longitude,
-          name: '我的位置',
+          name: cinema_name || address,
           address: address
         })
       },
@@ -421,7 +435,8 @@
     &__body{
       background: #FAFAFA;
       .schedule_wrap{
-        margin-top: 32rpx;
+        position: relative;
+        z-index: 2;
         .schedule_date{
           border-radius: 10px 10px 0px 0px;
           background: #FFFFFF;
@@ -522,6 +537,10 @@
         }
       }
       .film_data_wrap{
+        padding-bottom: 32rpx;
+        border-top: 1rpx solid #eee;
+        position: relative;
+
         &.skeleton-wrap{
           .film_list_swiper{
             display: flex;
@@ -545,18 +564,34 @@
         .image {
           height: 100%;
           width: 100%;
+          border-radius: 18rpx;
         }
         .film_list_swiper{
           height: 300rpx;
           width: 100%;
-          margin: 40rpx 0;
+          padding: 40rpx 0;
+
+          //#ifdef MP-WEIXIN
+          .image-box {
+            width: 100%;
+            height: 300rpx;
+          }
+          //#endif
 
           .image {
+            margin: 0 auto;
+            //#ifdef H5
             width: 100%;
+            //#endif
+            //#ifdef MP-WEIXIN
+            width: 220rpx;
+            border-radius: 14rpx;
+            //#endif
             height: 300rpx;
             transform: scale(0.9);
             filter: contrast(0.5);
             transition: all 300ms;
+
             &.swiper_active{
               transform: scale(1);
               filter: contrast(1);
@@ -587,16 +622,33 @@
             margin-top: 16rpx;
             .film_type{
               font-size: 24rpx;
-              color: #AAAAAA;
+              color: #999;
               font-weight: 400;
               padding: 0 40rpx;
             }
 
           }
         }
+
+        .active_film_bg {
+          position: absolute;
+          background-size: 120% auto;
+          top:0;
+          left: 0;
+          right: 0;
+          bottom: -40rpx;
+          //#ifdef MP-WEIXIN
+          z-index: 0;
+          //#endif
+          //#ifdef H5
+          z-index: -1;
+          //#endif
+          opacity: .15;
+
+        }
       }
       .ticket_notice{
-        padding: 20rpx 48rpx;
+        padding: 20rpx 20rpx;
         font-size: 26rpx;
         line-height: 36rpx;
         &.skeleton-wrap{
@@ -604,9 +656,9 @@
         }
       }
       .cinema_data_wrap{
-        border-radius: 0px 0px 20rpx 20rpx;
+        border-radius: 0 0 20rpx 20rpx;
         background: rgba(255, 255, 255, 1);
-        box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.05);
+        box-shadow: 0 2rpx 20rpx 0 rgba(0, 0, 0, 0.05);
         padding: 28rpx 48rpx;
         display: flex;
         align-items: center;

package/src/components/JfbMovieTfkFilmList/Api.js

@@ -6,53 +6,72 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'getTfkByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getTFKListFilmHotList',
+    title: '获取热映影片列表',
+    path: '/movie/v1/film/list',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+      type: ['类型 hot rightnow', 'string', '必选'],
+      city_code: ['城市CODE', 'Number|string', '必选'],
+      page_size: ['page_size', 'Number|string', '必选', '20'],
+      page_token: ['page_token', 'Number|string', '必选'],
+      scene: ['应用场景', 'string', '可选', 'list'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'updateTfkFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getTFKListFilmRightnowList',
+    title: '获取即将上映影片列表',
+    path: '/movie/v1/film/list',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+      type: ['类型 hot rightnow', 'string', '必选'],
+      city_code: ['城市CODE', 'Number|string', '必选'],
+      page_size: ['page_size', 'Number|string', '必选', '20'],
+      page_token: ['page_token', 'Number|string', '必选'],
+      scene: ['应用场景', 'string', '可选', 'list'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'removeTfkFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getTFKCinemaList',
+    title: '获取即将上映影片列表',
+    path: '/movie/v1/cinema/list',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      city_code: ['city_code', 'Number', '必选'],
+      latitude: ['latitude', 'Number', '必选'],
+      longitude: ['longitude', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'addTfkFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getTFKPosterContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/ad-content',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填'],
     },
     isConsole: true,
     disabled: true,
   },
+
+  {
+    mapFnName: 'getTFKSortList',
+    title: '获取内容',
+    path: '/movie/v1/film/options',
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
+
+  //
 ];