Merge remote-tracking branch 'origin/master'

my/renzheng/index.vue

@@ -52,14 +52,13 @@
 		<view class=" padding bg radius margin" style="padding-top: 20rpx; margin-top: 20rpx;">
 			<view class="margin-top-sm">请选择认证类型</view>
 			<view class="guke-list">
-				<view class="guke-btn huiBtn" :class="{ lanBtn: selected.includes(item) }"
+				<view class="guke-btn huiBtn" :class="{ lanBtn: selected.includes(item) }" @click="gukeBtn(item)"
-					@click="gukeBtn(item)" v-for="(item,index) in typeList" :key="index">
+					v-for="(item,index) in typeList" :key="index">
 					{{item.value}}
 				</view>
 			</view>
 		</view>
-		<view class=" padding bg radius margin"
+		<view class=" padding bg radius margin" style="padding-top: 20rpx; margin-top: 20rpx;">
-			style="padding-top: 20rpx; margin-top: 20rpx;">
 			<view class="margin-top-sm">上传身份证正面</view>
 			<view class="flex" style="overflow: hidden;flex-direction: initial;">
 				<view class="margin-top flex margin-right-sm" v-if="form.front.length">
@@ -137,7 +136,8 @@
 						</view>
 					</view>
 				</view>
-				<jp-cropper-watermark :watermarkType="1" mode="ratio" :width="400" :height="500" :maxWidth="400" :maxHeight="500" :url="url" @cancel="oncancel" @ok="onok"></jp-cropper-watermark>
+				<jp-cropper-watermark :watermarkType="1" mode="ratio" :width="400" :height="500" :maxWidth="400"
+					:maxHeight="500" :url="url" @cancel="oncancel" @ok="onok"></jp-cropper-watermark>
 			</view>
 			<view class="margin-top-sm">持有资质证书（可多张）</view>
 			<view class="flex" style="overflow: hidden;flex-wrap: wrap;">
@@ -220,7 +220,7 @@
 		<!-- 性别选择 -->
 		<u-action-sheet :list="actionSheetList" v-model="show" @click="actionSheetCallback"></u-action-sheet>
 		<!-- 出生日期 -->
-		<u-picker v-model="showData" :params="params" @confirm="bindData"></u-picker>
+		<u-picker v-model="showData" mode="time" :params="params" @confirm="bindData"></u-picker>
 		<!-- 支付方式 -->
 		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
 			<view class="popup_pay">
