jufubao-movie 1.0.34-beta5 → 1.0.35-beta100

package/package.json

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

package/src/components/JfbMovieLineCinemaChoose/Attr.js

@@ -38,19 +38,6 @@ export default {
           router: XdBus.getParentApi('getPagesTree'),
         },
       },
-      {
-        label: '电子码兑换:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'codeChoosePath',
-        placeholder: '请选择电子码兑换路径',
-        value: data.codeChoosePath || null,
-        className: 'input80',
-        groupKey:'advanced',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
     ].filter(i=>i)
   },
 }

package/src/components/JfbMovieLineCinemaChoose/JfbMovieLineCinemaChoose.vue

@@ -57,15 +57,8 @@
         <view class="cinema_item" v-for="i in 5" :key="i">
           <view class="item_main">
             <view class="item_name"></view>
-          </view>
-          <view>
-            <view class="item_addr"></view>
-          </view>
-          <view class="item_dist_btn">
             <view class="item_dist"></view>
-            <view style="display: flex;">
-              <view class="cinema_item-btn"></view>
-            </view>
+            <view class="item_addr"></view> 
           </view>
         </view>
       </view>
@@ -75,32 +68,12 @@
             class="cinema_item"
             v-for="item in filterCinemaList"
             :key="item.cinema_id"
-            @click="toChooseSchedule(item)"
+            @click="toChooseSchedule(item.cinema_id)"
           >
             <view class="item_main">
               <view class="item_name">{{ item.cinema_name }}</view>
-            </view>
-            <view>
-              <view class="item_addr">{{ item.address }}</view>
-            </view>
-            <view class="item_dist_btn">
-              <view class="item_dist">
-                <xd-font-icon icon="icondizhi" size="32" style="margin-right: 30rpx;"></xd-font-icon>
-                {{ item.distance }}
-              </view>
-              <view style="display: flex;">
-                <view
-                  v-if="item.code_index > -1"
-                  :style="{background: mainColor}"
-                  class="cinema_item-btn"
-                  @click.stop="toCodePath(item)">电子码</view>
-                <view
-                  v-if="item.seat_index > -1"
-                  :style="{background: mainColor, marginLeft: '20rpx'}"
-                  class="cinema_item-btn"
-                  @click.stop="toSchedulePath(item)">在线选座</view>
-              </view>
-            </view>
+              <view class="item_dist">{{ item.distance }}</view>
+              <view class="item_addr">{{ item.address }}</view> </view>
           </view>
         </view>
         <view v-else class="cinema_list">
@@ -170,7 +143,6 @@ export default {
       film: {},
       cinemaList: [],
       scheduleChoosePath: "",
-      codeChoosePath: "",
       film_id: "",
       citySubs: [],
       subIndex: 0,
@@ -228,20 +200,12 @@ export default {
         "content.schedule_choose_path",
         { value: "/movie/schedule/schedule" }
       ).value;
-      this.codeChoosePath = getContainerPropsValue(container, "content.codeChoosePath", {value: ""}).value;
-    },
-    toChooseSchedule(item) {
-      if(item.seat_index > -1) this.toSchedulePath(item);
-      else if(item.code_index > -1) this.toCodePath(item);
     },
