hwq 3 vuotta sitten
vanhempi
commit
c56cc6d3fe
9 muutettua tiedostoa jossa 265 lisäystä ja 208 poistoa
  1. 18 0
      api/finance.js
  2. 2 2
      manifest.json
  3. 1 4
      pages.json
  4. 3 2
      pages/assets/logroll.vue
  5. 178 173
      pages/index/node.vue
  6. 29 1
      pages/message/message.vue
  7. 34 26
      pages/user/user.vue
  8. BIN
      static/img/rengou.png
  9. BIN
      static/img/start.png

+ 18 - 0
api/finance.js

@@ -144,4 +144,22 @@ export function systemWallet(data) {
 		method: 'get',
 		data
 	});
+}
+
+//消息类型列表
+export function messageList(data){
+	return request({
+		url: '/api/message',
+		method: 'get',
+		data
+	});
+}
+
+//消息详情
+export function message(data,id){
+	return request({
+		url: '/api/message/'+ id,
+		method: 'get',
+		data
+	});
 }

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "Lala NFT",
     "appid" : "__UNI__3CDE968",
     "description" : "",
-    "versionName" : "1.3.0",
-    "versionCode" : 130,
+    "versionName" : "1.3.9",
+    "versionCode" : 139,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

+ 1 - 4
pages.json

