jufubao-movie 1.0.42 → 1.0.44-beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbMovieLineLineSeat/XdOnlineSeat.vue +16 -7
  3. package/src/components/JfbMovieLineLineSeat/XdOnlineSeatMove.vue +37 -21
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-movie",
3
- "version": "1.0.42",
3
+ "version": "1.0.44-beta1",
4
4
  "private": false,
5
5
  "description": "聚福宝在线选座业务组件插件包",
6
6
  "main": "index.js",
package/src/components/JfbMovieLineLineSeat/XdOnlineSeat.vue CHANGED
@@ -117,9 +117,9 @@
117
117
  <view class="xd-seat__footer-tick" v-if="getSelectedNames.length > 0">
118
118
  <view
119
119
  :style="{ borderColor: styleMainColor, color: styleMainColor }"
120
- v-for="(name, nindex) in getSelectedNames"
121
- :key="nindex"
122
- >{{ name }}</view>
120
+ v-for="(name) in getSelectedNames"
121
+ :key="name.value"
122
+ >{{ name.label }}</view>
123
123
  </view>
124
124
  <view class="xd-seat__footer-phone">
125
125
  <view>手机号：</view>
@@ -344,10 +344,19 @@ export default {
344
344
  getSelectedNames() {
345
345
  if (this.userSelectedSeatInfo === null) return [];
346
346
  if (this.userSelectedSeatInfo["seatSelected"].length === 0) return [];
347
- return this.$xdUniHelper.getListKeyForValue(
348
- this.userSelectedSeatInfo["seatSelected"],
349
- "name"
350
- );
347
+ console.log('seatSelected',JSON.stringify(this.userSelectedSeatInfo["seatSelected"].map(item=>{
348
+ return {
349
+ label: item.name,
350
+ value: item.id + item.row + item.column,
351
+ }
352
+ })));
353
+ return this.userSelectedSeatInfo["seatSelected"].map(item=>{
354
+ return {
355
+ label: item.name,
356
+ value: item.id + item.row + item.column,
357
+ }
358
+ })
359
+
351
360
  },
352
361
  },
353
362
 
package/src/components/JfbMovieLineLineSeat/XdOnlineSeatMove.vue CHANGED
@@ -182,14 +182,16 @@
182
182
  backgroundImage:'url('+ `${areaLove}${seat.isLove}-${seat.typeStatus}` +'.png?ver='+ ver +')'
183
183
  }"></view>
184
184
  </template>
185
-
186
185
  <template v-else>
187
186
  <view v-if="seat.typeStatus === 'use'" class='xd-online-seat__bg' :style="{
188
187
  backgroundImage:'url('+ `${areaOhter}${seat.typeStatus}-${areaPriceIndex[seat.price]}` +'.png?ver='+ ver +')'
189
188
  }"></view>
190
- <view v-else class='xd-online-seat__bg' :style="{
191
- backgroundImage:'url('+ `${areaOhter}${seat.typeStatus}` +'.png?ver='+ ver +')'
192
- }"></view>
189
+ <template v-else>
190
+ <view v-if="seat.typeStatus" class='xd-online-seat__bg' :style="{
191
+ backgroundImage:'url('+ `${areaOhter}${seat.typeStatus}` +'.png?ver='+ ver +')'
192
+ }"></view>
193
+ <view v-else class='xd-online-seat__bg'></view>
194
+ </template>
193
195
  </template>
194
196
  </template>
195
197
  <!--普通排期-->
@@ -197,9 +199,12 @@
197
199
  <view class="xd-online-seat__bg" v-if="seat.isLove" :style="{
198
200
  backgroundImage:'url('+ `${nomarlLove}${seat.isLove}-${seat.typeStatus}` +'.png?ver='+ ver +')'
199
201
  }"></view>
200
- <view v-else class="xd-online-seat__bg" :style="{
201
- backgroundImage:'url('+ nomarlOhter+seat.typeStatus +'.png?ver='+ver+')'
202
- }"></view>
202
+ <template v-else>
203
+ <view v-if="seat.typeStatus" class="xd-online-seat__bg" :style="{
204
+ backgroundImage:'url('+ nomarlOhter+seat.typeStatus +'.png?ver='+ver+')'
205
+ }"></view>
206
+ <view v-else class='xd-online-seat__bg'></view>
207
+ </template>
203
208
  </template>
204
209
  </view>
205
210
  </view>
