Explorar o código

feat:提交代码,补充电影模块数据

longzhicheng hai 1 ano
pai
achega
6be387a7fa

BIN=BIN
src/static/icon/small_icon_1.png


BIN=BIN
src/static/icon/small_icon_2.png


BIN=BIN
src/static/icon/small_icon_3.png


+ 6 - 5
src/subPages/pages/movies/chooseSeat.vue

@@ -250,7 +250,10 @@
250 250
 					channel_sn: this.optArr[0].channel_sn,
251 251
 					sched_seat: _newArr,
252 252
 					detailInfo:this.initInfo ,
253
-					totalPrice:this.totalPrice
253
+					totalPrice:this.totalPrice,
254
+					pv:this.optArr[0].pv,
255
+					yanglaojin:this.optArr[0].yanglaojin,
256
+					gongxian:this.optArr[0].gongxian,
254 257
 				}
255 258
 				
256 259
 				uni.navigateTo({
@@ -358,8 +361,7 @@
358 361
 					newArray[row][col].status = 1
359 362
 					this.SelectNum--
360 363
 					this.getOptArr(newArray[row][col], 0)
361
-					this.totalPrice = (parseFloat(this.totalPrice) * 100 - parseFloat(newArray[row][col].price) * 100) /
362
-						100
364
+					this.totalPrice = (parseFloat(this.totalPrice) * 1000 - parseFloat(newArray[row][col].price) * 1000) /1000
363 365
 				} else if (seatValue === 1) {
364 366
 					if (this.SelectNum == 4) {
365 367
 						uni.showToast({
@@ -369,8 +371,7 @@
369 371
 						return
370 372
 					}
371 373
 					newArray[row][col].status = 2
372
-					this.totalPrice = (parseFloat(this.totalPrice) * 100 + parseFloat(newArray[row][col].price) * 100) /
373
-						100
374
+					this.totalPrice = (parseFloat(this.totalPrice) * 1000 + parseFloat(newArray[row][col].price) * 1000) /1000
374 375
 					this.SelectNum++
375 376
 					this.getOptArr(newArray[row][col], 1)
376 377
 				}

+ 53 - 11
src/subPages/pages/movies/moviesOrder.vue

@@ -29,10 +29,23 @@
29 29
 				<!-- <text class="hint-tx">原价¥60</text> -->
30 30
 			</view>
31 31
 
32
-			<!-- <view class="discount-info">
33
-				<text class="discount-tx">本单已优惠</text>
34
-				<text class="discount-price">-3.6</text>
35
-			</view> -->
32
+			<view class="s-info">
33
+				<view class="s-info-item">
34
+					<image class="s-info-icon" src="/static/icon/small_icon_3.png" mode="aspectFill"></image>
35
+					<text class="s-detail">送贡献值:{{gongxian}}</text>
36
+				</view>
37
+				
38
+				<view class="s-info-item">
39
+					<image class="s-info-icon" src="/static/icon/small_icon_1.png" mode="aspectFill"></image>
40
+					<text class="s-detail">送积分:{{gongxian}}</text>
41
+				</view>
42
+				
43
+				<view class="s-info-item">
44
+					<image class="s-info-icon" src="/static/icon/small_icon_2.png" mode="aspectFill"></image>
45
+					<text class="s-detail">送养老金:{{yanglaojin}}</text>
46
+				</view>
47
+				
48
+			</view>
36 49
 			<view class="card-line"></view>
37 50
 
38 51
 
@@ -137,18 +150,24 @@
137 150
 	const userPhone = ref('')
138 151
 	const schedSeat=ref([])
139 152
 	const totalPrice=ref(0)
153
+	const pv=ref('')
154
+	const yanglaojin=ref('')
155
+	const gongxian=ref('')
140 156
 	let channel_sn=''
141 157
 
142 158
 	// 格式化时间补零
143 159
 	const formatTime = (num) => num < 10 ? `0${num}` : num
144 160
 	onLoad((option) => {
145 161
 		if(option.params){
146
-			orderDetail.value = JSON.parse(decodeURIComponent(option.params)).detailInfo
147
-			schedSeat.value =  JSON.parse(decodeURIComponent(option.params)).sched_seat
148
-			channel_sn=  JSON.parse(decodeURIComponent(option.params)).channel_sn
149
-			totalPrice.value = JSON.parse(decodeURIComponent(option.params)).totalPrice
150
-			console.log("===orderDetail.value",schedSeat.value);
151
-			console.log("===orderDetail.value",schedSeat.value.length);
162
+			let _info = JSON.parse(decodeURIComponent(option.params))
163
+			orderDetail.value = _info.detailInfo
164
+			schedSeat.value =  _info.sched_seat
165
+			channel_sn=  _info.channel_sn
166
+			totalPrice.value = _info.totalPrice
167
+			pv.value =  _info.totalPrice
168
+			yanglaojin.value=  _info.yanglaojin
169
+			gongxian.value = _info.gongxian
170
+			
152 171
 			initTimer()
153 172
 		}
154 173
 		
@@ -274,6 +293,29 @@
274 293
 		box-sizing: border-box;
275 294
 		position: relative;
276 295
 		padding-bottom: 200rpx;
296
+		
297
+		.s-info{
298
+			display: flex;
299
+			flex-direction: row;
300
+			align-items: center;
301
+			.s-info-item{
302
+				display: flex;
303
+				flex-direction: row;
304
+				align-items: center;
305
+				flex: 1;
306
+			}
307
+			
308
+			.s-info-icon{
309
+				width: 30rpx;
310
+				height: 30rpx;
311
+				margin-right: 10rpx;
312
+			}
313
+			
314
+			.s-detail{
315
+				font-size: 26rpx;
316
+				color: #666;
317
+			}
318
+		}
277 319
 
278 320
 		.bottom-btn-content {
279 321
 			display: flex;
@@ -432,7 +474,7 @@
432 474
 			flex-direction: row;
433 475
 			align-items: center;
434 476
 			margin-top: 50rpx;
435
-			margin-bottom: 60rpx;
477
+			margin-bottom: 26rpx;
436 478
 
437 479
 			.close-icon {
438 480
 				width: 26rpx;

+ 2 - 2
src/subPages/pages/movies/moviesTicketList.vue

@@ -61,8 +61,8 @@
61 61
 			</view>
62 62
 			<view class="item-h-x">
63 63
 				<text class="item-price">¥{{item.price}}</text>
64
-				<text class="item-price-unit">pv{{item.pv}}</text>
65
-				<text class="item-price-unit">养老金{{item.yanglaojin}}</text>
64
+				<text class="item-price-unit">pv:{{item.pv}}</text>
65
+				<text class="item-price-unit">养老金:{{item.yanglaojin}}</text>
66 66
 			</view>
67 67
 			<view class="buy-btn">购票</view>
68 68
 		</view>