-    toCodePath(item){
+    toChooseSchedule(cinema_id) {
       this.$xdUniHelper.navigateTo({
-        url: this.codeChoosePath + `?cinema_id=${item.cinema_id}`,
-      });
-    },
-    toSchedulePath(item){
-      this.$xdUniHelper.navigateTo({
-        url: this.scheduleChoosePath + `?cinema_id=${item.cinema_id}&film_id=${this.film_id}`,
+        url:
+          this.scheduleChoosePath +
+          `?cinema_id=${cinema_id}&film_id=${this.film_id}`,
       });
     },
     handleGetCitySub(city_code) {
@@ -273,13 +237,7 @@ export default {
         this.loadingList = false;
         this.$xdHideLoading();
         const { list, next_page_token, area_list } = res;
-        this.cinemaList = list.map(item => {
-          let seat_index = item.cinema_type.findIndex(ii => ii == 'SEAT');  //在线选座
-          let code_index = item.cinema_type.findIndex(ii => ii == 'CODE');  //电子码
-          item['code_index'] = code_index;
-          item['seat_index'] = seat_index;
-          return item;
-        });
+        this.cinemaList = list;
         this.page_token = next_page_token;
         let citySubs = area_list.map((item) => {
           return {
@@ -455,23 +413,19 @@ view {
     }
     .cinema_list {
       background: #fff;
+
       &.skeleton-wrap{
         .cinema_item{
           .item_name{
-            .skeleton-item(100%, 62rpx);
-          }
-          .item_addr{
-            .skeleton-item(300rpx);
+            .skeleton-item(400rpx);
           }
           .item_dist{
-            .skeleton-item(100rpx);
-          }
-          .cinema_item-btn{
-            .skeleton-item(160rpx, 50rpx, 50rpx);
+            .skeleton-item;
+            padding: 0 !important;
+            margin-top: 20rpx;
           }
         }
       }
-
       .empty_data {
         font-size: 28rpx;
         color: #888888;
@@ -479,53 +433,29 @@ view {
         line-height: 200rpx;
       }
       .cinema_item {
-        padding: 32rpx 40rpx;
-        // border-radius: 20rpx;
-        background: #ffffff;
-        // box-shadow: 0px 16rpx 60rpx 0px #e3e3e3;
-        border-bottom: 1px solid #e3e3e3;
-        margin-bottom: unit(24, rpx);
-        &-btn {
-          font-size: unit(26, rpx);
-          border-radius: unit(40, rpx);
-          padding: unit(12, rpx) unit(48, rpx);
-          color: #ffffff;
-          text-align: center;
-          height: unit(40, rpx);
-          line-height: unit(40, rpx);
-        }
+        padding: unit(32, rpx);
+        border-bottom: 1px solid #eee;
         .item_main {
           display: flex;
-          justify-content: space-between;
+          flex-direction: column;
           align-items: flex-start;
-          margin-bottom: 24rpx;
           .item_name {
             font-size: 28rpx;
             font-weight: 700;
             color: #000;
+            padding-right: 20rpx;
+          }
+          .item_dist {
+            font-size: 24rpx;
+            font-weight: 400;
+            color: #f3616e;
+            padding: unit(16, rpx) 0;
+          }
+          .item_addr {
+            font-size: 24rpx;
+            font-weight: 400;
+            color: #a6a6a6;
           }
-        }
-        .item_dist {
-          font-size: 24rpx;
-          font-weight: 400;
-          color: #f3616e;
-          padding-top: 4rpx;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-        .item_addr {
-          width: 60%;
-          flex-wrap: wrap;
-          font-size: 24rpx;
-          font-weight: 400;
-          color: #a6a6a6;
-        }
-        .item_dist_btn{
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin-top: 24rpx;
         }
       }
     }

package/src/components/JfbMovieLineLineSeat/XdOnlineSeat.vue

@@ -7,9 +7,7 @@
       :style="{ borderTopColor: styleMainColor }"
     >
       <view class="xd-seat__title-name">{{ filmInfo["film_name"] }}</view>
-      <view class="xd-seat__title-address">{{
-        cinemaInfo["cinema_name"]
-      }}</view>
+      <view class="xd-seat__title-address">{{cinemaInfo["cinema_name"] }}</view>
       <view class="xd-seat__title-back" v-if="show" @click.stop="back">
         <xd-font-icon
           icon="iconzhiyuanfanhui12"
@@ -24,6 +22,7 @@
         v-model="userSelectedSeatInfo"
         v-if="selectedSeatInfo !== null"
         :list="selectedSeatList"
+        :area-prices="areaPrices"
         :layout-info="layoutInfo"
         :seat-max-buy-number="4"
         :hall-name="selectedSeatInfo['hall_name']"
@@ -44,8 +43,7 @@
             "
             v-for="(item, index) in noticeList"
             :key="index"
-            >{{ item }}</view
-          >
+          >{{ item }}</view>
         </xd-notice-bar>
       </view>
       <view class="xd-seat__footer-paiqi">
@@ -83,9 +81,7 @@
               type="primary"
               radius="10rpx"
               size="small"
-              >{{ scheduleListIsShow ? "收起场次" : "切换场次" }}</xd-button
-            >
-          </view>
+            >{{ scheduleListIsShow ? "收起场次" : "切换场次" }}</xd-button></view>
         </view>
         <view class="xd-seat__footer-paiqi-content" v-if="scheduleListIsShow">
           <scroll-view
@@ -131,8 +127,7 @@
           :style="{ borderColor: styleMainColor, color: styleMainColor }"
           v-for="(name, nindex) in getSelectedNames"
           :key="nindex"
-          >{{ name }}</view
-        >
+        >{{ name }}</view>
       </view>
       <view class="xd-seat__footer-phone">
         <view>手机号：</view>
@@ -288,9 +283,8 @@ export default {
       selectedSeatInfo: null, //选中影院信息
       selectedSeatList: null, ///选中影院座位信息
       userSelectedSeatInfo: null, //用户选中座位信息
-
+      areaPrices: null, //是否有分期排期
       noticeList: ["观影提示:电影放映期间厅内禁止饮食，感谢配合！"],
-
       styleMainColor: "", //插件主题风格样式
     };
   },
@@ -464,10 +458,15 @@ export default {
      */
     getSeat(item) {
       this.$emit("onGetSeatList", item, (seat) => {
-        console.log("onGetSeatList", seat, item);
-        this.selectedSeatInfo = seat;
         this.selectedSeatList = seat["seat"];
+        this.areaPrices = (seat['area_price'] || []).map(item=>{
+          return {
+            ...item,
+            area_id: this.$xdUniHelper.randomChar(15)
+          }
+        });
         this.phone = seat["phone_number"];
+        this.selectedSeatInfo = seat;
       });
     },