Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pageD/identity/companyIdentity.vue

@@ -1,83 +1,86 @@
 <template>
 	<view class="center">
 		<view>
-			<label class="radio" v-model="radios">
-				<radio value="1" name="radios" /><text>公司</text>
-				<radio value="2" name="radios" /><text>个人</text>
-			</label>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
+			 alt=""></image>
+			<text>公司</text>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
+			 alt=""></image>
+			<text>个人</text>
 		</view>
-		<view v-if="radios == 1">
-		<view>
-			<button type="default">上传营业执照</button>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">公司名称</text>
-			<view class="con-list">
-				<input placeholder="请填写公司名称" name="input" @input="addressInput"></input>
+		<view v-if="consentStatus == true">
+			<view>
+				<button type="default">上传营业执照</button>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">纳税人识别号</text>
-			<view class="con-list">
-				<input placeholder="请填写纳税人识别号" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">公司名称</text>
+				<view class="con-list">
+					<input placeholder="请填写公司名称" name="input" v-model="identityAuthenticationInfo.compName"></input>
+				</view>
 			</view>
-		</view>
-		<view>
-			<button type="default">上传身份证正面</button>
-			<button type="default">上传身份证反面</button>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">姓名</text>
-			<view class="con-list">
-				<input placeholder="请填写姓名" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">纳税人识别号</text>
+				<view class="con-list">
+					<input placeholder="请填写纳税人识别号" name="input" v-model="identityAuthenticationInfo.payTaxesCard"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">身份证号</text>
-			<view class="con-list">
-				<input placeholder="请填写身份证号" name="input" @input="addressInput"></input>
+			<view>
+				<button type="default">上传身份证正面</button>
+				<button type="default">上传身份证反面</button>
 			</view>
-		</view>
-		<view>
-			<button type="default">上传银行卡正面</button>
-			<button type="default">上传银行卡反面</button>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">银行卡号</text>
-			<view class="con-list">
-				<input placeholder="请填写银行卡号" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">姓名</text>
+				<view class="con-list">
+					<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">开户行</text>
-			<view class="con-list">
-				<input placeholder="请填写开户行" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">身份证号</text>
+				<view class="con-list">
+					<input placeholder="请填写身份证号" name="input" v-model="identityAuthenticationInfo.customerNumberCard"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">开户支行</text>
-			<view class="con-list">
-				<input placeholder="请填写开户支行" name="input" @input="addressInput"></input>
+			<view>
+				<button type="default">上传银行卡正面</button>
+				<button type="default">上传银行卡反面</button>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">手机号</text>
-			<view class="con-list">
-				<input placeholder="请填写手机号" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">银行卡号</text>
+				<view class="con-list">
+					<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<button type="default">获取验证码</button>
-			<view class="con-list">
-				<input placeholder="请填写6位短信验证码" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">开户行</text>
+				<view class="con-list">
+					<input placeholder="请填写开户行" name="input" v-model="identityAuthenticationInfo.bankDeposit"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">公司地址</text>
-			<view class="con-list">
-				<input placeholder="请填写公司地址" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">开户支行</text>
+				<view class="con-list">
+					<input placeholder="请填写开户支行" name="input" v-model="identityAuthenticationInfo.bankDepositBranch"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">手机号</text>
+				<view class="con-list">
+					<input placeholder="请填写手机号" name="input" v-model="identityAuthenticationInfo.customerPhone"></input>
+				</view>
+			</view>
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode' class='getcode'>{{sendText}}</button>
+				<view style='width:70%;position:relative;margin-left: 200px;'>
+
+					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">公司地址</text>
+				<view class="con-list">
+					<input placeholder="请填写公司地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
+				</view>
 			</view>
-		</view>
 		</view>
 		<view v-else>
 			<view>
@@ -87,13 +90,13 @@
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">
-					<input placeholder="请填写姓名" name="input" @input="addressInput"></input>
+					<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写身份证号" name="input" v-model="identityAuthenticationInfo.customerNumberCard"></input>
 				</view>
 			</view>
 			<view>
@@ -103,53 +106,58 @@
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
-					<input placeholder="请填写银行卡号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户行</text>
 				<view class="con-list">
-					<input placeholder="请填写开户行" name="input" @input="addressInput"></input>
+					<input placeholder="请填写开户行" name="input" v-model="identityAuthenticationInfo.bankDeposit"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
 				<view class="con-list">
