jufubao-movie 1.0.43 → 1.0.45

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 (37) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbMovieAfterOrder/JfbMovieAfterOrder.vue +3 -1
  3. package/src/components/JfbMovieAfterOrder/JfbMovieAfterOrderLess.less +6 -5
  4. package/src/components/JfbMovieAfterOrderDetail/JfbMovieAfterOrderDetail.vue +3 -1
  5. package/src/components/JfbMovieAfterOrderDetail/JfbMovieAfterOrderDetailLess.less +6 -5
  6. package/src/components/JfbMovieCenter/JfbMovieCenter.vue +3 -1
  7. package/src/components/JfbMovieCenter/JfbMovieCenterLess.less +6 -5
  8. package/src/components/JfbMovieCode/JfbMovieCode.vue +3 -1
  9. package/src/components/JfbMovieCode/JfbMovieCodeLess.less +6 -5
  10. package/src/components/JfbMovieCodeChoose/JfbMovieCodeChoose.vue +3 -1
  11. package/src/components/JfbMovieCodeChoose/JfbMovieCodeChooseLess.less +6 -5
  12. package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue +3 -1
  13. package/src/components/JfbMovieConfirm/JfbMovieConfirmLess.less +6 -5
  14. package/src/components/JfbMovieLineCinema/JfbMovieLineCinema.vue +3 -3
  15. package/src/components/JfbMovieLineCinema/JfbMovieLineCinemaLess.less +6 -5
  16. package/src/components/JfbMovieLineCinemaChoose/JfbMovieLineCinemaChoose.vue +3 -1
  17. package/src/components/JfbMovieLineCinemaChoose/JfbMovieLineCinemaChooseLess.less +6 -5
  18. package/src/components/JfbMovieLineFilm/JfbMovieLineFilm.vue +3 -1
  19. package/src/components/JfbMovieLineFilm/JfbMovieLineFilmLess.less +6 -5
  20. package/src/components/JfbMovieLineFilmInfo/JfbMovieLineFilmInfo.vue +3 -1
  21. package/src/components/JfbMovieLineFilmInfo/JfbMovieLineFilmInfoLess.less +6 -5
  22. package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeat.vue +45 -26
  23. package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeatLess.less +6 -5
  24. package/src/components/JfbMovieLineLineSeat/XdOnlineSeat.vue +17 -7
  25. package/src/components/JfbMovieLineLineSeat/XdOnlineSeatMove.vue +9 -7
  26. package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue +3 -1
  27. package/src/components/JfbMovieLineSchedule/JfbMovieLineScheduleLess.less +6 -5
  28. package/src/components/JfbMovieOrder/JfbMovieOrder.vue +3 -1
  29. package/src/components/JfbMovieOrder/JfbMovieOrderLess.less +6 -5
  30. package/src/components/JfbMovieOrderDetail/JfbMovieOrderDetail.vue +3 -1
  31. package/src/components/JfbMovieOrderDetail/JfbMovieOrderDetailLess.less +6 -5
  32. package/src/components/JfbMoviePay/JfbMoviePay.vue +3 -1
  33. package/src/components/JfbMoviePay/JfbMoviePayLess.less +6 -5
  34. package/src/components/JfbMovieTfkFilmList/JfbMovieTfkFilmList.vue +3 -1
  35. package/src/components/JfbMovieTfkFilmList/JfbMovieTfkFilmListLess.less +6 -5
  36. package/src/components/JfbMovieTfkFilmRecommend/JfbMovieTfkFilmRecommend.vue +3 -1
  37. package/src/components/JfbMovieTfkFilmRecommend/JfbMovieTfkFilmRecommendLess.less +6 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-movie",
3
- "version": "1.0.43",
3
+ "version": "1.0.45",
4
4
  "private": false,
5
5
  "description": "聚福宝在线选座业务组件插件包",
6
6
  "main": "index.js",
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-after-order__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-after-order__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-after-order__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-after-order-detail__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-after-order-detail__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-after-order-detail__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-center__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-center__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-center__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-code__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-code__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-code__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx: isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-code-choose__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-code-choose__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-confirm__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-confirm__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-confirm__body" v-if="order_info!==null" :style="{paddingBottom: layoutInfo.bottom+'rpx'}">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,9 +13,9 @@
13
13
  :class="{ editx: isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-line-cinema__edit-icon" @click="delEdit"
