xuhaolan 4 years ago
parent
commit
a60a620d1a
6 changed files with 367 additions and 298 deletions
  1. 1 1
      pages.json
  2. 16 3
      pages/index/index.vue
  3. 310 283
      pages/money/account.vue
  4. 14 2
      pages/user/award.vue
  5. 20 9
      pages/user/withdrawal.vue
  6. 6 0
      store/model/user.js

+ 1 - 1
pages.json

@@ -577,7 +577,7 @@
 		}]
 		}]
 	}],
 	}],
 	"preloadRule": {
 	"preloadRule": {
-		"pages/user/suer": {
+		"pages/user/user": {
 			"network": "all",
 			"network": "all",
 			"packages": ["pagesA"]
 			"packages": ["pagesA"]
 		}
 		}

+ 16 - 3
pages/index/index.vue

@@ -123,12 +123,14 @@
 			<view class="goods-wrapper flex">
 			<view class="goods-wrapper flex">
 			
 			
 				<view class="good" v-if="userInfo.uid &&  userInfo.level<=1"
 				<view class="good" v-if="userInfo.uid &&  userInfo.level<=1"
+				v-show="auth ==0"
 					@click="navTo('/pages/store/apply')">
 					@click="navTo('/pages/store/apply')">
 					<image src="../../static/img/daili.jpg"  class="good-img"></image>
 					<image src="../../static/img/daili.jpg"  class="good-img"></image>
 					<view class="good-name clamp">加盟代理</view>
 					<view class="good-name clamp">加盟代理</view>
 					<!-- <view class="good-info clamp">纯植物无香精</view> -->
 					<!-- <view class="good-info clamp">纯植物无香精</view> -->
 					<view class="good-price">
 					<view class="good-price">
 						<text class="new-price">568.00</text>
 						<text class="new-price">568.00</text>
+						
 						<text class="old-price">755.00</text>
 						<text class="old-price">755.00</text>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -219,7 +221,7 @@
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
-				
+				isAuth:0,
 				wechat_qrcode: '', //公众号二维码
 				wechat_qrcode: '', //公众号二维码
 				storeList: [], //门店列表
 				storeList: [], //门店列表
 				shareShow: false, //分享海报
 				shareShow: false, //分享海报
@@ -263,7 +265,14 @@
 		computed: {
 		computed: {
 			...mapState(['loginInterceptor', 'weichatObj', 'baseURL', 'urlFile']),
 			...mapState(['loginInterceptor', 'weichatObj', 'baseURL', 'urlFile']),
 			...mapState('user', ['hasLogin', 'userInfo']),
 			...mapState('user', ['hasLogin', 'userInfo']),
-			...mapState('latlon', ['lat', 'lon'])
+			...mapState('latlon', ['lat', 'lon']),
+			auth(){
+				loadIndexs({}).then(({data})=>{
+					this.isAuth = data.is_auth
+					
+				})
+				return this.isAuth
+			}
 		},
 		},
 
 
 		onShareAppMessage() {
 		onShareAppMessage() {
@@ -328,7 +337,10 @@
 
 
 			this.loadData();
 			this.loadData();
 			this.getBargainList();
 			this.getBargainList();
-			this.IndexShare()
+			// #ifdef MP-WEIXIN
+			this.IndexShare()	
+			// #endif
+					
 			// this.getProducts()
 			// this.getProducts()
 		},
 		},
 		//下拉刷新
 		//下拉刷新
@@ -539,6 +551,7 @@
 					.then(({
 					.then(({
 						data
 						data
 					}) => {
 					}) => {
+						console.log(data,'8989')
 						let goods = data.info;
 						let goods = data.info;
 						this.carouselList = data.banner;
 						this.carouselList = data.banner;
 						this.swiperLength = this.carouselList.length;
 						this.swiperLength = this.carouselList.length;

+ 310 - 283
pages/money/account.vue

@@ -1,33 +1,37 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
 		<view class="navbar">
 		<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 v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
 		</view>
 
 
 
 
 		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
 		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<view class="row b-b" >
+				<view class="row b-b">
 					<text class="tit">开户银行</text>
 					<text class="tit">开户银行</text>
 					<!-- range是你要显示的数组,range-key是数组中你要显示的那一项,range-key="{{'label'}}" ,range-key中的数据要加引号!!!!!才生效! -->
 					<!-- range是你要显示的数组,range-key是数组中你要显示的那一项,range-key="{{'label'}}" ,range-key中的数据要加引号!!!!!才生效! -->
-					<picker class="input" :range="bankList" mode="selector"  :value="addressIndex"  @change="changeBank">
+					<picker class="input" :range="bankList" mode="selector" :value="addressIndex" @change="changeBank">
 						<view v-if="bankList[bankIndex]">{{bankList[bankIndex] }}</view>
 						<view v-if="bankList[bankIndex]">{{bankList[bankIndex] }}</view>
 						<view v-else class="font-color-gray">开户银行</view>
 						<view v-else class="font-color-gray">开户银行</view>
 					</picker>
 					</picker>
 				</view>
 				</view>
-				<view class="row b-b" >
+				<view class="row b-b">
 					<text class="tit">所属支行</text>
 					<text class="tit">所属支行</text>
-					<input class="input" v-model="tabItem.orderList.zhiBank" type="text" placeholder="所属支行" placeholder-class="placeholder" />
+					<input class="input" v-model="tabItem.orderList.zhiBank" type="text" placeholder="所属支行"
+						placeholder-class="placeholder" />
 				</view>
 				</view>
 				<view class="row b-b">
 				<view class="row b-b">
 					<text class="tit">姓名</text>
 					<text class="tit">姓名</text>
-					<input class="input" v-model="tabItem.orderList.name" type="text" placeholder="提款人姓名" placeholder-class="placeholder" />
+					<input class="input" v-model="tabItem.orderList.name" type="text" placeholder="提款人姓名"
+						placeholder-class="placeholder" />
 				</view>
 				</view>
 				<view class="row b-b">
 				<view class="row b-b">
 					<text class="tit">{{ tabIndex == 0 ? '账号' : '银行卡号' }}</text>
 					<text class="tit">{{ tabIndex == 0 ? '账号' : '银行卡号' }}</text>
-					<input class="input" v-model="tabItem.orderList.code" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
+					<input class="input" v-model="tabItem.orderList.code" type="text" placeholder="请输入账号"
+						placeholder-class="placeholder" />
 				</view>
 				</view>
-				
+
 			</swiper-item>
 			</swiper-item>
 		</swiper>
 		</swiper>
 
 
@@ -36,306 +40,329 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { aliInfo, bankInfo, setAliInfo, setBankInfo , extractBank} from '@/api/wallet.js';
-export default {
-	data() {
-		return {
-			bankList: [],
-			bankIndex:0,
-			addressDetail:'',
-			addressIndex:[0],
-			tabCurrentIndex: 0,
-			addressData: {
-				name: '',
-				mobile: '',
-				area: '',
-				default: false,
-				id: ''
-			},
-			bankList: [],
-			bankIndex:0,
-			navList: [
-				// {
-				// 	state: 0,
-				// 	text: '支付宝',
-				// 	loadingType: 'more',
-				// 	orderList: {
-				// 		name: '',
-				// 		code: '',
-				// 		id: ''
-				// 	}
-				// },
-				
-				{
-					state: 1,
-					text: '银行卡',
-					loadingType: 'more',
-					
-					orderList: {
-						
-						name: '',
-						code: '',
-						id: '',
-						bank:'',
-						zhiBank:''
-					}
-				}
-			]
-		};
-	},
+	import {
+		aliInfo,
+		bankInfo,
+		setAliInfo,
+		setBankInfo,
+		extractBank
+	} from '@/api/wallet.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				bankList: [],
+				bankIndex: 0,
+				addressDetail: '',
+				addressIndex: [0],
+				tabCurrentIndex: 0,
+				addressData: {
+					name: '',
+					mobile: '',
+					area: '',
+					default: false,
+					id: ''
+				},
+				navList: [
+					// {
+					// 	state: 0,
+					// 	text: '支付宝',
+					// 	loadingType: 'more',
+					// 	orderList: {
+					// 		name: '',
+					// 		code: '',
+					// 		id: ''
+					// 	}
+					// },
 
 
-	onLoad(options) {
-		this.tabCurrentIndex = +options.state || 0;
-		// this.loadAli();
-		// this.loadBank();
-		this.onCityClick();
-	},
+					{
+						state: 1,
+						text: '银行卡',
+						loadingType: 'more',
 
 
-	methods: {
-		changeBank(e){
-			console.log(e,'22221');
-			this.bankIndex =e.target.value
-		},
-		//选择下拉框
-		onCityClick(){
-			extractBank({}).then(({data})=>{
-				console.log(data,'22222');
-				// this.navList.orderList.name = data.extractBank
-				this.bankList = data.extractBank
-			})
-		},
-		//加载数据
-		loadAli(source) {
-			aliInfo({}).then(({ data }) => {
-				let order = this.navList[0].orderList;
-				this.$set(order, 'name', data.fullname);
-				this.$set(order, 'code', data.alino);
-				this.$set(order, 'id', data.id);
-			});
-		},
-		loadBank() {
-			bankInfo({}).then(({ data }) => {
-				console.log(data,'22222');
-				let order = this.navList[1].orderList;
-				this.$set(order, 'name', data.fullname);
-				this.$set(order, 'code', data.bankno);
-				this.$set(order, 'bankName', data.bank);
-				this.$set(order, 'id', data.id);
-			});
+						orderList: {
+
+							name: '',
+							code: '',
+							id: '',
+							bank: '',
+							zhiBank: ''
+						}
+					}
+				]
+			};
 		},
 		},
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
+
+		onLoad(options) {
+			this.tabCurrentIndex = +options.state || 0;
+			// this.loadAli();
+			// this.loadBank();
+			this.onCityClick();
 		},
 		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
+		computed: {
+			...mapState('user', ['bankInfo'])
 		},
 		},
-		// 提交保存
-		confirm() {
-			let obj = this;
-			let arr = obj.navList[0].orderList;
-			let pages = getCurrentPages(); //获取所有页面栈实例列表
-			console.log(pages);
-			let nowPage = pages[pages.length - 1]; //当前页页面实例
-			let prevPage = pages[pages.length - 2]; //上一页页面实例
-			console.log(prevPage);
-			prevPage.$vm.sh = 100;   //修改上一页data里面的sh参数值为100
-			
-			if (obj.tabCurrentIndex == 0) {
-				if (!arr.name) {
-					return this.$api.msg('请输入提款人姓名');
-				}
-				if (!obj.bankList[obj.bankIndex]) {
-					// console.log(obj.bankList[obj.bankIndex]);
-					return this.$api.msg('请输入所属银行');
-				}
-				if (!arr.code) {
-					return this.$api.msg('请输入银行卡号');
-				}
-				if (!arr.zhiBank) {
-					return this.$api.msg('请输入所属支行');
-				}
-				let data = {
-					fullname: arr.name,
-					
-					bank: obj.bankList[obj.bankIndex]+'('+arr.zhiBank+')',
-					bankno: arr.code
-				};
-				console.log(data,'4444');
-				// #ifdef H5
-				prevPage.$vm.bankData = data;
-				console.log(data,'54454');
-				// #endif
-				// #ifdef MP
-				prevPage.setData({
-					bankData: data
+		methods: {
+			...mapMutations('user', ['addBank']),
+			changeBank(e) {
+				console.log(e, '22221');
+				this.bankIndex = e.target.value
+			},
+			//选择下拉框
+			onCityClick() {
+				extractBank({}).then(({
+					data
+				}) => {
+					console.log(data, '22222');
+					// this.navList.orderList.name = data.extractBank
+					this.bankList = data.extractBank
+				})
+			},
+			//加载数据
+			loadAli(source) {
+				aliInfo({}).then(({
+					data
+				}) => {
+					let order = this.navList[0].orderList;
+					this.$set(order, 'name', data.fullname);
+					this.$set(order, 'code', data.alino);
+					this.$set(order, 'id', data.id);
 				});
 				});
-				// #endif
-				// obj.setBankInfo({
-				// 	fullname: arr.name,
-				// 	bank: arr.bankName,
-				// 	bankno: arr.code,
-				// 	id:arr.id
-				// });
-				uni.navigateBack({
-					delta: 1
+			},
+			loadBank() {
+				bankInfo({}).then(({
+					data
+				}) => {
+					console.log(data, '22222');
+					let order = this.navList[1].orderList;
+					this.$set(order, 'name', data.fullname);
+					this.$set(order, 'code', data.bankno);
+					this.$set(order, 'bankName', data.bank);
+					this.$set(order, 'id', data.id);
 				});
 				});
-			}
-			// if (obj.tabCurrentIndex == 0) {
-			// 	if (!arr.name) {
-			// 		return this.$api.msg('请输入提款人姓名');
-			// 	}
-			// 	if (!arr.code) {
-			// 		return this.$api.msg('请输入支付宝账号');
-			// 	}
-			// 	let data = {
-			// 		fullname: arr.name,
-			// 		alino: arr.code
-			// 	};
-			// 	// #ifdef H5
-			// 	prevPage.$vm.aliData = data;
-			// 	// #endif
+			},
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			// 提交保存
+			confirm() {
+				let obj = this;
+				let arr = obj.navList[0].orderList;
+				arr.bank = obj.bankList[obj.bankIndex]
+				this.addBank(arr);
+		
+				// prevPage.$vm.sh = 100; //修改上一页data里面的sh参数值为100
 
 
-			// 	// #ifdef MP
-			// 	prevPage.setData({
-			// 		bankData: data
-			// 	});
-			// 	// #endif
-			// 	// obj.setAliInfo({
-			// 	// 	fullname: arr.name,
-			// 	// 	alino: arr.code,
-			// 	// 	id:arr.id
-			// 	// });
-			// 	uni.navigateBack({
-			// 		delta: 1
-			// 	});
-			// }
-		},
-		/* 保存银行卡详细 */
-		setBankInfo(obj) {
-			setBankInfo(obj)
-				.then(e => {
-					uni.showToast({
-						title: '修改成功',
-						duration: 2000,
-						position: 'top'
+				if (obj.tabCurrentIndex == 0) {
+					if (!arr.name) {
+						return this.$api.msg('请输入提款人姓名');
+					}
+					if (!obj.bankList[obj.bankIndex]) {
+						// console.log(obj.bankList[obj.bankIndex]);
+						return this.$api.msg('请输入所属银行');
+					}
+					if (!arr.code) {
+						return this.$api.msg('请输入银行卡号');
+					}
+					if (!arr.zhiBank) {
+						return this.$api.msg('请输入所属支行');
+					}
+					let data = {
+						fullname: arr.name,
+
+						bank: obj.bankList[obj.bankIndex] + '(' + arr.zhiBank + ')',
+						bankno: arr.code
+					};
+					console.log(data, '4444');
+					// #ifdef H5
+					// prevPage.$vm.bankData = data;
+					// console.log(data, '54454');
+					// #endif
+					// #ifdef MP
+					// prevPage.setData({
+					// 	bankData: data
+					// });
+					// #endif
+					// obj.setBankInfo({
+					// 	fullname: arr.name,
+					// 	bank: arr.bankName,
+					// 	bankno: arr.code,
+					// 	id:arr.id
+					// });
+					uni.navigateBack({
+						delta: 1
 					});
 					});
-					this.$api.prePage().dataUp();
-					setTimeout(() => {
-						uni.navigateBack();
-					}, 1500);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 修改支付宝信息
-		setAliInfo(obj) {
-			setAliInfo(obj)
-				.then(e => {
-					uni.showToast({
-						title: '修改成功',
-						duration: 2000,
-						position: 'top'
+				}
+				// if (obj.tabCurrentIndex == 0) {
+				// 	if (!arr.name) {
+				// 		return this.$api.msg('请输入提款人姓名');
+				// 	}
+				// 	if (!arr.code) {
+				// 		return this.$api.msg('请输入支付宝账号');
+				// 	}
+				// 	let data = {
+				// 		fullname: arr.name,
+				// 		alino: arr.code
+				// 	};
+				// 	// #ifdef H5
+				// 	prevPage.$vm.aliData = data;
+				// 	// #endif
+
+				// 	// #ifdef MP
+				// 	prevPage.setData({
+				// 		bankData: data
+				// 	});
+				// 	// #endif
+				// 	// obj.setAliInfo({
+				// 	// 	fullname: arr.name,
+				// 	// 	alino: arr.code,
+				// 	// 	id:arr.id
+				// 	// });
+				// 	uni.navigateBack({
+				// 		delta: 1
+				// 	});
+				// }
+			},
+			/* 保存银行卡详细 */
+			setBankInfo(obj) {
+				setBankInfo(obj)
+					.then(e => {
+						uni.showToast({
+							title: '修改成功',
+							duration: 2000,
+							position: 'top'
+						});
+						this.$api.prePage().dataUp();
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 1500);
+					})
+					.catch(e => {
+						console.log(e);
 					});
 					});
-					this.$api.prePage().dataUp();
-					setTimeout(() => {
-						uni.navigateBack();
-					}, 1500);
-				})
-				.catch(e => {
-					console.log(e);
-				});
+			},
+			// 修改支付宝信息
+			setAliInfo(obj) {
+				setAliInfo(obj)
+					.then(e => {
+						uni.showToast({
+							title: '修改成功',
+							duration: 2000,
+							position: 'top'
+						});
+						this.$api.prePage().dataUp();
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 1500);
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			}
 		}
 		}
-	}
-};
+	};
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-	.tit {
-		margin-right:50rpx;
-		flex-shrink: 0;
-		width: 120rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.input {
+	.row {
 		display: flex;
 		display: flex;
 		align-items: center;
 		align-items: center;
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
+		position: relative;
+		padding: 0 30rpx;
+		height: 110rpx;
+		background: #fff;
+
+		.tit {
+			margin-right: 50rpx;
+			flex-shrink: 0;
+			width: 120rpx;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+
+		.input {
+			display: flex;
+			align-items: center;
+			flex: 1;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+
+		.iconlocation {
+			font-size: 36rpx;
+			color: $font-color-light;
+		}
 	}
 	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
+
+	page,
+	.content {
+		background: $page-color-base;
+		height: 100%;
 	}
 	}
-}
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
 
 
-.swiper-box {
-	height: 750rpx;
-}
+	.swiper-box {
+		height: 750rpx;
+	}
 
 
-.navbar {
-	display: flex;
-	height: 40px;
-	padding: 0 5px;
-	background: #fff;
-	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-	position: relative;
-	z-index: 10;
-	.nav-item {
-		flex: 1;
+	.navbar {
 		display: flex;
 		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		font-size: 15px;
-		color: $font-color-dark;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 		position: relative;
 		position: relative;
-		&.current {
-			color: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
+		z-index: 10;
+	
+	.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid $base-color;
+				}
 			}
 			}
 		}
 		}
 	}
 	}
-}
 
 
-.add-btn {
-	&.up {
-		background-color: $base-color;
-		color: #fff;
+	.add-btn {
+		&.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);
 	}
 	}
-	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);
-}
 </style>
 </style>

+ 14 - 2
pages/user/award.vue

@@ -36,11 +36,15 @@
 				</scroll-view>
 				</scroll-view>
 			</swiper-item>
 			</swiper-item>
 		</swiper>
 		</swiper>
-		<view class="moneyTx" ><view class="btn" @click="navto('./withdrawal')">提现</view></view>
+		<view class="moneyTx" ><view class="btn" @click="navto('./withdrawal')" v-show="auth ==0">提现</view></view>
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
+	import {
+		loadIndexs,
+		getStoreList
+	} from '@/api/index.js';
 import { getSpreadCount } from '@/api/user.js';
 import { getSpreadCount } from '@/api/user.js';
 import { spreadCommission, userBalance } from '@/api/wallet.js';
 import { spreadCommission, userBalance } from '@/api/wallet.js';
 import { mapState, mapMutations } from 'vuex';
 import { mapState, mapMutations } from 'vuex';
@@ -56,7 +60,14 @@ export default {
 		uniLoadMore
 		uniLoadMore
 	},
 	},
 	computed: {
 	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+		auth(){
+			loadIndexs({}).then(({data})=>{
+				this.isAuth = data.is_auth
+				
+			})
+			return this.isAuth
+		}
 	},
 	},
 	onReady() {
 	onReady() {
 		//初始化获取页面宽度
 		//初始化获取页面宽度
@@ -79,6 +90,7 @@ export default {
 	data() {
 	data() {
 		return {
 		return {
 			// 头部图高度
 			// 头部图高度
+			isAuth:0,
 			maxheight: '',
 			maxheight: '',
 			tabCurrentIndex: 0,
 			tabCurrentIndex: 0,
 			navList: [
 			navList: [

+ 20 - 9
pages/user/withdrawal.vue

@@ -50,7 +50,7 @@
 			</template>
 			</template>
 			
 			
 		</view>
 		</view>
-		<!-- #ifndef MP-WEIXIN -->
+		
 		<view class="list">
 		<view class="list">
 			<view style="padding-top: 28rpx; font-size: 32rpx; font-weight: 600;color: #4d4d4d;">
 			<view style="padding-top: 28rpx; font-size: 32rpx; font-weight: 600;color: #4d4d4d;">
 				提现到
 				提现到
@@ -85,11 +85,11 @@
 						<view class="icon iconfont"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
 						<view class="icon iconfont"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
 						<view class="title-box">
 						<view class="title-box">
 							<view class="title">
 							<view class="title">
-								<text v-if="bankData.bankno">{{ bankData.bank + ' ' + bankData.bankno }}</text>
+								<text v-if="bankData.code">{{ bankData.bank +'(' + bankData.zhiBank + ')' + ' ' + bankData.code }}</text>
 								<text v-else>请创建银行账号</text>
 								<text v-else>请创建银行账号</text>
 							</view>
 							</view>
 							<view class="node">
 							<view class="node">
-								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
+								<text v-if="bankData.name">真实姓名({{ bankData.name }})</text>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="right"><radio value="bank" color="#ff4c4c" :checked="type == 'bank'" /></view>
 						<view class="right"><radio value="bank" color="#ff4c4c" :checked="type == 'bank'" /></view>
@@ -97,7 +97,7 @@
 				</label>
 				</label>
 			</radio-group>
 			</radio-group>
 		</view>
 		</view>
-		<!-- #endif -->
+	
 		<button class="add-btn up" @click="confirm">提交申请</button>
 		<button class="add-btn up" @click="confirm">提交申请</button>
 		<button class="add-btn up" @click="navTo('/pages/money/account')">账号管理</button>
 		<button class="add-btn up" @click="navTo('/pages/money/account')">账号管理</button>
 	</view>
 	</view>
@@ -108,6 +108,10 @@ import { getMoneyStyle } from '@/utils/rocessor.js';
 import { extractCash, extractBank, aliInfo, bankInfo, } from '@/api/wallet.js';
 import { extractCash, extractBank, aliInfo, bankInfo, } from '@/api/wallet.js';
 import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
 import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
 import { getSpreadCount } from '@/api/user.js';
 import { getSpreadCount } from '@/api/user.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 export default {
 export default {
 	filters: {
 	filters: {
 		getMoneyStyle
 		getMoneyStyle
@@ -140,7 +144,8 @@ export default {
 		//实际到账
 		//实际到账
 		sjdz() {
 		sjdz() {
 			return (this.withdrawal*1*(1-this.suilv*0.01))
 			return (this.withdrawal*1*(1-this.suilv*0.01))
-		}
+		},
+		...mapState('user',['bankInfo'])
 	},
 	},
 	onLoad(options) {
 	onLoad(options) {
 		// #ifdef H5
 		// #ifdef H5
@@ -152,7 +157,12 @@ export default {
 		// this.loadAli();
 		// this.loadAli();
 		// this.loadBank();
 		// this.loadBank();
 	},
 	},
+	onShow() {
+		console.log(this.bankInfo,"33333")
+		this.bankData= this.bankInfo
+	},
 	methods: {
 	methods: {
+		
 		// 更新数据
 		// 更新数据
 		dataUp(){
 		dataUp(){
 			this.loadAli();
 			this.loadAli();
@@ -167,7 +177,8 @@ export default {
 		// 加载银行卡信息
 		// 加载银行卡信息
 		async loadBank() {
 		async loadBank() {
 			bankInfo({}).then(e => {
 			bankInfo({}).then(e => {
-				this.bankData = e.data;
+				// this.bankData = e.data;
+				console.log(this.bankData,'银行卡信息');
 				
 				
 			});
 			});
 		},
 		},
@@ -229,9 +240,9 @@ export default {
 				}
 				}
 			}
 			}
 			if (this.type=='bank') {
 			if (this.type=='bank') {
-				data.name = this.bankData.fullname;
-				data.bankname = this.bankData.bank;
-				data.cardnum = this.bankData.bankno;
+				data.name = this.bankData.name;
+				data.bankname = this.bankData.bank + '(' + this.bankData.zhiBank + ')';
+				data.cardnum = this.bankData.code;
 				if(!data.name) {
 				if(!data.name) {
 					return this.$api.msg('请完善银行卡信息')
 					return this.$api.msg('请完善银行卡信息')
 				}
 				}

+ 6 - 0
store/model/user.js

@@ -8,6 +8,7 @@ let state = {
 		unpaid_count: 0 //待付款
 		unpaid_count: 0 //待付款
 	}, //订单信息
 	}, //订单信息
 	hasLogin: false, //是否登录
 	hasLogin: false, //是否登录
+	bankInfo: {}
 }
 }
 
 
 let mutations = {
 let mutations = {
@@ -15,6 +16,11 @@ let mutations = {
 	login(state) {
 	login(state) {
 		state.hasLogin = true;
 		state.hasLogin = true;
 	},
 	},
+	addBank(state,provider){
+		console.log(provider,'1111')
+		state.bankInfo = provider
+		console.log(state.bankInfo,'22222')
+	},
 	// 退出登录
 	// 退出登录
 	logout(state, provider) {
 	logout(state, provider) {
 		state.hasLogin = false;
 		state.hasLogin = false;