Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/duanju/video_app into test

me/invite/cashDetail.vue

@@ -54,6 +54,9 @@
 			</view>
 
 			<view style="display: flex;width: 100%;justify-content: center;">
+				<view class="u-flex-1" style="color: grey;padding-bottom: 30px;padding-top: 20upx;" @click="realName">
+					实名认证
+				</view>
 				<view class="u-flex-1" style="color: grey;padding-bottom: 30px;padding-top: 20upx;" @click="goZhifuBao">
 					提现账号
 				</view>
@@ -132,7 +135,7 @@
 				用户在平台中对奖励提现的，适用以下规则：
 				<br/>
 				<br/>
-				1，用户的收益达到最低提现金额要求后，可以申请提现。每日发起前10笔提现为自动到账，超出则需第二个工作日后到账。
+				1，用户的收益达到最低提现金额要求后，可以申请提现，每日只可以提现一笔。
 				<br/>
 				2，用户需要通过支付宝提现，需按照要求绑定支付宝账号并填写提现金额或其他提现所需信息，请确保提供的信息准确无误，以免提现失败。
 				<br/>
@@ -144,7 +147,7 @@
 				<br/>
 				4，每日23:00至次日11:00为系统维护时间，活动的对应奖励可能延迟到账。提现通常会在72小时内到账，如遇双休日、节假日，提现到账时间可能会延长。活动高峰期间，由于网络拥堵，用户可能存在短时间内无法提现的情况。平台将尽最大努力及时恢复提现功能，但无需因此承担任何责任。
 				<br/>
-		`,
+				`,
 				money: '',
 				mayMoney: '0',
 				shouxufei: '',
@@ -385,6 +388,15 @@
 				});
 			},
 			
+			/**
+			 * 实名认证
+			 */
+			realName() {
+				uni.navigateTo({
+					url: '/me/invite/realName'
+				});
+			},
+			
 			/**
 			 * 绑定支付宝
 			 */
