cmy 1 tahun lalu
induk
melakukan
0b71284441
2 mengubah file dengan 22 tambahan dan 11 penghapusan
  1. 1 1
      pages/game/history.vue
  2. 21 10
      pages/index/entertainment.vue

+ 1 - 1
pages/game/history.vue

@@ -31,7 +31,7 @@
 			return {
 				id: '',
 				page: 1,
-				limit: 10,
+				limit: 20,
 				loadingType: 'more',
 				loaded: false,
 				list: []

+ 21 - 10
pages/index/entertainment.vue

@@ -122,6 +122,9 @@
 					<view class="list-buttom success" v-if="item.result===0">
 						{{$t('enter.a6')}}
 					</view>
+					<view @click="alertDetailOpen(item)" class="list-buttom primary margin-l-10" v-if="item.result===0||item.result==1">
+						{{$t('enter.u18')}}
+					</view>
 				</view>
 			</view>
 		</view>
@@ -141,13 +144,21 @@
 		</uni-popup>
 		<uni-popup type="center" ref="popupDetail">
 			<view class="alert-detail">
-				<view class="padding-c-30 padding-t-30 padding-b-30">
+				<view class="padding-c-30 padding-t-30 padding-b-30" v-if="alertDetail.result_info">
+					<view class="flex">
+						<view class="type">
+							NO
+						</view>
+						<view class="num" >
+							{{alertDetail.no}}
+						</view>
+					</view>
 					<view class="flex">
 						<view class="type">
 							{{$t('gameList.a5')}}
 						</view>
-						<view class="num" v-if="alertDetail.ts">
-							{{getTime(alertDetail.ts)}}
+						<view class="num" v-if="alertDetail.result_infots">
+							{{getTime(alertDetail.result_info.ts)}}
 						</view>
 					</view>
 					<view class="flex">
@@ -155,7 +166,7 @@
 							open
 						</view>
 						<view class="num">
-							{{alertDetail.o*1}}
+							{{alertDetail.result_info.o*1}}
 						</view>
 					</view>
 					<view class="flex">
@@ -163,7 +174,7 @@
 							close
 						</view>
 						<view class="num">
-							{{alertDetail.c*1}}
+							{{alertDetail.result_info.c*1}}
 						</view>
 					</view>
 					<view class="flex">
@@ -171,7 +182,7 @@
 							lowest
 						</view>
 						<view class="num">
-							{{alertDetail.l*1}}
+							{{alertDetail.result_info.l*1}}
 						</view>
 					</view>
 					<view class="flex">
@@ -179,7 +190,7 @@
 							highest
 						</view>
 						<view class="num">
-							{{alertDetail.h*1}}
+							{{alertDetail.result_info.h*1}}
 						</view>
 					</view>
 				</view>
@@ -252,7 +263,7 @@
 				betList: {
 					list: [], //游戏进行记录
 					page: 1,
-					limit: 10,
+					limit: 5,
 				},
 				userWallet: 0,
 				// 当前最新K线数据
@@ -306,7 +317,7 @@
 			// 弹窗详情
 			alertDetailOpen(item) {
 				console.log(item);
-				this.alertDetail = item.room.result_info;
+				this.alertDetail = item.room;
 				this.$refs.popupDetail.open();
 			},
 			// 倒计时清理
@@ -939,7 +950,7 @@
 				padding-top: 30rpx;
 
 				.jl {
-					font-size: 24rpx;
+					font-size: $font-lg + 4rpx;
 					font-weight: 400;
 					color: #999999;
 				}