8-15-1

api/wallet.js

@@ -79,7 +79,7 @@ export function setAliInfo(data) {
 		data
 	});
 }
-//保存默认银行卡账号
+// 保存默认银行卡账号
 export function setBankInfo(data) {
 	return request({
 		url: '/api/bank/edit',
@@ -160,4 +160,22 @@ export function integrallist(data) {
 		method: 'get',
 		data
 	});
+}
+
+// 保存银行卡信息
+export function setBank(data) {
+	return request({
+		url: '/api/public/pay',
+		method: 'post',
+		data
+	});
+}
+
+// 获取银行卡信息
+export function getBank(data) {
+	return request({
+		url: '/api/public/pay_list',
+		method: 'get',
+		data
+	});
 }

pages/money/account.vue

@@ -1,236 +1,303 @@
-<template>
-	<view class="content">
-		<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">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<view class="row b-b">
-					<text class="tit">姓名</text>
-					<input class="input" v-model="tabItem.orderList.name" type="text" placeholder="提款人姓名" placeholder-class="placeholder" />
-				</view>
-				<view class="row b-b">
-					<text class="tit">{{ tabIndex == 0 ? '账号' : '银行卡号' }}</text>
-					<input class="input" v-model="tabItem.orderList.code" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
-				</view>
-				<view class="row b-b" v-if="tabIndex == 1">
-					<text class="tit">所属银行</text>
-					<input class="input" v-model="tabItem.orderList.bankName" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
-				</view>
-			</swiper-item>
-		</swiper>
-
-		<button class="add-btn up" @click="confirm">提交申请</button>
-	</view>
-</template>
-
-<script>
-import { aliInfo, bankInfo, setAliInfo, setBankInfo } from '@/api/wallet.js';
-export default {
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '支付宝',
-					loadingType: 'more',
-					orderList: {
-						name: '',
-						code: '',
-						id:''
-					}
-				},
-				{
-					state: 1,
-					text: '银行卡',
-					loadingType: 'more',
-					orderList: {
-						name: '',
-						code: '',
-						bankName: '',
-						id:''
-					}
-				}
-			]
-		};
-	},
-
-	onLoad(options) {
-		this.tabCurrentIndex = +options.state || 0;
-		this.loadAli();
-		this.loadBank();
-	},
-
-	methods: {
-		//加载数据
-		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}) => {
-				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)
-			});
-		},
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		},
-		// 提交保存
-		confirm() {
-			let obj = this;
-			let arr = obj.navList[obj.tabCurrentIndex].orderList;
-			if (obj.tabCurrentIndex == 1) {
-				obj.setBankInfo({
-					fullname: arr.name,
-					bank: arr.bankName,
-					bankno: arr.code,
-					id:arr.id
-				});
-			}
-			if (obj.tabCurrentIndex == 0) {
-				obj.setAliInfo({
-					fullname: arr.name,
-					alino: arr.code,
-					id:arr.id
-				});
-			}
-		},
-		/* 保存银行卡详细 */
-		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);
-				});
-		},
-		// 修改支付宝信息
-		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>
-
-<style lang="scss">
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-	.tit {
-		flex-shrink: 0;
-		width: 120rpx;
-		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;
-	}
-}
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.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;
-		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;
-	}
-	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);
-}
+<template>
+	<view class="content">
+		<!-- 	<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> -->
+		<view class="row b-b">
+			<text class="tit">姓名</text>
+			<input class="input" v-model="name" type="text" placeholder="请输入姓名"
+				placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<text class="tit">银行卡号</text>
+			<input class="input" v-model="payment" type="text" placeholder="请输入银行卡号"
+				placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<text class="tit">手机号码</text>
+			<input class="input" v-model="phone" type="text" placeholder="请输入手机号码"
+				placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<text class="tit">所属银行</text>
+			<input class="input" v-model="bank" type="text" placeholder="请输入所属银行"
+				placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<text class="tit">所属支行</text>
+			<input class="input" v-model="bank_name" type="text" placeholder="请输入所属支行"
+				placeholder-class="placeholder" />
+		</view>
+
+		<button class="add-btn up" @click="confirm">提 交 保 存</button>
+	</view>
+</template>
+
+<script>
+	import {
+		aliInfo,
+		bankInfo,
+		setAliInfo,
+		setBankInfo,
+		setBank,
+		getBank
+	} from '@/api/wallet.js';
+	export default {
+		data() {
+			return {
+				type: 3,
+				payment: '',
+				name:'',
+				bank: '',
+				phone:'',
+				bank_name: '',
+				loading: false
+			};
+		},
+
+		onLoad(options) {
+			// this.tabCurrentIndex = +options.state || 0;
+			// this.loadAli();
+			// this.loadBank();
+			this.getBank()
+		},
+
+		methods: {
+			//加载数据
+			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
+				}) => {
+					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)
+				});
+			},
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			// 提交保存
+			confirm() {
+				let obj = this;
+				// let arr = obj.navList[obj.tabCurrentIndex].orderList;
+				// if (obj.tabCurrentIndex == 1) {
+				// 	obj.setBankInfo({
+				// 		fullname: arr.name,
+				// 		bank: arr.bankName,
+				// 		bankno: arr.code,
+				// 		id: arr.id
+				// 	});
+				// }
+				// if (obj.tabCurrentIndex == 0) {
+				// 	obj.setAliInfo({
+				// 		fullname: arr.name,
+				// 		alino: arr.code,
+				// 		id: arr.id
+				// 	});
+				// }
+				if(obj.loading) {
+					return
+				}
+				if(obj.name == '') {
+					return obj.$api.msg('请输入姓名')
+				}
+				if(obj.payment == '') {
+					return obj.$api.msg('请输入银行卡号')
+				}
+				if(obj.phone == '') {
+					return obj.$api.msg('请输入手机号')
+				}
+				if(obj.bank == '') {
+					return obj.$api.msg('请输入所属银行')
+				}
+				if(obj.bank_name == '') {
+					return obj.$api.msg('请输入所属支行')
+				}
+				obj.loading = true
+				setBank({
+					type: obj.type,
+					name: obj.name,
+					phone: obj.phone,
+					payment: obj.payment,
+					bank: obj.bank,
+					bank_name: obj.bank_name
+				}).then(res => {
+					obj.loading = false
+					uni.showToast({
+						title: '修改成功',
+						duration: 2000,
+						position: 'top'
+					});
+					console.log('修改成功')
+					obj.$api.prePage().dataUp()
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1500)
+				}).catch(err => {
+					obj.loading = false
+				})
+			},
+			getBank() {
+				let obj = this
+				getBank().then(res => {
+					if(res.data.bank.length == 0) {
+						console.log('没有填信息')
+					}else {
+						let bank = res.data.bank
+						obj.name = bank.name
+						obj.phone= bank.phone
+						obj.payment= bank.payment
+						obj.bank= bank.bank
+						obj.bank_name= bank.bank_name
+					}
+				})
+			},
+			/* 保存银行卡详细 */
+			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);
+					});
+			},
+			// 修改支付宝信息
+			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>
+
+<style lang="scss">
+	.row {
+		display: flex;
+		align-items: center;
+		position: relative;
+		padding: 0 30rpx;
+		height: 110rpx;
+		background: #fff;
+
+		.tit {
+			flex-shrink: 0;
+			width: 200rpx;
+			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;
+		}
+	}
+
+	page,
+	.content {
+		background: $page-color-base;
+		height: 100%;
+	}
+
+	.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;
+			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: #bb9159;
+			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);
+	}
 </style>

