12-28

api/user.js

@@ -101,4 +101,28 @@ export function delcollect(data) {
 	});
 }
 
+//用户修改信息
+export function edit(data) {
+        return request({
+                url: '/api/user/edit',
+                method: 'post',
+                data
+        });
+}
 
+//开通会员
+export function becomeVip(data) {
+	return request({
+		url: '/api/level/recharge',
+		method: 'post',
+		data
+	});
+}
+//获取会员
+export function getVip(data) {
+	return request({
+		url: '/api/level/lst',
+		method: 'get',
+		data
+	});
+}

pages/category/vip.vue

@@ -11,16 +11,10 @@
 						<view class="tip" v-if="userInfo.level == 0">尚未开通会员</view>
 					</view>
 				</view>
-				<view class="now-wrap">
-					立即开通
-				</view>
+				<view class="now-wrap">立即开通</view>
 				<view class="card-info">
-					<view class="info-tit">
-						会员卡
-					</view>
-					<view class="info-val">
-						100通证 终身付费会员
-					</view>
+					<view class="info-tit">会员卡</view>
+					<view class="info-val">￥{{ money }}/永久 终身{{name}}</view>
 				</view>
 			</view>
 		</view>
@@ -31,15 +25,15 @@
 					<view class="tool-img"><image src="../../static/icon/kt1.png" mode=""></image></view>
 					<view class="tool-name">佣金奖励</view>
 				</view>
-				<view class="tool-item" >
+				<view class="tool-item">
 					<view class="tool-img"><image src="../../static/icon/kt2.png" mode=""></image></view>
 					<view class="tool-name">专属折扣</view>
 				</view>
-				<view class="tool-item" >
+				<view class="tool-item">
 					<view class="tool-img"><image src="../../static/icon/kt3.png" mode=""></image></view>
 					<view class="tool-name">专属服务</view>
 				</view>
-				<view class="tool-item" >
+				<view class="tool-item">
 					<view class="tool-img"><image src="../../static/icon/kt4.png" mode=""></image></view>
 					<view class="tool-name">团队奖励</view>
 				</view>
@@ -53,359 +47,493 @@
 					<view class="tool-name bold">优惠价</view>
 					<view class="tool-img"><image src="../../static/icon/kt5.png" mode=""></image></view>
 				</view>
-				<view class="tool-item1" >
+				<view class="tool-item1">
 					<view class="tool-name">会员专属</view>
 					<view class="tool-name bold">专属服务包</view>
 					<view class="tool-img"><image src="../../static/icon/kt6.png" mode=""></image></view>
-					
 				</view>
-				<view class="tool-item1" >
+				<view class="tool-item1">
 					<view class="tool-name">推广得</view>
 					<view class="tool-name bold">更多佣金</view>
 					<view class="tool-img"><image src="../../static/icon/kt7.png" mode=""></image></view>
-					
 				</view>
 			</view>
 		</view>
 		<view class="bottom-btn">
-			<view class="btm-left">
-				永久付费会员100通证
-			</view>
-			<view class="btm-right" @click="readyPay()">
-				马上开通
-			</view>
+			<view class="btm-left">永久{{name}}￥{{ money }}</view>
+			<view class="btm-right" @click="readyPay()">马上开通</view>
 		</view>
