2021-8-2

pages/assets/myPing.vue

@@ -6,9 +6,9 @@
 				<view class="info-num">{{happy || '0.00' }}</view>
 				<view class="info-font">福气值</view>
 			</view> -->
-			<view class="info">
-				<view class="info-num">{{ luck || '0.00' }}</view>
-				<view class="info-font">昨日USDT分红值</view>
+			<view class="info" v-for="ls in listType">
+				<view class="info-num">{{ ls.num || '0.00' }}</view>
+				<view class="info-font">昨日{{ ls.name }}分红值</view>
 			</view>
 			<!-- <view class="info">
 				<view class="info-num">{{honor || '0.00' }}</view>
@@ -34,7 +34,13 @@
 				<view class="flex clamp">
 					<view class="log"><image src="../../static/img/pgTip.png" mode="scaleToFill"></image></view>
 					<view class="name clamp">{{ item.name }}</view>
-					<view class="lun">{{ item.lun }}</view>
+					<view class="lun">
+						<text>{{ item.lun }}</text>
+						<text v-if="item.status == 0">未开始</text>
+						<text v-if="item.status == 1">已拼中</text>
+						<text v-if="item.status == 2">未拼中</text>
+						<text v-if="item.status == 3">已失败</text>
+					</view>
 				</view>
 				<view class="more">详情</view>
 			</view>
@@ -58,7 +64,7 @@
 </template>
 
 <script>
