2023-10-30

pages/index/entertainment.vue

@@ -27,11 +27,16 @@
 				</view>
 				<view class="yi flex-start">
 					<!-- <image class="img" src="../../static/icon/le.png" mode=""></image> -->
-					<view class="wz padding-l-10">{{history.base.token}}</view>
-					<view class="qx padding-l-10" v-if="history.next.id">{{history.next.no}}</view>
+					<view class="wz">下期压注</view>
+					<view class="qx padding-l-10" v-if="history.list.length>0">{{history.next.no}}</view>
 				</view>
-				<view class="shu">
-					{{KlineList.c*1}}
+				<view class="yi flex-start margin-t-10">
+					<!-- <image class="img" src="../../static/icon/le.png" mode=""></image> -->
+					<view class="wz">当期进行</view>
+					<view class="qx padding-l-10" v-if="history.list.length>0">{{history.list[0].no}}</view>
+				</view>
+				<view class="shu" v-if="history.list.length>0">
+					{{history.list[0].result_info.c}}
 				</view>
 			</view>
 			<!--右 -->
@@ -441,7 +446,7 @@
 				const typeList = [that.$t('enter.u6'), that.$t('enter.u4'), that.$t('enter.u5'), that.$t('enter.u7')];
 				uni.showModal({
 					title: that.$t('enter.c4'),
-					content: `${that.$t('enter.a8')}${that.upOnBtnData.value}USDT${that.$t('enter.a10')}${typeList[that.upOnBtnData.type-1]}`,
+					content: `${that.$t('enter.a8')}${that.upOnBtnData.value}USDT${that.$t('enter.a10')}${that.history.next.no}${typeList[that.upOnBtnData.type-1]}`,
 					success: res => {
 						if (res.confirm) {
 							that.gameBetIn();
@@ -629,10 +634,18 @@
 				}, id).then(({
 					data
 				}) => {
-					that.history.list = data.list || [];
+					
 					that.history.base = data.game || {};
 					that.history.next = data.next_game || '';
 					that.history.now = data.now_game || '';
+					if( data.list){
+						that.history.list = data.list.map((res)=>{
+							res.result_info.c = (+res.result_info.c).toFixed(data.game.decimal)
+							return res
+						});
+					}else{
+						that.history.list = [];
+					}
 					// 是否不存在启动中的活动并判断防止重复调用创建倒计时
 					// 判断是否不存在游戏，并且没有倒计时对象，且在当前页面
 					if (that.loadPage && !that.history.next && !that.getNextTimeObj) {
@@ -929,7 +942,7 @@
 					.he1 {
 						background: #fdaf41;
 						border-radius: 10rpx;
-						margin-bottom: 40rpx;
+						margin-bottom: 20rpx;
 						margin-right: 20rpx;
 						width: 84rpx;
 						height: 84rpx;