第一版本测试

App.vue

@@ -5,13 +5,6 @@
 	} from '@/common/auth.js'
 	export default {
 		onLaunch: function() {
-
-			uni.getSystemInfo({
-				success: function(res) {
-					console.log("系统信息：", res)
-				}
-			});
-
 			if (getToken()) {
 				console.log('存在');
 				uni.reLaunch({

common/baiduUtil.js

@@ -38,6 +38,7 @@ export function idcard(path, token, type, callback) {
 			'Content-Type': 'application/x-www-form-urlencoded'
 		},
 		success: (res) => {
+			console.log("wwwwwww",res);
 			callback(res.data)
 		}
 	})

components/my-file/my-file.vue

@@ -46,8 +46,12 @@
 			},
 			'zczm': {
 				handler(newItems, oldItems) {
-					console.log('数组发生变化11', newItems, oldItems);
-					// 在这里可以执行其他操作，比如更新视图或发送请求等
+					// let zczmList = []
+					// newItems.forEach(e => {
+					// 	zczmList.push(e.url)
+					// })
+
+					// this.$emit("@recordsChange", zczmList)
 				},
 				deep: true // 使用深度监听，以便检测到数组内部的变化
 			},

manifest.json

@@ -86,6 +86,7 @@
                 "/api" : {
                     // "target" : "http://10.16.4.9:8080", // 需要跨域的域名
                     "target" : "http://10.16.4.5:8080", // 需要跨域的域名
+
                     // "target" : "http://121.36.73.159:805", // 需要跨域的域名
                     "changeOrigin" : true,
                     "secure" : false,
@@ -96,6 +97,7 @@
                 "/uploadPath" : {
                     // "target" : "http://10.16.4.9:8080/file/uploadPath/", // 需要跨域的域名
                     "target" : "http://10.16.4.5:8080/file/uploadPath/", // 需要跨域的域名
+
                     // "target" : "http://121.36.73.159:805/file/uploadPath/", // 需要跨域的域名
                     "changeOrigin" : true,
                     "secure" : false,

pages/index/index.vue

@@ -14,7 +14,7 @@
 		</view>
 
 		<view class="btnBox">
-			<image class="btnImg" src="../../static/images/hywh.png" @click="btnClick(0)" />
+			<image class="btnImg" src="../../static/images/lrzc.png" @click="btnClick(0)" /> 
 			<image class="btnImg img2" src="../../static/images/jsjz.png" @click="btnClick(1)" />
 		</view>
 
@@ -39,7 +39,7 @@
 									<text v-else>{{item.createTime.substring(0,8) }}</text>
 									<text>{{item.lrSpyj || '无'}}</text>
 								</view>
-								<view v-else-if="item.lzzt == '1' || item.lzzt == '2'"
+								<view v-else-if="item.lzzt == '1' || item.lzzt == '2' || item.lzzt == '5'"
 									style="width: 60px;display: flex;flex-direction: column;background-image: url('../../static/images/daishenhe.png');background-position: left;background-size:58px 58px;background-repeat: no-repeat;">
 									<text v-if="item.updateTime">{{item.updateTime.substring(0,8) }}</text>
 									<text v-else>{{item.createTime.substring(0,8) }}</text>

pages/info/add.vue

@@ -1,16 +1,18 @@
 <template>
-	<view>
-		<uni-card>
+	<view class="content">
+		<uni-card class="card">
 			<uni-section title="基本信息" type="line">
 
 				<view>
 					<view class="lzcOCR">
-						<view class="box">
-							<image :src="zjcaijianSrc" mode="widthFix" @click="paizhao('front')"></image>
+						<view class="imgBox">
+							<image :src="zjcaijianSrc" style="width: 40vw;" mode="widthFix" @click="paizhao('front')">
+							</image>
 							<view class="text">拍摄人像面</view>
 						</view>
-						<view class="box">
-							<image :src="zjcaijianSrcFan" mode="widthFix" @click="paizhao('back')"></image>
+						<view class="imgBox">
+							<image :src="zjcaijianSrcFan" style="width: 40vw;" mode="widthFix" @click="paizhao('back')">
+							</image>
 							<view class="text">拍摄国徽面</view>
 						</view>
 					</view>
@@ -48,7 +50,7 @@
 					</uni-forms-item>
 
 					<uni-forms-item label="特困证明" v-if="baseFormData.istk == 1">
-						<myfile :zczmList="tkzmList"></myfile>
+						<myfile :zczmList="tkzmList" @recordsChange="tkChange"></myfile>
 					</uni-forms-item>
 
 					<uni-forms-item label="是否低保">
@@ -56,7 +58,7 @@
 					</uni-forms-item>
 
 					<uni-forms-item label="低保证明" v-if="baseFormData.isdb == 1">
-						<myfile :zczmList="dbzmList"></myfile>
+						<myfile :zczmList="dbzmList" @recordsChange="dbChange"></myfile>
 					</uni-forms-item>
 
 					<uni-forms-item label="是否重残">
@@ -65,7 +67,7 @@
 
 					<uni-forms-item label="重残证明" v-if="baseFormData.iszc == 1">
 						<!-- <uni-file-picker v-model="zczm" @select="imgSelect3" @delete="imgDelete3"></uni-file-picker> -->
-						<myfile :zczmList="zczmList"></myfile>
+						<myfile :zczmList="zczmList" @recordsChange="zcChange"></myfile>
 					</uni-forms-item>
 
 					<view v-if="show">
@@ -242,6 +244,7 @@
 					istk: "0",
 					isdb: "0",
 					iszc: "0",
+					lzzt: 0,
 				},
 				rules: {
 					jzdz: {
@@ -301,7 +304,6 @@
 							title: '正在识别中...'
 						})
 					}, 100);
-
 					// 压缩	
 					translateAll(base64ToUrl(e.data.data.arg.base64), (base64, blobUrl) => {
 						idcard(base64, this.token, this.cardType, this.callbackIdcard)
@@ -346,6 +348,15 @@
 
 		},
 		methods: {
+			tkChange(e) {
+				this.tkzmList = e
+			},
+			dbChange(e) {
+				this.dbzmList = e
+			},
+			zcChange(e) {
+				this.zczmList = e
+			},
 			getAddressList(code) {
 				GetChildListByCode({
 					code: code
@@ -393,7 +404,7 @@
 
 				} else {
 					showConfirm(res.data.error_msg)
-
+					this.faceBase64 = ''
 				}
 			},
 			callbackToken(e) {
@@ -401,7 +412,14 @@
 			},
 			callbackIdcard(words) {
 				uni.hideLoading()
+				if (!this.cardType) {
+					this.cardType = uni.getStorageSync("cardType")
+				}
 				if (this.cardType == 'front') {
+					if (!words) {
+						showConfirm('请上传正确的身份证人像面')
+						return
+					}
 					if (words.image_status == "other_type_card") {
 						showConfirm('请上传正确的身份证人像面')
 						return
@@ -522,7 +540,11 @@
 					// 		}
 					// 	})
 					// }
-				} else {
+				} else if (this.cardType == 'back') {
+					if (!words) {
+						showConfirm('请上传正确的身份证国徽面')
+						return
+					}
 					if (words.image_status == "other_type_card") {
 						showConfirm('请上传正确的身份证国徽面')
 						return
@@ -535,11 +557,14 @@
 					// words.words_result['失效日期'].words
 					// words.words_result['签发日期'].words
 					// words.words_result['签发机关'].words
-					this.baseFormData.sfzqfjg = words.words_result['签发机关'].words
-					this.baseFormData.sfzyxqxs = words.words_result['签发日期'].words
-					this.baseFormData.sfzyxqxz = words.words_result['失效日期'].words
-					this.backBase64 = words.card_image
-					this.zjcaijianSrcFan = 'data:image/jpeg;base64,' + words.card_image
+					if (words && words.words_result) {
+						this.baseFormData.sfzqfjg = words.words_result['签发机关'].words
+						this.baseFormData.sfzyxqxs = words.words_result['签发日期'].words
+						this.baseFormData.sfzyxqxz = words.words_result['失效日期'].words
+						this.backBase64 = words.card_image
+						this.zjcaijianSrcFan = 'data:image/jpeg;base64,' + words.card_image
+					}
+
 				}
 			},
 			toggle(type) {
@@ -604,6 +629,10 @@
 			},
 
 			preSave() {
+				if (this.baseFormData.lzzt != 0 && this.baseFormData.lzzt != 3 && this.baseFormData.lzzt != 6) {
+					showConfirm('信息正在审核，请审核后重试')
+					return
+				}
 				if (!this.ocrXm) {
 					showConfirm('请先拍摄身份证人像面')
 					return
@@ -647,16 +676,25 @@
 					if (this.backBase64) paramFiles.push('data:image/jpeg;base64,' + this.backBase64)
 					paramFiles.push(this.src)
 					if (this.baseFormData.istk == 1 && this.tkzmList.length == 1 && this.tkzmList[0].indexOf(
-							'data:image') > 0) {
+							'data:image') > -1) {
 						paramFiles.push(this.tkzmList[0])
+						// 特殊材料待审核
+						this.baseFormData.lzzt = 5
+						this.baseFormData.lrSpyj = '同意'
 					}
 					if (this.baseFormData.isdb == 1 && this.dbzmList.length == 1 && this.dbzmList[0].indexOf(
-							'data:image') > 0) {
+							'data:image') > -1) {
 						paramFiles.push(this.dbzmList[0])
+						// 特殊材料待审核
+						this.baseFormData.lzzt = 5
+						this.baseFormData.lrSpyj = '同意'
 					}
 					if (this.baseFormData.iszc == 1 && this.zczmList.length == 1 && this.zczmList[0].indexOf(
-							'data:image') > 0) {
+							'data:image') > -1) {
 						paramFiles.push(this.zczmList[0])
+						// 特殊材料待审核
+						this.baseFormData.lzzt = 5
+						this.baseFormData.lrSpyj = '同意'
 					}
 
 					UploadSome({
@@ -730,71 +768,36 @@
 				}
 
 
-			},
-			setSrc(e, blobUrl) {
-				uni.getFileInfo({
-					filePath: blobUrl,
-					success: (res) => {
-						let size = res.size
-						let scale = 1
-						if (size / 1024 / 1024 > 0.12) {
-							scale = 0.6
-							translate(this.src, scale, 'blob', this.setSrc)
-						} else {
-							idcard(e, this.token, this.cardType, this.callbackIdcard)
-						}
-					},
-					fail: (err) => {
-						console.log("err:", err);
-					}
-				})
-			},
-			setFaceSrc(e, blobUrl) {
-				// this.src = blobUrl
-				this.src = e
-				uni.getFileInfo({
-					filePath: blobUrl,
-					success: (res) => {
-						let size = res.size
-						let scale = 1
-						if (size / 1024 / 1024 > 0.1) {
-							scale = 0.6
-							translate(blobUrl, scale, 'blob', this.setFaceSrc)
-						} else {
-							// idcard(e, this.token, this.cardType, this.callbackIdcard)
-							match(this.token, e.split(",")[1], this.idcardFace, this.callbackFace)
-						}
-					},
-					fail: (err) => {
-						console.log("err:", err);
-					}
-				})
-			},
+			}
 		}
 	}
 </script>
 
-<style>
+<style scoped>
+	.content {
+		padding: 1vh;
+	}
+
+
 	.lzcOCR {
 		display: flex;
 		justify-content: space-between;
 		margin-top: 5vh;
 
-		.box {
-			width: 47%;
-			text-align: center;
+	}
 
-			image {
-				width: 100%;
-			}
+	.imgBox {
+		width: 47%;
+		text-align: center;
 
-			.text {
-				width: 100%;
-				/* background-color: red; */
-			}
+		image {
+			width: 100%;
 		}
 
-
+		.text {
+			width: 100%;
+			/* background-color: red; */
+		}
 	}
 
 	.miaoshu {

pages/login/index.vue

@@ -91,11 +91,13 @@
 				height: '42vh',
 				inputHeight: '5vh',
 				formData: {
-					// username: '220722199507280418',
-					// password: 'sckj@2022',
+					// username: 'lrry220103000000',
+					// password: 'sckj12356',
+					username: '',
+					password: '',
 					// code: "081X2kll21UGPc4HRlml27WxeO3X2kl6",
-					username: '15143018065',
-					password: 'sckj12356',
+					// username: '15143018065',
+					// password: 'sckj12356',
 					openid: "",
 				},
 				rules: {

static/html/card.html

@@ -19,9 +19,9 @@
 
 			<div class="buttonBox">
 				<!-- 拍照按钮 -->
-				<img id="back" src="../images/back.png" />
-				<img id="capture" src="../images/pai.png" />
-				<img id="fanzhuan" style="visibility: hidden" src="../images/fan.png" />
+				<img class="buttonImg" id="back" src="../images/back.png" />
+				<img class="buttonImg" id="capture" src="../images/pai.png" />
+				<img class="buttonImg" id="fanzhuan" style="visibility: hidden" src="../images/fan.png" />
 			</div>
 		</div>
 
@@ -54,8 +54,8 @@
 			var mediaStreamTrack;
 			// 85.6   54
 
-			v_t_w = v_t_w * 90 / 100
-			v_t_h = 54 / 85.6 * v_t_w
+			// v_t_w = v_t_w * 90 / 100
+			// v_t_h = 54 / 85.6 * v_t_w
 
 			canvas.width = v_t_w;
 			canvas.height = v_t_h;
@@ -180,8 +180,8 @@
 					// 调用用户媒体设备，访问摄像头
 					getUserMedia({
 						video: {
-							width: v_t_w,
-							height: v_t_h,
+							width: 200,
+							height: 400,
 							facingMode: mode //设置使用后置摄像头，user为前置摄像头
 						},
 					}, successFun, errorFun);
@@ -212,7 +212,7 @@
 			flex-direction: column;
 			text-align: center;
 			height: 98vh;
-
+			width: 100%;
 
 
 		}
@@ -231,12 +231,13 @@
 		.buttonBox {
 			display: flex;
 			justify-content: space-around;
-			margin-top: 39vh;
+			margin-top: 35vh;
 
 
-			img {
-				height: 40px;
-				width: 40px;
+			.buttonImg {
+		
+				width: 15vw;
+				object-fit: contain;
 			}
 		}
 

static/html/face.html

@@ -15,7 +15,7 @@
 		<!-- <canvas id="canvas" width="500" height="400" style="transform: rotateY(180deg);"></canvas> -->
 		<div class="box">
 			<span class="text">请正对摄像头</span>
-			<canvas id="canvas"></canvas>
+			<canvas class="canvas" id="canvas"></canvas>
 		</div>
 
 		<div class="wenziBox">
@@ -26,16 +26,16 @@
 			</div>
 			<div class="imgBox">
 				<div class="item">
-					<img src="../images/face.png" alt="" />
-					<span>正脸</span>
+					<img class="buttonImg" src="../images/face.png" alt="" />
+					<span class="span">正脸</span>
 				</div>
 				<div class="item">
-					<img src="../images/deng.png" alt="" />
-					<span>光线</span>
+					<img class="buttonImg" src="../images/deng.png" alt="" />
+					<span class="span">光线</span>
 				</div>
 				<div class="item">
-					<img src="../images/qingxi.png" alt="" />
-					<span>清晰</span>
+					<img class="buttonImg" src="../images/qingxi.png" alt="" />
+					<span class="span">清晰</span>
 				</div>
 			</div>
 		</div>
@@ -44,9 +44,9 @@
 		<div class="buttonBox">
 
 			<!-- 拍照按钮 -->
-			<img id="back" src="../images/back.png" />
-			<img id="capture" src="../images/pai.png" />
-			<img id="fanzhuan" src="../images/fan.png" />
+			<img class="buttonImg" id="back" src="../images/back.png" />
+			<img class="buttonImg" id="capture" src="../images/pai.png" />
+			<img class="buttonImg" id="fanzhuan" src="../images/fan.png" />
 
 		</div>
 
@@ -150,8 +150,19 @@
 				video.play();
 				// 可以通过画布canvas渲染，获取使用默认的video也行
 				setInterval(function() {
+					// canvas.width = v_t_w;
+					// canvas.height = v_t_h;
+					// context.drawImage(video, 0, 0, v_t_w, v_t_h);
+					
+					
 					canvas.width = v_t_w;
 					canvas.height = v_t_h;
+					// context.strokeRect(60, 60, 100, 100);
+					context.beginPath();
+					context.arc(v_t_w / 2, v_t_w / 2, v_t_w / 2, 0, Math.PI * 2, true); // 绘制
+					context.closePath(); // 结束路径绘制
+					
+					context.clip(); // 根据路径切割画布内容
 					context.drawImage(video, 0, 0, v_t_w, v_t_h);
 
 					// context.beginPath();
@@ -227,20 +238,21 @@
 			}
 		</script>
 	</body>
-	<style>
+	<style scoped>
 		video {
 			transform: rotateY(180deg);
 			display: none;
 		}
 
 		.box {
-			margin: 13vh auto;
+			margin: 12vh auto;
 			display: flex;
 			flex-direction: column;
 			text-align: center;
 
-			canvas {
-				margin-top: 8vh;
+
+			.canvas {
+				margin-top: 6vh;
 				border-radius: 50%;
 			}
 
@@ -257,7 +269,7 @@
 				flex-direction: row;
 				justify-content: space-around;
 
-				p {
+				.line {
 					border-bottom: 1px solid black;
 					width: 20vw;
 				}
@@ -273,14 +285,7 @@
 					display: flex;
 					flex-direction: column;
 
-					img {
-						width: 50px;
-						height: 50px;
-						/* margin-left: 1vw; */
-						margin-bottom: 1vh;
-					}
-
-					span {
+					.span {
 						text-align: center;
 					}
 				}
@@ -294,12 +299,12 @@
 			display: flex;
 			justify-content: space-around;
 			margin-top: 10vh;
+		}
 
-
-			img {
-				height: 40px;
-				width: 40px;
-			}
+		.buttonImg {
+			width: 15vw;
+			object-fit: contain;
+			margin-bottom: 1vh;
 		}
 
 		.noneImg {
@@ -340,7 +345,7 @@
 		#popupImg {
 			margin-left: 25vw;
 		}
-		
+
 
 		.popupBox {
 			margin-top: 2vh;