7-11

api/user.js

@@ -278,3 +278,12 @@ export function getMyRent(data) {
 		data
 	})
 }
+
+//
+export function certificate(data) {
+	return request({
+		url: '/api/rent/certificate',
+		method: 'get',
+		data
+	})
+}

pages/user/user.vue

@@ -17,6 +17,10 @@
 						<text class="num">{{ user.brokerage_price || '0.00' }}</text>
 						<text>我的佣金</text>
 					</view>
+					<view class="tj-item" @click="navTo('/pages/user_home/money/qxq')">
+						<text class="num">{{ user.certificate || '0.00' }}</text>
+						<text>我的骑行券</text>
+					</view>
 					<view class="tj-item" @click="navTo('/pages/user_home/money/wallet')">
 						<text class="num">{{user.now_money || '0.00' }}</text>
 						<text>我的卡券</text>

pages/user_home/actionList.vue

@@ -6,11 +6,17 @@
 			<view class="action-tit">
 				{{item.title}}
 			</view>
+			<view class=" time">
+				<view class="">
+					活动时间：{{getTime(item.start_time)}} - {{getTime(item.end_time)}}
+				</view>
+			</view>
 		</view>
 		<uni-load-more :status="loadingType"></uni-load-more>
 	</view>
 </template>
 <script>
+	import { getTime } from '@/utils/rocessor.js'
 	import {
 		articleList,
 		record,
@@ -38,8 +44,17 @@
 
 		},
 		methods: {
+			getTime,
 			goAction(item) {
 				if(this.type == 0) {
+					let time = new Date().getTime()
+					console.log(time);
+					if(time < item.start_time*1000) {
+						return this.$api.msg('活动未开始，请耐心等待')
+					}
+					if(time > item.end_time*1000) {
+						return this.$api.msg('活动已结束')
+					}
 					uni.navigateTo({
 						url: '/pages/shop/action?id=' + item.id
 					})
@@ -98,5 +113,10 @@
 			padding: 15rpx;
 			padding-left: 30rpx;
 		}
+		.time {
+			font-size: 12rpx;
+			padding: 20rpx;
+			padding-top: 0;
+		}
 	}
 </style>

pages/user_home/money/qxq.vue

@@ -14,7 +14,7 @@
 				<image src="../../../static/image/awardbg.png" mode="scaleToFill"></image>
 			</view>
 			<view class="money-box">
-				<view class="money">{{ bankData.brokerage_price || 0 }}</view>
+				<view class="money">{{ userInfo.certificate || 0 }}</view>
 				<view>我的骑行券</view>
 			</view>
 			<!-- <view class="moneybtn-box flex">
@@ -99,6 +99,7 @@
 		extractBank,
 		spreadCommission
 	} from '@/api/wallet.js'
+	import { certificate,getUser } from '@/api/user.js'
 	export default {
 		filters: {
 			getMoneyStyle
@@ -139,7 +140,7 @@
 					// 	limit: 10 //每次信息条数
 					// },
 					{
-						state: 3,
+						state: 1,
 						text: '收入',
 						loadingType: 'more',
 						orderList: [],
@@ -147,7 +148,7 @@
 						limit: 10 //每次信息条数
 					},
 					{
-						state: 4,
+						state:0,
 						text: '支出',
 						loadingType: 'more',
 						orderList: [],
@@ -169,6 +170,7 @@
 			this.loadData();
 		},
 		methods: {
+			
 			extractBank() {
 				extractBank().then(res => {
 					this.bankData = res.data
@@ -196,32 +198,28 @@
 					//tab切换只有第一次需要加载数据
 					return;
 				}
-				if (navItem.loadingType === 'loading') {
+				if (navItem.loadingType === 'loading' || navItem.loadingType == 'noMore') {
 					//防止重复加载
 					return;
 				}
 				// 修改当前对象状态为加载中
 				navItem.loadingType = 'loading';
 
-				spreadCommission({
+				certificate({
 						page: navItem.page,
 						limit: navItem.limit,
-					},state)
+						pm: state
+					})
 					.then(({
 						data
 					}) => {
-						if(data.length > 0) {
-							navItem.orderList = navItem.orderList.concat(data[0].list)
-							navItem.page++
-							if (navItem.limit == data.length) {
-								navItem.loadingType = 'more';
-							} else {
-								navItem.loadingType = 'noMore'
-							}
+						navItem.orderList = navItem.orderList.concat(data)
+						if(data.length == navItem.limit) {
+							navItem.loadingType = 'more'
 						}else {
-							navItem.loadingType = 'noMore'
+							navItem.loadingType = 'noMoe'
 						}
-						
+						navItem.page++
 						uni.hideLoading();
 						this.$set(navItem, 'loaded', true);
 					})