2021-10-22

components/mchart.vue

@@ -1,88 +1,84 @@
 <template>
 	<view class="content">
-		<qiun-data-charts type="line" :chart-data="chartData" echartsApp />
+		<scroll-view scroll-x="true" class="box" v-if="istrue">
+			<view class="tu" :style="{'width': boxwidth}">
+				<qiun-data-charts type="area" :chart-data="chartData" echartsApp />
+			</view>
+		</scroll-view>
 	</view>
 </template>
 
 <script>
-	 
-	import {
-		lalaprice 
-	} from '@/api/wallet.js'
-	export default {
-		data() {
-			return {
-				chartData: {
-					categories: [],
-					series: [{
+import { lalaprice } from '@/api/wallet.js';
+export default {
+	data() {
+		return {
+			boxwidth:'',
+			istrue: false,
+			chartData: {
+				categories: [],
+				series: [
+					{
 						name: 'LALA价格走势图',
 						data: []
-					}]
-				}
+					}
+				]
 			}
-		},
-
-		mounted() {
-			console.log(this.chartData, '渲染完毕');
-			this.createChart()
-		},
-		methods: {
-			createChart() {
-				lalaprice().then(e => {
-					console.log(e.data, "123456")
-					// this.chart_data = e.data
+		};
+	},
 
+	mounted() {
+		console.log(this.chartData, '渲染完毕');
+		this.createChart();
+	},
+	methods: {
+		createChart() {
+			lalaprice()
+				.then(e => {
+					console.log(e.data, '123456');
+					this.chart_data = e.data
+					this.boxwidth = e.data.length *150 + 'rpx';
+					// this.$set(this,'boxwidth',e.data.length *150 + 'rpx')
+					console.log(this.boxwidth,"宽度")
 					let time = e.data.map(item => {
-						return item.date
-					})
-					console.log(time)
+						return item.date;
+					});
+					console.log(time);
 
-					this.$set(this.chartData, 'categories', time.reverse())
+					this.$set(this.chartData, 'categories', time.reverse());
 
 					let val = e.data.map(item => {
-						return +item.lala_price
-					})
-
-					console.log(val)
-					this.$set(this.chartData.series[0], 'data', val.reverse())
-					// 		option = {
-					// 			xAxis: {
-					// 				type: 'category',
-					// 				data: time
-					// 			},
-					// 			yAxis: {
-					// 				type: 'value'
-					// 			},
-					// 			series: [{
-					// 				data: val,
-					// 				type: 'line'
-					// 			}],
-					// 			grid: {
-					// 				left: '15%',
-					// 				right: '2%'
-					// 			}
-					// 		};
+						return +item.lala_price;
+					});
 
-					// 		option && myChart.setOption(option);
-				}).catch((E) => {
-					console.log(E);
+					console.log(val);
+					this.$set(this.chartData.series[0], 'data', val.reverse());
+					this.istrue = true;
 				})
-
-			}
+				.catch(E => {
+					console.log(E);
+				});
 		}
 	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.content {
-		width: 750rpx;
-		height: 500rpx;
-	}
+.content {
+	width: 750rpx;
+	height: 500rpx;
+}
 
-	.line-chart {
-		height: 500rpx;
-		width: 730rpx;
-		margin: auto;
-		background-color: #eee;
-	}
+.line-chart {
+	height: 500rpx;
+	width: 730rpx;
+	margin: auto;
+	background-color: #eee;
+}
+.box {
+	height: 500rpx;
+}
+.tu {
+	height: 500rpx;
+}
 </style>

manifest.json

@@ -2,8 +2,8 @@
     "name" : "Lala NFT",
     "appid" : "__UNI__3CDE968",
     "description" : "",
-    "versionName" : "1.2.4",
-    "versionCode" : 124,
+    "versionName" : "1.2.9",
+    "versionCode" : 129,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -52,7 +52,7 @@
             },
             "splashscreen" : {
                 "androidStyle" : "default",
-                "iosStyle" : "common",
+                "iosStyle" : "storyboard",
                 "android" : {
                     "hdpi" : "C:/Users/Administrator/Desktop/qidongtu.9.png",
                     "xhdpi" : "C:/Users/Administrator/Desktop/qidongtu.9.png",

pages/assets/myPing.vue

@@ -4,34 +4,34 @@
 		<view class="zong flex">
 			<view class="info" v-for="ls in listType">
 				<view class="info-num">{{ ls.num || '0.00' }}</view>
-				<view class="info-font">奖金池</view>
+				<view class="info-font">{{ ls.name }}奖金池</view>
 			</view>
 		</view>
 		<view class="zongbox flex">
 			<view class="info">
-				<view class="num">30</view>
+				<view class="num">{{yesterday.join}}</view>
 				<view class="info-font">昨日拼购数</view>
 			</view>
 			<view class="info">
-				<view class="num">20</view>
+				<view class="num">{{month.join}}</view>
 				<view class="info-font">月度拼购数</view>
 			</view>
 			<view class="info">
-				<view class="num">50</view>
+				<view class="num">{{history.join}}</view>
 				<view class="info-font">累计总拼购数</view>
 			</view>
 		</view>
 		<view class="zongbox flex">
 			<view class="info">
-				<view class="num">30</view>
+				<view class="num">{{yesterday.bingo}}</view>
 				<view class="info-font">昨日拼中数</view>
 			</view>
 			<view class="info">
-				<view class="num">20</view>
+				<view class="num">{{month.bingo}}</view>
 				<view class="info-font">月度拼中数</view>
 			</view>
 			<view class="info">
-				<view class="num">50</view>
+				<view class="num">{{history.bingo}}</view>
 				<view class="info-font">累计总拼中数</view>
 			</view>
 		</view>
@@ -78,17 +78,15 @@ import { pinkLog, systemWallet } from '@/api/finance.js';
 export default {
 	data() {
 		return {
-			happy: '0.00',
-			luck: '0.00',
-			// honor: '0.00',
-			// usdt: '0.00',
-			// fil: '0.00',
 			list: [],
 			listType: [], //分红数量
 			loadtype: 'loadmore',
 			page: 1,
 			limit: 10,
-			bonus: 0 //分红
+			bonus: 0 ,//分红
+			yesterday:'',//昨日
+			month:'',//季度
+			history:''//累计
 		};
 	},
 	onReachBottom() {
@@ -129,6 +127,10 @@ export default {
 				limit: that.limit
 			})
 				.then(e => {
+					this.yesterday = e.data.yesterday
+					this.month = e.data.month
+					this.history = e.data.history
+					console.log(this.yesterday,'1234556')
 					const data = e.data.list.map(ls => {
 						const lun = ls.group_num > 0 ? '第'+ ls.group_num + '轮' : '';
 						console.log(ls.table)
@@ -194,7 +196,7 @@ page {
 	box-shadow: 0px 0px 17rpx 0px rgba(0, 0, 0, 0.05);
 	border-radius: 20rpx;
 	margin: -150rpx auto 0;
-	justify-content: center;
+	justify-content: space-between;
 	padding: 0rpx 36rpx;
 	.info {
 		display: flex;

pages/assets/teamDetails.vue

@@ -16,12 +16,12 @@
 					开奖时间：
 					<text>{{item.time}}</text>
 				</view>
-				<view class="main-info new">该轮预约{{item.bingos+item.fails}}份，拼中{{item.bingos}}份，退回{{item.fails}}份</view>
+				<view class="main-info new">该轮预约11份，拼中2份，退回9份</view>
 			</view>
 		</view>
 		<view class="box">
 			<view class="allTitle">
-				<view class="title-left">第{{item.table_id}}组 预约份数/总份数：{{item.joins}}/{{item.join_number}}</view>
+				<view class="title-left">第{{item.table_id}}组 预约份数/总份数：11/11</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>

pages/index/article.vue

@@ -6,6 +6,11 @@
 		<view class="title">
 			{{ title }}
 		</view>
+		<view class="main flex">
+			<view class="">{{ author }}</view>
+			
+			<view class="" style="color: #d8d9da;"><span>{{time}}</span>{{ visit }}</view>
+		</view>
 		<view v-html="synopsis" class="content">
 			{{ synopsis }}
 		</view>
@@ -21,6 +26,8 @@ export default {
 			title: '',
 			synopsis:'',
 			time:'',
+			author:'',
+			visit:''
 		}
 	},
 	onLoad(option) {
@@ -35,6 +42,8 @@ export default {
 				obj.title = e.data.title;
 				obj.synopsis = e.data.content
 				obj.time = e.data.add_time;
+				obj.author = e.data.author;
+				obj.visit = e.data.visit;
 			})
 		}
 	}
@@ -53,9 +62,18 @@ export default {
 			height: 100%;
 		}
 	}
+	.main {
+		margin: 20rpx 50rpx;
+		font-size: 24rpx;
+		color: #000;
+		span {
+			display: inline-block;
+			padding-right: 20rpx;
+		}
+	}
 	.title{
 		width: 90%;
-		margin: 0 auto;
+		margin: 20rpx auto 0;
 		font-size: 40rpx;
 		font-weight: 500;
 		color: #171313;

pages/index/convert.vue

@@ -126,7 +126,7 @@
 								console.log(e.data.back[es], '555');
 							}
 						});
-						console.log(that.moneyType);
+						console.log(that.moneyType,'111');
 						console.log(that.add, '兑入');
 					})
 					.catch(e => {

pages/index/datile.vue

@@ -23,7 +23,7 @@
 				<view class="shopBox-bottom">
 					<view class="forward">
 						<view class="forward-left"></view>
-						<view class="forward-right">每组分数:&nbsp {{ list.data.join_number }}份</view>
+						<view class="forward-right">每组分数:&nbsp 11份</view>
 					</view>
 					<view class="consume">
 						GAS消耗:
@@ -48,6 +48,11 @@
 		</scroll-view>
 		<u-popup v-model="show" mode="bottom" border-radius="40" height="868rpx" :closeable="true">
 			<view class="yugo">
+				
+				<view class="Type flex" >
+					<view class="moneyName clamp" @click="moneyshow = true">{{moneyType[index].text}}</view>
+					<u-icon name="arrow-down-fill" color="#0F253A" size="10"></u-icon>
+				</view>
 				<view class="zhu">
 					注：每轮限购1组，每组限购1份
 					<span class="zhu-right">
@@ -62,7 +67,7 @@
 					</view>
 					<view class="info-box">
 						<view class="info-left">预约金额：</view>
-						<view class="info-right">{{ money }}</view>
+						<view class="info-right">{{ moneyType[index].money*1 }}{{moneyType[index].text}}</view>
 					</view>
 					<view class="info-box">
 						<view class="info-left">预约手续费：</view>
@@ -82,6 +87,7 @@
 				</view>
 			</view>
 		</u-popup>
+		<u-action-sheet :list="moneyType" v-model="moneyshow" @click="changeIndex"></u-action-sheet>
 	</view>
 </template>
 
@@ -104,6 +110,9 @@ export default {
 			history: false,
 			show: false, //支付数量
 			show1: false, //支付密码
+			moneyshow:false,//支付方式开关
+			moneyType:[{text:''}],//支付方式选择
+			index:0,//判断支付方式是那个
 			password: '',
 			value: 1,
 			money: '',
@@ -163,14 +172,27 @@ export default {
 						e.type = type
 					})
 					obj.list = data;
-					
-					console.log(obj.list)
+					obj.moneyType[0].text = obj.list.data.cost_money_type;
+					obj.moneyType[0].money = obj.list.data.cost;
+					if(obj.list.data.cost_money_type != obj.list.data.cost_2_money_type){
+						let shuj = []
+						shuj.money = obj.list.data.cost_2;
+						shuj.text = obj.list.data.cost_2_money_type;
+						console.log(shuj,'111')
+						obj.moneyType[1] = shuj
+						console.log(obj.moneyType,'123')
+					}
 					uni.hideLoading();
 				})
 				.catch(e => {
 					console.log(e);
 				});
 		},
+		// 弹出层选择事件
+		changeIndex(e) {
+			console.log(e);
+			this.index = e;
+		},
 		buy() {
 			this.money = 1 * this.list.data.cost + this.list.data.cost_money_type;
 			this.souxu = this.list.data.ticket + this.list.data.ticket_money_type;
@@ -192,7 +214,8 @@ export default {
 		pswQd() {
 			buylala(
 				{
-					trade_psw: this.password
+					trade_psw: this.password,
+					cost_type:this.moneyType[this.index].text
 				},
 				this.id
 			)
@@ -368,6 +391,33 @@ export default {
 	padding-top: 80rpx;
 	position: relative;
 	height: 100%;
+	.Type {
+		border-top: 1px solid #eeeeee;
+		padding: 20rpx $page-row-spacing;
+		justify-content: start;
+		.moneyName {
+			font-size: 30rpx;
+			font-weight: 500;
+			color: $font-color-dark;
+			margin: 0 20rpx;
+		}
+	
+		.input {
+			flex-grow: 1;
+			height: 45rpx;
+			line-height: 45rpx;
+			margin-left: 40rpx;
+			color: $font-color-light;
+			border-bottom: 1px solid $border-color-light;
+		}
+	
+		.line {
+			width: 2rpx;
+			background-color: $font-color-dark;
+			margin: 0 10rpx;
+			height: 30rpx;
+		}
+	}
 	.zhu {
 		height: 112rpx;
 		border-top: 1px #eeeeee solid;

pages/index/index.vue

@@ -69,7 +69,7 @@
 				<view class="shopBox-bottom">
 					<view class="forward">
 						<view class="forward-left"></view>
-						<view class="forward-right">每组分数:&nbsp {{ item.join_number }}份</view>
+						<view class="forward-right">每组分数:&nbsp 11份</view>
 					</view>
 					<view class="consume">
 						GAS消耗:
@@ -100,6 +100,10 @@
 		</view>
 		<u-popup v-model="show" mode="bottom" border-radius="40" height="868rpx" :closeable="true">
 			<view class="yugo">
+				<view class="Type flex" >
+					<view class="moneyName clamp" @click="moneyshow = true">{{moneyType[index].text}}</view>
+					<u-icon name="arrow-down-fill" color="#0F253A" size="10"></u-icon>
+				</view>
 				<view class="zhu">
 					注：每轮限购1组，每组限购1份
 					<span class="zhu-right">
@@ -114,7 +118,7 @@
 					</view>
 					<view class="info-box">
 						<view class="info-left">预约金额：</view>
-						<view class="info-right">{{ money }}</view>
+						<view class="info-right">{{ moneyType[index].money*1 }}{{moneyType[index].text}}</view>
 					</view>
 					<view class="info-box">
 						<view class="info-left">预约门票：</view>
@@ -144,6 +148,7 @@
 				<image src="../../static/img/teach.png" mode=""></image>
 			</view>
 		</view>
+		<u-action-sheet :list="moneyType" v-model="moneyshow" @click="changeIndex"></u-action-sheet>
 	</view>
 </template>
 <script>
@@ -156,6 +161,9 @@ export default {
 			tishi:true,//是否显示教程框
 			show: false, //支付数量
 			show1: false, //支付密码
+			moneyshow:false,//支付方式开关
+			moneyType:[{text:''}],//支付方式选择
+			index:0,//判断支付方式是那个
 			password: '',
 			value: 1,
 			list: [],
@@ -167,7 +175,8 @@ export default {
 			swiperLength: 0,
 			swiperCurrent: 0,
 			showList: [],
-			start: '' //平团开始时间
+			start: '' ,//平团开始时间
+			moneyType:['usdt','usdc'],//兑出币种类型
 		};
 	},
 	//页面加载即刻发生
@@ -190,8 +199,10 @@ export default {
 					let arr = data.roll;
 					let ar = [];
 					arr.forEach(e => {
+						console.log(e)
 						ar.push(e.info);
 					});
+					
 					arr.infoList = ar;
 					obj.showList = arr;
 					lala({
@@ -236,7 +247,27 @@ export default {
 							});
 						});
 						obj.list = data.list.data;
-						console.log(obj.list, '1111111');
+						obj.list.forEach(e =>{
+							e.moneyType = [];
+							if(e.cost_money_type !=e.cost_2_money_type){
+								let type1 = {};
+								let type2 = {};
+								
+								type1.text = e.cost_money_type;
+								type1.money = e.cost;
+								e.moneyType[0] = type1
+								type2.text = e.cost_2_money_type;
+								type2.money = e.cost_2;
+								e.moneyType[1] = type2
+							}else {
+								let type1 = '';
+								
+								type1.text = e.cost_money_type;
+								type1.money = e.cost;
+								e.moneyType[0] = type1
+							}
+							console.log(e,'11111')
+						})
 						uni.stopPullDownRefresh();
 						uni.hideLoading();
 					});
@@ -254,9 +285,15 @@ export default {
 				url: url
 			});
 		},
+		changeIndex(e) {
+			console.log(e);
+			this.index = e;
+		},
 		buy(item) {
 			this.money = 1 * item.cost + item.cost_money_type;
 			this.souxu = 1 * item.ticket + item.ticket_money_type;
+			this.moneyType = item.moneyType;
+			this.index = 0;
 			this.id = item.id;
 			this.show = true;
 		},
@@ -285,7 +322,8 @@ export default {
 			const obj = this;
 			buylala(
 				{
-					trade_psw: this.password
+					trade_psw: this.password,
+					cost_type:this.moneyType[this.index].text
 				},
 				this.id
 			)
@@ -612,6 +650,33 @@ export default {
 	padding-top: 80rpx;
 	position: relative;
 	height: 100%;
+	.Type {
+		border-top: 1px solid #eeeeee;
+		padding: 20rpx $page-row-spacing;
+		justify-content: start;
+		.moneyName {
+			font-size: 30rpx;
+			font-weight: 500;
+			color: $font-color-dark;
+			margin: 0 20rpx;
+		}
+	
+		.input {
+			flex-grow: 1;
+			height: 45rpx;
+			line-height: 45rpx;
+			margin-left: 40rpx;
+			color: $font-color-light;
+			border-bottom: 1px solid $border-color-light;
+		}
+	
+		.line {
+			width: 2rpx;
+			background-color: $font-color-dark;
+			margin: 0 10rpx;
+			height: 30rpx;
+		}
+	}
 	.zhu {
 		height: 112rpx;
 		border-top: 1px #eeeeee solid;

pages/index/node.vue

@@ -33,7 +33,7 @@
 					<u-line-progress :show-percent="false" inactive-color="#BBBBBB" active-color="#29F3FD" :percent="zuiduo"></u-line-progress>
 				</view>
 				<view class="yue-num">
-					仅剩{{ zuiduo }}%
+					仅剩{{ shen }}份，总共{{ all }}份
 				</view>
 				
 			</view>
@@ -59,7 +59,9 @@ export default {
 	data() {
 		return {
 			mun: 1,
-			zuiduo:0,
+			zuiduo:0,//剩余份数占总数的百分比
+			shen:0,//还剩几份
+			all:0,//总量
 			id:'',
 			list:'',
 			show1: false, //支付密码
@@ -74,8 +76,10 @@ export default {
 			getPoint().then(({data}) => {
 				console.log(data)
 				this.list = data[0]
+				this.shen = data[0].stock * 1
 				this.zuiduo = (data[0].stock * 1 / data[0].all_stock) * 100
-				this.zuiduo = this.zuiduo.toFixed(2)
+				// this.zuiduo = this.zuiduo.toFixed(2)
+				this.all = data[0].all_stock*1
 				this.id = data[0].id
 			})
 		},

pages/set/set.vue

@@ -22,28 +22,31 @@
 </template>
 
 <script>
+import { logout } from '@/api/set.js';
 export default {
 	methods: {
-		toLogout(){
+		toLogout() {
 			let obj = this;
 			uni.showModal({
-			    content: '确定要退出登录么',
-			    success: (e)=>{
-			    	if(e.confirm){
-						logout({}).then((e) => {
-							uni.navigateBack();
-						}).catch((e) => {
-							console.log(e);
-						})
-			    		obj.logout();
-			    	}
-			    }
+				content: '确定要退出登录么',
+				success: e => {
+					if (e.confirm) {
+						logout({})
+							.then(e => {
+								uni.navigateBack();
+							})
+							.catch(e => {
+								console.log(e);
+							});
+						obj.logout();
+					}
+				}
 			});
 		},
 		nav(url) {
 			uni.navigateTo({
 				url
-			})
+			});
 		}
 	}
 };
@@ -114,8 +117,8 @@ page {
 	margin: 158rpx auto 30rpx;
 	width: 560rpx;
 	height: 80rpx;
-	background: linear-gradient(90deg, #58BAB0, #60BAB0, #45969B);
+	background: linear-gradient(90deg, #58bab0, #60bab0, #45969b);
 	border-radius: 40px;
-	color: #FFFFFF;
+	color: #ffffff;
 }
 </style>

pages/user/extension.vue

@@ -14,7 +14,7 @@
 					</view>
 					<view class="">
 						<view class="name">
-							<view class="name-left">{{ userInfo.phone || userInfo.email || '游客' }}</view>
+							<view class="name-left clamp">{{ userInfo.phone || userInfo.email || '游客' }}</view>
 							<view class="name-right">
 								<image class="image" src="../../static/img/img28.png"></image>
 								<view class="level" v-if="userInfo.level">{{ userInfo.level_info.name }}</view>
@@ -77,15 +77,15 @@
 			</view>
 			<view class="box-item flex">
 				<view class="box-left">昨日分享奖励</view>
-				<view class="box-right">{{yesterday.recommend || 0}}USDT</view>
+				<view class="box-right">{{yesterday.recommend*1 || 0}}USDT</view>
 			</view>
 			<view class="box-item flex">
 				<view class="box-left">昨日团队奖励</view>
-				<view class="box-right">{{yesterday.group || 0}}USDT</view>
+				<view class="box-right">{{yesterday.group*1 || 0}}USDT</view>
 			</view>
 			<view class="box-item flex">
 				<view class="box-left" style="color:#44969D;">昨日累计奖励</view>
-				<view class="box-right" style="color:#44969D;">{{yesterday.group || 0}}USDT</view>
+				<view class="box-right" style="color:#44969D;">{{yesterday.all*1 || 0}}USDT</view>
 			</view>
 		</view>
 		<view class="box">
@@ -95,15 +95,15 @@
 			</view>
 			<view class="box-item flex">
 				<view class="box-left">累计分享奖励</view>
-				<view class="box-right">{{all.recommend || 0}}USDT</view>
+				<view class="box-right">{{all.recommend*1 || 0}}USDT</view>
 			</view>
 			<view class="box-item flex">
 				<view class="box-left">累计团队奖励</view>
-				<view class="box-right">{{all.group || 0}}USDT</view>
+				<view class="box-right">{{all.group*1 || 0}}USDT</view>
 			</view>
 			<view class="box-item flex">
 				<view class="box-left" style="color:#44969D;">历史累计奖励</view>
-				<view class="box-right" style="color:#44969D;">{{all.group || 0}}USDT</view>
+				<view class="box-right" style="color:#44969D;">{{all.all*1 || 0}}USDT</view>
 			</view>
 		</view>
 		<view class="liebiao flex" @click="navto('/pages/user/extensionList')">
@@ -178,7 +178,9 @@ export default {
 				this.achievement_month = data.achievement_month;
 				this.small_achivement_month = data.small_achivement_month;
 				this.all = data.all;
+				this.all.all = this.all.pink*1 + this.all.recommend*1 + this.all.group*1;
 				this.yesterday = data.yesterday;
+				this.yesterday.all = this.yesterday.pink*1 + this.yesterday.recommend*1 + this.yesterday.group*1;
 			})
 			
 		},
@@ -367,6 +369,9 @@ page {
 				color: #ffffff;
 				display: flex;
 				justify-content: start;
+				.name-left {
+					width: 220rpx;
+				}
 				.name-right {
 					margin-left: 20rpx;
 					width: 50rpx;
@@ -378,8 +383,9 @@ page {
 					}
 					.level {
 						position: absolute;
-						top: 20rpx;
-						left: 10rpx;
+						top: 35%;
+						left: 50%;
+						margin-left: -12rpx;
 						font-size: 20rpx;
 					}
 				}

pages/user/myNote.vue

@@ -14,30 +14,30 @@
 		<view class="zongbox flex">
 			<view class="zongbox-left">昨日</view>
 			<view class="info">
-				<view class="num">30</view>
+				<view class="num">{{yesterday_award}}</view>
 				<view class="info-font">昨日门票分红</view>
 			</view>
 			<view class="info">
-				<view class="num">20</view>
+				<view class="num">{{yesterday_service}}</view>
 				<view class="info-font">手续费分红</view>
 			</view>
 			<view class="info">
-				<view class="num">50</view>
+				<view class="num">0</view>
 				<view class="info-font">其他分红</view>
 			</view>
 		</view>
 		<view class="zongbox flex">
 			<view class="zongbox-left">历史</view>
 			<view class="info">
-				<view class="num">30</view>
+				<view class="num">{{all_award}}</view>
 				<view class="info-font">历史门票分红</view>
 			</view>
 			<view class="info">
-				<view class="num">20</view>
+				<view class="num">{{all_service}}</view>
 				<view class="info-font">手续费分红</view>
 			</view>
 			<view class="info">
-				<view class="num">50</view>
+				<view class="num">0</view>
 				<view class="info-font">其他分红</view>
 			</view>
 		</view>
@@ -56,11 +56,11 @@
 							<view class="item-main">
 								<view class="main-top flex">
 									<view class="top-left">认购份数：{{ ls.buy_num * 1 }}</view>
-									<view class="top-right">累计释放：20</view>
+									<view class="top-left">释放天数：{{ ls.release_time_now }}</view>
+									<!-- <view class="top-right">累计释放：20</view> -->
 								</view>
 								<view class="main-top flex">
-									<view class="top-left">释放天数：{{ ls.release_time_now }}</view>
-									<view class="top-right">累计分红：20</view>
+									<!-- <view class="top-right">累计分红：20</view> -->
 								</view>
 							</view>
 						</view>
@@ -80,16 +80,17 @@
 						<view class="name1">{{ ls.plan_name }}</view>
 					</view>
 					<view class="item-main">
-						<view class="main-top">合伙人数：{{ls.request_num}}</view>
-						<view class="main-top">累计分红：{{ls.release_money*1}}</view>
-						<view class="main-top">时间：2021年9月2日</view>
+						<view class="main-top">已加入人数：{{ls.request_num*1}}</view>
+						<view class="main-top">合伙总人数：{{ls.all_stock*1}}</view>
+						<view class="main-top">分红总量：{{ls.release_money*1}}</view>
+						<!-- <view class="main-top">时间：2021年9月2日</view> -->
 					</view>
 				</view>
 			</view>
 		</view>
 		<!-- </swiper-item>
 		</swiper> -->
-		<u-popup v-model="show" mode="center" width="548rpx" border-radius="14">
+		<!-- <u-popup v-model="show" mode="center" width="548rpx" border-radius="14">
 			<view class="psw-wrapper">
 				<view class="psw-title">请输入支付密码</view>
 				<input type="password" v-model="password" class="psw-ipt" />
@@ -98,7 +99,7 @@
 					<text class="psw-qd" @click="pswQd">确定</text>
 				</view>
 			</view>
-		</u-popup>
+		</u-popup> -->
 	</view>
 </template>
 <script>
@@ -113,8 +114,12 @@ export default {
 			tabList: [],
 			pointList: [],
 			loding: 'more',
-			all: '',
-			yesterday: ''
+			all: '',//累计释放
+			yesterday: '',//昨天释放
+			all_award:'',//历史门票分红
+			yesterday_award:'',//昨日门票分红
+			all_service: 0,//历史手续费分红
+			yesterday_service:'',//昨日手续费分红
 		};
 	},
 	//页面加载即刻发生
@@ -129,7 +134,26 @@ export default {
 			});
 			myPiont({ page: 1, limit: 10000 }).then(({ data }) => {
 				this.yesterday = data.yesterday * 1;
+				this.yesterday_award = (data.yesterday_award * 1).toFixed(4);
 				this.all = data.all * 1;
+				this.all_award = (data.all_award * 1).toFixed(4);
+				if (data.all_service.length != 0 ){
+					for(let i = 0;i < data.all_service.length; i++){
+						let j = data.all_service[i].sum *1
+						this.all_service = this.all_service + j
+						console.log(j,'1111')
+					}
+					this.all_service = (this.all_service*1).toFixed(4)
+				}else {
+					this.all_service = 0;
+				}
+				if (data.yesterday_service.length != 0 ){
+					for(let i = 0;i < data.yesterday_service.length; i++){
+						this.yesterday_service += data.yesterday_service[i].sum
+					}
+				}else {
+					this.yesterday_service = 0;
+				}
 				this.tabList = data.list;
 				getPoint().then(({ data }) => {
 					this.pointList = data;
@@ -195,7 +219,7 @@ page {
 	background: #ffffff;
 	box-shadow: 0px 0px 17rpx 0px rgba(0, 0, 0, 0.05);
 	border-radius: 20rpx;
-	margin: 10rpx auto 0;
+	margin: 20rpx auto 0;
 	justify-content: space-around;
 	padding: 36rpx 10rpx 36rpx 60rpx;
 	position: relative;
@@ -223,9 +247,8 @@ page {
 	}
 }
 .tabSwiper {
-	height: calc(100% - 70rpx);
 	.swiper-item {
-		padding: 30rpx;
+		padding: 30rpx 30rpx 0;
 	}
 }
 .box {

pages/user/user.vue

@@ -9,7 +9,7 @@
 				</view>
 				<view class="">
 					<view class="name">
-						<view class="name-left">{{ userInfo.phone || userInfo.email || '游客' }}</view>
+						<view class="name-left clamp">{{ userInfo.phone || userInfo.email || '游客' }}</view>
 						<view class="name-right">
 							<image class="image" src="../../static/img/img28.png"></image>
 							<view class="level" v-if="userInfo.level">{{ userInfo.level_info.name }}</view>
@@ -21,7 +21,9 @@
 			</view>
 			<view class="config" @click="nav('/pages/set/userinfo')">
 				<view class="myself"><image src="../../static/img/myself.png" mode=""></image></view>
-				我的资料
+				<view class="">
+					我的资料
+				</view>
 			</view>
 		</view>
 		<view class="main">
@@ -290,6 +292,9 @@ page {
 			color: #ffffff;
 			display: flex;
 			justify-content: start;
+			.name-left {
+				max-width: 220rpx;
+			}
 			.name-right {
 				margin-left: 20rpx;
 				width: 50rpx;
@@ -301,8 +306,9 @@ page {
 				}
 				.level {
 					position: absolute;
-					top: 20rpx;
-					left: 10rpx;
+					top: 35%;
+					left: 50%;
+					margin-left: -12rpx;
 					font-size: 20rpx;
 				}
 			}
@@ -447,6 +453,7 @@ page {
 	}
 }
 .config {
+	z-index: 10;
 	background: #fff;
 	text-align: right;
 	font-size: 26rpx !important;
@@ -459,14 +466,12 @@ page {
 	font-weight: 500;
 	color: #60bab0;
 	line-height: 58rpx;
-	padding:2rpx 8rpx;
+	padding:2rpx 20rpx;
 	display: flex;
+	align-items: center;
 	.myself {
-		padding-top: 9rpx;
-		padding-left: 5rpx;
-		height: 30rpx;
-		width: 30rpx;
-		margin-right: 6rpx;
+		padding-top: 12rpx;
+		margin-right: 10rpx;
 		image {
 			height: 30rpx;
 			width: 30rpx;

unpackage/apple/账号.txt

@@ -0,0 +1,2 @@
+AppID: inc.lala.com
+密码 112233

unpackage/cache/appleConfig.ini

@@ -1,9 +1,30 @@
 [appleAppid]
-appleAppid=uni.UNIF0EBD91
+appleAppid=inc.lala.com
 
 [iosStyle]
-iosStyle=common
+iosStyle=storyboard
 
 [universalLinks]
 universalLinks=
 spaceid=
+
+[appstore]
+appstore=2c2f2d6a9a9d574f9bd199618f3d89b4
+
+[iphone]
+app%402x=f1210b3a274609b0bf24148229582306
+app%403x=5af22fb83936c3918f3f404dacfd8c06
+notification%402x=ec64af336f1ab85bb397c2d2da6d9700
+notification%403x=d75ee64d80e499116cdffceb333e53eb
+settings%402x=8d2e82ee013d113b5f3314e45ea79fd8
+settings%403x=3a3c2228cfb071ff8f0eca3f83e72d56
+spotlight%402x=3ad3a4bcd6fa5b918e36873cc9268f22
+spotlight%403x=f1210b3a274609b0bf24148229582306
+
+[universalLinks_qq]
+universalLinks_qq=
+spaceid_qq=
+
+[universalLinks_weibo]
+universalLinks_weibo=
+spaceid_weibo=

unpackage/cache/certdataios

@@ -0,0 +1,3 @@
+iosProfile=D:/工作/项目2/nft拼团/NFT/unpackage/apple/lala.mobileprovision
+ioscertFile=D:/工作/项目2/nft拼团/NFT/unpackage/apple/lala2021.p12
+ioscertPassword=7IwuiYJfyRjKKTfhI7sjzw==