17
- >删除</view
18
- >
16
+ <view class="jfb-movie-line-cinema__edit-icon"@click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
19
19
  </view>
20
20
  <!-- #endif -->
21
21
  <view
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx: isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-line-cinema-choose__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-line-cinema-choose__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-line-cinema-choose__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-line-film__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-line-film__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-line-film__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx: isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-line-film-info__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-line-film-info__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-line-film-info__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-line-line-seat__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-line-line-seat__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-line-line-seat__body">
@@ -233,36 +235,50 @@
233
235
  if(res1['error_code']) {
234
236
  this.handleCheckStatusIsError(res1, ()=>{
235
237
  this.handleGetFilm(resolve)
238
+ }, ()=>{
239
+ this.handleBaseInfoEnd(resolve,res, res1)
236
240
  });
237
241
  return
238
242
  }
239
243
 
240
- this.is_not_show_price = res.is_not_show_price;
241
- let paiqi_data = res.schedule_data.map(item => {
242
- item['name'] = item['date_name'];
243
- item['paiqi_data'] = item['paiqi'].map(pp => {
244
- pp['price'] = pp['sale_price'];
245
- pp['jfb_film_id'] = pp['film_id'];
246
- pp['jfb_cinema_id'] = pp['cinema_id'];
247
- pp['data_id'] = pp['schedule_id'];
248
- return pp;
249
- });
250
- return item;
244
+ //正常逻辑
245
+ this.handleBaseInfoEnd(resolve,res, res1)
246
+ })
247
+ },
248
+
249
+ /**
250
+ * @description 遇到
251
+ * @param resolve
252
+ * @param res
253
+ * @param res1
254
+ * @constructor
255
+ */
256
+ handleBaseInfoEnd(resolve, res, res1){
257
+ this.is_not_show_price = res.is_not_show_price;
258
+ let paiqi_data = res.schedule_data.map(item => {
259
+ item['name'] = item['date_name'];
260
+ item['paiqi_data'] = item['paiqi'].map(pp => {
261
+ pp['price'] = pp['sale_price'];
262
+ pp['jfb_film_id'] = pp['film_id'];
263
+ pp['jfb_cinema_id'] = pp['cinema_id'];
264
+ pp['data_id'] = pp['schedule_id'];
265
+ return pp;
251
266
  });
252
- this.paiQiData = paiqi_data;
253
- resolve({
254
- paiqi_data: paiqi_data,
255
- film_data: [{
256
- ...res1,
257
- id: res1.film_id,
258
- }],
259
- cinema_data: res1
260
- })
261
- if(res1.temp_order_id || res1.oms_order_id){
262
- this.isPop = true;
263
- this.handleToPay(res1);
264
- }
267
+ return item;
268
+ });
269
+ this.paiQiData = paiqi_data;
270
+ resolve({
271
+ paiqi_data: paiqi_data,
272
+ film_data: [{
273
+ ...res1,
274
+ id: res1.film_id,
275
+ }],
276
+ cinema_data: res1
265
277
  })
278
+ if(res1.temp_order_id || res1.oms_order_id){
279
+ this.isPop = true;
280
+ this.handleToPay(res1);
281
+ }
266
282
  },
267
283
 
268
284
  handleGetSeatList(item, resolve) {
@@ -350,7 +366,7 @@
350
366
  })
351
367
  },
352
368
 
353
- handleCheckStatusIsError({error_msg,error_message,error_code}, cb=null){
369
+ handleCheckStatusIsError({error_msg,error_message,error_code}, cb=null,errCb=null){
354
370
  let msg = error_message || error_msg;
355
371
  if(!msg) return false;
356
372
 
@@ -368,6 +384,9 @@
368
384
  if(res.confirm) {
369
385
  if(typeof cb === 'function') cb();
370
386
  }
387
+ if(res.cancel) {
388
+ if(typeof errCb === 'function') errCb();
389
+ }
371
390
  }
372
391
  })
373
392
  return true
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -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
 
