10.17

api/activity.js

@@ -1,276 +0,0 @@
-import request from "@/utils/request.js";
-/**
- * 
- * 所有活动接口 包括：拼团，砍价，秒杀
- * 
-*/
-// 砍价产品详情
-export function getBargainDetail(data,id) {
-	return request({
-		url: '/api/bargain/detail/' + id,
-		method: 'get',
-		data
-	});
-}
-
-/**
- * 砍价产品详情
- */
-// export function getBargainDetail(id) {
-//   return request.get("bargain/detail/" + id);
-// }
-
-//砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格
-export function postBargainHelpCount(data) {
-	return request({
-		url: '/api/bargain/help/count',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格
- */
-// export function postBargainHelpCount(data) {
-//   return request.post("bargain/help/count", data);
-// }
-
-//砍价 开启砍价用户信息
-export function postBargainStartUser(data) {
-	return request({
-		url: '/api/bargain/start/user',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 开启砍价用户信息
- */
-// export function postBargainStartUser(data) {
-//   return request.post("bargain/start/user", data);
-// }
-
-//砍价开启
-export function postBargainStart(data) {
-	return request({
-		url: '/api/bargain/start',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价开启
- */
-// export function postBargainStart(bargainId) {
-//   return request.post("bargain/start", { bargainId: bargainId});
-// }
-
-// 砍价 砍掉金额
-export function postBargainHelpPrice(data) {
-	return request({
-		url: '/api/bargain/help/price',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 砍掉金额
- */
-// export function postBargainHelpPrice(data) {
-//   return request.post("bargain/help/price", data);
-// }
-
-// 砍价 帮助好友砍价
-export function postBargainHelp(data) {
-	return request({
-		url: '/api/bargain/help',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 帮助好友砍价
- */
-// export function postBargainHelp(data) {
-//   return request.post("bargain/help", data);
-// }
-
-// 砍价 砍价帮
-export function postBargainHelpList(data) {
-	return request({
-		url: '/api/bargain/help/list',
-		method: 'post',
-		data
-	});
-}
-
-
-/**
- * 砍价 砍价帮
- */
-// export function postBargainHelpList(data) {
-//   return request.post("bargain/help/list", data);
-// }
-
-// 砍价 观看/分享/参与次数
-export function postBargainShare(data) {
-	return request({
-		url: '/api/bargain/share',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 观看/分享/参与次数
- */
-// export function postBargainShare(bargainId) {
-//   return request.post("bargain/share", { bargainId: bargainId});
-// }
-
-// 砍价列表(已参与)
-export function getBargainUserList(data) {
-	return request({
-		url: '/api/bargain/user/list',
-		method: 'get',
-		data
-	});
-}
-
-/**
- * 
- * 砍价列表(已参与)
- * @param object data
-*/
-// export function getBargainUserList(data){
-//   return request.get('bargain/user/list',data);
-// }
-
-// 砍价取消
-export function getBargainUserCancel(data) {
-	return request({
-		url: '/api/bargain/user/cancel',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价取消
- */
-// export function getBargainUserCancel(data) {
-//   return request.post("/bargain/user/cancel", data);
-// }
-
-
-
-
-
-/**
- * 拼团列表
- * 
-*/
-export function getCombinationList(data) {
-  return request.get('combination/list', data,{noAuth:true});
-}
-
-/**
- * 拼团详情
- * 
-*/
-export function getCombinationDetail(id) {
-  return request.get('combination/detail/'+id);
-}
-
-/**
- * 拼团 开团
- */
-export function getCombinationPink(id) {
-  return request.get("combination/pink/" + id);
-}
-
-/**
- * 拼团 取消开团
- */
-export function postCombinationRemove(data) {
-  return request.post("combination/remove",data);
-}
-
-/**
- * 砍价列表
- */
-export function getBargainList(data) {
-  return request.get("bargain/list", data,{noAuth:true});
-}
-
-
-/**
- * 
- * 取消砍价
- * @param int bargainId
-*/
-export function bargainUserCancel(bargainId){
-  return request.post('bargain/user/cancel', { bargainId: bargainId})
-}
-
-/**
- * 秒杀产品时间区间
- * 
-*/
-export function getSeckillIndexTime(){
-  return request.get('seckill/index',{},{noAuth:true});
-}
-
-/**
- * 秒杀产品列表
- * @param int time
- * @param object data
-*/
-export function getSeckillList(time,data){
-  return request.get('seckill/list/'+time,data,{noAuth:true});
-}
-
-/**
- * 秒杀产品详情
- * @param int id
-*/
-export function getSeckillDetail(id){
-  return request.get('seckill/detail/'+id);
-}
-
-/**
- * 砍价海报
- * @param object data
- * 
-*/
-export function getBargainPoster(data){
-  return request.post('bargain/poster',data)
-}
-
-/**
- * 拼团海报
- * @param object data
- * 
-*/
-export function getCombinationPoster(data){
-  return request.post('combination/poster',data)
-}
-
-/**
- * 获取秒杀小程序二维码
- */
-export function seckillCode(id,data) {
-  return request.get("seckill/code/"+id,data);
-}
-
-/**
- * 获取拼团小程序二维码
- */
-export function scombinationCode(id) {
-  return request.get("combination/code/"+id);
-}

api/mypledge.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 我的质押
+export function getLock(data) {
+	return request({
+		url: '/api/lock/join',
+		method: 'GET',
+		data
+	});
+}

pages/history/history.vue

@@ -31,7 +31,7 @@
 .all {
 	width: 750rpx;
 	min-height: 100vh;
-	background-color: #000;
+	background-color: $page-color-base;
 }
 .list {
 	display: flex;

pages/index/entertainment.vue

@@ -16,7 +16,7 @@
 			<view class="le">
 				<view class="tit flex-start">
 					<view class="ti1">{{$t('enter.u1')}}</view>
-					<view class="ti2">({{$t('enter.u2')}})</view>
+					<view class="ti2">{{$t('enter.u2')}}</view>
 				</view>
 				<view class="he">
 					<view class="numbox flex-start">
@@ -458,7 +458,6 @@
 
 				} catch (e) {
 					console.log(e, 'cuowu');
-					//TODO handle the exception
 				}
 
 			},
@@ -481,7 +480,6 @@
 <style lang="scss">
 	.all {
 		width: 750rpx;
-		/* height: 2500rpx; */
 		height: 100%;
 		padding-top: var(--status-bar-height);
 		padding-bottom: 30rpx;
@@ -539,10 +537,8 @@
 
 			.he {
 				padding-top: 40rpx;
-
 				.numbox {
 					flex-wrap: wrap;
-
 					.he1 {
 						background: #fdaf41;
 						border-radius: 10rpx;

pages/index/index.vue

@@ -85,31 +85,31 @@
 				navList: {
 					loadingType: 'more',
 					orderList: [{
-						type: 'TRX',
+						type: 'BTC',
 						img: '../../static/shouye/shouye5.png',
 						money: 2222,
 						fl: 1,
 						bfb: 0.25,
 					}, {
-						type: 'TRX',
+						type: 'BTC',
 						img: '../../static/shouye/shouye6.png',
 						money: 2222,
 						fl: 0,
 						bfb: 9.25,
 					}, {
-						type: 'TRX',
+						type: 'ETH',
 						img: '../../static/shouye/shouye7.png',
 						money: 2222,
 						fl: 1,
 						bfb: 0.25,
 					}, {
-						type: 'TRX',
+						type: 'BNB',
 						img: '../../static/shouye/shouye8.png',
 						money: 2222,
 						fl: 1,
 						bfb: 0.25,
 					}, {
-						type: 'TRX',
+						type: 'LTC',
 						img: '../../static/shouye/shouye9.png',
 						money: 2222,
 						fl: 0,
@@ -134,7 +134,7 @@
 			}
 		},
 		onLoad() {
-			this.prices()
+			// this.prices()
 		},
 		
 		methods: {
@@ -164,19 +164,19 @@
 				}
 				// 修改当前对象状态为加载中
 				navItem.loadingType = 'loading';
-				getCertList({
-						page: navItem.page,
-						limit: navItem.limit
-					})
-				// prices({
+				// getCertList({
 				// 		page: navItem.page,
 				// 		limit: navItem.limit
 				// 	})
+				prices({
+						page: navItem.page,
+						limit: navItem.limit
+					})
 					.then(({
 						data
 					}) => {
 						console.log(data, '111');
-						
+						// TODO
 						let list = data.list.data;
 						navItem.orderList = navItem.orderList.concat(list);
 						navItem.page++;
@@ -210,10 +210,10 @@
 						console.log(e);
 					});
 			},
-			async prices() {
-				const res = await prices();
-				console.log('123', res);
-			},
+			// async prices() {
+			// 	const res = await prices();
+			// 	console.log('123', res);
+			// },
 		},
 	}
 </script>
@@ -223,6 +223,7 @@
 		width: 100%;
 		height: 1600rpx;
 		background-color: #000000;
+		padding-top: var(--status-bar-height);
 	}
 
 	.top {

pages/index/information.vue

@@ -100,7 +100,8 @@
 .content{
 	width: 750rpx;
 	height: 1800rpx;
-	background-color: #000000;
+	background-color: $page-color-base;
+	padding-top: var(--status-bar-height);
 }
 
 .list {

pages/index/pledge.vue

@@ -164,6 +164,7 @@
 		width: 750rpx;
 		height: 100%;
 		background-color: #000000;
+		padding-top: var(--status-bar-height);
 	}
 
 	.top {

pages/myPledge/myPledge.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="all">
 		<view class="top">
-			<view class="zhiya"> {{$t('myple.u1')}} </view>
+			<view class="zhiya"> {{ $t("myple.u1") }} </view>
 			<view class="zhiyashu">
 				<p class="shu">241,142,574.25</p>
 				<p class="wen">USDT</p>
@@ -33,7 +33,7 @@
 					class="list-scroll-content"
 					@scrolltolower="loadData">
 					<!-- 空白页 -->
-				<!-- 	<empty
+					<!-- 	<empty
 						v-if="
 							tabItem.loaded === true &&
 							tabItem.orderList.length === 0
@@ -41,22 +41,22 @@
 					<!-- 订单列表 -->
 					<view>
 						<!-- <view class="order-item flex" > -->
-						<view  class="order-item">
+						<view class="order-item">
 							<view class="title-box">
 								<view class="title">
-									<text>{{$t('myple.u4')}}</text>
+									<text>{{ $t("myple.u4") }}</text>
 								</view>
 								<view class="title">
-									<text>{{$t('myple.u5')}}</text>
+									<text>{{ $t("myple.u5") }}</text>
 								</view>
 								<view class="title">
-									<text>{{$t('myple.u6')}}</text>
+									<text>{{ $t("myple.u6") }}</text>
 								</view>
 								<view class="title">
-									<text>{{$t('myple.u7')}}</text>
+									<text>{{ $t("myple.u7") }}</text>
 								</view>
 								<view class="title">
-									<text>{{$t('myple.u8')}}</text>
+									<text>{{ $t("myple.u8") }}</text>
 								</view>
 							</view>
 							<view class="heng"></view>
@@ -116,6 +116,7 @@
 <script>
 	import { mapState, mapMutations } from "vuex";
 	import { getCommissionInfo, getUserInfo } from "@/api/user.js";
+	import { getLock } from "@/api/mypledge.js";
 	import { getMoneyStyle } from "@/utils/rocessor.js";
 	import { mapGetters } from "vuex";
 	import uniLoadMore from "@/components/uni-load-more/uni-load-more.vue";
@@ -123,7 +124,7 @@
 	import {
 		spreadCommission,
 		userBalance,
-		extractBank,
+		// extractBank,
 	} from "@/api/wallet.js";
 	export default {
 		filters: {
@@ -188,9 +189,9 @@
 		},
 		onLoad(options) {},
 		onShow() {
-			this.extractBank();
 			this.getUserInfo();
 			this.loadData();
+			this.getLock();
 		},
 		methods: {
 			getUserInfo() {
@@ -198,12 +199,11 @@
 					this.userInfo = data;
 				});
 			},
-			extractBank() {
-				extractBank().then(res => {
-					console.log(res);
-					this.yj = res.data.brokerage_price;
-				});
+			async getLock() {
+				const res = await getLock();
+				console.log("123", res);
 			},
+
 			toBack() {
 				uni.switchTab({
 					url: "/pages/pledge/pledge",
@@ -232,7 +232,6 @@
 				}
 				// 修改当前对象状态为加载中
 				// navItem.loadingType = 'loading';
-
 				spreadCommission(
 					{
 						page: navItem.page,
@@ -282,7 +281,7 @@
 	.all {
 		width: 750rpx;
 		height: 1660rpx;
-		background-color: #000000;
+		background-color: $page-color-base;
 	}
 	.top {
 		margin-left: 30rpx;
@@ -331,7 +330,6 @@
 		height: 137rpx;
 	}
 
-	// !!!!
 	.navbar {
 		margin-top: 20rpx;
 		display: flex;
@@ -368,13 +366,9 @@
 
 	// 列表样式
 	.order-item {
-		// margin-top: 30rpx;
-		// width: 690rpx;
 		background: #191a1f;
 	}
 	.title-box {
-		// margin-top: 30rpx;
-		// margin-top: 30rpx;
 		margin-left: 38rpx;
 		display: flex;
 		justify-content: space-between;
@@ -383,9 +377,6 @@
 	.title {
 		flex: 1;
 		margin-top: 30rpx;
-		// text-align: center;
-		// white-space: normal;
-		// word-wrap: break-word;
 		width: 43rpx;
 		height: 50rpx;
 		font-size: 22rpx;
@@ -395,14 +386,13 @@
 		line-height: 28rpx;
 		opacity: 0.53;
 	}
-	
+
 	.list {
 		margin-top: 40rpx;
 		margin-left: 38rpx;
 		display: flex;
 		justify-content: space-between;
 		width: 690rpx;
-		// background-color: #000000;
 	}
 	.item {
 		height: 40rpx;
@@ -426,18 +416,6 @@
 		height: 2rpx;
 		background: #e9e9e9;
 	}
-	// .list-scroll-content {
-	// 	background: #000;
-	// 	height: 100%;
-	// 	// height: 1600rpx;
-	// }
-	// .content {
-	// 	height: 100%;
-	// 	// height: 1600rpx;
-	// 	.empty-content {
-	// 		background-color: #000;
-	// 	}
-	// }
 	.btn-box {
 		width: 674rpx;
 		height: 88rpx;

pages/recharge/recharge.vue

@@ -107,7 +107,7 @@
 	.all {
 		width: 750rpx;
 		height: 1416rpx;
-		background-color: #000000;
+		background-color: $page-color-base;
 	}
 	.top {
 		margin-left: 28rpx;

pages/tabulation/tabulation.vue

@@ -70,9 +70,8 @@
 <style lang="scss">
 .all {
 	width: 750rpx;
-	// height: 100%;
 	min-height: 100vh;
-	background-color: #000000;
+	background-color: $page-color-base;
 }
 .row {
 	display: flex;
@@ -169,7 +168,6 @@
 .ima {
 	width: 13rpx;
 	height: 19rpx;
-	// background: #FFFFFF;
 	margin-top: 35rpx;
 	margin-left: 20rpx;
 }
@@ -183,7 +181,6 @@
 }
 .last {
 	display: flex;
-	// 
 	justify-content: start;
 }
 .left {
@@ -198,7 +195,6 @@
 	font-size: 28rpx;
 	font-weight: 500;
 	color: #b98134;
-	// margin-left: 10rpx;
 	margin-top: 30rpx;
 }
 .right {

pages/user/shareQrCode.vue

@@ -88,7 +88,7 @@
 		width: 750rpx;
 		// height: 100%;
 		min-height: 100vh;
-		background-color: #000000;
+		background-color: $page-color-base;
 	}
 	.list {
 		width: 710rpx;

pages/user/team.vue

@@ -262,7 +262,7 @@
 
 <style lang="scss">
 	page {
-		background: #000000;
+		background: $page-color-base;
 		height: 100%;
 	}
 

pages/zyXingqing/zyXingqing.vue

@@ -122,7 +122,7 @@
 .all {
 	width: 750rpx;
 	height: 100%;
-	background-color: #000;
+	background-color: $page-color-base;
 }
 .shang {
 	width: 720rpx;