@@ -376,14 +381,17 @@
376
381
  backgroundImage:'url('+ `${areaLove}${seat.isLove}-${seat.typeStatus}` +'.png?ver='+ ver +')'
377
382
  }"></view>
378
383
  </template>
379
-
380
384
  <template v-else>
381
385
  <view v-if="seat.typeStatus === 'use'" class='xd-online-seat__bg' :style="{
382
386
  backgroundImage:'url('+ `${areaOhter}${seat.typeStatus}-${areaPriceIndex[seat.price]}` +'.png?ver='+ ver +')'
383
387
  }"></view>
384
- <view v-else class='xd-online-seat__bg' :style="{
385
- backgroundImage:'url('+ `${areaOhter}${seat.typeStatus}` +'.png?ver='+ ver +')'
386
- }"></view>
388
+ <template v-else>
389
+ <view v-if="seat.typeStatus" class='xd-online-seat__bg' :style="{
390
+ backgroundImage:'url('+ `${areaOhter}${seat.typeStatus}` +'.png?ver='+ ver +')'
391
+ }"></view>
392
+ <view v-else class='xd-online-seat__bg'></view>
393
+ </template>
394
+
387
395
  </template>
388
396
  </template>
389
397
  <!--普通排期-->
@@ -391,9 +399,12 @@
391
399
  <view class="xd-online-seat__bg" v-if="seat.isLove" :style="{
392
400
  backgroundImage:'url('+ `${nomarlLove}${seat.isLove}-${seat.typeStatus}` +'.png?ver='+ ver +')'
393
401
  }"></view>
394
- <view v-else class="xd-online-seat__bg" :style="{
395
- backgroundImage:'url('+ nomarlOhter+seat.typeStatus +'.png?ver='+ver+')'
396
- }"></view>
402
+ <template v-else>
403
+ <view v-if="seat.typeStatus" class="xd-online-seat__bg" :style="{
404
+ backgroundImage:'url('+ nomarlOhter+seat.typeStatus +'.png?ver='+ver+')'
405
+ }"></view>
406
+ <view v-else class='xd-online-seat__bg'></view>
407
+ </template>
397
408
  </template>
398
409
  </view>
399
410
  </view>
@@ -703,6 +714,9 @@
703
714
  * @description 初始化座位数据
704
715
  */
705
716
  initData() {
717
+ //this.seatSourceList
718
+
719
+
706
720
  /**对象转化为数组**/
707
721
  if (helper.checkVarType(this.seatSourceList) === 'object') {
708
722
  let temp = [];
@@ -1101,7 +1115,6 @@
1101
1115
  * @param posCol
1102
1116
  */
1103
1117
  handleChooseSeat: function (ev, item, posRow, posCol) {
1104
-
1105
1118
  //如果是不可选，直接返回
1106
1119
  if (item['type'] === 1 || item['type'] === -1) return;
1107
1120
 
@@ -1113,17 +1126,20 @@
1113
1126
  return;
1114
1127
  }
1115
1128
 
1116
- console.warn(`handleChooseSeat:${JSON.stringify(item)}`)
1129
+ //当前选中的单座已经选中了3个，在选择情侣座控制
1130
+ if ((item['type'] === 0 || item['type']=== 3) && this.seatSelected.length === 3) {
1131
+ if(item.lovely === 'LL' || item.lovely === 'LR') {
1132
+ this.seatTips();
1133
+ return;
1134
+ }
1135
+ }
1117
1136
 
1118
1137
  //选择当前行数据
1119
1138
  let row = this.$xdUniHelper.cloneDeep(this.seatArray[posRow]);
1120
- console.log(item, posRow, posCol, item['type']);
1121
-
1122
-
1123
1139
 
1124
1140
  //取消选择中操作
1125
1141
  if (item['type'] === 2) {
1126
- console.log('取消选择中操作', item['type']);
1142
+ console.log('取消选择中操作', item['type'],item.name , item.id);
1127
1143
  item['type'] = 0;
1128
1144
  item['typeStatus'] = 'use';
1129
1145
 
@@ -1150,7 +1166,7 @@
1150
1166
 
1151
1167
  //选择中操作
1152
1168
  else if (item['type'] === 0 || item['type'] === 3) {
1153
- console.log('选择中操作', item['type'], item.name);
1169
+ console.log('选择中操作', item['type'], item.name , item.id);
1154
1170
  item['type'] = 2;
1155
1171
  item['typeStatus'] = 'selected';
1156
1172
  this.selectSeat(item, '+');