@@ -733,6 +742,7 @@ export default {
733
742
  &__content {
734
743
  position: relative;
735
744
  z-index: 99;
745
+ min-height: 40vh;
736
746
  }
737
747
 
738
748
  &__title {
@@ -1115,7 +1115,6 @@
1115
1115
  * @param posCol
1116
1116
  */
1117
1117
  handleChooseSeat: function (ev, item, posRow, posCol) {
1118
-
1119
1118
  //如果是不可选,直接返回
1120
1119
  if (item['type'] === 1 || item['type'] === -1) return;
1121
1120
 
@@ -1127,17 +1126,20 @@
1127
1126
  return;
1128
1127
  }
1129
1128
 
1130
- 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
+ }
1131
1136
 
1132
1137
  //选择当前行数据
1133
1138
  let row = this.$xdUniHelper.cloneDeep(this.seatArray[posRow]);
1134
- console.log(item, posRow, posCol, item['type']);
1135
-
1136
-
1137
1139
 
1138
1140
  //取消选择中操作
1139
1141
  if (item['type'] === 2) {
1140
- console.log('取消选择中操作', item['type']);
1142
+ console.log('取消选择中操作', item['type'],item.name , item.id);
1141
1143
  item['type'] = 0;
1142
1144
  item['typeStatus'] = 'use';
1143
1145
 
@@ -1164,7 +1166,7 @@
1164
1166
 
1165
1167
  //选择中操作
1166
1168
  else if (item['type'] === 0 || item['type'] === 3) {
1167
- console.log('选择中操作', item['type'], item.name);
1169
+ console.log('选择中操作', item['type'], item.name , item.id);
1168
1170
  item['type'] = 2;
1169
1171
  item['typeStatus'] = 'selected';
1170
1172
  this.selectSeat(item, '+');
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-line-schedule__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-line-schedule__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-line-schedule__body" :style="{
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-order__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-order__edit-icon"@click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-order__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-order-detail__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-order-detail__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-order-detail__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -13,7 +13,9 @@
13
13
  :class="{ editx : isEditx && active }"
14
14
  v-if="isEditx && active && !noBorder"
15
15
  >
16
- <view class="jfb-movie-pay__edit-icon" @click="delEdit">删除</view>
16
+ <view class="jfb-movie-pay__edit-icon" @click.stop="delEdit">
17
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
18
+ </view>
17
19
  </view>
18
20
  <!-- #endif -->
19
21
  <view class="jfb-movie-pay__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -10,7 +10,9 @@
10
10
  :class="{ editx : isEditx && active }"
11
11
  v-if="isEditx && active"
12
12
  >
13
- <view class="jfb-movie-tfk-film-list__edit-icon" @click="delEdit">删除</view>
13
+ <view class="jfb-movie-tfk-film-list__edit-icon" @click.stop="delEdit">
14
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
15
+ </view>
14
16
  </view>
15
17
  <!-- #endif -->
16
18
  <view class="jfb-movie-tfk-film-list__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);
@@ -10,7 +10,9 @@
10
10
  :class="{ editx : isEditx && active }"
11
11
  v-if="isEditx && active"
12
12
  >
13
- <view class="jfb-movie-tfk-film-recommend__edit-icon" @click="delEdit">删除</view>
13
+ <view class="jfb-movie-tfk-film-recommend__edit-icon" @click.stop="delEdit">
14
+ <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
15
+ </view>
14
16
  </view>
15
17
  <!-- #endif -->
16
18
  <view class="jfb-movie-tfk-film-recommend__body">
@@ -33,7 +33,7 @@
33
33
  left:0;
34
34
  bottom:0;
35
35
  right:0;
36
- z-index: 4;
36
+ z-index: var(--preview-z-index);
37
37
  cursor: pointer;
38
38
  }
39
39
 
@@ -44,17 +44,18 @@
44
44
  cursor: pointer;
45
45
  position: absolute;
46
46
  right: unit(0, rpx);
47
- top: unit(-52, rpx);
47
+ top: unit(0, rpx);
48
48
  height: unit(50, rpx);
49
- line-height: unit(50, rpx);
49
+ z-index: 100;
50
50
  display: flex;
51
51
  justify-content: center;
52
52
  align-items: center;
53
- background: rgba(0, 0, 0, .6);
54
- border-radius: unit(10, rpx);
53
+ background: rgba(0, 0, 0, .4);
54
+ border-radius: 0 0 0 20rpx;
55
55
  box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
56
56
  color: #fff;
57
57
  font-size: unit(22, rpx);
58
+ padding: 0 6rpx 0 6px;
58
59
 
59
60
  &-icon{
60
61
  padding: 0 unit(20, rpx);