no message

api/finance.js

@@ -12,6 +12,16 @@ export function getBalanceAcctFlow(params) {
 	});
 }
 
+export function getUserExpendTbcList(params) {
+	return request({
+		url: "/finance/getUserExpendTbcList",
+		method: "get",
+		data: params,
+	});
+}
+
+
+
 /**
  * 查询账户余额
  * @param {Object} params

pages/rwa_package/dongjian/jia.vue

@@ -2,10 +2,12 @@
 	<view class="content">
 		<TopSafe bgColor="#fff"></TopSafe>
 		<Header title="数字积分" bgColor="#fff" />
-		<view class="contract-view">
+		<view class="contract-view" :style="{
+			'overflow-y': curTab == 0 ? 'auto' : 'hidden'
+		}">
 			<image src="/static/new/jia_bg.png" class="jia-img">
 			</image>
-			<view class="box-panel">
+			<view class="box-panel" style="padding:0;margin-bottom:30rpx;">
 				<view class="box-top">
 					<view class="flex-c-lr" style="align-items: center;">
 						<text class="text-40 text-bold text-zu1">{{lockedData ? lockedData.selfBuyLocked : 0}}</text>
@@ -16,7 +18,15 @@
 						<text class="text-fu1 text-24 text-w-400">推广锁定量(数字积分)</text>
 					</view>
 				</view>
-				<view class="box-list" style="margin-top:40rpx;">
+				<view class="tab-view">
+					<view class="tab-list" @click="onTab(index)" v-for="(item,index) in tabList" :key="index">
+						<text class="text-32" :style="{color:index == curTab ? '#7934F6' : '#666666'}">{{item}}</text>
+						<view class="tab-line" v-if="index == curTab"></view>
+					</view>
+				</view>
+			</view>
+			<view class="box-panel" v-if="curTab == 0">
+				<view class="box-list">
 					<view class="head-box">
 						<text class="text-zu1 text-28 text-bold">推广解锁</text>
 						<text class="text-fu1 text-24 text-w-400">获得2贡献值解锁1贡献值对应的数字积分直推奖励。</text>
@@ -80,7 +90,7 @@
 					
 				</view>
 			</view>
-			<view class="box-panel mt-32 mb-32">
+			<view class="box-panel mt-32 mb-32"  v-if="curTab == 0">
 				<text class="text-zu1 text-28 text-bold" style="font-weight: bold;">数字积分获取说明</text>
 				<text class="text-fu text-24" style="margin-top:24rpx">1.商城优选区消费1:1获得贡献值，每消费1元获得1贡献值，次日根据当日商城营收占比获得数字积分。</text>
 				<text class="text-fu text-24 " style="margin-top:24rpx">2.直推用户消费10:1获得贡献值，直推用户优选区每消费10元您将获得1积分。</text>
@@ -93,7 +103,70 @@
 				<text class="text-fu text-24 " style="margin-top:24rpx">5.最终解释权归信任桥所有。</text>
 			</view>
 			<!-- (2)转盘抽奖获得 -->
-
+			<view class="tab-two-panel" v-if="curTab == 1">
+				<mescroll-uni
+				  ref="mescrollRef"
+				  @down="downCallback"
+				  @up="upCallback"
+				  :up="upOption"
+				  :down="downOption"
+				  @init="mescrollInit"
+				  :fixed="false"
+				>
+				  <view class="mescrollUniView">
+				    <view class="dai-list-view" v-for="(item,index) in daiList" :key="index">
+						<view class="dai-top">
+							<view class="time-view">
+								<text class="text-zu text-24" style="margin-right:12rpx">距销毁</text>
+								<u-count-down
+									:time="item.time"
+									format="HH:mm:ss"
+									autoStart
+									millisecond
+									@finish="onFinish"
+									:ref="'time' + item.refId"
+									@change="onChange($event,index)"
+								>
+									<view class="time-panel">
+										<view class="time__custom">
+											<text class="text-24" style="color:#FE2E2E">{{ item.timeData.days>10?item.timeData.days:'0'+item.timeData.days}}</text>
+										</view>
+										<text class="text-zu text-24" style="margin:0 10rpx">天</text>
+										<view class="time__custom">
+											<text class="text-24" style="color:#FE2E2E">{{ item.timeData.hours>10?item.timeData.hours:'0'+item.timeData.hours}}</text>
+										</view>
+										<text class="text-24" style="margin:0 10rpx">:</text>
+										<view class="time__custom">
+											<text class="text-24" style="color:#FE2E2E">{{ item.timeData.minutes }}</text>
+										</view>
+										<text class="text-24" style="margin:0 10rpx">:</text>
+										<view class="time__custom">
+											<text class="text-24" style="color:#FE2E2E">{{ item.timeData.seconds }}</text>
+										</view>
+									</view>
+								</u-count-down>
+							</view>
+						 
+						</view>
+						<view class="dai-mid" style="margin-top:40rpx;">
+							<text class="text-32 text-fu1">下级:</text>
+							<text class="text-32 text-zu1">{{item.lowerLevelPhone}}</text>
+						</view>
+						<view class="dai-mid" style="margin-top:32rpx;">
+							<text class="text-32 text-fu1">积分奖励总量:</text>
+							<text class="text-32 text-zu1">{{item.expendAmount}}</text>
+						</view>
+						<view class="dai-progress" style="margin-top:40rpx;">
+							<u-line-progress :percentage="item.unlockRatio" activeColor="#7934F6" height="16rpx" :showText="true" ></u-line-progress>
+						</view>
+						<view class="dai-bottom">
+							<text class="text-24 text-fu1">0</text>
+							<text class="text-24 text-fu1">{{item.Tbclockacmont}}</text>
+						</view>
+					</view>
+				  </view>
+				</mescroll-uni>
+			</view>
 		</view>
 		<!-- <DownPopup :show="true"></DownPopup> -->
 		<up-toast ref="uToastRef"></up-toast>
@@ -102,7 +175,7 @@
 
 <script>
 import { getUserInfo } from '@/api/auth.js';
-import { getVcoinLocked,getVcoinReleaseLog } from '@/api/finance.js';
+import { getVcoinLocked,getVcoinReleaseLog,getUserExpendTbcList } from '@/api/finance.js';
 import Header from '@/components/common/header.vue';
 import TopSafe from '@/components/common/top-safe.nvue'
 import DownPopup from '@/components/common/down-popup.vue';
@@ -110,22 +183,101 @@ import { quickens } from '@/api/contract.js'
 import Decimal from 'decimal.js';
 import func from '@/utils/func.js'
 
+import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
+import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue";
+
 
 export default {
-	components: { Header, TopSafe, DownPopup },
+	mixins: [MescrollMixin],
+	components: { Header, TopSafe, DownPopup,MescrollUni },
 	data() {
 		return {
 			lockedData:null,
 			topHead:['解锁数量','解锁时间','触发解锁订单'],
 			bottomHead:['解锁数量','解锁时间'],
 			topList:[],
-			bottomList:[]
+			bottomList:[],
+			tabList:['已解锁','待解锁'],
+			curTab:0,
+			daiList:[],
+			upOption: {
+			  auto: false,
+			  page: {
+			    size: 10, // 每页数据的数量,默认10
+			  },
+			  noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+			  empty: {
+			    tip: `空空如也`,
+			  },
+			  textColor: "#333",
+			  bgColor: "rgba(0,0,0,0)",
+			},
+			downOption: {
+			  auto: false,
+			  textColor: "#333",
+			  bgColor: "rgba(0,0,0,0)",
+			},
 		};
 	},
 	onLoad() {
 		this.init();
 	},
 	methods: {
+		onChange(e,index){
+			this.daiList[index].timeData = e; 
+			
+			console.log('e',e)
+			
+		},
+		onFinish(){
+			this.downCallback();
+		},
+		mescrollInit(mescroll) {
+		  this.mescroll = mescroll;
+		},
+		upCallback(page) {
+		  let pageNum = page.num;
+		  let pageSize = page.size;
+		
+		  let params = {
+		    status:0,
+		    page: page.num,
+		    pageSize: page.size,
+		  };
+			 getUserExpendTbcList(params).then(res=>{
+				 let curPageLen = '';
+				 if(res.data.entitys){
+					 curPageLen = res.data.entitys.length;
+					 if (page.num === 1) this.daiList = [];
+					 this.daiList = this.daiList.concat(res.data.entitys);
+					 this.daiList.forEach(item=>{
+						 item.time = item.endDate - item.date;
+						 item.timeData = {};
+					 })
+					 console.log('daiList',this.daiList)
+				 }else{
+					 curPageLen = 0;
+				 }
+						
+				this.mescroll.endBySize(curPageLen, res.data.totalCount);
+			 })
+		  
+		},
+		downCallback() {
+		  this.$nextTick(function () {
+		    this.mescroll && this.mescroll.resetUpScroll();
+		  });
+		},
+		onTab(index){
+			if(this.curTab != index){
+				this.curTab = index;
+				if(this.curTab == 0){
+					this.daiList = [];
+				}else{
+					this.downCallback();
+				}
+			}
+		},
 		onJump(item){
 			uni.navigateTo({
 				url:`/pages/other_package/productInfo/productInfo?id=${item.refId}`
@@ -221,8 +373,6 @@ export default {
 	flex-direction: column;
 	align-items: center;
 	overflow-y: auto;
-	padding: 0 32rpx;
-	box-sizing: border-box;
 	position: relative;
 	background-color: #fff;
 
@@ -233,9 +383,91 @@ export default {
 		min-height:240rpx;
 		margin-bottom:40rpx;
 	
+		padding: 0 32rpx;
+		box-sizing: border-box;
+	}
+	.tab-two-panel{
+		width:100%;
+		height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
+		min-height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
+		display: flex;
+		flex-direction: column;
+		padding: 0 32rpx;
+		box-sizing: border-box;
+		.mescrollUniView{
+			width:calc(100vw - 64rpx);
+			height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
+			min-height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
+			display: flex;
+			flex-direction: column;
+			.dai-list-view{
+				width:100%;
+				height:344rpx;
+				min-height:344rpx;
+				margin-bottom:24rpx;
+				display: flex;
+				flex-direction: column;
+				padding: 32rpx;
+				box-sizing: border-box;
+				border-radius: 16rpx;
+				border: 2rpx solid #EAEAEA;
+				.dai-bottom{
+					width:100%;
+					margin-top:12rpx;
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+				}
+				.dai-progress{
+					width:100%;
+					height:16rpx;
+					min-height:16rpx;
+					display: flex;
+				}
+				.time-view{
+					width:100%;
+					height:40rpx;
+					min-height:40rpx;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					.time-panel{
+						height:40rpx;
+						display: flex;
+						flex:1;
+						flex-direction: row;
+						align-items: center;
+						.time__custom{
+							width:48rpx;
+							height:40rpx;
+							background-color: rgba(254, 46, 46, 0.10);
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							border-radius: 8rpx;
+						}
+					}
+				}
+				.dai-mid{
+					width:100%;
+					height:32rpx;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: space-between;
+				}
+				.dai-top{
+					width:100%;
+					height:40rpx;
+					display: flex;
+					flex-direction: row;
+					align-items: cneter;
+				}
+			}
+		}
 	}
-
 	.box-panel {
+		
 		position: relative;
 		z-index: 1;
 		display: flex;
@@ -243,7 +475,9 @@ export default {
 		width: 100%;
 		background-color: #fff;
 		box-sizing: border-box;
-
+		
+		padding: 0 32rpx;
+		box-sizing: border-box;
 		.box-top {
 			width: 100%;
 			height: 90rpx;
@@ -251,8 +485,37 @@ export default {
 			display: flex;
 			flex-direction: row;
 			justify-content: space-between;
+			padding: 0 32rpx;
+			box-sizing: border-box;
+		}
+		.tab-view{
+			width:100%;
+			height:80rpx;
+			min-height:80rpx;
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			align-items: center;
+			border-bottom:2rpx solid #D0D7DE;
+			box-sizing: border-box;
+			margin-top:48rpx;
+			.tab-list{
+				width:100%;
+				height:100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				position: relative;
+				.tab-line{
+					width:48rpx;
+					background-color: #7934F6;
+					height:4rpx;
+					position: absolute;
+					bottom:0;
+				}
+			}
+			
 		}
-
 		.box-list {
 			width:100%;
 			display: flex;
@@ -262,6 +525,7 @@ export default {
 			border-radius: 12rpx;
 			flex-direction: column;
 			align-items: center;
+			
 			.box-li{
 				width:calc(100% - 8rpx);
 				height:386rpx;
@@ -329,6 +593,7 @@ export default {
 			}
 			
 			.head-box{
+				
 				width:100%;
 				height:88rpx;
 				min-height:88rpx;