pages/money/pay.vue

@@ -5,7 +5,7 @@
 			<text class="price">{{ money }}</text>
 		</view>
 		<view class="pay-type-list">
-			<view class="type-item b-b" @click="changePayType(1)">
+			<view class="type-item b-b" @click="changePayType(1)" v-if="money != 0">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>

pages/product/product.vue

@@ -363,6 +363,9 @@ export default {
 				obj.actionImage = obj.productValue[str].image;
 				obj.uniqueId = obj.productValue[str].unique;
 				obj.goodIntegral = obj.productValue[str].integral
+				if(obj.is_xf == 1) {
+					obj.goodsNumberMax = 1
+				}
 				console.log(obj.goodIntegral,'obj.goodIntegral')
 				// #ifdef H5
 				obj.shareDate();
@@ -427,6 +430,9 @@ export default {
 				this.uniqueId = data.unique;
 				this.goodIntegral = data.integral
 				console.log(this.goodIntegral,'xuanz')
+			}
+			if(this.is_xf == 1) {
+				this.goodsNumberMax = 1
 			}
 		},
 		//分享

pages/public/register.vue

@@ -104,7 +104,7 @@
 					obj.$api.msg('请输入电话号码');
 					return;
 				}
-				if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.phone)) {
+				if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(this.phone)) {
 					obj.$api.msg('请输入正确的手机号');
 					return;
 				}

pages/set/addressManage.vue

@@ -119,7 +119,7 @@ export default {
 				this.$api.msg('请填写收货人姓名');
 				return;
 			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.mobile)) {
+			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(data.mobile)) {
 				this.$api.msg('请输入正确的手机号码');
 				return;
 			}

pages/user/myggz.vue