-import { pinkLog,systemWallet } from '@/api/finance.js';
+import { pinkLog, systemWallet } from '@/api/finance.js';
 export default {
 	data() {
 		return {
@@ -68,10 +74,11 @@ export default {
 			// usdt: '0.00',
 			// fil: '0.00',
 			list: [],
+			listType: [], //分红数量
 			loadtype: 'loadmore',
 			page: 1,
 			limit: 10,
-			bonus:0,//分红
+			bonus: 0 //分红
 		};
 	},
 	onReachBottom() {
@@ -79,16 +86,27 @@ export default {
 	},
 	onLoad() {
 		this.loadData();
-		this.systemWallet()
+		this.systemWallet();
 	},
 	methods: {
 		// 获取昨日分红
-		systemWallet(){
-			systemWallet().then((e) => {
-				console.log(e);
-			}).catch((e) => {
-				console.log(e);
-			})
+		systemWallet() {
+			systemWallet()
+				.then(e => {
+					for (let a in e.data.back) {
+						const num = +e.data.back[a].money.money;
+						if (num > 0) {
+							this.listType.push({
+								name: e.data.back[a].money.money_type,
+								num: num
+							});
+						}
+					}
+					console.log(this.listType);
+				})
+				.catch(e => {
+					console.log(e);
+				});
 		},
 		loadData() {
 			let that = this;
@@ -102,7 +120,7 @@ export default {
 			})
 				.then(e => {
 					const data = e.data.list.map(ls => {
-						const lun = ls.group_num > 0 ? ls.group_num + '轮' : '未开奖';
+						const lun = ls.group_num > 0 ? ls.group_num + '轮' : '';
 						const time = new Date(ls.pay_time * 1000);
 						return {
 							name: ls.activity.name,
@@ -112,7 +130,8 @@ export default {
 							type: ls.cost_money_type,
 							time: time.getFullYear() + '-' + (time.getMonth() + 1) + '-' + time.getDate(),
 							image: ls.activity.background_image,
-							id:ls.id
+							id: ls.id,
+							status: ls.status
 						};
 					});
 					that.list.push(...data);
@@ -130,7 +149,7 @@ export default {
 		},
 		nav(e) {
 			uni.navigateTo({
-				url: '/pages/assets/teamDetails?id='+e.id
+				url: '/pages/assets/teamDetails?id=' + e.id
 			});
 		}
 	}

pages/assets/teamDetails.vue

@@ -1,76 +1,115 @@
 <template>
 	<view class="center">
 		<view class="box">
-			<view class="title">
-				<view class="log"><image src="" mode=""></image></view>
-				<view class="name">FilsCoin矿机拼购</view>
-				<view class="lun">36轮</view>
-				<view class="more">已开奖</view>
+			<view class="title flex">
+				<view class="flex">
+					<view class="log"><image src="../../static/img/pgTip.png" mode="scaleToFill"></image></view>
+					<view class="name">{{ item.name }}</view>
+					<view class="lun">{{ item.lun }}</view>
+				</view>
+				<view v-if="item.status == 0" class="more text-gray">未开始</view>
+				<view v-if="item.status >0" class="more text-success" >已开奖</view>
 			</view>
 			<view class="main">
 				<view class="main-info rule">每轮限购1组，每组限购1份</view>
 				<view class="main-info time">
 					开奖时间：
-					<text>2021-07-21 08:00:00</text>
+					<text>{{item.stopTime}}</text>
 				</view>
-				<view class="main-info new">该轮预约1份，拼中1份，退回0份</view>
+				<view class="main-info new">该轮预约{{item.bingos+item.fails}}份，拼中{{item.bingos}}份，退回{{item.fails}}份</view>
 			</view>
 		</view>
 		<view class="box">
 			<view class="allTitle">
-				<view class="title-left">第1组 预约份数/总份数：11/11</view>
-				<view class="title-right">未中奖</view>
+				<view class="title-left">第{{item.table_id}}组 预约份数/总份数：{{item.joins}}/{{item.join_number}}</view>
+				<view class="title-right text-gray" v-if="item.status == 0">未开奖</view>
+				<view class="title-right text-success" v-if="item.status == 1">已中奖</view>
+				<view class="title-right text-danger" v-if="item.status == 2">未中奖</view>
+				<view class="title-right text-warning" v-if="item.status == 3">未成团</view>
 			</view>
 			<view class="yu-main">
-				<view class="img"><image src="" mode=""></image></view>
+				<view class="img"><image src="../../static/img/bgTip2.png" mode="scaleToFill"></image></view>
 				<view class="yu-info">
-					<view class="info">
+					<view class="info" v-if="item.status > 1">
 						<view class="yu-font">回退本金</view>
-						<view class="yu-num">100USDT</view>
+						<view class="yu-num">{{item.cost+item.type}}</view>
 					</view>
 					<view class="info">
 						<view class="yu-font">收益</view>
-						<view class="yu-num">3USDT</view>
+						<view class="yu-num">{{item.join_award+item.type}}</view>
 					</view>
 					<view class="info">
 						<view class="yu-font">唯一凭证</view>
-						<view class="yu-num">LALA122002552000</view>
+					</view>
+					<view class="info">
+						<view class="yu-num">{{item.order_id}}</view>
 					</view>
 				</view>
 			</view>
 			<view class="boom">
 				<view class="boom-font">当前组爆快</view>
-				<view class="boom-num">
+				<!-- <view class="boom-num">
 					LALA122002552000
 					<br />
 					LALA122002552000
-				</view>
+				</view> -->
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { pinkLogDate } from '@/api/finance.js';
+import { pinkLogDate } from '@/api/finance.js';
 export default {
 	data() {
 		return {
-			id:''
+			id: '',
+			item: {}
 		};
 	},
 	onLoad(e) {
 		this.id = e.id;
-		this.getDate()
+		this.getDate();
 	},
 	methods: {
 		getDate() {
-			pinkLogDate({},this.id).then((e) => {
-				console.log(e);
-			}).catch((e) => {
-				console.log(e);
-			})
+			pinkLogDate({}, this.id)
+				.then(e => {
+					const ls = e.data;
+					const lun = ls.group_num > 0 ? ls.group_num + '轮' : '';
+					const time = new Date(ls.pay_time * 1000);
+					let sy = ls.join_award*ls.cost/100+'';
+					const num = sy.split('.')[1]
+					// 判断小数点是否超过8位数标
+					if(num&&num.length>8){
+						sy = (+sy).toFixed(8);
+					}
+					this.item = {
+						name: ls.activity.name,
+						lun,
+						fen: 1,
+						money: +ls.cost,
+						type: ls.cost_money_type,
+						time: time.getFullYear() + '-' + (time.getMonth() + 1) + '-' + time.getDate(),
+						stopTime:'',
+						image: ls.activity.background_image,
+						id: ls.id,
+						status: ls.status,
+						bingos:ls.bingos,
+						fails:ls.fails,
+						table_id:ls.table_id,
+						joins:ls.joins.length,
+						join_number:ls.activity.join_number,
+						cost:+ls.cost,
+						join_award:+sy,
+						order_id:ls.order_id
+					};
+				})
+				.catch(e => {
+					console.log(e);
+				});
 		}
-	},
+	}
 };
 </script>
 
@@ -88,13 +127,9 @@ page {
 	border-radius: 20rpx;
 	padding: 26rpx 36rpx 30rpx 30rpx;
 	.title {
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
 		.log {
 			width: 48rpx;
 			height: 46rpx;
-			background: #00bcd4;
 			image {
 				width: 100%;
 				height: 100%;
@@ -189,6 +224,7 @@ page {
 			display: flex;
 			justify-content: space-between;
 			.yu-font {
+				flex-shrink: 0;
 				font-size: 26rpx;
 				font-family: PingFang SC;
 				font-weight: 500;

pages/index/datile.vue

@@ -5,7 +5,7 @@
 				<view class="shopBox-top">
 					<view class="left"><image src="../../static/img/index4.png" mode=""></image></view>
 					<view class="between" style="margin-left: -340rpx;">
-						<text id="one">{{ list.data.name }}</text>
+						<text id="one">{{ list.data?list.data.name:'' }}</text>
 						<text id="two">{{ list.lun }}轮</text>
 					</view>
 					<text id="three">预约中</text>
@@ -44,7 +44,7 @@
 				<view class="shopBox-top">
 					<view class="left"><image src="../../static/img/index4.png" mode=""></image></view>
 					<view class="between" style="margin-left: -340rpx;">
-						<text id="one">{{ list.data.name }}</text>
+						<text id="one">{{ list.data?list.data.name:'' }}</text>
 						<text id="two">{{ list.lun+1 }}轮</text>
 					</view>
 					<text id="three" style="color: #44969D;">待上架</text>
@@ -84,7 +84,7 @@
 					<view class="shopBox-top">
 						<view class="left"><image src="../../static/img/index4.png" mode=""></image></view>
 						<view class="between" style="margin-left: -340rpx;">
-							<text id="one">{{ list.data.name }}</text>
+							<text id="one">{{ list.data?list.data.name:'' }}</text>
 							<text id="two">{{ item.group_num*1 }}轮</text>
 						</view>
 						<text id="three" style="color: #6D7C88;">已开奖</text>
@@ -170,7 +170,12 @@ export default {
 			limit: 10,
 			page: 1,
 			id: '',
-			list: '',
+			list: {
+				data:{
+					name:'',
+					cost:''
+				}
+			},
 			history:false,
 			show: false, //支付数量
 			show1: false, //支付密码