jufubao-movie 1.0.39-beta11 → 1.0.39-beta13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-movie",
-  "version": "1.0.39-beta11",
+  "version": "1.0.39-beta13",
   "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,9 +13,7 @@
       :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">
@@ -28,7 +26,7 @@
           <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/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/JfbMovieTfkFilmList.vue

@@ -122,8 +122,22 @@
         </view>
         <!--film hot|rightnow-->
         <!--cinema-->
-        <view v-if="type === 'list'" id="list-filter" class="list-filter" :style="{marginTop:outSpacing + 'rpx'}">
-          <view class="list-filter-block" :class="{hasFitler:!!curQueryTab}">
+        <view class="list-filter-empty" v-if="isFixed"></view>
+        <view
+          v-if="type === 'list'"
+          id="list-filter"
+          class="list-filter"
+          :class="{
+            isFixed: isFixed,
+          }"
+          :style="{
+            marginTop:isFixed?0:(outSpacing + 'rpx'),
+            top: isFixed ? ((layoutInfo.top) +'rpx'): 0,
+            marginLeft:isFixed?0:(-outSpacing + 'rpx'),
+            marginRight:isFixed?0:(-outSpacing + 'rpx'),
+          }"
+        >
+          <view class="list-filter-block">
             <view @click="handleFilterTab('filter')">
               <xd-font-icon icon="iconrepository-xialaxuanxiangdown" size="24" color="#999"></xd-font-icon>
               <text>{{areaName}}</text>
@@ -386,6 +400,7 @@
         preRendering:[],
         listFilterTop:null,
         listFilterTopTimer:0,
+        isFixed: false,
       }
     },
     computed:{
@@ -544,7 +559,7 @@
               .select('#list-filter')
               .boundingClientRect((data) => {
                 if(data && data.top !==undefined){
-                  let listFilterTop = data.top - this.layoutInfo.top * this.$rpxNum - this.outSpacing  * this.$rpxNum;
+                  let listFilterTop = data.top - this.layoutInfo.top * this.$rpxNum;
                   if(listFilterTop !== this.listFilterTop) {
                     setTimeout(()=>{
                       this.getListFilterEleTop();
@@ -662,7 +677,7 @@
       handleFilterTab(tab){
         uni.pageScrollTo({
           scrollTop: this.listFilterTop,
-          duration: 200,
+          duration: 1,
           success:()=>{
             if(tab === this.curQueryTab ) {
               this.curQueryTab = ''
@@ -754,6 +769,7 @@
         if(value === this.type) return;
         this.type = value;
         if( this.type === 'hot' ||  this.type === 'rightnow' ) {
+          this.isFixed = false;
           this.virtualList.onChangeTab(this,'#content-ref', 'fixed' );
         }
         if( this.type === 'list') {
@@ -945,6 +961,12 @@
       onJfbScroll(options){
         //console.log(options.e.scrollTop)
         this.virtualList.onScrollEvent(options.e.scrollTop);
+
+        //未初始化完成不执行改逻辑
+        if(this.listFilterTop !== null) {
+          this.isFixed = options.e.scrollTop >= this.listFilterTop
+        }
+
       },
 
       setShowTypeList(){
@@ -1005,6 +1027,8 @@
   @import "./JfbMovieTfkFilmListLess.less";
 
   .jfb-movie-tfk-film-list {
+    position: relative;
+    z-index: 200;
     &__body{
       .tfk-list {
         & >view:first-child {
@@ -1149,9 +1173,12 @@
       .list-filter {
         position: relative;
         z-index: 3;
-        .hasFitler {
-          box-shadow: 0 -5rpx 20rpx 0 rgba(0,0,0, .1);
-          border-radius: 20rpx 20rpx 0 0;
+
+        &.isFixed {
+          position: fixed;
+          left:0;
+          right: 0;
+          z-index: 9999;
         }
 
         &-block {
@@ -1183,7 +1210,12 @@
           width: 100%;
           z-index: 3;
         }
+
+        &-empty{
+          height: 100rpx;
+        }
       }
+
     }
 
     .noConfig {

package/src/components/JfbMovieTfkFilmList/XdQueryFilter.vue

@@ -46,7 +46,7 @@ export default {
 
 <style lang="less" scoped>
   .xd-query-filter {
-    box-shadow: 0 5rpx 20rpx 0 rgba(0,0,0, .1);
+    box-shadow: 0 10rpx 20rpx 0 rgba(0,0,0, .1);
     background: #fff;
     border-radius: 0 0 20rpx 20rpx;
   }