@@ -254,7 +254,7 @@
 	export default {
 		data() {
 			return {
-				selected:[],
+				selected: [],
 				showAgree: false,
 				form: {
 					name: '',
@@ -325,9 +325,9 @@
 				closeable: true,
 				XCXIsSelect: '否',
 				renzhengStatus: false,
-				typeList:[],
+				typeList: [],
-				url:'',
+				url: '',
-				urlUol:''
+				urlUol: '',
 			}
 		},
 		onLoad() {
@@ -379,12 +379,23 @@
 			}]
 			this.openWay = 2;
 			// #endif
+			//this.dateValue = this.getDate();
 		},
 		onShow() {
 			// this.Getmoney()
 			this.checkRenzhengStatus();
 		},
 		methods: {
+			getDate() { //年月日
+				const date = new Date();
+				// const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			},
 			gukeBtn(item) {
 				var index = this.selected.indexOf(item);
 				if (index === -1) {
@@ -394,12 +405,12 @@
 				}
 				var data = [];
 				for (var i = 0; i < this.selected.length; i++) {
-						data.push(this.selected[i].id)
+					data.push(this.selected[i].id)
 				}
 				this.typeId = data.join(",")
-				console.log("this.typeId",this.typeId)
+				console.log("this.typeId", this.typeId)
 			},
-			fuwuType(){
+			fuwuType() {
 				this.$Request.get("/app/dict/list", {
 					type: '服务类型'
 				}).then(res => {
@@ -740,45 +751,49 @@
 						for (let i = 0; i < res.tempFilePaths.length; i++) {
 							that.$queue.showLoading("上传中...");
 							uni.getFileInfo({
-							  filePath: res.tempFilePaths[i],
+								filePath: res.tempFilePaths[i],
-							  success: (infoRes) => {
+								success: (infoRes) => {
-							    const size = infoRes.size;
+									const size = infoRes.size;
-							    if (size / 1024 / 1024 > 4) {
+									if (size / 1024 / 1024 > 4) {
-							      // 图片大于2MB
+										// 图片大于2MB
-									uni.showToast({
+										uni.showToast({
-										icon:'error',
+											icon: 'error',
-										title:'图片超出2MB限制,请重新选择'
+											title: '图片超出2MB限制,请重新选择'
-									})
+										})
-							    } else {
+									} else {
-							      // 图片小于等于2MB
+										// 图片小于等于2MB
-									uni.uploadFile({ // 上传接口
+										uni.uploadFile({ // 上传接口
-										//url: websocketUtils.uploadFileUrl(), //真实的接口地址
+											//url: websocketUtils.uploadFileUrl(), //真实的接口地址
-										url: urlName,
+											url: urlName,
-										filePath: res.tempFilePaths[i],
+											filePath: res.tempFilePaths[i],
-										name: 'file',
+											name: 'file',
-										success: (uploadFileRes) => {
+											success: (uploadFileRes) => {
-											if (e == 3) {
+												if (e == 3) {
-												if (that.infantImg.length <= 5) {
+													if (that.infantImg.length <= 5) {
-													that.infantImg.push(JSON.parse(uploadFileRes.data)
+														that.infantImg.push(JSON.parse(
-														.data)
+																uploadFileRes.data)
+															.data)
 
+													}
+												} else if (e == 2) {
+													if (that.certificateImg.length <=
+														5) {
+														that.certificateImg.push(JSON
+															.parse(uploadFileRes
+																.data)
+															.data)
+														// that.image = JSON.parse(uploadFileRes.data)
+														// 	.data
+													}
 												}
-											} else if (e == 2) {
+												uni.hideLoading();
-												if (that.certificateImg.length <= 5) {
-													that.certificateImg.push(JSON.parse(uploadFileRes.data)
-														.data)
-													// that.image = JSON.parse(uploadFileRes.data)
-													// 	.data
-												}
 											}
-											uni.hideLoading();
+										});
-										}
+									}
-									});
+								},
-							    }
+								fail: () => {
-							  },
+									cons.log("上传失败")
-							  fail: () => {
+								}
-							   cons.log("上传失败")
-							  }
 							});
 
 						}
@@ -786,11 +801,11 @@
 				})
 			},
 			onok(ev) {
-				var that=this;
+				var that = this;
 				this.url = "";
 				// that.form.headImg = ev.path;
 				var url = null;
-				if(ev.path){
+				if (ev.path) {
 					that.$queue.showLoading("上传中...");
 					// 图片小于等于2MB
 					uni.uploadFile({ // 上传接口
@@ -805,7 +820,7 @@
 						}
 					});
 				}
-				console.log("asdasdasdasd",this.avatar)
+				console.log("asdasdasdasd", this.avatar)
 			},
 			oncancel() {
 				// url设置为空，隐藏控件
@@ -820,24 +835,24 @@
 					success: res => {
 						for (let i = 0; i < res.tempFilePaths.length; i++) {
 							uni.getFileInfo({
-							  filePath: res.tempFilePaths[i],
+								filePath: res.tempFilePaths[i],
-							  success: (infoRes) => {
+								success: (infoRes) => {
-							    const size = infoRes.size;
+									const size = infoRes.size;
-								console.log("size----------->",size / 1024 / 1024)
+									console.log("size----------->", size / 1024 / 1024)
-							    if (size / 1024 / 1024 > 4) {
+									if (size / 1024 / 1024 > 4) {
-							      // 图片大于2MB
+										// 图片大于2MB
-									uni.showToast({
+										uni.showToast({
-										icon:'error',
+											icon: 'error',
-										title:'图片超出4MB限制,请重新选择'
+											title: '图片超出4MB限制,请重新选择'
-									})
+										})
-							    } else {
+									} else {
-									that.url=res.tempFilePaths[i];
+										that.url = res.tempFilePaths[i];
-									that.urlUol=res.tempFilePaths[i];
+										that.urlUol = res.tempFilePaths[i];
-							    }
+									}
-							  },
+								},
-							  fail: () => {
+								fail: () => {
-							   cons.log("上传失败")
+									cons.log("上传失败")
-							  }
+								}
 							});
 						}
 					}
@@ -852,39 +867,42 @@
 						for (let i = 0; i < res.tempFilePaths.length; i++) {
 
 							uni.getFileInfo({
-							  filePath: res.tempFilePaths[i],
+								filePath: res.tempFilePaths[i],
-							  success: (infoRes) => {
+								success: (infoRes) => {
-							    const size = infoRes.size;
+									const size = infoRes.size;
-							    if (size / 1024 / 1024 > 4) {
+									if (size / 1024 / 1024 > 4) {
-							      // 图片大于2MB
+										// 图片大于2MB
-									uni.showToast({
+										uni.showToast({
-										icon:'error',
+											icon: 'error',
-										title:'图片超出2MB限制,请重新选择'
+											title: '图片超出2MB限制,请重新选择'
-									})
+										})
-							    } else {
+									} else {
-							      // 图片小于等于2MB
+										// 图片小于等于2MB
-									uni.uploadFile({ // 上传接口
+										uni.uploadFile({ // 上传接口
-										url: websocketUtils.uploadFileUrl(), //真实的接口地址
+											url: websocketUtils.uploadFileUrl(), //真实的接口地址
-										filePath: res.tempFilePaths[i],
+											filePath: res.tempFilePaths[i],
-										name: 'file',
+											name: 'file',
-										success: (uploadFileRes) => {
+											success: (uploadFileRes) => {
-											if (e == 1) {
+												if (e == 1) {
-												that.form.front = JSON.parse(uploadFileRes.data).data
+													that.form.front = JSON.parse(
-											} else if (e == 2) {
+														uploadFileRes.data).data
-												that.form.back = JSON.parse(uploadFileRes.data).data
+												} else if (e == 2) {
-											} else if (e == 4) {
+													that.form.back = JSON.parse(
-												that.form.headImg = JSON.parse(uploadFileRes.data).data
+														uploadFileRes.data).data
-												console.log(that.form.headImg)
+												} else if (e == 4) {
-											}
+													that.form.headImg = JSON.parse(
-											uni.hideLoading();
+														uploadFileRes.data).data
+													console.log(that.form.headImg)
+												}
+												uni.hideLoading();
 
-										}
+											}
-									});
+										});
-							    }
+									}
-							  },
+								},
-							  fail: () => {
+								fail: () => {
-							   cons.log("上传失败")
+									cons.log("上传失败")
-							  }
+								}
 							});
 
 						}
@@ -1073,24 +1091,27 @@
 
 <style scoped>
 	.huiBtn {
-		color:#333;
+		color: #333;
 		background: #f3f3f3;
 		// color: #333333;
 	}
+
 	.lanBtn {
-		color:#fff;
+		color: #fff;
 		background: #049F89;
 	}
+
 	.guke-btn {
-		width:30%;
+		width: 30%;
-		line-height:34px;
+		line-height: 34px;
 		text-align: center;
 		font-weight: bold;
-		font-size:11px;
+		font-size: 11px;
 		border-radius: 6px;
-		margin-top:5px;
+		margin-top: 5px;
-		margin-right:6px;
+		margin-right: 6px;
 	}
+
 	.guke-list {
 		width: 100%;
 		display: flex;
@@ -1101,22 +1122,25 @@
 		background-color: #fff;
 		justify-content: flex-start;
 	}
+
 	page {
 		background-color: #F7F7F7;
 	}
 
 	.bg {
 		width: 94%;
-		margin:30rpx auto;
+		margin: 30rpx auto;
 		background-color: #FFFFFF;
 		padding: 20rpx 36rpx;
 		border-radius: 26rpx;
 
 	}
-	.add-word{
+
+	.add-word {
 		font-size: 26rpx;
 		color: #afb5c1;
 	}
+
 	.skbox {}
 
 	.skleft {
@@ -1196,4 +1220,8 @@
 	.bgCol2 {
 		color: #557EFD;
 	}
-</style>
+
+	/deep/.uni-picker-view-wrapper uni-picker-view-column:nth-child(1) {
+		display: block !important;
+	}
+</style>