12456

api/user.js

@@ -101,4 +101,11 @@ export function delcollect(data) {
 	});
 }
 
-
+// 兑换
+export function coral(data) {
+	return request({
+		url: '/api/change/coral',
+		method: 'post',
+		data
+	});
+}

api/wallet.js

@@ -98,5 +98,47 @@ export function balance(data) {
 	});
 }
 
+//保存收款信息
+export function auction(data) {
+	return request({
+		url: '/api/auction/pay',
+		method: 'post',
+		data
+	});
+}
 
+//获取收款信息
+export function pay_list(data) {
+	return request({
+		url: '/api/auction/pay_list',
+		method: 'get',
+		data
+	});
+}
 
+//获取购物积分详情
+export function sp_final_list(data) {
+	return request({
+		url: '/api/sp_final_list/list',
+		method: 'get',
+		data
+	});
+}
+
+//获取提货券详情
+export function top_ticket_list(data) {
+	return request({
+		url: '/api/top_ticket_list/list',
+		method: 'get',
+		data
+	});
+}
+
+//获取提货券详情
+export function aid_val_list(data) {
+	return request({
+		url: '/api/aid_val_list/list',
+		method: 'get',
+		data
+	});
+}

pages.json

@@ -502,17 +502,17 @@
 				"navigationBarTitleText": "提现账号"
 			}
 		},