@@ -29,10 +29,7 @@
 		{
 			"path": "pages/index/node",
 			"style": {
-				"navigationBarTitleText": "节点",
-				"app-plus": {
-					"titleNView": false
-				}
+				"navigationBarTitleText": "拼团合伙人"
 			}
 		},
 		{

+ 3 - 2
pages/assets/logroll.vue

@@ -70,7 +70,7 @@ export default {
 <style lang="scss">
 .center {
 	width: 100%;
-	height: 100%;
+	height: 100vh;
 	position: relative;
 	padding-bottom: 40rpx;
 	.bg {
@@ -78,7 +78,7 @@ export default {
 		top: 0;
 		left: 0;
 		right: 0;
-		height: 100%;
+		height: 100vh;
 		image {
 			width: 100%;
 			height: 100%;
@@ -231,6 +231,7 @@ export default {
 	margin: 50rpx auto 0;
 	padding: 20rpx 20rpx;
 	.pwd-font {
+		width: 140rpx;
 		font-size: 30rpx;
 		font-family: PingFang SC;
 		font-weight: 500;

+ 178 - 173
pages/index/node.vue

@@ -1,97 +1,73 @@
 <template>
 	<view class="center">
-		<scroll-view class="box" scroll-y="true" >
-			<view class="bg">
-				<image src="../../static/img/rengou.png" mode=""></image>
+		<scroll-view class="box" scroll-y="true">
+			<view class="bg"><image src="../../static/img/rengou.png" mode=""></image></view>
+			<view class="title">
+				<image src="../../static/img/start.png" mode=""></image>
+				<view class="title-font">技术改变生活</view>
+				<image src="../../static/img/start.png" mode=""></image>
 			</view>
-			<view class="rengou">
-					1、每份投资{{list.buy_price*1}}U,有效直推3人<br>
-					2、49份组成一个社区节点<br>
-					3、总节点合伙人1024名,每期49人,分21期招募
-			</view>
-			<view class="quanyi">
-					1、赠送1T FiL矿机1080天标准产币收益,技术服务费30% <br>
-					2、赠送LALA积分通证10万枚,每天1%释放。LALA上交易所前每天1%上涨,总100天<br>
-					3、享受LALA门票50%合伙人加权分红(扣除销毁后的门票,门票销毁按照市场情况动态调整,系数在10~50%之间)。<br>
-					4、享受项目总50%的股权加权分红(包括门票、手续费等)。<br>
-					5、享受LALA社区会员A2级别权益。<br>
-					6、赠送LALA NFT创世勋章一枚。
-			</view>
-			<view class="rule">
-					1、LALA NFT平台节点合伙人共分21期,即21个主节点。<br>
-					2、LALA节点每期认购满额后,自然开启第2期节点认购。直至21个节点认购满结束。<br>
-					3、个人可以一次多份参与认购,也可参与多个节点认购,每份节点认购享受的权益相同。<br>
-			</view>
-			<view class="jiedian">
-				<view class="mun">
-					{{mun}}
-				</view>
-				<view class="font">
-					认购份数
-				</view>
-				<view class="jdt">
-					<u-line-progress :show-percent="false" inactive-color="#BBBBBB" active-color="#29F3FD" :percent="zuiduo"></u-line-progress>
-				</view>
-				<view class="yue-num">
-					仅剩{{ shen }}份,总共{{ all }}份
-				</view>
-				
-			</view>
-			<view class="btn" @click="buy()">
-				立即认购
+			<view class="main">
+				说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容说明内容
 			</view>
+			<view class="btn" @click="buy()">加入合伙人</view>
 		</scroll-view>
-		<u-popup v-model="show1" 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" />
-				<view class="psw-btn">
-					<text @click="cancel">取消</text>
-					<text class="psw-qd" @click="pswQd">确定</text>
+		<uni-popup ref="popup" type="center">
+			<view class="popup">
+				<view class="popup-dox">
+					<view class="popup-title">确认付款</view>
+					<view class="popup-little">请输入支付密码确认付款</view>
+				</view>
+				<view class="people-info">
+					<view class="info-main">
+						{{ list.buy_price * 1 }}
+						<text>{{ list.buy_money_type }}</text>
+					</view>
+					<view class="info-tip">加入合伙人</view>
+					<view class="pwd-box">
+						<view class="pwd-font">密码</view>
+						<view class="input"><input type="password" value="password" v-model="password" placeholder="请输入支付密码" placeholder-class="pwd-tip" /></view>
+					</view>
+					<view class="btn-box" @click="pswQd">确认</view>
 				</view>
 			</view>
-		</u-popup>
+			<view class="close_icon" @click="close"><image src="../../static/img/Close.png"></image></view>
+		</uni-popup>
 	</view>
 </template>
 <script>
-import { getPoint,buyPoint } from '@/api/set.js'
+import { getPoint, buyPoint } from '@/api/set.js';
 export default {
 	data() {
 		return {
 			mun: 1,
-			zuiduo:0,//剩余份数占总数的百分比
-			shen:0,//还剩几份
-			all:0,//总量
-			id:'',
-			list:'',
-			show1: false, //支付密码
-			password: '',
-		}
+			zuiduo: 0, //剩余份数占总数的百分比
+			shen: 0, //还剩几份
+			all: 0, //总量
+			id: '',
+			list: '',
+			password: ''
+		};
 	},
 	onLoad() {
-		this.loadData()
+		this.loadData();
 	},
 	methods: {
 		async loadData() {
-			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.all = data[0].all_stock*1
-				this.id = data[0].id
-			})
+			getPoint().then(({ data }) => {
+				console.log(data);
+				this.list = data[0];
+				this.id = data[0].id;
+			});
 		},
-		buy(){
-			this.show1 = true
+		buy() {
+			this.$refs.popup.open();
 		},
-		cancel() {
-			this.password = '';
-			this.show1 = false;
+		close() {
+			this.$refs.popup.close();
 		},
 		pswQd() {
-			const obj = this
+			const obj = this;
 			buyPoint(
 				{
 					trade_psw: this.password,
@@ -102,16 +78,16 @@ export default {
 				.then(e => {
 					this.password = '';
 					this.show1 = false;
-					this.$api.msg("购买节点成功");
+					this.$api.msg('购买节点成功');
 				})
 				.catch(e => {
 					this.password = '';
 					this.show1 = false;
 					console.log(e);
 				});
-		},
+		}
 	}
-}
+};
 </script>
 <style lang="scss">
 page {
@@ -125,140 +101,169 @@ page {
 .box {
 	position: relative;
 	width: 100%;
-	height: 100%;
+	height: 1930rpx;
 	.bg {
 		position: absolute;
 		top: 0;
 		right: 0;
 		left: 0;
 		width: 100%;
-		height: 3456rpx;
+		height: 1930rpx;
 		image {
 			width: 100%;
-			height: 3456rpx;
+			height: 1930rpx;
 		}
 	}
-	.rengou {
-		position: relative;
-		z-index: 10;
-		padding-top: 1120rpx;
-		margin: 0 auto;
-		width: 460rpx;
-		font-size: 24rpx;
-		line-height: 36rpx;
+	.btn {
+		width: 684rpx;
+		height: 96rpx;
+		position: absolute;
+		bottom: 108rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+		background: #29f3fd;
+		border-radius: 48rpx;
+		text-align: center;
+		line-height: 96rpx;
+		font-size: 42rpx;
 		font-family: PingFang SC;
 		font-weight: bold;
-		color: #FFFFFF;
-		height: 1260rpx;
+		color: #030454;
 	}
-	.quanyi {
+	.title {
+		padding-top: 700rpx;
 		position: relative;
 		z-index: 10;
-		// padding-top: 254rpx;
-		// margin: 0 auto;
-		margin: 240rpx auto 0;
-		width: 460rpx;
-		font-size: 24rpx;
-		line-height: 36rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #FFFFFF;
-		height: 420rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		image {
+			width: 36rpx;
+			height: 34rpx;
+		}
+		.title-font {
+			padding: 0 10rpx;
+			font-size: 48rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
 	}
-	.rule {
+	.main {
 		position: relative;
 		z-index: 10;
-		// padding-top: 264rpx;
-		// margin: 0 auto;
-		margin: 264rpx auto 0;
-		width: 460rpx;
+		width: 624rpx;
+		height: 244rpx;
 		font-size: 24rpx;
-		line-height: 36rpx;
 		font-family: PingFang SC;
-		font-weight: bold;
+		font-weight: 500;
 		color: #FFFFFF;
-		height: 252rpx;
+		margin: 50rpx auto 0;
 	}
-	.jiedian {
-		text-align: center;
-		position: relative;
-		z-index: 10;
-		// padding-top: 280rpx;
-		// margin: 0 auto;
-		margin: 300rpx auto 0;
-		width: 460rpx;
-		color: #FFFFFF;
-		height: 206rpx;
-		line-height: 1;
-		.mun {
-			font-size: 50rpx;
+}
+.popup {
+	width: 540rpx;
+	background-color: #ffffff;
+	border-radius: 15rpx;
+	text-align: center;
+	padding-bottom: 50rpx;
+	.popup-dox {
+		padding-top: 84rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		.popup-title {
+			font-size: 36rpx;
 			font-family: PingFang SC;
 			font-weight: bold;
+			color: #333333;
 		}
-		.font {
-			margin-top: 10rpx;
+		.popup-little {
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #808080;
 		}
-		.jdt {
-			// padding: 20rpx;
-			margin: 20rpx auto 0;
-			width: 300rpx;
-			height: auto;
+	}
+	.people-info {
+		margin-top: 56rpx;
+		padding: 0 26rpx;
+		text-align: left;
+		line-height: 1;
+		.info-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+		}
+		.info-main {
+			text-align: center;
+			margin-top: 70rpx;
+			font-size: 70rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #e83f30;
+			text {
+				font-size: 40rpx;
+			}
 		}
-		.yue-num {
-			font-size: 20rpx;
-			color: #29F3FD;
+		.info-tip {
+			text-align: center;
 			margin-top: 20rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
 		}
 	}
-	.btn {
-		position: relative;
-		margin: 120rpx auto 0;
-		z-index: 10;
-		width: 514rpx;
-		height: 80rpx;
-		background: #29F3FD;
-		border-radius: 40px;
+	.pwd-box {
+		width: 490rpx;
+		background: #f4f4f4;
+		border-radius: 10rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+		margin: 50rpx auto 0;
+		padding: 20rpx 20rpx;
+		.pwd-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+		}
+		.pwd-tip {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			opacity: 0.51;
+		}
+		.input {
+			margin-left: 20rpx;
+		}
+	}
+	.btn-box {
+		margin: 46rpx auto 0;
+		width: 460rpx;
+		height: 70rpx;
+		background: linear-gradient(0deg, #2e58ff, #32c6ff);
+		border-radius: 10rpx;
 		text-align: center;
-		line-height: 80rpx;
-		font-size: 32rpx;
+		line-height: 70rpx;
+		font-size: 28rpx;
 		font-family: PingFang SC;
-		font-weight: bold;
-		color: #051D38;
+		font-weight: 500;
+		color: #ffffff;
 	}
 }
-.line {
-	display: inline-block;
-	padding-left: 20rpx;
-}
-.psw-wrapper {
-	width: 548rpx;
-	height: 344rpx;
-	background-color: #ffffff;
-	.psw-title {
+.close_icon {
+	width: 60rpx;
+	height: 60rpx;
+	margin: 88rpx auto 0;
+	image {
 		width: 100%;
-		font-size: 35rpx;
-		padding: 43rpx 0 49rpx;
-		text-align: center;
-		font-weight: 800;
-	}
-	.psw-ipt {
-		display: block;
-		background-color: #dce3ed;
-		height: 90rpx;
-		width: 464rpx;
-		padding-left: 30rpx;
-		margin: 0 auto;
-		font-size: 80rpx;
-	}
-	.psw-btn text {
-		display: inline-block;
-		text-align: center;
-		width: 50%;
-		padding-top: 29rpx;
-		font-size: 35rpx;
-	}
-	.psw-qd {
-		color: #45969b;
+		height: 100%;
 	}
 }
 </style>

+ 29 - 1
pages/message/message.vue

@@ -1,8 +1,36 @@
 <template>
+	<view class="center">
+		
+	</view>
 </template>
 
 <script>
+import { messageList } from '@/api/finance.js'
+export default {
+	
+	data(){
+		return {
+			list:[],
+		}
+	},
+	onLoad() {
+		this.loadData()
+	},
+	methods: {
+		loadData() {
+			messageList({page:1,limit:10}).then(({data}) =>{
+				console.log(data)
+			})
+		}
+	}
+}
 </script>
 
-<style>
+<style lang="scss">
+.center,page {
+	height: 100%;
+	width: 100%;
+	background: #F8F8F8;
+}
+
 </style>

+ 34 - 26
pages/user/user.vue

@@ -69,36 +69,16 @@
 					</view>
 				</view>
 			</view>
-			<view class="my-order">
-				<view class="box-title flex ">
-					<view class="title1"><text>拼购工具</text></view>
-					<view class="link" hover-class="common-hover"></view>
-				</view>
-				<view class="order-section">
-					<view class="order-item" @click="nav('/pages/assets/myPing')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon1 position-relative"><image class="icon-img" src="../../static/user/myPing.png" mode="aspectFit"></image></view>
-						<text>我的拼购</text>
-					</view>
-					<view class="order-item" @click="nav('/pages/user/myNote')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="icon1 position-relative"><image class="icon-img" src="../../static/user/myPoint.png" mode="aspectFit"></image></view>
-						<text>我的节点</text>
-					</view>
-					<view class="order-item" @click="nav('/pages/market/myCalculation')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="icon1 position-relative"><image class="icon-img" src="../../static/user/myFu.png" mode="aspectFit"></image></view>
-						<text>我的服务器</text>
-					</view>
-					<view class="order-item" @click="nav('/pages/index/info')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon1 position-relative"><image class="icon-img" src="../../static/user/data.png" mode="aspectFit"></image></view>
-						<text>汇总数据</text>
-					</view>
-				</view>
-			</view>
 			<view class="my-order">
 				<view class="box-title flex ">
 					<view class="title1"><text>更多功能</text></view>
 					<view class="link" hover-class="common-hover"></view>
 				</view>
 				<view class="order-section">
+					<view class="order-item" @click="nav('/pages/user/extension')" hover-class="common-hover" :hover-stay-time="50">
+						<view class=" icon1 position-relative"><image class="icon-img" src="../../static/user/myTeam.png" mode="aspectFit"></image></view>
+						<text>我的资产</text>
+					</view>
 					<view class="order-item" @click="nav('/pages/user/extension')" hover-class="common-hover" :hover-stay-time="50">
 						<view class=" icon1 position-relative"><image class="icon-img" src="../../static/user/myTeam.png" mode="aspectFit"></image></view>
 						<text>我的团队</text>
@@ -111,6 +91,10 @@
 						<view class="icon1 position-relative"><image class="icon-img" src="../../static/user/myShare.png" mode="aspectFit"></image></view>
 						<text>团队邀请</text>
 					</view>
+					<view class="order-item" @click="nav('/pages/user/extension')" hover-class="common-hover" :hover-stay-time="50">
+						<view class=" icon1 position-relative"><image class="icon-img" src="../../static/user/myTeam.png" mode="aspectFit"></image></view>
+						<text>银行卡管理</text>
+					</view>
 					<view class="order-item" @click="nav('/pages/address/address')" hover-class="common-hover" :hover-stay-time="50">
 						<view class=" icon1 position-relative"><image class="icon-img" src="../../static/user/myAddress.png" mode="aspectFit"></image></view>
 						<text>收货地址</text>
@@ -130,6 +114,30 @@
 				</view>
 			</view>
 		</view>
+		<view class="my-order">
+			<view class="box-title flex ">
+				<view class="title1"><text>拼购工具</text></view>
+				<view class="link" hover-class="common-hover"></view>
+			</view>
+			<view class="order-section">
+				<view class="order-item" @click="nav('/pages/assets/myPing')" hover-class="common-hover" :hover-stay-time="50">
+					<view class=" icon1 position-relative"><image class="icon-img" src="../../static/user/myPing.png" mode="aspectFit"></image></view>
+					<text>我的拼购</text>
+				</view>
+				<view class="order-item" @click="nav('/pages/user/myNote')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon1 position-relative"><image class="icon-img" src="../../static/user/myPoint.png" mode="aspectFit"></image></view>
+					<text>我的节点</text>
+				</view>
+				<view class="order-item" @click="nav('/pages/market/myCalculation')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon1 position-relative"><image class="icon-img" src="../../static/user/myFu.png" mode="aspectFit"></image></view>
+					<text>我的服务器</text>
+				</view>
+				<view class="order-item" @click="nav('/pages/index/info')" hover-class="common-hover" :hover-stay-time="50">
+					<view class=" icon1 position-relative"><image class="icon-img" src="../../static/user/data.png" mode="aspectFit"></image></view>
+					<text>汇总数据</text>
+				</view>
+			</view>
+		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="popup">
 				<view class="popup-dox">
@@ -426,7 +434,7 @@ page,
 			font-weight: bold;
 			color: #666666;
 		}
-
+ 
 		.sweets-name {
 			font-size: 28rpx;
 			font-family: PingFang SC;
@@ -437,7 +445,7 @@ page,
 }
 
 .my-order {
-	margin-top: 20rpx;
+	margin: 80rpx auto 0;
 	display: flex;
 	justify-content: space-between;
 	flex-direction: column;

BIN
static/img/rengou.png


BIN
static/img/start.png