@@ -177,6 +177,7 @@
 						obj.sr = data.sr
 						obj.zc = data.zc
 						navItem.orderList = navItem.orderList.concat(data.list)
+						navItem.page++
 						if(navItem.limit == data.list.length) {
 							navItem.loadingType = 'more'
 						}else {

pages/user/mygwjf.vue

@@ -230,6 +230,7 @@
 						obj.dsf = data.dsf
 						obj.jrsf = data.jrsf
 						navItem.orderList = navItem.orderList.concat(data.list)
+						navItem.page++
 						if(navItem.limit == data.list.length) {
 							navItem.loadingType = 'more'
 						}else {

pages/user/myjf.vue

@@ -18,8 +18,11 @@
 				<view>当前余额</view>
 			</view>
 			<view class="moneybtn-box">
-				<view class="money-btn" @click="navto('/pages/user/withdrawal?jftype=2')">
+				<!-- <view class="money-btn" @click="navto('/pages/user/withdrawal?jftype=2')">
 					动态积分提现
+				</view> -->
+				<view class="money-btn" >
+					
 				</view>
 				<view class="money-btn" @click="navto('/pages/user/xfjfzz?type=2')">
 					动态积分转账
@@ -185,6 +188,7 @@
 						obj.sr = data.sr
 						obj.zc = data.zc
 						navItem.orderList = navItem.orderList.concat(data.list)
+						navItem.page++
 						if(navItem.limit == data.list.length) {
 							navItem.loadingType = 'more'
 						}else {

pages/user/mythq.vue

@@ -163,6 +163,7 @@ export default {
 					obj.sr = data.sr
 					obj.zc = data.zc
 					navItem.orderList = navItem.orderList.concat(data.list)
+					navItem.page++
 					if(navItem.limit == data.list.length) {
 						navItem.loadingType = 'more'
 					}else {

pages/user/withdrawal.vue

@@ -55,28 +55,28 @@
 						</view>
 					</view>
 				</label> -->
-				<!-- <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-if="bank_name">{{ bank_name + ' ' + bank_code }}</text>
 								<text v-else>请创建银行账号</text>
 							</view>
 							<view class="node">
-								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
+								<text v-if="bank_people">真实姓名({{ bank_people }})</text>
 							</view>
 						</view>
 						<view class="right">
 							<radio value="bank" color="#c29963" :checked="type == 'bank'" />
 						</view>
 					</view>
-				</label> -->
+				</label>
 			</radio-group>
 		</view>
-		<view class="row b-b" v-if="type == 'weixin'">
+		<!-- <view class="row b-b" v-if="type == 'weixin'">
 			<text class="tit">微信账号</text>
 			<input class="input" type="text" v-model="weixin_no" placeholder="请输入微信账号"
 				placeholder-class="placeholder" />
@@ -110,9 +110,10 @@
 			<text class="tit">所属支行</text>
 			<input class="input" type="text" v-model="bank_belonging" placeholder="请输入所属支行"
 				placeholder-class="placeholder" />
-		</view>
+		</view> -->
+		<button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button>
 		<button class="add-btn up" @click="confirm">提交申请</button>
-		<!-- <button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button> -->
+		
 	</view>
 </template>
 
@@ -124,7 +125,9 @@
 		extractCash,
 		extractBank,
 		aliInfo,
-		bankInfo
+		bankInfo,
+		setBank,
+		getBank
 	} from '@/api/wallet.js';
 	import {
 		orderData,
@@ -196,10 +199,31 @@
 			// // 加载提款账号信息
 			// this.loadAli();
 			// this.loadBank();
+			this.dataUp()
 			
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			dataUp() {
+				let obj = this
+				getBank().then(res => {
+					if(res.data.bank.length == 0) {
+						console.log('没有填信息')
+					}else {
+						let bank = res.data.bank
+						obj.bank_people = bank.name;
+						obj.bank_name = bank.bank;
+						obj.bank_code = bank.payment;
+						obj.bank_belonging = bank.bank_name
+						
+						// obj.name = bank.name
+						// obj.phone= bank.phone
+						// obj.payment= bank.payment
+						// obj.bank= bank.bank
+						// obj.bank_name= bank.bank_name
+					}
+				})
+			},
 			// 加载余额信息
 			async loadData() {
 				
@@ -382,7 +406,9 @@
 
 	.add-btn {
 		&.modified {
-			color: #ffffff;
+			// color: #ffffff;
+			border:1px solid #bb9159;
+			color: #bb9159;
 		}
 
 		&.up {

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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.ead01763.js></script><script src=/index/static/js/index.43bfd804.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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.66c9eac4.js></script><script src=/index/static/js/index.314e7807.js></script></body></html>