-		{
-			"path": "pages/money/withdrawal",
-			"style": {
-				"navigationBarTitleText": "提现"
-			}
-		},
 		{
 			"path": "pages/money/recharge",
 			"style": {
 				"navigationBarTitleText": "充值"
 			}
+		},
+		{
+			"path": "pages/money/withdmoenys",
+			"style": {
+				"navigationBarTitleText": "兑换"
+			}
 		},
 		{
 			"path": "pages/category/category",

pages/money/withdmoenys.vue

@@ -0,0 +1,274 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="flex" v-if="type == 'shop'">
+				<view class="buttom">
+					<view class="icon">{{ userInfo.sp_final | 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 == 'th'">
+				<view class="buttom">
+					<view class="icon">{{ userInfo.top_ticket | getMoneyStyle }}</view>
+					<text class="text">可兑换提货券</text>
+				</view>
+			</view>
+		</view>
+		<view class="row-box">
+			<view class="title">{{type == 'yue' ? '申请兑换购物积分': type == 'shop'? '申请兑换提货券' : '申请兑换广告值'}}</view>
+			<view class="row">
+				<!-- <text class="tit">￥</text> -->
+				<input class="input" type="number" v-model="withdrawal" placeholder="请输入兑换金额" placeholder-class="placeholder" />
+				<view class="buttom" v-if="type == 'shop'" @click="withdrawal = userInfo.sp_final">全部转账</view>
+				<view class="buttom" v-if="type == 'yue'" @click="withdrawal = userInfo.now_money">全部转账</view>
+				<view class="buttom" v-if="type == 'th'" @click="withdrawal = userInfo.top_ticket">全部转账</view>
+			</view>
+		</view>
+		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交申请</button>
+	</view>
+</template>
+
+<script>
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { getUserInfo, coral } from '@/api/user.js';
+import { mapMutations, mapState } from 'vuex';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	data() {
+		return {
+			money: '0.00', //可提现金额
+			withdrawal: '', //提现金额
+			password: '', //支付密码
+			card: '', //转账卡号
+			name: '',
+			// #ifdef H5
+			weichatBsrowser: false,
+			// #endif
+			loding: false,
+			type: 'xl'
+		};
+	},
+	onLoad(options) {
+		// #ifdef H5
+		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
+		// #endif
+		this.dataUp();
+		if (options.type) {
+			this.type = options.type;
+			console.log(this.type);
+		}
+	},
+	computed: {
+		...mapState('user', ['userInfo'])
+	},
+	methods: {
+		...mapMutations('user', ['setUserInfo', 'login']),
+		// 更新数据
+		dataUp() {
+			let obj = this;
+			getUserInfo({})
+				.then(e => {
+					obj.login();
+					// 保存返回用户数据
+					obj.setUserInfo(e.data);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		// 切换选中对象
+		tabRadio(e) {
+			this.type = e.detail.value;
+		},
+		// 提交
+		confirm() {
+			let obj = this;
+			obj.loding = true;
+			if (obj.withdrawal == 0) {
+				obj.loding = false;
+				uni.showModal({
+					title: '提示',
+					content: '转账金额不要为0'
+				});
+				return;
+			}
+			let data = {
+				amount: obj.withdrawal ,//金额
+			};
+			if(obj.type == 'shop') {
+				data.type = 2
+			}
+			if(obj.type == 'yue') {
+				data.type = 1
+			}
+			coral(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();
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	height: 100%;
+}
+.content-money {
+	padding: 30rpx 0;
+	background: #ffffff;
+}
+
+.item {
+	padding: 0 $page-row-spacing;
+	background-color: #ffffff;
+}
+.flex {
+	background-color: #ffffff;
+	text-align: center;
+	margin: 0 30rpx;
+	border-radius: $border-radius-sm;
+	justify-content: center;
+	.buttom {
+		font-size: $font-lg;
+		width: 50%;
+	}
+	.interval {
+		width: 2px;
+		height: 60rpx;
+		background-color: #eeeeee;
+	}
+	.icon {
+		background-size: 100%;
+		font-size: 42rpx;
+		color: $font-color-dark;
+		font-weight: bold;
+		background-repeat: no-repeat;
+		background-position: center;
+	}
+	.text {
+		color: $font-color-light;
+	}
+}
+
+.row-box {
+	margin-top: 30rpx;
+	padding: 20rpx 30rpx;
+	background: #fff;
+	.title {
+		font-size: $font-base + 2rpx;
+		color: $font-color-dark;
+	}
+	.row {
+		display: flex;
+		align-items: center;
+		position: relative;
+		height: 80rpx;
+		.tit {
+			flex-shrink: 0;
+			width: 40rpx;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+		.input {
+			flex: 1;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+		.iconlocation {
+			font-size: 36rpx;
+			color: $font-color-light;
+		}
+
+		.buttom {
+			color: #f21f5d;
+			font-size: $font-base;
+		}
+	}
+}
+.add-btn {
+	margin: 140rpx auto;
+	width: 670rpx;
+	height: 88rpx;
+	background: #303030;
+	border-radius: 10px;
+	font-size: 32rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #F8DABA;
+	line-height: 88rpx;
+	text-align: center;
+}
+.name {
+	background: #fff;
+	padding: 30rpx;
+}
+.list {
+	padding-left: 30rpx;
+	margin-top: 30rpx;
+	background-color: #ffffff;
+	.box {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 120rpx;
+		border-bottom: 1px solid $border-color-light;
+		.icon {
+			font-size: 48rpx;
+			padding-right: 20rpx;
+			.icon-img {
+				height: 50rpx;
+				width: 50rpx;
+			}
+		}
+		.iconweixin1 {
+			color: #18bf16;
+		}
+		.iconzhifubao {
+			color: #08aaec;
+		}
+		.title-box {
+			flex-grow: 1;
+			text-align: left;
+			.title {
+				font-size: $font-base + 2rpx;
+				color: $font-color-base;
+			}
+			.node {
+				font-size: $font-sm;
+				color: $font-color-light;
+			}
+		}
+	}
+}
+.tip {
+	padding: 20rpx;
+	color: #ff0000;
+}
+/deep/ .uni-radio-input {
+	width: 45rpx;
+	height: 45rpx;
+}
+</style>

pages/money/withdrawal.vue

@@ -1,312 +0,0 @@
-<template>
-	<view class="content">
-		<uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar>
-		<view class="content-money">
-			<view class="flex ">
-				<view class="buttom">
-					<view class="icon">{{ money | getMoneyStyle }}</view>
-					<text class="text">可提现金额</text>
-				</view>
-				<view class="interval"></view>
-				<view class="buttom">
-					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
-					<text class="text">待审核提现金额</text>
-				</view>
-			</view>
-		</view>
-		<view class="row-box">
-			<view class="title">提现金额</view>
-			<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>
-		</view>
-		<!-- #ifndef MP-WEIXIN -->
-		<view class="list" v-if="!weichatBsrowser">
-			<radio-group @change="tabRadio">
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconweixin1"></view>
-						<view class="title-box">
-							<view class="title"><text>提现至微信</text></view>
-						</view>
-						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
-					</view>
-				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconzhifubao"></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="aliData.fullname">提现至支付宝</text>
-								<text v-else>请创建支付宝账号</text>
-							</view>
-							<view class="node">
-								<text v-if="aliData.fullname">真实姓名({{ aliData.fullname }})</text>
-							</view>
-						</view>
-						<view class="right"><radio value="alipay" color="#5dbc7c" :checked="type == 'alipay'" /></view>
-					</view>
-				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="bankData.bankno">{{ bankData.bank + ' ' + bankData.bankno }}</text>
-								<text v-else>请创建银行账号</text>
-							</view>
-							<view class="node">
-								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
-							</view>
-						</view>
-						<view class="right"><radio value="bank" color="#5dbc7c" :checked="type == 'bank'" /></view>
-					</view>
-				</label>
-			</radio-group>
-		</view>
-		<!-- #endif -->
-		<button class="add-btn up" @click="confirm">提交申请</button>
-		<button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button>
-	</view>
-</template>
-
-<script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
-import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		uniNoticeBar
-	},
-	data() {
-		return {
-			type: 'weixin', //提现方式
-			money: '0.00', //可提现金额
-			freeze: '0.0', //冻结金额
-			withdrawal: '', //提现金额
-			minPrice: '', //最少提现金额
-			aliData: {},
-			bankData: {},
-			// #ifdef H5
-			weichatBsrowser: false
-			// #endif
-		};
-	},
-	onLoad(options) {
-		// #ifdef H5
-		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-		// #endif
-		//加载提现信息
-		this.loadData();
-		// 加载提款账号信息
-		this.loadAli();
-		this.loadBank();
-	},
-	methods: {
-		// 更新数据
-		dataUp(){
-			this.loadAli();
-			this.loadBank();
-		},
-		//加载数据
-		async loadAli(source) {
-			aliInfo({}).then(e => {
-				this.aliData = e.data;
-			});
-		},
-		// 加载银行卡信息
-		async loadBank() {
-			bankInfo({}).then(e => {
-				this.bankData = e.data;
-			});
-		},
-		// 加载余额信息
-		async loadData() {
-			extractBank({}).then(({ data }) => {
-				this.money = data.moneyCount;//可提现余额
-				this.minPrice = data.minPrice;//最小提现
-				this.freeze =data.inmoneyCount//提现中的余额
-			});
-		},
-		// 跳转
-		navTo(url) {
-			uni.navigateTo({
-				url: url
-			});
-		},
-		// 切换选中对象
-		tabRadio(e) {
-			this.type = e.detail.value;
-		},
-		// 提交
-		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)
-				.then(e => {
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000,
-						position: 'top'
-					});
-				})
-				.catch(e => {
-					console.log();
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-.content-money {
-	padding: 30rpx 0;
-	background: #ffffff;
-}
-.flex {
-	background-color: #ffffff;
-	text-align: center;
-	margin: 0 30rpx;
-	border-radius: $border-radius-sm;
-	.buttom {
-		font-size: $font-lg;
-		width: 50%;
-	}
-	.interval {
-		width: 2px;
-		height: 60rpx;
-		background-color: #eeeeee;
-	}
-	.icon {
-		background-size: 100%;
-		font-size: 42rpx;
-		color: $font-color-dark;
-		font-weight: bold;
-		background-repeat: no-repeat;
-		background-position: center;
-	}
-	.text {
-		color: $font-color-light;
-	}
-}
-
-.row-box {
-	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	.title {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-	.row {
-		display: flex;
-		align-items: center;
-		position: relative;
-		height: 80rpx;
-		.tit {
-			flex-shrink: 0;
-			width: 40rpx;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.input {
-			flex: 1;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.iconlocation {
-			font-size: 36rpx;
-			color: $font-color-light;
-		}
-
-		.buttom {
-			color: $font-color-spec;
-			font-size: $font-base;
-		}
-	}
-}
-.add-btn {
-	&.modified {
-		color: $base-color;
-	}
-	&.up {
-		background-color: $base-color;
-		color: #fff;
-	}
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 0 auto;
-	margin-top: 30rpx;
-	font-size: $font-lg;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-
-.list {
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	background-color: #ffffff;
-	.box {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		border-bottom: 1px solid $border-color-light;
-		.icon {
-			font-size: 48rpx;
-			padding-right: 20rpx;
-			.icon-img {
-				height: 50rpx;
-				width: 50rpx;
-			}
-		}
-		.iconweixin1 {
-			color: #18bf16;
-		}
-		.iconzhifubao {
-			color: #08aaec;
-		}
-		.title-box {
-			flex-grow: 1;
-			text-align: left;
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-base;
-			}
-			.node {
-				font-size: $font-sm;
-				color: $font-color-light;
-			}
-		}
-	}
-}
-/deep/ .uni-radio-input {
-	width: 45rpx;
-	height: 45rpx;
-}
-</style>

pages/user/myggz.vue

@@ -4,12 +4,12 @@
 			<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 class="header">我的广告值</view>
 			</view>
 			<view class="content-bg"><image src="../../static/img/zhihuanjuan.png" mode=""></image></view>
 			<view class="money-box">
-				<view class="money">{{ userInfo.now_money || '0' }}</view>
-				<view>提货券</view>
+				<view class="money">{{ userInfo.aid_val || '0' }}</view>
+				<view>广告值</view>
 			</view>
 			<!-- <view class="money-btn" @click="navto('/pages/money/recharge')">
 				兑换广告值
@@ -41,7 +41,7 @@
 						<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>
+									<text>{{ item.mark }}</text>
 								</view>
 								<view class="time">
 									<text>{{ item.add_time }}</text>
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { aid_val_list, userBalance } from '@/api/wallet.js';
 import { getMoneyStyle } from '@/utils/rocessor.js';
 import { mapState, mapMutations } from 'vuex';
 import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
@@ -154,34 +154,18 @@ export default {
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 
-			spreadCommission(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
+			aid_val_list(
+				
 			)
 				.then(({ data }) => {
 					console.log(data);
-					// obj.recharge = data.income;
-					// obj.orderStatusSum = data.expend;
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}else {
-						navItem.loadingType = 'noMore';
-					}
-					if (navItem.limit == data[0].list.length) {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
+					obj.recharge = data.sr;
+					obj.orderStatusSum = data.zc;
+					obj.navList[0].orderList = data.zj
+					obj.navList[1].orderList = data.kc
+					navItem.loadingType = 'nomore';
+					navItem.loaded = true
 					uni.hideLoading();
-					this.$set(navItem, 'loaded', true);
 				})
 				.catch(e => {
 					console.log(e);

pages/user/mygwjf.vue

@@ -8,10 +8,10 @@
 			</view>
 			<view class="content-bg"><image src="../../static/img/yongjin-bg.png" mode=""></image></view>
 			<view class="money-box">
-				<view class="money">{{ userInfo.now_money || '0' }}</view>
+				<view class="money">{{ userInfo.sp_final || '0' }}</view>
 				<view>购物积分</view>
 			</view>
-			<view class="money-btn" @click="navto('/pages/money/recharge')">
+			<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=shop')">
 				兑换提货券
 				<text>></text>
 			</view>
@@ -41,7 +41,7 @@
 						<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>
+									<text>{{ item.mark }}</text>
 								</view>
 								<view class="time">
 									<text>{{ item.add_time }}</text>
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { sp_final_list, userBalance } from '@/api/wallet.js';
 import { getMoneyStyle } from '@/utils/rocessor.js';
 import { mapState, mapMutations } from 'vuex';
 import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
@@ -154,34 +154,16 @@ export default {
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 
-			spreadCommission(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
+			sp_final_list()
 				.then(({ data }) => {
 					console.log(data);
-					// obj.recharge = data.income;
-					// obj.orderStatusSum = data.expend;
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}else {
-						navItem.loadingType = 'noMore';
-					}
-					if (navItem.limit == data[0].list.length) {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
+					obj.recharge = data.sr;
+					obj.orderStatusSum = data.zc;
+					obj.navList[0].orderList = data.zj
+					obj.navList[1].orderList = data.kc
+					navItem.loadingType = 'nomore';
+					navItem.loaded = true
 					uni.hideLoading();
-					this.$set(navItem, 'loaded', true);
 				})
 				.catch(e => {
 					console.log(e);

pages/user/mythq.vue

@@ -8,13 +8,13 @@
 			</view>
 			<view class="content-bg"><image src="../../static/img/thq-bg.png" mode=""></image></view>
 			<view class="money-box">
-				<view class="money">{{ userInfo.now_money || '0' }}</view>
+				<view class="money">{{ userInfo.top_ticket || '0' }}</view>
 				<view>提货券</view>
 			</view>
-			<view class="money-btn" @click="navto('/pages/money/recharge')">
+			<!-- <view class="money-btn" @click="navto('/pages/money/withdmoenys?type=th')">
 				兑换广告值
 				<text>></text>
-			</view>
+			</view> -->
 		</view>
 		<view class="info-box flex">
 			<view class="info-item">
@@ -41,7 +41,7 @@
 						<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>
+									<text>{{ item.mark }}</text>
 								</view>
 								<view class="time">
 									<text>{{ item.add_time }}</text>
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { top_ticket_list, userBalance } from '@/api/wallet.js';
 import { getMoneyStyle } from '@/utils/rocessor.js';
 import { mapState, mapMutations } from 'vuex';
 import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
@@ -154,34 +154,16 @@ export default {
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 
-			spreadCommission(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
+			top_ticket_list()
 				.then(({ data }) => {
 					console.log(data);
-					// obj.recharge = data.income;
-					// obj.orderStatusSum = data.expend;
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}else {
-						navItem.loadingType = 'noMore';
-					}
-					if (navItem.limit == data[0].list.length) {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
+					obj.recharge = data.sr;
+					obj.orderStatusSum = data.zc;
+					obj.navList[0].orderList = data.zj
+					obj.navList[1].orderList = data.kc
+					navItem.loadingType = 'nomore';
+					navItem.loaded = true
 					uni.hideLoading();
-					this.$set(navItem, 'loaded', true);
 				})
 				.catch(e => {
 					console.log(e);

pages/user/myxfjf.vue

@@ -11,10 +11,6 @@
 				<view class="money">{{ userInfo.now_money || '0' }}</view>
 				<view>消费积分</view>
 			</view>
-			<!-- <view class="money-btn" @click="navto('/pages/money/recharge')">
-				兑换广告值
-				<text>></text>
-			</view> -->
 		</view>
 		<view class="info-box flex">
 			<view class="info-item" @click="navto('/pages/user/xfjfzz')">
@@ -22,12 +18,12 @@
 				<view class="info-font">互转</view>
 			</view>
 			<view class="shu"></view>
-			<view class="info-item">
+			<view class="info-item" @click="navto('/pages/user/withdrawal')">
 				<image src="../../static/icon/tixian.png" mode=""></image>
 				<view class="info-font">提现</view>
 			</view>
 			<view class="shu"></view>
-			<view class="info-item">
+			<view class="info-item" @click="navto('/pages/money/withdmoenys?type=yue')">
 				<image src="../../static/icon/duihuan.png" mode=""></image>
 				<view class="info-font">兑换</view>
 			</view>
@@ -173,19 +169,19 @@ export default {
 					if (data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data[0].list);
 						console.log(navItem.orderList);
-						navItem.page++;
+						navItem.page++;
+						if (navItem.limit == data[0].list.length) {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'more';
+							return;
+						} else {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'noMore';
+						}
 					}else {
 						navItem.loadingType = 'noMore';
-					}
-					if (navItem.limit == data[0].list.length) {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
-					uni.hideLoading();
+					}
+					uni.hideLoading();
 					this.$set(navItem, 'loaded', true);
 				})
 				.catch(e => {

pages/user/user.vue

@@ -3,13 +3,13 @@
 		<view class="vheigh"></view>
 		<view class="top-image"><image src="../../static/user/user-top.png" mode=""></image></view>
 		<view class="user-set flex">
-			<view class="set-logo"><image src="../../static/user/user1.png" mode=""></image></view>
+			<view class="set-logo" @click="navTo('/pages/set/userinfo')"><image src="../../static/user/user1.png" mode=""></image></view>
 			<view class="xx-logo"><image src="../../static/user/user2.png" mode=""></image></view>
 		</view>
 		<view class="user-wrap">
 			<view class="info-left flex">
 				<view class="user-name">
-					<image src="../../static/error/missing-face.png" mode=""></image>
+					<image :src="userInfo.avatar || '../../static/error/missing-face.png'" mode=""></image>
 					<view class="user-font">
 						<view class="name clamp">{{ userInfo.nickname }}</view>
 						<view class="phone">{{ userInfo.phone }}</view>
@@ -19,7 +19,7 @@
 			</view>
 			<view class="info-right" @click="navTo('/pages/user/myxfjf')">
 				<image class="iright-icon" src="../../static/user/user3.png" mode=""></image>
-				<view class="iright-font">消费积分：12345678</view>
+				<view class="iright-font">消费积分：{{ userInfo.now_money }}</view>
 			</view>
 		</view>
 		<view class="main-box">
@@ -32,7 +32,7 @@
 			</view>
 			<view class="main flex">
 				<view class="item" @click="navTo('/pages/user/mygwjf')">
-					<view class="item-num">5690</view>
+					<view class="item-num">{{ userInfo.sp_final}}</view>
 					<view class="item-font">购物积分</view>
 				</view>
 				<view class="item" @click="navTo('/pages/user/mythq')">

pages/user/withdrawal.vue

@@ -1,16 +1,16 @@
 <template>
 	<view class="content">
-		<uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar>
+		<!-- <uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar> -->
 		<view class="content-money">
 			<view class="flex ">
 				<view class="buttom">
 					<view class="icon">{{ money | getMoneyStyle }}</view>
-					<text class="text">可提现佣金</text>
+					<text class="text">可提现金额</text>
 				</view>
 				<view class="interval"></view>
 				<view class="buttom">
 					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
-					<text class="text">待审核提现佣金</text>
+					<text class="text">待审核提现金额</text>
 				</view>
 			</view>
 		</view>
@@ -25,7 +25,7 @@
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list" v-if="!weichatBsrowser">
 			<radio-group @change="tabRadio">
-				<label>
+				<!-- <label>
 					<view class="box">
 						<view class="icon iconfont iconweixin1"></view>
 						<view class="title-box">
@@ -33,17 +33,17 @@
 						</view>
 						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
 					</view>
-				</label>
+				</label> -->
 				<label>
 					<view class="box">
 						<view class="icon iconfont iconzhifubao"></view>
 						<view class="title-box">
 							<view class="title">
-								<text v-if="aliData.fullname">提现至支付宝</text>
+								<text v-if="aliData.name">提现至支付宝</text>
 								<text v-else>请创建支付宝账号</text>
 							</view>
 							<view class="node">
-								<text v-if="aliData.fullname">真实姓名({{ aliData.fullname }})</text>
+								<text v-if="aliData.name">真实姓名({{ aliData.name }})</text>
 							</view>
 						</view>
 						<view class="right"><radio value="alipay" color="#5dbc7c" :checked="type == 'alipay'" /></view>
@@ -54,11 +54,11 @@
 						<view class="icon iconfont"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
 						<view class="title-box">
 							<view class="title">
-								<text v-if="bankData.bankno">{{ bankData.bank + ' ' + bankData.bankno }}</text>
+								<text v-if="bankData.payment">{{ bankData.bank + ' ' + bankData.payment }}</text>
 								<text v-else>请创建银行账号</text>
 							</view>
 							<view class="node">
-								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
+								<text v-if="bankData.name">真实姓名({{ bankData.name }})</text>
 							</view>
 						</view>
 						<view class="right"><radio value="bank" color="#5dbc7c" :checked="type == 'bank'" /></view>
@@ -68,13 +68,13 @@
 		</view>
 		<!-- #endif -->
 		<button class="add-btn up" @click="confirm">提交申请</button>
-		<button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button>
+		<button class="add-btn modified" @click="navTo('/pages/collection/collection')">账号管理</button>
 	</view>
 </template>
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
+import { extractCash, extractBank, pay_list } from '@/api/wallet.js';
 import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
 export default {
 	filters: {
@@ -85,7 +85,7 @@ export default {
 	},
 	data() {
 		return {
-			type: 'weixin', //提现方式
+			type: 'ali', //提现方式
 			money: '0.00', //可提现金额
 			freeze: '0.0', //冻结金额
 			withdrawal: '', //提现金额
@@ -104,33 +104,23 @@ export default {
 		//加载提现信息
 		this.loadData();
 		// 加载提款账号信息
-		this.loadAli();
-		this.loadBank();
+		this.loadinfo();
 	},
 	methods: {
-		// 更新数据
-		dataUp() {
-			this.loadAli();
-			this.loadBank();
-		},
 		//加载数据
-		async loadAli(source) {
-			aliInfo({}).then(e => {
-				this.aliData = e.data;
-			});
-		},
-		// 加载银行卡信息
-		async loadBank() {
-			bankInfo({}).then(e => {
-				this.bankData = e.data;
+		async loadinfo(source) {
+			pay_list().then(({ data }) => {
+				this.aliData = data.zfb;
+				this.bankData = data.bank;
+				console.log(data);
 			});
 		},
 		// 加载余额信息
 		async loadData() {
 			extractBank({}).then(({ data }) => {
-				this.money = data.commissionCount;
-				this.minPrice = data.minPrice;
-				this.freeze = data.incommissionCount;
+				this.money = data.moneyCount; //可提现余额
+				this.minPrice = data.minPrice; //最小提现
+				this.freeze = data.inmoneyCount; //提现中的余额
 			});
 		},
 		// 跳转
@@ -148,18 +138,8 @@ export default {
 			let data = {
 				extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
 				money: this.withdrawal, //金额
-				money_type: 0 //0佣金1余额
+				money_type: 1 //0佣金1余额
 			};
-
-			if (this.withdrawal < this.minPrice) {
-			uni.showToast({
-				title: '提现金额不可少于'+this.minPrice,
-				duration: 2000,
-				mask: false,
-				icon: 'none',
-			})
-				return;
-			}
 			if (this.type == 'alipay') {
 				data.name = this.aliData.fullname;
 				data.alipay_code = this.aliData.alino;
@@ -201,6 +181,7 @@ page {
 	border-radius: $border-radius-sm;
 	.buttom {
 		font-size: $font-lg;
+		color: $font-color-dark;
 		width: 50%;
 	}
 	.interval {
@@ -251,18 +232,18 @@ page {
 		}
 
 		.buttom {
-			color: $font-color-spec;
+			color: #dc262b;
 			font-size: $font-base;
 		}
 	}
 }
 .add-btn {
 	&.modified {
-		color: $base-color;
+		color: #303030;
 	}
 	&.up {
-		background-color: $base-color;
-		color: #fff;
+		background: #303030;
+		color: #F8DABA;
 	}
 	display: flex;
 	align-items: center;
@@ -273,7 +254,6 @@ page {
 	margin-top: 30rpx;
 	font-size: $font-lg;
 	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
 }
 
 .list {