jufubao-movie 1.0.39-beta8 → 1.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-movie",
-  "version": "1.0.39-beta8",
+  "version": "1.0.39",
   "private": false,
   "description": "聚福宝在线选座业务组件插件包",
   "main": "index.js",

package/src/components/JfbMovieLineCinemaChoose/Api.js

@@ -12,7 +12,7 @@
  */
 module.exports = [
   {
-    mapFnName: 'getCinemaList', //自定义方法名字（必选）
+    mapFnName: 'getCinemaChooseList', //自定义方法名字（必选）
     title: '获取影院列表',
     path: '/movie/v1/cinema/list',
     isRule: false,
@@ -25,7 +25,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getFilmInfo',
+    mapFnName: 'getFilmChooseInfo',
     title: '获取影片详情',
     path: '/movie/v1/film/get',
     isRule: false,
@@ -37,7 +37,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: "getCitySub",
+    mapFnName: "getCityChooseSub",
     title: "获取城市的区位列表",
     path: "/common/v1/region/city/getsub-lv",
     isRule: false,

package/src/components/JfbMovieLineCinemaChoose/JfbMovieLineCinemaChoose.vue

@@ -13,22 +13,20 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-movie-line-cinema-choose__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-movie-line-cinema-choose__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-movie-line-cinema-choose__body">
       <view class="film_base_wrap-top"></view>
       <view class="film_base_wrap">
-        <view class="film_info">
+        <view class="film_info" v-if="film.show_name">
           <view class="film_post">
             <image :src="film.poster" />
           </view>
           <view class="film_other">
             <view class="film_name_score">
               <view class="film_name">{{ film.show_name }}</view>
-              <view class="film_score">{{ film.remark }}</view>
+              <view class="film_score" v-if="film.remark">{{ film.remark }}</view>
             </view>
             <view class="film_type">{{ film.type }}</view>
             <view class="film_sub">导演：{{ film.director }}</view>
@@ -206,7 +204,7 @@ export default {
       const { film_id } = options;
       this.film_id = film_id;
       const { stateCity } = this;
-      jfbRootExec("getFilmInfo", {
+      jfbRootExec("getFilmChooseInfo", {
         vm: this,
         data: {
           film_id,
@@ -246,7 +244,7 @@ export default {
       });
     },
     handleGetCitySub(city_code) {
-      jfbRootExec("getCitySub", {
+      jfbRootExec("getCityChooseSub", {
         vm: this,
         data: {
           city_code,
@@ -260,7 +258,7 @@ export default {
       // let region = citySubs[subIndex] || {};
       console.log(stateCity, stateLocation, "p_getCinemaList");
       this.$xdShowLoading({});
-      jfbRootExec("getCinemaList", {
+      jfbRootExec("getCinemaChooseList", {
         vm: this,
         data: {
           city_code: stateCity.city_code,
@@ -356,14 +354,20 @@ view {
           .film_name_score {
             display: flex;
             justify-content: space-between;
-            align-items: center;
+            align-items: flex-start;
             font-size: 36rpx;
             font-weight: 700;
             .film_name {
               color: #000;
+              flex: 1;
+              line-height: 46rpx;
             }
             .film_score {
               color: #ff5733;
+              flex-shrink: 0;
+              margin-left: 6rpx;
+              font-size: 32rpx;
+              line-height: 46rpx;
             }
           }
           .film_type {

package/src/components/JfbMovieLineCinemaChoose/Mock.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  getFilmInfo: {
+  getFilmChooseInfo: {
     "id": 155,
     "city_code": "",
     "show_name_en": "我的遗憾和你有关",
@@ -27,7 +27,7 @@ module.exports = {
     "deleted_time": 0,
     "request_id": "9aefdeb726bc8644"
   },
-  getCinemaList: {
+  getCinemaChooseList: {
     list: [
       {
         cinema_id: 6780394,

package/src/components/JfbMovieLineFilm/JfbMovieLineFilm.vue

@@ -43,7 +43,6 @@
           }"
         >即将上映</view>
       </view>
-
       <view v-if="loadingList" class="switch_section skeleton-wrap">
         <view class="film_item" v-for="i in 6" :key="i">
           <view class="film_post"></view>
@@ -134,8 +133,6 @@
           </view>
         </view>
       </template>
-
-
     </view>
   </view>
 </template>
@@ -211,6 +208,22 @@
       }
     },
     created() {
+      let mapType = {
+        hot:0,
+        rightnow: 1,
+      }
+      let tab_id = '';
+      // #ifdef H5
+      tab_id = this.$xdUniHelper.getParmater('tab_id') ? this.$xdUniHelper.getParmater('tab_id'):'';
+      // #endif
+      // #ifdef MP-WEIXIN
+      let pages = this.$xdUniHelper.parseURL(this.$root.$scope.$page.fullPath);
+      tab_id  = (pages.params && pages.params['tab_id']) ? pages.params['tab_id'] :'';
+      // #endif
+      if(['hot', 'rightnow'].includes(tab_id)) {
+        this.activeIndex = mapType[tab_id];
+      }
+
       this.init(this.container);
       this.getList();
     },

package/src/components/JfbMovieLineFilmInfo/JfbMovieLineFilmInfo.vue

@@ -13,15 +13,13 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-movie-line-film-info__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-movie-line-film-info__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-movie-line-film-info__body">
       <view class="film_base_wrap-top"></view>
       <view class="film_base_wrap">
-        <view class="film_info">
+        <view class="film_info" v-if="film.poster">
           <view class="film_post">
             <image :src="film.poster"></image>
           </view>

package/src/components/JfbMovieLineFilmInfo/Mock.js

@@ -5,7 +5,7 @@ module.exports = {
     "id": 3671,
     "city_code": "",
     "show_name_en": "",
-    "remark": "",
+    "remark": "9.7分",
     "highlight": "",
     "country": "",
     "show_name": "八角笼中",

package/src/components/JfbMovieLineLineSeat/XdOnlineSeat.vue

@@ -37,6 +37,7 @@
           >{{ item }}</view>
         </xd-notice-bar>
       </view>
+      <view class="xd-seat__footer-name">{{filmInfo.film_name}}</view>
       <view class="xd-seat__footer-paiqi">
         <view class="xd-seat__footer-paiqi-tab">
           <view>
@@ -755,6 +756,15 @@ export default {
     z-index: 101;
     background: #fff;
 
+    &-name {
+      line-height: 40rpx;
+      font-size: 36rpx;
+      .uni-cut(1,40);
+      padding: 0 20rpx;
+      font-weight: 600;
+      color: #333;
+    }
+
     &-paiqi {
       &-content {
         height: unit(134, rpx);
@@ -925,6 +935,7 @@ export default {
 
         & .tab-show {
           font-size: @xd-font-size-base;
+          color:#999
         }
 
         & > view {

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -647,7 +647,7 @@
           z-index: 0;
           //#endif
           //#ifdef H5
-          z-index: -1;
+          z-index: 0;
           //#endif
           opacity: .15;
 

package/src/components/JfbMovieTfkFilmList/Attr.js

@@ -1,5 +1,7 @@
 'use strict';
 
+import PosterAttr from "./PosterAttr.js";
+
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
@@ -8,15 +10,7 @@ export default {
   content: (data) => {
     let outSpacing = 20;
     if(data['outSpacing'] ) outSpacing = Number(data['outSpacing'])
-    let size = {width:750 - outSpacing*2,height:null};
-    if(data.poster && data.poster.size && data.poster.size.height) {
-      size['height'] = data.poster.size.height
-    }
-    let poster = {
-      size: size,
-      type:'1',
-      position: Object.assign({},data.poster && data.poster.position)
-    };
+
     return [
 
       {
@@ -112,236 +106,9 @@ export default {
             });
         },
       },
-      {
-        ele: 'title',
-        label: '广告设置',
-        size: 'small',
-        groupKey:'content',
-      },
-
-      {
-        label: '广告位置配置:',
-        ele: 'xd-site-poster',
-        valueKey: 'poster',
-        className: 'input80',
-        value: poster,
-        groupKey:'content',
-        setting: {
-          count: 1,
-          scene: {label: '广告', value: 'normal'},
-          sizeDisabled: {
-            wDisabled:true,
-            hDisabled: false,
-          },
-          typeDisabled: true
-        },
-        handleCustom({action, data}) {
-          //设置场景参数
-          if(data) {
-            data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
-          }
-          console.log(action,data,'hjhjhjhjhj');
-
-          //获取显示内容
-          if (action === 'screenList') {
-            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'editx_base_ad_split_screen'})
-              .then(res => {
-                data.cb(res['list'])
-              })
-              .catch(error => {
-                console.error(error);
-              });
-            return
-          }
-
-          //获取返回参数(广告位高度必选项)
-          if (action === 'getPosterInfo') {
-            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
-              .then(res => {
-                data.cb({list: res.list, selectId: res.selected})
-              })
-              .catch(error => {
-                console.error(error);
-              });
-            return
-          }
-
-          //使用内容分类
-          if (action === 'cmsPublishEditxContent') {
-            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
-              .then(res => {
-                data.cb(res)
-              })
-              .catch(error => {
-                console.error(error);
-              });
-            return
-          }
-
-          let loading = XdBus.getParentApi('loading')({});
-          //位置列表
-          if (action === 'getListPostion') {
-            XdBus.getParentApi('getListPosterPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置创建
-          if (action === 'addPostion') {
-            XdBus.getParentApi('addPosterPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置编辑
-          if (action === 'editPostion') {
-            XdBus.getParentApi('updatePosterPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置删除
-          if (action === 'deleltePostion') {
-            XdBus.getParentApi('deletePosterPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //获取广告位内容列表
-          if (action === 'getListContent') {
-            XdBus.getParentApi('getListPosterContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //广告内容创建
-          if (action === 'addContent') {
-            XdBus.getParentApi('addPosterContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容编辑
-          if (action === 'editContent') {
-            XdBus.getParentApi('updatePosterContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容删除
-          if (action === 'deleteContent') {
-            XdBus.getParentApi('deletePosterContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //获取广告内容跳转地址类型
-          if (action === 'jumpPosterContentType') {
-            XdBus.getParentApi('getOptionsSettingList')({setting_id: "cms_setting"})
-              .then(res => {
-                loading.close();
-                data.cb(res['redirect_type'])
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //发布
-          if (action === 'publish') {
-            console.log('publish', data.params)
-            XdBus.getParentApi('cmsPublishContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //获取站内页面地址
-          if (action === 'router') {
-            loading.close()
-            return XdBus.getParentApi('getPagesTree');
-
-          }
-
-          //通知页面进行刷新
-          if(action === 'update') {
-            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
-            loading.close()
-          }
-        },
-      },
-      {
-        label: '广告位置使用张数:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'posterNum',
-        groupKey:'content',
-        value: data.posterNum || 1,
-        placeholder: '请输入广告位置使用张数',
-        className: 'input40',
-        unit: '张',
-      },
 
+      //广告属性配置
+      ...PosterAttr(data,outSpacing),
 
       {
         label: '外边间距:',

package/src/components/JfbMovieTfkFilmList/ContentItem.vue

@@ -101,11 +101,11 @@
       },
       handleDetail(item){
         console.log('handleDetail.item',item,item.id);
-        this.$emit('on-film-detail',item.id);
+        this.$emit('on-film-detail',item);
       },
       handleBuy(item){
         console.log('handleDetail.item',item,item.id);
-        this.$emit('on-buy',item.id);
+        this.$emit('on-buy',item);
       }
     }
   }