-					<input placeholder="请填写开户支行" name="input" @input="addressInput"></input>
+					<input placeholder="请填写开户支行" name="input" v-model="identityAuthenticationInfo.bankDepositBranch"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人姓名</text>
 				<view class="con-list">
-					<input placeholder="请填写收款人姓名" name="input" @input="addressInput"></input>
+					<input placeholder="请填写收款人姓名" name="input" v-model="identityAuthenticationInfo.payeeName"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写收款身份证号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写收款身份证号" name="input" v-model="identityAuthenticationInfo.payeeNumberCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写手机号" name="input" v-model="identityAuthenticationInfo.customerPhone"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
-				<button type="default">获取验证码</button>
-				<view class="con-list">
-					<input placeholder="请填写6位短信验证码" name="input" @input="addressInput"></input>
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode' class='getcode'>{{sendText}}</button>
+				<view style='width:70%;position:relative;margin-left: 200px;'>
+					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
 				</view>
+
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">联系地址</text>
 				<view class="con-list">
-					<input placeholder="请填写联系地址" name="input" @input="addressInput"></input>
+					<input placeholder="请填写联系地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
 				</view>
 			</view>
 		</view>
+		<view class="padding flex flex-direction">
+			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
+		</view>
 	</view>
+	
 </template>
 
 <script>
@@ -158,15 +166,105 @@
 		data() {
 			return {
 				radios: 2,
-
+				inputContent: null,
+				customerPhone: '',
+				consentStatus: true,
+				consentStatus1: false,
+				codestatus: false,
+				verifyCode: null,
+				inputStatus: 'none',
+				sendText: '获取验证码',
+				platform: '',
+				sendDisabled: false,
+				identityAuthenticationInfo: {
+					customerPhone: ''
+				},
 			};
 		},
 		methods: {
-			radioschenge( index ) {
+			consent() {
+				if (this.consentStatus == false && this.consentStatus1 == true) {
+					this.consentStatus = true
+					this.consentStatus1 = false
+				} else if (this.consentStatus == true && this.consentStatus1 == false) {
+					this.consentStatus = false
+					this.consentStatus1 = true
+				}
+
+			},
+
+			getcode() {
+				var that = this
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.customerPhone)) {
+					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
+							phone: this.customerPhone
+						}).then(res => {
+							if (res.data.code == 200) {
+								that.sendDisabled = true
+								let sec = 60
+								let interval = setInterval(() => {
+									sec--;
+									that.sendText = sec + 's后重发'
+									if (sec <= 0) {
+										that.sendDisabled = false
+										that.sendText = "获取验证码"
+										clearInterval(interval)
+									}
+								}, 1000)
+							} else {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+						.catch(res => {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+				} else {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+
+			},
+			verifyCodeInput(e) {
+				this.verifyCode = e.detail.value
+			},
+			phoneinput(e) {
+				if (e.detail.value.length == 11) {
+					this.codestatus = true
+				}
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.isPhone = false
+			},
+			radioschenge(index) {
 				console.log(index)
 				this.radios = index
-			}
-		}
+			},
+			commit() {
+				this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this.identityAuthenticationInfo)
+					.then(res => {
+						console.log(12545645)
+					}).catch(res => {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
+					})
+			},
+		},
 	}
 </script>
 
@@ -186,6 +284,16 @@
 		position: relative;
 	}
 
+	.verificationCode {
+		margin-top: 20px;
+		background: #F5F6F9;
+		color: #AFB3BF;
+	}
+
+	.verificationCode:after {
+		border: none;
+	}
+
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;
@@ -203,4 +311,36 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
+
+	.verificationCode.active {
+		background: #22C572;
+		color: #fff;
+	}
+
+	.getcode {
+		font-size: 14px;
+		position: absolute;
+		/* 	right:0; */
+		top: 50%;
+		transform: translateY(-50%);
+		color: #AFB3BF;
+		background: #F5F6F9;
+		height: 30px;
+		line-height: 30px;
+
+	}
+
+	.getcode:after {
+		border: none;
+	}
+
+	.uni-navigator {
+		display: inline-block;
+		color: #22C572;
+	}
+
+	.getcode.active {
+		background: #22C572;
+		color: #fff;
+	}
 </style>

pages/user/user.vue

@@ -194,7 +194,7 @@
 							name: '我的任务',
 							icon:'cuIcon-copy',
 							tips: 0,
-							url:'/pages/user/task',
+							url:'/pages/task/my_task',
 							show:true
 						},
 						{