123

api/functionalUnit.js

@@ -64,3 +64,21 @@ export function signUser(data) {
 		data
 	});
 }
+
+//天天领红包-当天可领
+export function my_award(data) {
+	return request({
+		url: '/api/game/my_award',
+		method: 'get',
+		data
+	});
+}
+
+//天天领红包-领取红包
+export function get_award(data,id) {
+	return request({
+		url: '/api/game/get_award/' + id,
+		method: 'post',
+		data
+	});
+}

api/user.js

@@ -153,8 +153,26 @@ export function transfer(data) {
 		method: 'post',
 		data
 	})
+}
+
+//余额转账
+export function yuetransfer(data) {
+	return request({
+		url:'/api/yue/trade',
+		method: 'post',
+		data
+	})
 }
 
+//现金转账
+export function cashtransfer(data) {
+	return request({
+		url:'/api/cash/trade',
+		method: 'post',
+		data
+	})
+}
+
 // 我的分红积分
 export function share(data) {
 	return request({

api/wallet.js

@@ -27,6 +27,15 @@ export function extractCash(data) {
 	});
 }
 
+// 提现
+export function exchangeCash(data) {
+	return request({
+		url: '/api/extract/brokerage',
+		method: 'post',
+		data
+	});
+}
+
 // 提现信息
 export function extractBank(data) {
 	return request({

pages.json

@@ -108,7 +108,7 @@
 		{
 			"path": "pages/money/withdmoenys",
 			"style": {
-				"navigationBarTitleText": "响亮积分转账"
+				"navigationBarTitleText": "转账"
 			}
 		},
 		{

pages/index/index.vue

@@ -27,7 +27,7 @@
 		</view>
 		<view class="navbar">
 			<view class="navbar-box flex">
-				<view class="navbar-item" @click="navTo('/pages/index/sign')">
+				<view class="navbar-item" @click="navTo('/pages/index/sign1')">
 					<image class="nitem-image" src="../../static/index/index05.png" mode=""></image>
 					<view class="nitem-font">天天领红包</view>
 				</view>
@@ -53,7 +53,6 @@
 			<view class="product-title">
 				<image class="pt-image" src="../../static/index/index15.png" mode=""></image>
 				<view class="pt-title">会员礼包</view>
-				<view class="pt-tip">每日必买</view>
 			</view>
 			<view class="hotgoods">
 				<view class="hotgoods-item" v-for="item in bastList" :key="item.id" @click="navToDetailPage(item)">

pages/index/sign1.vue

@@ -3,13 +3,11 @@
 		<view class="title">天天领现金</view>
 		<view class="main after" v-if="signTrue">
 			<image class="main-bg" src="../../static/img/money-ok.png" mode=""></image>
-			<view class="num">
-				{{day_integral}}
-			</view>
+			<view class="num">{{ day_integral }}</view>
 		</view>
 		<view class="main before" v-if="!signTrue">
 			<image class="main-bg" src="../../static/img/money-bg.png" mode=""></image>
-			<view class="btn" @click="integral()">立即领取</view>
+			<view class="btn" :class="{ current: is_have == true }" @click="integral()">立即领取</view>
 		</view>
 		<view class="info-box flex">
 			<view class="info-item">
@@ -18,7 +16,7 @@
 			</view>
 			<view class="info-item">
 				<view class="info-num">{{ allSign }}</view>
-				<view class="info-font">领取天数</view>
+				<view class="info-font">公益池金额</view>
 			</view>
 		</view>
 	</view>
@@ -26,7 +24,7 @@
 
 <script>
 import calendar from '../../components/ss-calendar/ss-calendar.vue';
-import { signList, integral, signUser } from '@/api/functionalUnit.js';
+import { signList, integral, signUser, my_award, get_award } from '@/api/functionalUnit.js';
 export default {
 	components: {
 		calendar
@@ -41,7 +39,9 @@ export default {
 			allSign: 0, //累计签到
 			sum_integral: 0, //累计获得积分
 			day_integral: '', //今天签到的钱
-			signTrue: false
+			signTrue: false,
+			is_have: true, //是否可领
+			id: ''
 		};
 	},
 	onLoad() {
@@ -58,20 +58,25 @@ export default {
 		},
 		//获取签到用户信息
 		signUser() {
-			signUser({ all: 1 }).then(({ data }) => {
-				this.actionDay = data.sign_num; //连续签到天数
-				this.allSign = data.sum_sgin_day; //累计签到天数
-				this.sum_integral = data.sum_integral; //累计总积分
+			my_award().then(data => {
+				console.log(data);
+				this.sum_integral = data.data.all_get;
+				this.allSign = data.data.all_out;
+				if (data.data.todayAward != null) {
+					this.day_integral = data.data.todayAward.award; //今天获取的金额
+					this.id = data.data.todayAward.id;
+					this.is_have = false;
+				}
+				console.log(this.is_have);
 			});
 		},
 		// 签到
 		integral() {
 			console.log(111);
-			integral({})
+			get_award({}, this.id)
 				.then(e => {
 					console.log(e);
-					this.day_integral = e.data.integral, //今天获取的金额
-						// 改为已签到
+					// 改为已签到
 					this.signTrue = true;
 					this.actionDay++;
 					// 保存签到成功
@@ -106,6 +111,9 @@ page,
 .before {
 	padding-top: 590rpx;
 }
+.current {
+	background: #bebebe;
+}
 .main {
 	width: 750rpx;
 	height: 926rpx;
@@ -124,7 +132,7 @@ page,
 		font-size: 122rpx;
 		font-family: PingFang SC;
 		font-weight: bold;
-		color: #EB2749;
+		color: #eb2749;
 		opacity: 0.9;
 	}
 	.btn {

pages/money/wallet.vue

@@ -11,9 +11,13 @@
 				<view class="money">{{money | getMoneyStyle}}</view>
 				<view>我的余额</view>
 			</view>
-			<view class="money-btn" @click="navto('/pages/money/recharge')">
-				余额充值
-				<text>></text>
+			<view class="moneybtn-box">
+				<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=yue')">
+					余额转账
+				</view>
+				<view class="money-btn" @click="navto('/pages/money/recharge')">
+					余额充值
+				</view>
 			</view>
 		</view>
 		<view class="info-box flex">
@@ -130,8 +134,6 @@ export default {
 		// 获取用户余额
 		userBalance({}).then(({ data }) => {
 			this.money = data.now_money;
-			this.orderStatusSum = data.orderStatusSum
-			this.recharge = data.recharge
 		});
 	},
 	methods: {
@@ -142,7 +144,8 @@ export default {
 			});
 		},
 		//获取收入支出信息
-		async loadData(source) {
+		async loadData(source) {
+			let obj = this
 			//这里是将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
@@ -165,13 +168,17 @@ export default {
 				},
 				state
 			)
-				.then(({ data }) => {
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
+				.then(({ data }) => {
+					obj.recharge = data.income;
+					obj.orderStatusSum = data.expend;
+					if (data.list.length > 0) {
+						navItem.orderList = navItem.orderList.concat(data.list[0].list);
 						console.log(navItem.orderList);
 						navItem.page++;
+					}else {
+						navItem.loadingType = 'noMore';
 					}
-					if (navItem.limit == data.length) {
+					if (navItem.limit == data.list[0].list.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;
@@ -300,7 +307,7 @@ page {
 .money-box {
 	position: relative;
 	z-index: 2;
-	padding-top: 90rpx;
+	padding-top: 70rpx;
 	color: #ffffff;
 	text-align: center;
 	.money {
@@ -313,20 +320,17 @@ page {
 		font-size: 30rpx;
 	}
 }
-.money-btn {
+.moneybtn-box {
+	display: flex;
+	justify-content: space-between;
 	position: relative;
 	z-index: 2;
 	color: #ffffff;
-	padding-right: 50rpx;
-	text-align: right;
+	padding:20rpx 50rpx ;
 	font-size: 30rpx;
 	font-family: PingFang SC;
 	font-weight: bold;
 	color: #FFFFFF;
-	text {
-		display: inline-block;
-		padding-left: 10rpx;
-	}
 }
 
 .navbar {

pages/money/withdmoenys.vue

@@ -1,33 +1,49 @@
 <template>
 	<view class="content">
 		<view class="content-money">
-			<view class="flex">
+			<view class="flex" v-if="type == 'xl'">
 				<view class="buttom">
 					<view class="icon">{{ userInfo.integral | getMoneyStyle }}</view>
 					<text class="text">可用响亮积分</text>
 				</view>
 			</view>
+			<view class="flex" v-if="type == 'yue'">
+				<view class="buttom">
+					<view class="icon">{{ userInfo.now_money | getMoneyStyle }}</view>
+					<text class="text">可用余额</text>
+				</view>
+			</view>
+			<view class="flex" v-if="type == 'cash'">
+				<view class="buttom">
+					<view class="icon">{{ userInfo.cash | getMoneyStyle }}</view>
+					<text class="text">可用现金</text>
+				</view>
+			</view>
+		</view>
+		<view class="row-box">
+			<view class="title">收款人手机号</view>
+			<view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人手机号" placeholder-class="placeholder" /></view>
 		</view>
-		<u-form ref="uForm" class="item">
-			<u-form-item label-width='150' label="用户手机"><u-input type="text" v-model="card" /></u-form-item>
-		</u-form>
 		<view class="row-box">
 			<view class="title">转账金额</view>
 			<view class="row">
 				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" placeholder='转入金额' placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = userInfo.integral">全部转账</view>
+				<input class="input" type="number" v-model="withdrawal" placeholder="转入金额" placeholder-class="placeholder" />
+				<view class="buttom" v-if="type == 'xl'" @click="withdrawal = userInfo.integral">全部转账</view>
+				<view class="buttom" v-if="type == 'yue'" @click="withdrawal = userInfo.now_money">全部转账</view>
+				<view class="buttom" v-if="type == 'cash'" @click="withdrawal = userInfo.cash">全部转账</view>
 			</view>
 		</view>
-		
-		<button class="add-btn up" :class="{'action':loding}" @click="!loding?confirm():''">转入</button>
+		<view class="tip" v-if="withdrawal != 0 && type == 'xl'">实际转入{{ realmoney }}响亮积分,{{ gy }}响亮积分流入公益池</view>
+
+		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交申请</button>
 	</view>
 </template>
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
-import { getUserInfo,transfer } from '@/api/user.js';
-import { mapMutations,mapState } from 'vuex';
+import { getUserInfo, transfer, yuetransfer, cashtransfer } from '@/api/user.js';
+import { mapMutations, mapState } from 'vuex';
 export default {
 	filters: {
 		getMoneyStyle
@@ -36,13 +52,14 @@ export default {
 		return {
 			money: '0.00', //可提现金额
 			withdrawal: '', //提现金额
-			password:'',//支付密码
-			card:'',//转账卡号
-			name:'',
+			password: '', //支付密码
+			card: '', //转账卡号
+			name: '',
 			// #ifdef H5
 			weichatBsrowser: false,
 			// #endif
-			loding:false,
+			loding: false,
+			type: 'xl'
 		};
 	},
 	onLoad(options) {
@@ -50,22 +67,34 @@ export default {
 		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
 		// #endif
 		this.dataUp();
+		if (options.type) {
+			this.type = options.type;
+			console.log(this.type);
+		}
 	},
 	computed: {
-		...mapState('user', ['userInfo']) 
+		...mapState('user', ['userInfo']),
+		realmoney() {
+			return (this.withdrawal * 0.9).toFixed(2) * 1;
+		},
+		gy() {
+			return (this.withdrawal * 0.08).toFixed(2) * 1;
+		}
 	},
 	methods: {
 		...mapMutations('user', ['setUserInfo', 'login']),
 		// 更新数据
-		dataUp(){
+		dataUp() {
 			let obj = this;
-			getUserInfo({}).then((e) => {
-				obj.login();
-				// 保存返回用户数据
-				obj.setUserInfo(e.data);
-			}).catch((e) => {
-				console.log(e);
-			})
+			getUserInfo({})
+				.then(e => {
+					obj.login();
+					// 保存返回用户数据
+					obj.setUserInfo(e.data);
+				})
+				.catch(e => {
+					console.log(e);
+				});
 		},
 		// 切换选中对象
 		tabRadio(e) {
@@ -75,46 +104,86 @@ export default {
 		confirm() {
 			let obj = this;
 			obj.loding = true;
-			if(obj.withdrawal == 0){
+			if (obj.withdrawal == 0) {
 				obj.loding = false;
 				uni.showModal({
-					title:"提示",
-					content:"转账金额不要为0"
-				})
+					title: '提示',
+					content: '转账金额不要为0'
+				});
 				return;
 			}
-			if(obj.card == obj.userInfo.phone){
+			if (obj.card == obj.userInfo.phone) {
 				obj.loding = false;
 				uni.showModal({
-					title:"提示",
-					content:"不要输入自己的用户账号"
-				})
-			}else{
-				
+					title: '提示',
+					content: '不要输入自己的用户账号'
+				});
+			} else {
 				let data = {
-					to_user_account:obj.card, //编号
+					to_user_account: obj.card, //编号
 					num: obj.withdrawal //金额
+				};
+				if (obj.type == 'xl') {
+					transfer(data)
+						.then(e => {
+							// 允许按钮点击
+							obj.loding = false;
+							// 初始化提现金额
+							obj.withdrawal = '';
+							uni.showToast({
+								title: '提交成功',
+								duration: 2000,
+								position: 'top'
+							});
+							obj.dataUp();
+						})
+						.catch(e => {
+							obj.$api.msg(e.msg);
+							obj.loding = false;
+							console.log();
+						});
+				}
+				if (obj.type == 'yue') {
+					yuetransfer(data)
+						.then(e => {
+							// 允许按钮点击
+							obj.loding = false;
+							// 初始化提现金额
+							obj.withdrawal = '';
+							uni.showToast({
+								title: '提交成功',
+								duration: 2000,
+								position: 'top'
+							});
+							obj.dataUp();
+						})
+						.catch(e => {
+							obj.$api.msg(e.msg);
+							obj.loding = false;
+							console.log();
+						});
 				}
-				transfer(data)
-					.then(e => {
-						// 允许按钮点击
-						obj.loding = false;
-						// 初始化提现金额
-						obj.withdrawal = ''
-						uni.showToast({
-							title: '提交成功',
-							duration: 2000,
-							position: 'top'
+				if (obj.type == 'cash') {
+					cashtransfer(data)
+						.then(e => {
+							// 允许按钮点击
+							obj.loding = false;
+							// 初始化提现金额
+							obj.withdrawal = '';
+							uni.showToast({
+								title: '提交成功',
+								duration: 2000,
+								position: 'top'
+							});
+							obj.dataUp();
+						})
+						.catch(e => {
+							obj.$api.msg(e.msg);
+							obj.loding = false;
+							console.log();
 						});
-						obj.dataUp();
-					})
-					.catch(e => {
-						obj.$api.msg(e.msg)
-						obj.loding = false;
-						console.log();
-					});
+				}
 			}
-			
 		}
 	}
 };
@@ -129,9 +198,9 @@ page {
 	background: #ffffff;
 }
 
-.item{
+.item {
 	padding: 0 $page-row-spacing;
-	background-color: #FFFFFF;
+	background-color: #ffffff;
 }
 .flex {
 	background-color: #ffffff;
@@ -191,24 +260,20 @@ page {
 		}
 
 		.buttom {
-			color: $base-color;
+			color: #f21f5d;
 			font-size: $font-base;
 		}
 	}
 }
 .add-btn {
-	background: $base-color;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
+	width: 520rpx;
 	height: 80rpx;
-	margin: 0 auto;
-	margin-top: 30rpx;
-	font-size: $font-lg;
-	border-radius: 10rpx;
-	color: #fff;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	border: 2rpx solid #f21f5d;
+	border-radius: 40rpx;
+	margin: 140rpx auto;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #f21f5d;
 }
 .name {
 	background: #fff;
@@ -252,6 +317,10 @@ page {
 		}
 	}
 }
+.tip {
+	padding: 20rpx;
+	color: #ff0000;
+}
 /deep/ .uni-radio-input {
 	width: 45rpx;
 	height: 45rpx;

pages/money/withdrawal.vue

@@ -12,7 +12,7 @@
 			<view class="title">转换金额</view>
 			<view class="row">
 				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" placeholder="请输入佣金数量" placeholder-class="placeholder" />
+				<input class="input" type="number" v-model="withdrawal" placeholder="请输入消费券数量" placeholder-class="placeholder" />
 				<view class="buttom" @click="withdrawal = money">全部转换</view>
 			</view>
 		</view>
@@ -25,7 +25,7 @@
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
+import { exchangeCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
 import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
 export default {
 	filters: {
@@ -85,9 +85,8 @@ export default {
 		// 加载余额信息
 		async loadData() {
 			extractBank({}).then(({ data }) => {
-				this.money = data.moneyCount;//可提现余额
+				this.money = data.commissionCount;//可提现余额
 				this.minPrice = data.minPrice;//最小提现
-				this.freeze =data.inmoneyCount//提现中的余额
 			});
 		},
 		// 跳转
@@ -103,22 +102,9 @@ export default {
 		// 提交
 		confirm() {
 			let data = {
-				extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
 				money: this.withdrawal, //金额
-				money_type: 1//0佣金1余额
 			}
-			if (this.type=='alipay') {
-				data.name = this.aliData.fullname;
-				data.alipay_code = this.aliData.alino;
-			}
-			if (this.type=='bank') {
-				data.name = this.bankData.fullname;
-				data.bankname = this.bankData.bank;
-				data.cardnum = this.bankData.bankno;
-			}
-			
-			
-			extractCash(data)
+			exchangeCash(data)
 				.then(e => {
 					uni.showToast({
 						title: '提交成功',

pages/user/award.vue

@@ -19,12 +19,12 @@
 		<view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">累计收入</view>
-				<view class="info-num">300</view>
+				<view class="info-num">{{recharge}}</view>
 			</view>
 			<view class="shu"></view>
 			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">300</view>
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{orderStatusSum}}</view>
 			</view>
 		</view>
 		<view class="navbar">
@@ -96,6 +96,8 @@ export default {
 			// 头部图高度
 			maxheight: '',
 			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
 			navList: [
 				{
 					state: 0,
@@ -136,6 +138,7 @@ export default {
 		},
 		//获取收入支出信息
 		async loadData(source) {
+			let obj = this;
 			//这里是将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
@@ -159,10 +162,15 @@ export default {
 				state
 			)
 				.then(({ data }) => {
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
+					obj.recharge = data.income;
+					obj.orderStatusSum = data.expend;
+						console.log(data);
+					if (data.list.length > 0) {
+						navItem.orderList = navItem.orderList.concat(data.list[0].list);
 						console.log(navItem.orderList);
 						navItem.page++;
+					}else {
+						navItem.loadingType = 'noMore';
 					}
 					if (navItem.limit == data.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore

pages/user/cash.vue

@@ -11,20 +11,24 @@
 				<view class="money">{{ userInfo.cash }}</view>
 				<view>我的现金</view>
 			</view>
-			<view class="money-btn" @click="navto('/pages/user/withdrawal')">
-				现金提现
-				<text>></text>
+			<view class="moneybtn-box">
+				<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=cash')">
+					现金转账
+				</view>
+				<view class="money-btn" @click="navto('/pages/user/withdrawal')">
+					现金提现
+				</view>
 			</view>
 		</view>
 		<view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">累计收入</view>
-				<view class="info-num">300</view>
+				<view class="info-num">{{recharge}}</view>
 			</view>
 			<view class="shu"></view>
 			<view class="info-item">
-				<view class="info-font">累计提现</view>
-				<view class="info-num">300</view>
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{orderStatusSum}}</view>
 			</view>
 		</view>
 		<view class="navbar">
@@ -96,9 +100,11 @@ export default {
 			// 头部图高度
 			maxheight: '',
 			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
 			navList: [
 				{
-					state: 0,
+					state: 1,
 					text: '收入',
 					loadingType: 'more',
 					orderList: [],
@@ -106,7 +112,7 @@ export default {
 					limit: 10 //每次信息条数
 				},
 				{
-					state: 1,
+					state: 0,
 					text: '支出',
 					loadingType: 'more',
 					orderList: [],
@@ -134,6 +140,7 @@ export default {
 		},
 		//获取收入支出信息
 		async loadData(source) {
+			let obj = this
 			//这里是将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
@@ -157,12 +164,14 @@ export default {
 				}
 			)
 				.then(({ data }) => {
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data);
+					obj.recharge = data.income;
+					obj.orderStatusSum = data.expend;
+					if (data.list.length > 0) {
+						navItem.orderList = navItem.orderList.concat(data.list);
 						console.log(navItem.orderList);
 						navItem.page++;
 					}
-					if (navItem.limit == data.length) {
+					if (navItem.limit == data.list.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;
@@ -288,6 +297,18 @@ page {
 		background: #dcdfe6;
 	}
 }
+.moneybtn-box {
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+	z-index: 2;
+	color: #ffffff;
+	padding:20rpx 50rpx ;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+}
 .money-box {
 	position: relative;
 	z-index: 2;
@@ -304,21 +325,6 @@ page {
 		font-size: 30rpx;
 	}
 }
-.money-btn {
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding-right: 50rpx;
-	text-align: right;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #FFFFFF;
-	text {
-		display: inline-block;
-		padding-left: 10rpx;
-	}
-}
 
 .navbar {
 	margin-top: 20rpx;

pages/user/mygx.vue

@@ -8,41 +8,11 @@
 			</view>
 			<view class="content-bg"><image src="../../static/img/mygx.png" mode=""></image></view>
 			<view class="money-box">
-				<view class="money">{{ userInfo.my_point }}</view>
+				<view class="money">{{ my_point }}</view>
 				<view>我的分红积分</view>
 				<view>1分红积分价值{{ price * 1}}</view>
 			</view>
 		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.title }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-								<view v-if="item.status == 0" class="status">待发放</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
 	</view>
 </template>
 
@@ -83,7 +53,8 @@ export default {
 			// 头部图高度
 			maxheight: '',
 			tabCurrentIndex: 0,
-			price: 0,
+			price: 0,
+			my_point: 0,
 			navList: [
 				{
 					state: 0,
@@ -111,6 +82,7 @@ export default {
 	onShow() {
 		share().then(({data}) =>{
 			this.price = data.price;
+			this.my_point = data.my_point;
 			console.log(data);
 		})
 		this.loadData();

pages/user/scoreAccumulate.vue

@@ -1,68 +1,134 @@
 <template>
 	<view class="content">
-		<!-- <view class="navbar">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="header">响亮积分</view>
+			</view>
+			<view class="content-bg"><image src="../../static/img/myjf.png" mode=""></image></view>
+			<view class="money-box">
+				<view class="money">{{userInfo.integral | getMoneyStyle}}</view>
+				<view>我的响亮积分</view>
+			</view>
+			<view class="money-btn" @click="navto('/pages/money/withdmoenys')">
+				积分转账
+				<text>></text>
+			</view>
+		</view>
+		<view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">累计收入</view>
+				<view class="info-num">{{recharge}}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{orderStatusSum}}</view>
+			</view>
+		</view>
+		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view> -->
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
+	
 					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.mark }}</text>
+					<view>
+						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.mark }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
 							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
+							<view class="money">
+								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
+								<view v-if="item.status == 0" class="status">待发放</view>
 							</view>
 						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
 					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-		<view class="btn" @click="navto('/pages/money/withdmoenys')">
-			响亮积分转账
-		</view>
 	</view>
 </template>
 
 <script>
-	
 import { integrallist } from '@/api/functionalUnit.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
+import { mapState, mapMutations } from 'vuex';
 export default {
+	filters: {
+		getMoneyStyle
+	},
 	components: {
 		empty,
 		uniLoadMore
 	},
-	onReady() {
-		
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	onReady(res) {
+		var _this = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					_this.height = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', _this.height);
+				});
+			},
+			fail: res => {}
+		});
 	},
 	data() {
 		return {
+			height: '',
+			// 头部图高度
+			maxheight:'',
 			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
 			navList: [
+				// {
+				// 	state: 0,
+				// 	text: '全部',
+				// 	loadingType: 'more',
+				// 	orderList: [],
+				// 	page: 1, //当前页数
+				// 	limit: 10 //每次信息条数
+				// },
 				{
 					state: 0,
-					text: '全部',
+					text: '支出',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
+				{
+					state: 1,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
 			],
 		};
 	},
+	onLoad(options) {},
 	onShow() {
-		// 载入积分数据
 		this.loadData();
 	},
 	methods: {
@@ -74,6 +140,7 @@ export default {
 		},
 		//获取收入支出信息
 		async loadData(source) {
+			let obj = this
 			//这里是将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
@@ -92,16 +159,20 @@ export default {
 			integrallist(
 				{
 					page: navItem.page,
-					limit: navItem.limit
+					limit: navItem.limit,
+					pm: state
 				},
-				state
 			)
 				.then(({ data }) => {
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data);
+					obj.recharge = data.income;
+					obj.orderStatusSum = data.expend;
+					if (data.list.length > 0) {
+						console.log(data);
+						navItem.orderList = navItem.orderList.concat(data.list);
+						console.log(navItem.orderList);
 						navItem.page++;
 					}
-					if (navItem.limit == data.length) {
+					if (navItem.limit == data.list.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;
@@ -125,6 +196,11 @@ export default {
 		//顶部tab点击
 		tabClick(index) {
 			this.tabCurrentIndex = index;
+		},
+		toBack() {
+			uni.navigateBack({
+				
+			})
 		}
 	}
 };
@@ -132,12 +208,137 @@ export default {
 
 <style lang="scss">
 page {
-	background: #ffffff;
+	background: #f1f1f1;
 	height: 100%;
 }
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+.content-money {
+	position: relative;
+	height: 480rpx;
+	.content-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 480rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+}
+.info-box {
+	width: 670rpx;
+	height: 186rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: -100rpx auto 0;
+	position: relative;
+	z-index: 2;
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+		.info-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #999999;
+		}
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
+		}
+	}
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 90rpx;
+	color: #ffffff;
+	text-align: center;
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+	.text {
+		font-size: 30rpx;
+	}
+}
+.money-btn {
+	position: relative;
+	z-index: 2;
+	color: #ffffff;
+	padding-right: 50rpx;
+	text-align: right;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+	text {
+		display: inline-block;
+		padding-left: 10rpx;
+	}
+}
+
 .navbar {
+	margin-top: 20rpx;
 	display: flex;
-	height: 40px;
+	height: 88rpx;
 	padding: 0 5px;
 	background: #fff;
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
@@ -150,10 +351,10 @@ page {
 		align-items: center;
 		height: 100%;
 		font-size: 15px;
-		color: $font-color-dark;
+		color: #999999;
 		position: relative;
 		&.current {
-			color: $base-color;
+			color: #000;
 			&:after {
 				content: '';
 				position: absolute;
@@ -162,16 +363,16 @@ page {
 				transform: translateX(-50%);
 				width: 44px;
 				height: 0;
-				border-bottom: 2px solid $base-color;
+				border-bottom: 2px solid #fe5b38;
 			}
 		}
 	}
 }
-// 列表
-
+//列表
 .swiper-box {
-	height: calc(100% - 44px);
-	padding-top: 10rpx;
+	.order-item:last-child {
+		margin-bottom: 60rpx;
+	}
 	.order-item {
 		padding: 20rpx 30rpx;
 		line-height: 1.5;
@@ -188,10 +389,15 @@ page {
 		.money {
 			color: #fd5b23;
 			font-size: $font-lg;
+			text-align: right;
+			.status {
+				color: $font-color-light;
+			}
 		}
 	}
 }
 .list-scroll-content {
+	background: #ffffff;
 	height: 100%;
 }
 .content {
@@ -200,19 +406,21 @@ page {
 		background-color: #ffffff;
 	}
 }
-.btn {
+.btn-box {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	text-align: center;
+	line-height: 88rpx;
 	position: fixed;
-	bottom: 30rpx;
+	bottom: 48rpx;
 	left: 0;
 	right: 0;
-	width: 690upx;
-	height: 80upx;
 	margin: 0 auto;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10upx;
-	text-align: center;
-	line-height: 80upx;
 }
 </style>

pages/user/withdrawal.vue

@@ -4,7 +4,7 @@
 		<view class="content-money">
 			<view class="flex " style="width: 750rpx;justify-content: space-around;margin-left: 0;">
 				<view class="buttom">
-					<view class="icon">{{ money | getMoneyStyle }}</view>
+					<view class="icon">{{ userInfo.cash | getMoneyStyle }}</view>
 					<text class="text">可提现现金</text>
 				</view>
 			</view>
@@ -15,10 +15,10 @@
 			<view class="row">
 				<text class="tit">￥</text>
 				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = money">全部提现</view>
+				<view class="buttom" @click="withdrawal = userInfo.cash">全部提现</view>
 			</view>
 		</view>
-		<view class="tip">
+		<view class="tip" v-if="withdrawal != 0">
 			实际到账 {{ real }}元
 		</view>
 		<!-- #ifndef MP-WEIXIN -->
@@ -94,6 +94,7 @@
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
 import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
+import { orderData, getUserInfo } from '@/api/user.js';
 import { mapState, mapMutations } from 'vuex';
 import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
 export default {
@@ -142,7 +143,6 @@ export default {
 		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 		// 加载余额信息
 		async loadData() {
-			this.money = this.userInfo.cash
 			extractBank({}).then(({ data }) => {
 				this.minPrice = data.minPrice;
 			});
@@ -188,6 +188,13 @@ export default {
 
 			extractCash(data)
 				.then(e => {
+					getUserInfo({})
+						.then(({ data }) => {
+							this.setUserInfo(data);
+						})
+						.catch(e => {
+							console.log(e);
+						});
 					uni.showToast({
 						title: '提交成功',
 						duration: 2000,

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>响亮商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.0c0314dc.js></script><script src=/index/static/js/index.b2f278b6.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.0c0314dc.js></script><script src=/index/static/js/index.e4f30980.js></script></body></html>