@@ -460,36 +472,53 @@
 							// if (parseFloat(that.mayMoney).toFixed(1) >= parseFloat(that.money) + shouxufei * 1) {
 							if (parseFloat(that.money).toFixed(2) >= parseFloat(cashMoney)) {
 								if (that.shouxufei > 0) {
-
 									uni.showModal({
 										title: "提现申请提示",
-										content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
+										content: '每日只可提现一次',
-											.money + '元\n\n收款人账号：' + that.zhifubao + '',
-										// content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
-										// 	.money + '元\n\n提现手续费：' + shouxufei +
-										// 	'\n\n收款人账号：' + that.zhifubao + '',
 										success: (e) => {
 											if (e.confirm) {
-												// that.money = money
+												uni.showModal({
-												that.getMoney();
+													title: "提现申请提示",
-												that.getMoneyDetail();
+													content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
+														.money + '元\n\n收款人账号：' + that.zhifubao + '',
+													// content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
+													// 	.money + '元\n\n提现手续费：' + shouxufei +
+													// 	'\n\n收款人账号：' + that.zhifubao + '',
+													success: (e) => {
+														if (e.confirm) {
+															// that.money = money
+															that.getMoney();
+															that.getMoneyDetail();
+														}
+													}
+												});
 											}
 										}
 									});
+									
 								} else {
 									uni.showModal({
 										title: "提现申请提示",
-										content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
+										content: '每日只可提现一次',
-											.money + '元\n\n收款人账号：' + that.zhifubao +
-											'',
 										success: (e) => {
 											if (e.confirm) {
-												// that.money = money
+												uni.showModal({
-												that.getMoney();
+													title: "提现申请提示",
-												that.getMoneyDetail();
+													content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
+														.money + '元\n\n收款人账号：' + that.zhifubao +
+														'',
+													success: (e) => {
+														if (e.confirm) {
+															// that.money = money
+															that.getMoney();
+															that.getMoneyDetail();
+														}
+													}
+												});
 											}
 										}
 									});
+									
 								}
 
 							} else {

me/invite/realName.vue

@@ -0,0 +1,177 @@
+<template>
+	<view class="containerView">
+		<list-cell title="姓名" type="text" placeholder="请输入姓名" v-model="certName"></list-cell>
+
+		<list-cell title="手机号" type="text" placeholder="请输入手机号" v-model="mobile"></list-cell>
+		
+		<list-cell title="身份证号码" type="text" placeholder="请输入身份证号码" v-model="certNum"></list-cell>
+		
+		<list-cell title="银行卡号码" type="text" placeholder="请输入银行卡号码" v-model="accountNo"></list-cell>
+		
+
+
+		<button class="confirm-btn" @click="toLogin"
+			:disabled="logining">认证</button>
+		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;margin-top: 32rpx;margin-bottom: 10rpx;">请正确填写收款人的银行卡号和真实的收款人姓名</view>
+		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;;margin-bottom: 10rpx;">银行卡号需与收款人姓名一致</view>
+		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;;margin-bottom: 10rpx;">身份证信息仅可使用一次</view>
+		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx">否则将无法正常收款，请须知</view>
+
+	</view>
+</template>
+
+<script>
+	import listCell from '@/me/components/com-input';
+	export default {
+		components: {
+			listCell
+		},
+		data() {
+			return {
+				certName: '',
+				mobile: '',
+				certNum: '',
+				accountNo: '',
+				logining: false
+			}
+		},
+		onLoad() {
+			let userId = uni.getStorageSync('userId');
+
+			if (userId) {
+				this.$u.api.userinfo().then(res => {
+					if (res.code === 0) {
+						if (res.data.certName) {
+							this.certName = res.data.certName;
+						}
+						if (res.data.mobile) {
+							this.mobile = res.data.mobile;
+						}
+						if (res.data.certNo) {
+							this.certNum = res.data.certNo;
+						}
+						if (res.data.accountNo) {
+							this.accountNo = res.data.accountNo;
+						}
+						
+					}
+				})
+			}
+
+		},
+		methods: {
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+
+			toLogin() {
+			    
+				if (!this.certName) {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					})
+				} else if (!this.mobile) {
+					uni.showToast({
+						title: '请输入手机号号',
+						icon: 'none'
+					})
+				} else if (!this.certNum) {
+					uni.showToast({
+						title: '请输入身份证账号',
+						icon: 'none'
+					})
+				} else if (!this.accountNo) {
+					uni.showToast({
+						title: '请请输入银行卡号',
+						icon: 'none'
+					})
+				} else {
+					this.logining = true
+					this.$u.post('app/user/updateUser?certName=' + this.certName + '&mobile=' + this.mobile + '&certNum=' + this.certNum + '&accountNo=' + this.accountNo).then(
+						res => {
+							this.logining = false
+							console.log(res);
+							if(res.code===0){
+								uni.setStorageSync('certName', this.certName)
+								uni.setStorageSync('mobile', this.mobile)
+								uni.setStorageSync('certNum', this.certNum)
+								uni.setStorageSync('accountNo', this.accountNo)
+								uni.showToast({
+									title: '修改成功',
+									icon: 'none',
+									complete() {
+										setTimeout(function() {
+											uni.navigateBack();
+										}, 1000)
+									}
+								})
+							}else{
+								uni.showToast({
+									title:res.msg||'修改失败',
+									icon:'none'
+								})
+							}
+							
+
+						});
+
+				}
+				
+			},
+		},
+
+	}
+</script>
+
+<style lang='scss'>
+	page {
+		background: #FFFFFF;
+	}
+
+	.containerView {
+		padding-top: 32upx;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #ffffff;
+	}
+
+	.confirm-btn1 {
+		width: 300px;
+		height: 42px;
+		line-height: 42px;
+		border-radius: 30px;
+		margin-top: 70upx;
+		/* background: whitesmoke; */
+		background: #ff7581;
+		color: #FFFFFF;
+		font-size: 32rpx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+
+
+
+	.confirm-btn {
+		width: 300px;
+		height: 42px;
+		line-height: 42px;
+		border-radius: 30px;
+		margin-top: 70upx;
+		background: #ff7581;
+		color: #ffffff;
+		font-size: 32rpx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+</style>

me/invite/zhifubao.vue

@@ -4,14 +4,9 @@
 
 		<list-cell title="支付宝账号" type="text" placeholder="请输入要绑定的支付宝手机号" v-model="zhiFuBao"></list-cell>
 		
-		<list-cell title="身份证号码" type="text" placeholder="请输入要绑定身份证号码" v-model="certNum"></list-cell>
+		<button class="confirm-btn" @click="toLogin"
-
-
-		<button :class="zhiFuBao&&zhiFuBaoName?'confirm-btn':'confirm-btn1'" @click="toLogin"
 			:disabled="logining">绑定账户</button>
 		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;margin-top: 32rpx;margin-bottom: 10rpx;">请正确填写收款人的支付宝账户和真实的收款人姓名</view>
-		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;;margin-bottom: 10rpx;">身份证姓名需与支付宝姓名一致</view>
-		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;;margin-bottom: 10rpx;">身份证信息仅可使用一次</view>
 		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx">否则将无法正常收款，请须知</view>
 
 	</view>
@@ -27,7 +22,6 @@
 			return {
 				zhiFuBao: '',
 				zhiFuBaoName: '',
-				certNum: '',
 				logining: false
 			}
 		},
@@ -43,9 +37,7 @@
 						if (res.data.zhiFuBaoName) {
 							this.zhiFuBaoName = res.data.zhiFuBaoName;
 						}
-						if (res.data.certNo) {
+						
-							this.certNum = res.data.certNo;
-						}
 					}
 				})
 			}
@@ -63,7 +55,6 @@
 			toLogin() {
 				let zhiFuBao = this.zhiFuBao
 				let zhiFuBaoName = this.zhiFuBaoName
-				let certNum = this.certNum
 			    
 				if (!zhiFuBao) {
 					uni.showToast({
@@ -75,21 +66,15 @@
 						title: '请设置收款人支付宝账号',
 						icon: 'none'
 					})
-				} else if (!certNum) {
-					uni.showToast({
-						title: '请设置收款人身份证账号',
-						icon: 'none'
-					})
 				} else {
 					this.logining = true
-					this.$u.post('app/user/updateUser?zhiFuBao=' + zhiFuBao + '&certName=' + zhiFuBaoName + '&certNum=' + certNum).then(
+					this.$u.post('app/user/updateUser?zhiFuBao=' + zhiFuBao + '&certName=' + zhiFuBaoName).then(
 						res => {
 							this.logining = false
 							console.log(res);
 							if(res.code===0){
 								uni.setStorageSync('zhiFuBao', zhiFuBao)
 								uni.setStorageSync('zhiFuBaoName', zhiFuBaoName)
-								uni.setStorageSync('certNum', certNum)
 								uni.showToast({
 									title: '修改成功',
 									icon: 'none',

pages.json

@@ -373,6 +373,17 @@
 						}
 					}
 				},
+				{
+					"path": "invite/realName",
+					"style": {
+						"navigationBarTitleText": "实名认证",
+						"h5": {
+							"titleNView": {
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
 				{
 					"path": "invite/zhifubao",
 					"style": {