cmy 1 gadu atpakaļ
vecāks
revīzija
5ad841eb4b
2 mainītis faili ar 27 papildinājumiem un 12 dzēšanām
  1. 7 3
      pages/game/history.vue
  2. 20 9
      pages/index/entertainment.vue

+ 7 - 3
pages/game/history.vue

@@ -3,7 +3,7 @@
 		<view class="list padding-v-10 flex" v-for="(item,ind) in list" :key="ind">
 			<view class="le">
 				<view class="qs padding-b-10">{{$t('set.a7')}}{{item.no}}{{$t('set.a8')}}</view>
-				<view class="dy padding-b-10" v-if="item.result_info">{{item.result_info.c*1}}</view>
+				<view class="dy padding-b-10" v-if="item.result_info">{{item.result_info.c}}</view>
 				<view class="dy padding-b-10" v-else>{{ $t("enter.a2") }}</view>
 			</view>
 			<view class="ri flex" v-if="item.result">
@@ -56,9 +56,13 @@
 				getGame({
 					page: that.page,
 					limit: that.limit,
-				},that.id).then(res => {
-					let list = res.data.list.map((res)=>{
+				},that.id).then(({data}) => {
+					let list = data.list.map((res)=>{
+						if(res.result_info){
+							res.result_info.c = (Number(res.result_info.c).toFixed(data.game.decimal))
+						}
 						if(res.result){
+							
 							let arr = [];
 							const ar  =res.result.split(",")
 							console.log(ar,'ar');

+ 20 - 9
pages/index/entertainment.vue

@@ -157,7 +157,7 @@
 						<view class="type">
 							{{$t('gameList.a5')}}
 						</view>
-						<view class="num" v-if="alertDetail.result_infots">
+						<view class="num" v-if="alertDetail.result_info.ts">
 							{{getTime(alertDetail.result_info.ts)}}
 						</view>
 					</view>
@@ -166,7 +166,7 @@
 							open
 						</view>
 						<view class="num">
-							{{alertDetail.result_info.o*1}}
+							{{alertDetail.result_info.o}}
 						</view>
 					</view>
 					<view class="flex">
@@ -174,7 +174,7 @@
 							close
 						</view>
 						<view class="num">
-							{{alertDetail.result_info.c*1}}
+							{{alertDetail.result_info.c}}
 						</view>
 					</view>
 					<view class="flex">
@@ -182,7 +182,7 @@
 							lowest
 						</view>
 						<view class="num">
-							{{alertDetail.result_info.l*1}}
+							{{alertDetail.result_info.l}}
 						</view>
 					</view>
 					<view class="flex">
@@ -190,7 +190,7 @@
 							highest
 						</view>
 						<view class="num">
-							{{alertDetail.result_info.h*1}}
+							{{alertDetail.result_info.h}}
 						</view>
 					</view>
 				</view>
@@ -400,6 +400,7 @@
 						title: res.msg
 					});
 					that.gameBetList();
+					that.getUserWallet();
 				}).catch((res) => {
 					uni.hideLoading();
 					uni.showToast({
@@ -488,15 +489,25 @@
 			},
 			// 获取游戏压住记录
 			gameBetList() {
+				const that = this;
+				const lineNum = that.history.base.decimal;
 				gameBetList({
 					page: 1,
 					limit: 10,
-					id: this.history.base.id,
-				}).then((res) => {
-					this.betList.list = res.data.bet_log.map((res)=>{
+					id: that.history.base.id,
+				}).then(({data}) => {
+					that.betList.list = data.bet_log.map((res)=>{
 						res.num=Number(res.num);
 						res.get=Number(res.get);
-						res.sexy = res.get-res.num
+						res.sexy = res.get-res.num;
+						console.log(res);
+						if(res.room.result_info){
+							const obj = res.room.result_info
+							obj.c =Number(obj.c).toFixed(lineNum)
+							obj.o =Number(obj.o).toFixed(lineNum)
+							obj.h =Number(obj.h).toFixed(lineNum)
+							obj.l =Number(obj.l).toFixed(lineNum)
+						}
 						return res
 					});
 				})