jufubao-movie 1.0.39-beta12 → 1.0.39-beta14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-movie",
-  "version": "1.0.39-beta12",
+  "version": "1.0.39-beta14",
   "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

@@ -208,16 +208,21 @@
       }
     },
     created() {
-      // #ifdef H5
       let mapType = {
         hot:0,
         rightnow: 1,
       }
-      let addressType = this.$xdUniHelper.getParmater('tab_id')?this.$xdUniHelper.getParmater('tab_id'):'';
-      if(['hot', 'rightnow'].includes(addressType)) {
-        this.activeIndex = mapType[addressType];
-      }
+      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/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);
       }
     }
   }

package/src/components/JfbMovieTfkFilmList/JfbMovieTfkFilmList.vue

@@ -624,26 +624,26 @@
       },
 
       //影片列表
-      handleFilmDetail(film_id){
-        console.warn(`toFilmInfo(影片详情).${film_id}`)
+      handleFilmDetail(item){
+        console.warn(`toFilmInfo(影片详情).${item.id}`)
         if(!this.fimeDetailPath) {
           console.error('未配置链接');
           return;
         }
         if( this.isPreview) return;
         this.$xdUniHelper.navigateTo({
-          url: this.fimeDetailPath + `?film_id=${film_id}`
+          url: this.fimeDetailPath + `?film_id=${item.id}`
         })
       },
-      handleBuy(film_id){
-        console.warn(`toBuyChooseCinema(选择影院).${film_id}`)
+      handleBuy(item){
+        console.warn(`toBuyChooseCinema(选择影院).${item.id}`)
         if(!this.buyPath) {
           console.error('未配置链接');
           return;
         }
         if( this.isPreview) return;
         this.$xdUniHelper.navigateTo({
-          url: this.buyPath + `?film_id=${film_id}`
+          url: this.buyPath + `?film_id=${item.id}`
         })
       },
       //影片列表