+		<uni-popup ref="popupPay" type="bottom">
+			<view class="popup-box">
+				<view class="popup-pay">
+					<view class="paybox-top flex">
+						<view class="type">选择支付方式</view>
+						<view class="image" @click="close"><image src="../../static/img/x.png" mode="aspectFill"></image></view>
+					</view>
+					<view class="paybox-main flex">
+						<view class="zftype flex">
+							<image src="../../static/img/weixin.png" mode="aspectFill"></image>
+							<view class="zf">微信支付</view>
+						</view>
+						<label class="radio1" @click="changePayType(1)"><radio style="transform:scale(0.7)" value="" :checked="payType == 1" color="#FE4141"></radio></label>
+					</view>
+					<view class="paybox-main flex">
+						<view class="zftype flex">
+							<image src="../../static/img/yue.png" mode="aspectFill"></image>
+							<view class="zf">余额支付</view>
+						</view>
+						<label class="radio" @click="changePayType(2)">
+							<radio style="transform:scale(0.7)" class="rad" value="" :checked="payType == 2" color="#FE4141"></radio>
+						</label>
+					</view>
+				</view>
+				<view class="buttom flex">
+					<view class="heji">
+						合计：
+						<text>
+							￥
+							<text class="money">{{ money }}</text>
+						</text>
+					</view>
+					<view class="zhifu" @click="pay()">立即支付</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
-	import { becomeVip, getVip, setUserRed, claseauto } from '@/api/user.js';
-	import { mapState, mapMutations } from 'vuex';
-	import { getUserInfo } from '@/api/user.js';
-	export default {
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+import { becomeVip, getVip } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import { getUserInfo } from '@/api/user.js';
+// #ifdef H5
+import weixinObj from '@/plugin/jweixin-module/index.js';
+// #endif
+export default {
+	components: {
+		uniPopup
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	data() {
+		return {
+			money: '',
+			name:'',
+			level_id:'',
+			payType: 2,
+			payName: 'yue',
+			now_money: '', // 当前余额
+			payLoding: false, //判断是否支付中
+		};
+	},
+	onLoad() {
+		this.getVip();
+	},
+	methods: {
+		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+		getUserInfoB() {
+			getUserInfo({})
+				.then(({ data }) => {
+					this.setUserInfo(data);
+					if (data.wx_qr) {
+						uni.navigateTo({
+							url: '/pages/vip/success'
+						});
+					} else {
+						this.$api.msg('请完善会员信息');
+						setTimeout(() => {
+							uni.navigateTo({
+								url: '/pages/set/userdata'
+							});
+						}, 1000);
+					}
+				})
+				.catch(e => {
+					console.log(e);
+				});
 		},
-		data() {
-			return {
-				
-			}
+		// 获取vip等级
+		getVip() {
+			getVip({}).then(({ data }) => {
+				console.log(data)
+				this.money = data[0].money
+				this.name = data[0].name
+				this.level_id = data[0].id
+			});
 		},
-		onLoad() {
-			
+		// 开通会员
+		readyPay() {
+			this.$refs.popupPay.open();
 		},
-		methods:{
-			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			getUserInfoA() {
-				
-			},
-			getUserInfoB() {
-				getUserInfo({})
-					.then(({ data }) => {
-						this.setUserInfo(data);
-						if(data.wx_qr) {
-							uni.navigateTo({
-								url: '/pages/vip/success'
-							});
-						}else {
-							this.$api.msg('请完善会员信息')
-							setTimeout(()=> {
-								uni.navigateTo({
-									url:'/pages/set/userdata'
-								});
-							}, 1000);
-						}
-						
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			// 开通会员
-			readyPay() {
+		close() {
+			this.$refs.popupPay.close();
+		},
+		changePayType(type) {
+			this.payType = type;
+			console.log('this.payType', this.payType);
+			if (this.payType == 1) {
+				this.payName = 'weixin';
+				console.log('weixin', this.payName);
+			}
+			if (this.payType == 2) {
+				this.payName = 'yue';
+				console.log('yue', this.payName);
+			}
+			if (this.payType == 3) {
+				this.payName = 'ali';
+				console.log('ali', this.payName);
+			}
+		},
+		pay() {
+			let obj = this;
+			console.log('点击');
+			try {
 				let obj = this;
-				if(obj.userInfo.level > 0) {
-					return obj.$api.msg('您已开通会员')
-				}
-				getUserInfo()
-					.then(({ data }) => {
-						
-						this.setUserInfo(data);
-						if(data.now_money*1 < 100) {
-							return obj.$api.msg('您的通证不足100')
-						}
-					})
-				
-				console.log('点击');
-				try {
-					let obj = this;
-					obj.payLoding = true;
+				obj.payLoding = true;
+				// #ifdef H5
+				// 获取当前是否为微信浏览器
+				obj.froms = uni.getStorageSync('weichatBrowser') || '';
+				// #endif
+				uni.showLoading({
+					title: '支付中',
+					mask: true
+				});
+				let data = {
+					pay_type: this.payName,
+					level_id: obj.level_id,
 					// #ifdef H5
-					// 获取当前是否为微信浏览器
-					obj.froms = uni.getStorageSync('weichatBrowser') || '';
+					from: obj.froms ? 'weixin' : 'H5', //来源
 					// #endif
-					uni.showLoading({
-						title: '支付中',
-						mask: true
-					});
-					let data = {
-						pay_type: 'yue',
-						level_id: 1,
-						// #ifdef H5
-						from: obj.froms ? 'weixin' : 'H5', //来源
-						// #endif
-						// #ifdef MP-WEIXIN
-						from: 'routine', //来源
-						// #endif
-						// #ifdef APP-PLUS
-						from: 'app' //来源
-						// #endif
-					};
-					console.log(data, '传值');
-					becomeVip(data).then(({ data }) => {
-						console.log('fufei', data);
-						uni.hideLoading();
-						
-						if (data.status == 'PAY_ERROR') {
-							console.log(data);
-						}
-						if (data.status == 'SUCCESS') {
-							
-							obj.getUserInfoB();
-						}
-						console.log('-----', data);
-						let da = data.result.jsConfig;
-						if (obj.payName == 'weixin' || obj.payName == 'routine') {
-							// let da = data.result.jsConfig;
-							console.log('--da--', da);
-							let data = {
-								// #ifdef H5
-								timestamp: da.timestamp,
-								// #endif
-								// #ifdef MP
-								timeStamp: da.timestamp,
-								// #endif
-								nonceStr: da.nonceStr,
-								package: da.package,
-								signType: da.signType,
-								paySign: da.paySign,
-								success: function(res) {
-									console.log(res);
-									obj.getUserInfoB();
-								},
-								fail: e => {
-									console.log(e);
-								}
-							};
-							console.log('--data--', data);
+					// #ifdef MP-WEIXIN
+					from: 'routine', //来源
+					// #endif
+					// #ifdef APP-PLUS
+					from: 'app' //来源
+					// #endif
+				};
+				console.log(data, '传值');
+				becomeVip(data).then(({ data }) => {
+					console.log('fufei', data);
+					uni.hideLoading();
+					if (data.status == 'PAY_ERROR') {
+						console.log(data);
+					}
+					if (data.status == 'SUCCESS') {
+						obj.$refs.popupPay.close();
+						obj.getUserInfoB();
+					}
+					let da = data.result.jsConfig;
+					if (obj.payName == 'weixin' || obj.payName == 'routine') {
+						// let da = data.result.jsConfig;
+						console.log('--da--', da);
+						let data = {
+							// #ifdef H5
+							timestamp: da.timestamp,
+							// #endif
 							// #ifdef MP
-							wx.requestPayment(data);
+							timeStamp: da.timestamp,
 							// #endif
-							// #ifdef H5
-							if (obj.payName == 'weixin') {
-								weixinObj.chooseWXPay(data);
+							nonceStr: da.nonceStr,
+							package: da.package,
+							signType: da.signType,
+							paySign: da.paySign,
+							success: function(res) {
+								console.log(res);
+								obj.getUserInfoB();
+							},
+							fail: e => {
+								console.log(e);
 							}
-							// #endif
-						}
-				
-						uni.hideLoading();
+						};
+						console.log('--data--', data);
+						// #ifdef MP
+						wx.requestPayment(data);
+						// #endif
 						// #ifdef H5
-						if (data.status == 'PAY_ERROR') {
-							console.log(data);
-						}
-						if (data.status == 'SUCCESS') {
-							
-							obj.getUserInfoB();
+						if (obj.payName == 'weixin') {
+							weixinObj.chooseWXPay(data);
 						}
 						// #endif
-					});
-				} catch (e) {
-					console.log('fufiecw', e);
-					//TODO handle the exception
-				}
+					}
+		
+					uni.hideLoading();
+					// #ifdef H5
+					if (data.status == 'PAY_ERROR') {
+						console.log(data);
+					}
+					if (data.status == 'SUCCESS') {
+						obj.$refs.popupPay.close();
+						obj.getUserInfoB();
+					}
+					// #endif
+				});
+			} catch (e) {
+				console.log('fufiecw', e);
 			}
 		}
 	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.card {
-		position: relative;
-		margin: auto;
-		z-index: 10;
-		width: 655rpx;
-		height: 324rpx;
-		background: linear-gradient(225deg, #ffeed2 0%, #fed591 100%);
-		border-radius: 24rpx;
-		padding: 28rpx 25rpx 30rpx 36rpx;
-		.now-wrap {
-			width: 190rpx;
-			line-height: 69rpx;
-			background: #C09852;
-			border-radius: 35rpx;
-			position: absolute;
-			top:39rpx;
-			right: 25rpx;
+.card {
+	position: relative;
+	margin: auto;
+	z-index: 10;
+	width: 655rpx;
+	height: 324rpx;
+	background: linear-gradient(225deg, #ffeed2 0%, #fed591 100%);
+	border-radius: 24rpx;
+	padding: 28rpx 25rpx 30rpx 36rpx;
+	.now-wrap {
+		width: 190rpx;
+		line-height: 69rpx;
+		background: #c09852;
+		border-radius: 35rpx;
+		position: absolute;
+		top: 39rpx;
+		right: 25rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #f6dca9;
+		text-align: center;
+	}
+	.card-top {
+		justify-content: flex-start;
+		.avtur {
+			width: 90rpx;
+			height: 90rpx;
+			border-radius: 50%;
+			margin-right: 10rpx;
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+			}
+		}
+		.name {
 			font-size: 30rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #F6DCA9;
-			text-align: center;
-			
+			color: #333333;
 		}
-		.card-top {
-			justify-content: flex-start;
-			.avtur {
-				width: 90rpx;
-				height: 90rpx;
-				border-radius: 50%;
-				margin-right: 10rpx;
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 50%;
-				}
-			}
-			.name {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-			.tip {
-				font-size: 20rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				opacity: 0.52;
+		.tip {
+			font-size: 20rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+			opacity: 0.52;
+		}
+	}
+	.btn {
+		position: absolute;
+		top: 40rpx;
+		right: 24rpx;
+		width: 190rpx;
+		height: 69rpx;
+		background: #3a3a3b;
+		border-radius: 35rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #ffffff;
+		line-height: 69rpx;
+		text-align: center;
+	}
+	.card-info {
+		height: 120rpx;
+		position: absolute;
+		bottom: 30rpx;
+		left: 43rpx;
+		.info-tit {
+			line-height: 70rpx;
+			font-size: 40rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+		.info-val {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #343434;
+		}
+	}
+}
+.hyjl {
+	background-color: #fff;
+	padding: 30rpx 30rpx 0;
+	margin-bottom: 20rpx;
+	.jl-tit {
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #000000;
+	}
+}
+.tool {
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	align-items: center;
+	.tool-item {
+		width: 25%;
+		height: 160rpx;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-content: center;
+		.tool-img {
+			width: 45rpx;
+			height: 45rpx;
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
-		.btn {
-			position: absolute;
-			top: 40rpx;
-			right: 24rpx;
-			width: 190rpx;
-			height: 69rpx;
-			background: #3a3a3b;
-			border-radius: 35rpx;
+		.tool-name {
+			padding-top: 20rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #505050;
+		}
+	}
+	.tool-item1 {
+		background: #fafbff;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-content: center;
+		width: 222rpx;
+		height: 298rpx;
+		background: #fafbff;
+		border-radius: 10rpx;
+		.tool-name {
 			font-size: 30rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #ffffff;
-			line-height: 69rpx;
-			text-align: center;
+			color: #7b7b7b;
 		}
-		.card-info {
-			height: 120rpx;
-			position: absolute;
-			bottom: 30rpx;
-			left: 43rpx;
-			.info-tit {
-				line-height: 70rpx;
-				font-size: 40rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
-			}
-			.info-val {
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #343434;
+		.bold {
+			font-weight: bold;
+			color: #000;
+		}
+		.tool-img {
+			width: 157rpx;
+			height: 112rpx;
+			margin-top: 37rpx;
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
 	}
-	.hyjl {
-		background-color: #fff;
-		padding:30rpx 30rpx 0;
-		margin-bottom: 20rpx;
-		.jl-tit {
-			font-size: 36rpx;
+}
+.bottom-btn {
+	display: flex;
+	align-items: flex-end;
+	position: fixed;
+	bottom: 0;
+	text-align: center;
+	.btm-left {
+		width: 750rpx - 280rpx;
+		line-height: 100rpx;
+		background-color: #34332f;
+		color: #fff;
+	}
+	.btm-right {
+		width: 280rpx;
+		line-height: 108rpx;
+
+		background: #efd4a1;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #5a5a5a;
+	}
+}
+.popup-box {
+	width: 100%;
+	background: #ffffff;
+}
+.popup-pay {
+	position: relative;
+	justify-content: space-between;
+	padding: 0rpx 25rpx 32rpx 25rpx;
+	.paybox-top {
+		padding-top: 38rpx;
+		width: 100%;
+		.type {
+			font-size: 28rpx;
 			font-family: PingFang SC;
-			font-weight: 500;
-			color: #000000;
+			font-weight: bold;
+			color: #333333;
+		}
+		.image {
+			padding-right: 24rpx;
+			padding-bottom: 10rpx;
+			image {
+				width: 16rpx;
+				height: 16rpx;
+			}
 		}
 	}
-	.tool {
-		flex-wrap: wrap;
-		justify-content: flex-start;
-		align-items: center;
-		.tool-item {
-			width: 25%;
-			height: 160rpx;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
-			justify-content: center;
-			.tool-img {
-				width: 45rpx;
-				height: 45rpx;
-				image {
-					width: 100%;
-					height: 100%;
-				}
+	.paybox-main {
+		width: 100%;
+		margin-top: 54rpx;
+		.zftype {
+			padding-left: 5rpx;
+			image {
+				width: 38rpx;
+				height: 40rpx;
 			}
-			.tool-name {
-				padding-top: 20rpx;
+			.zf {
+				padding-left: 18rpx;
 				font-size: 28rpx;
 				font-family: PingFang SC;
 				font-weight: 400;
-				color: #505050;
+				color: #3f454b;
 			}
 		}
-		.tool-item1 {
-			background: #FAFBFF;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
-			justify-content: center;
-			width: 222rpx;
-			height: 298rpx;
-			background: #FAFBFF;
-			border-radius: 10rpx;
-			.tool-name {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #7B7B7B;
-			}
-			.bold {
-				font-weight: bold;
-				color: #000;
-			}
-			.tool-img {
-				width: 157rpx;
-				height: 112rpx;
-				margin-top: 37rpx;
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-		
 	}
-	.bottom-btn {
-		display: flex;
-		align-items: flex-end;
-		position: fixed;
-		bottom: 0;
-		text-align: center;
-		.btm-left {
-			width: 750rpx - 280rpx;
-			line-height: 100rpx;
-			background-color: #34332F;
-			color: #fff;
-		}
-		.btm-right {
-			width: 280rpx;
-			line-height: 108rpx;
-			
-			background: #EFD4A1;
-			font-size: 36rpx;
+}
+.buttom {
+	width: 100%;
+	height: 113rpx;
+	padding-top: 20rpx;
+	align-items: center;
+	.heji {
+		height: 100%;
+		width: 50%;
+		padding-left: 23rpx;
+		padding-top: 20rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: #3f454b;
+		text {
+			font-size: 24rpx;
 			font-family: PingFang SC;
 			font-weight: bold;
-			color: #5A5A5A;
+			color: #ff0000;
+			.money {
+				font-size: 36rpx;
+			}
 		}
 	}
+	.zhifu {
+		width: 50%;
+		height: 92rpx;
+		background: linear-gradient(180deg, #fd4646, #ff3535);
+		text-align: center;
+		line-height: 92rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+}
 </style>

pages/set/userinfo.vue

@@ -1,93 +1,359 @@
 <template>
 	<view class="content">
-		<view class="row b-b">
-			<text class="tit">昵称</text>
-			<input class="input" type="text" v-model="name" placeholder="修改昵称" placeholder-class="placeholder" />
+		<view class="tit">
+			上传微信收款码
+		</view>
+		<view class="up-wrap" @click="imgsub('upimg')">
+			<image :src="upimg" mode="" v-if="upimg"></image>
+			<image v-else src="../../static/img/upimg.png" mode=""></image>
+		</view>
+		<view class="tit">
+			基本信息
+		</view>
+		<view class="base-info">
+			<view class="base-item" style="padding-bottom: 20rpx;">
+				<view class="item-name">头像</view>
+				<view class="avatar" @click="imgsub('avatar')">
+					<image :src="avatar || '../../static/error/missing-face.png'" mode="" ></image>
+				</view>
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">昵称</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的昵称" v-model="nickname" />
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">ID</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的昵称" v-model="uid" disabled/>
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">手机号</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的手机号" v-model="phone" />
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">姓名</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的姓名" v-model="real_name" />
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">微信号</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的微信号" v-model="wx_no" />
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">支付宝姓名</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的支付宝姓名" v-model="alipay_name" />
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">支付宝账号</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的支付宝账号" v-model="alipay_no" />
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">开户行</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的开户行" v-model="account_Bank" />
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">所属支行</view>
+				<input type="text" value="" class="item-val" placeholder="输入所属支行" v-model="bank_branch" />
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">开户行姓名</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的开户行姓名" v-model="bank_name" />
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">银行卡账号</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的银行卡账号" v-model="bank_card" />
+			</view>
+		</view>
+		<view class="btn" @click="subInfo">提交保存</view>
+		<view class="btn1" @click="toLogout">退出登录</view>
+		<view class="jg" style="height: 70rpx;">
+
 		</view>
-		<button class="add-btn" @click="confirm">提交</button>
 	</view>
 </template>
 
 <script>
-import { mapState } from 'vuex';
-import { userEdit } from '@/api/set.js';
-export default {
-	data() {
-		return {
-			name: ''
-		};
-	},
-
-	computed: {
-		...mapState('user', ['userInfo'])
-	},
-	onShow(option) {
-		this.name = this.userInfo.nickname + '';
-	},
-	methods: {
-		switchChange(e) {
-			this.addressData.default = e.value;
+	import { mapState, mapMutations } from 'vuex';
+	import { getUserInfo } from '@/api/user.js';
+	import { edit } from '@/api/user.js';
+	import { upload } from '@/api/order.js';
+	  import { logout } from '@/api/set.js';
+	export default {
+		computed: {
+			...mapState('user',['userInfo'])
 		},
-		confirm() {
-			userEdit({ nickname: this.name, avatar: this.userInfo.avatar })
-				.then(e => {
-					this.$api.msg('修改成功');
+		data() {
+			return {
+				avatar: '',
+				upimg: '',
+				real_name: '',
+				nickname: '',
+				phone: '',
+				wx_no: '',
+				alipay_name: '',
+				alipay_no: '',
+				account_Bank: '',
+				bank_branch: '',
+				bank_card: '',
+				bank_name: '',
+				// birthday: '',
+				city: '',
+				card_id: '',//身份证
+				uid: '',
+				vip_name: ''
+			}
+		},
+		onLoad() {
+			let obj = this
+			obj.avatar = obj.userInfo.avatar || ''
+			obj.alipay_name = obj.userInfo.alipay_name || ''
+			obj.alipay_no = obj.userInfo.alipay_no || '',
+			obj.bank_branch = obj.userInfo.bank_branch || ''
+			obj.account_Bank = obj.userInfo.account_Bank || ''
+			obj.bank_card = obj.userInfo.bank_card || ''
+			obj.uid = obj.userInfo.uid
+			obj.bank_name = obj.userInfo.bank_name || ''
+			// obj.birthday = obj.userInfo.birthday || ''
+			// obj.card_id: obj.userInfo.card_id  || ''
+			obj.upimg = obj.userInfo.wx_qr || ''
+			obj.wx_no = obj.userInfo.wx_no || ''
+			obj.phone = obj.userInfo.phone || ''
+			obj.real_name = obj.userInfo.real_name || ''
+			obj.nickname = obj.userInfo.nickname || ''
+			console.log(obj.userInfo.vip_name,'obj.userInfo.vip_name')
+			// obj.vip_name = obj.userInfo.vip_name || '暂无'
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo','logout']),
+			//退出登录
+			toLogout() {
+				let obj = this;
+				uni.showModal({
+					content: '确定要退出登录么',
+					success: e => {
+						if (e.confirm) {
+							logout({}).then(e => {
+								obj.logout();
+								uni.navigateTo({
+									url:'/pages/public/login'
+								})
+							})
+							.catch(e => {
+								console.log(e);
+							});
+						}
+					}
+				});
+			},
+			imgsub(text) {
+				console.log('imgsub');
+				upload({
+					filename: ''
+				}).then(data => {
+					// this.upimg = data[0].url;
+					this.$set(this,text,data[0].url)
+				});
+			},
+			getUserInfo() {
+				getUserInfo({})
+					.then(({ data }) => {
+						this.setUserInfo(data);
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			bindDateChange(e) {
+				this.birthday = e.detail.value
+			},
+			subInfo() {
+				let obj = this
+				if(obj.upimg == '') {
+					obj.$api.msg('请上传收款码')
+					return
+				}
+				if(obj.avatar == '') {
+					obj.$api.msg('请上传头像')
+					return
+				}
+				if(obj.nickname == '') {
+					obj.$api.msg('请输入昵称')
+					return
+				}
+				if(obj.phone == '') {
+					obj.$api.msg('请输入手机号')
+					return
+				}
+				const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
+				if (!reg.test(obj.phone)) {
+					obj.$api.msg('请填写正确的手机号码');
+					return;
+				}
+				if(obj.real_name == '') {
+					obj.$api.msg('请输入姓名')
+					return
+				}
+				if(obj.wx_no == '') {
+					obj.$api.msg('请输入微信号')
+					return
+				}
+				if(obj.alipay_name == '') {
+					obj.$api.msg('请输入支付宝姓名')
+					return
+				}
+				if(obj.alipay_no == '') {
+					obj.$api.msg('请输入支付宝账号')
+					return
+				}
+				if(obj.account_Bank == '') {
+					obj.$api.msg('请输入开户行')
+					return
+				}
+				if(obj.bank_branch == '') {
+					obj.$api.msg('请输入所属支行')
+					return
+				}
+				if(obj.bank_name == '') {
+					obj.$api.msg('请输入开户姓名')
+					return
+				}
+				if(obj.bank_card == '') {
+					obj.$api.msg('请输入银行卡账号')
+					return
+				}
+				// if(obj.birthday == '') {
+				// 	obj.$api.msg('请输入出生日期')
+				// 	return
+				// }
+				
+				uni.showLoading({
+					title: '提交中...',
+					mask:true
+				})
+				edit({
+					avatar: obj.avatar,
+					alipay_name: obj.alipay_name,
+					alipay_no: obj.alipay_no,
+					account_Bank: obj.account_Bank,
+					bank_branch: obj.bank_branch,
+					bank_card: obj.bank_card,
+					bank_name: obj.bank_name,
+					// birthday: obj.birthday,
+					// card_id: obj.card_id,
+					wx_no: obj.wx_no,
+					phone: obj.phone,
+					real_name: obj.real_name,
+					nickname: obj.nickname,
+					wx_qr: obj.upimg
+					
+				}).then( res => {
+					obj.getUserInfo()
+					
+					obj.$api.msg('修改成功');
 					setTimeout(()=> {
 						uni.switchTab({
 							url:'/pages/user/user'
 						});
 					}, 1000);
-					console.log(e);
+					
+				}).catch( err => {
+					console.log(err)
 				})
-				.catch(e => {
-					console.log(e);
-				});
+			}
 		}
 	}
-};
 </script>
 
-<style lang="scss">
-page {
-	background: $page-color-base;
-	padding-top: 16upx;
-}
+<style lang="scss" scoped>
+	.tit {
+		padding: 30rpx 25rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #101010;
+	}
 
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30upx;
-	height: 110upx;
-	background: #fff;
+	.up-wrap {
+		margin-left: 30rpx;
+		width: 225rpx;
+		height: 225rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx;
 
-	.tit {
-		flex-shrink: 0;
-		width: 120upx;
-		font-size: 30upx;
-		color: $font-color-dark;
+		image {
+			width: 225rpx;
+			height: 225rpx;
+			border-radius: 10rpx;
+		}
 	}
-	.input {
-		flex: 1;
-		font-size: 30upx;
-		color: $font-color-dark;
+
+	.base-info {
+		margin: auto;
+		width: 702rpx;
+		// height: 1106px;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+
+		.base-item {
+			border: 1px solid #eee;
+			line-height: 100rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+			padding-left: 25rpx;
+			
+			.avatar {
+				margin: auto;
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 50%;
+				// background-color: #aaa;
+				image {
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 50%;
+				}
+			}
+			.item-name {
+				font-weight: bold;
+			}
+			.item-val {
+				display: block;
+				line-height: 100rpx;
+				height: 100rpx;
+				width: 478rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #000;
+			}
+		}
+
+	}
+
+	.btn {
+		margin: 70rpx auto 0;
+		width: 702rpx;
+		line-height: 84rpx;
+		background: linear-gradient(30deg, #FF4C4C, #FE6238);
+		border-radius: 10rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+		text-align: center;
 	}
-	.iconlocation {
-		font-size: 36upx;
-		color: $font-color-light;
+	.btn1 {
+		margin: 30rpx auto 0;
+		width: 702rpx;
+		line-height: 84rpx;
+		color: #FF4C4C;
+		border: 1px solid #FF4C4C;
+		background-color: #fff;
+		border-radius: 10rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		text-align: center;
 	}
-}
-.add-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690upx;
-	height: 80upx;
-	margin: 60upx auto;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10upx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
 </style>

pages/user/jindou.vue

@@ -5,7 +5,7 @@
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
 				<view class="header">我的金豆</view>
 				<image class="money_bg" src="../../static/img/anchor10.png"></image>
-				<view class="money">{{ userInfo.brokerage_price | getMoneyStyle }}</view>
+				<view class="money">{{ userInfo.integral | getMoneyStyle }}</view>
 			</view>
 
 		</view>

pages/user/user.vue

@@ -105,7 +105,7 @@
 import { mapState, mapMutations } from 'vuex';
 import uniList from '@/components/uni-list/uni-list.vue';
 import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import { orderData, userinfo } from '@/api/user.js';
+import { orderData, getUserInfo } from '@/api/user.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 let startY = 0,
 	moveY = 0,
@@ -148,7 +148,7 @@ export default {
 		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 		// 加载初始数据
 		loadBaseData() {
-			userinfo({})
+			getUserInfo({})
 				.then(({ data }) => {
 					this.setUserInfo(data);
 					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页