heyang 10 months ago
parent
commit
48099b042d
4 changed files with 349 additions and 248 deletions
  1. 1 1
      pages.json
  2. 172 121
      pages/views/pupilPage/pupilMine.vue
  3. 170 120
      pages/views/teacherPage/teacherMine.vue
  4. 6 6
      pages_basics/api/index.js

+ 1 - 1
pages.json

@@ -48,7 +48,7 @@
 				"navigationBarBackgroundColor": "#0183FA" //导航背景色
 			}
 		},
-		
+
 		{
 			"path": "pages/views/information/informationInfo",//消息
 			"style": {

+ 172 - 121
pages/views/pupilPage/pupilMine.vue

@@ -64,7 +64,7 @@
 			<view class="button-big-box" @click="goPage('electronicSignaturePupil')">
 				<img class="left-img" src="@/pages/images/newImage/icon_wd_dzqm@1x.png">
 				<view class="left-text-p">电子签名</view>
-				<view class="right-text-p"></view>
+				<view class="right-text-p" :class="isUpload?'color-D':''">{{!isUpload?'未上传':'已上传'}}</view>
 				<img class="right-img" src="@/pages/images/newImage/icon_wd_gd@1x.png">
 			</view>
 		</view>
@@ -83,6 +83,9 @@
 		studentinfoFacemy,
 		examPointsRecordGetMyPointsLogInfo,
 	} from '@/pages/api/index.js'
+	import {
+		querySignature,
+	} from '@/pages_basics/api/index.js'
 	import {
 		pageRestrictVerify
 	} from '@/utils/index'
@@ -97,11 +100,13 @@
 		data() {
 			return {
 				baseUrl: config.base_url,
-				userData:{},
-				bonusPoints:null,
-				creditScore:null,
-				ifFaceFeature:false,
-				isUpload:false,
+				userData: {},
+				bonusPoints: null,
+				creditScore: null,
+				ifFaceFeature: false,
+				isUpload: false,
+				signatureUrl: '',
+
 			}
 		},
 		created() {
@@ -110,22 +115,34 @@
 		mounted() {
 			this.systemUserProfile();
 			this.studentinfoFacemy();
+			this.querySignature();
 			this.examPointsRecordGetMyPointsLogInfo();
 		},
 		methods: {
-			scanCode(){
+			//查询用户电子签名
+			async querySignature() {
+				let self = this;
+				const {
+					data
+				} = await querySignature();
+				if (data.code == 200) {
+					self.isUpload = data.data.isUpload;
+					self.signatureUrl = data.data.signature;
+				}
+			},
+			scanCode() {
 				uni.scanCode({
 					onlyFromCamera: true,
 					success: function(res) {
-						if(res.result.indexOf('mid') != -1 &&
-							 res.result.indexOf('sid') != -1 &&
-							 res.result.indexOf('pid') != -1 &&
-							 res.result.indexOf('pri') != -1 ){
+						if (res.result.indexOf('mid') != -1 &&
+							res.result.indexOf('sid') != -1 &&
+							res.result.indexOf('pid') != -1 &&
+							res.result.indexOf('pri') != -1) {
 							uni.navigateTo({
 								url: '/pages_student/views/integralManage/codeSuccess?q=' +
 									encodeURIComponent(JSON.stringify(res.result))
 							});
-						}else{
+						} else {
 							uni.showToast({
 								title: '请扫描正确的二维码',
 								icon: "none",
@@ -137,7 +154,7 @@
 				});
 			},
 			goPage(type) {
-				if(!type){
+				if (!type) {
 					uni.showToast({
 						title: '暂未开放',
 						icon: "none",
@@ -160,7 +177,7 @@
 					uni.navigateTo({
 						url: "/pages_student/views/myRecord/index",
 					});
-				}else if (type == 'identityAuthenticationPupil') {
+				} else if (type == 'identityAuthenticationPupil') {
 					//身份验证
 					uni.navigateTo({
 						url: "/pages_basics/views/faceImage",
@@ -168,7 +185,7 @@
 				} else if (type == 'electronicSignaturePupil') {
 					//电子签名
 					uni.navigateTo({
-						url: "/pages_basics/views/signature/signature",
+						url: "/pages_basics/views/signature/signature?item="+this.signatureUrl,//电子签名
 					});
 				}
 			},
@@ -193,12 +210,14 @@
 				}
 			},
 			//获取当前身份人脸验证状态与学生卡上传状态
-			async studentinfoFacemy(){
+			async studentinfoFacemy() {
 				let obj = {
-					studentsId:uni.getStorageSync('userId')
+					studentsId: uni.getStorageSync('userId')
 				}
-				const {data} = await studentinfoFacemy(obj)
-				if(data.code == 200){
+				const {
+					data
+				} = await studentinfoFacemy(obj)
+				if (data.code == 200) {
 					this.certification = data.data;
 					this.ifFaceFeature = data.data.ifFaceFeature;
 				}
@@ -266,7 +285,8 @@
 						let res = JSON.parse(uploadFileRes.data);
 						if (res.code == 200) {
 							uni.navigateTo({
-								url: '/pages_basics/views/avatar?src=' + config.base_url + res.data.url,
+								url: '/pages_basics/views/avatar?src=' + config.base_url + res.data
+									.url,
 							});
 
 
@@ -296,157 +316,188 @@
 		display: flex;
 		flex-direction: column;
 		overflow: hidden;
-		.back-img-box{
-			z-index:0;
+
+		.back-img-box {
+			z-index: 0;
 			position: absolute;
-			top:0;
+			top: 0;
 			left: 0;
-			width:750rpx;
-			height:291rpx;
-		  background: linear-gradient(180deg, rgba(1,131,250,1) 0%, rgba(255,255,255,0) 100%);
+			width: 750rpx;
+			height: 291rpx;
+			background: linear-gradient(180deg, rgba(1, 131, 250, 1) 0%, rgba(255, 255, 255, 0) 100%);
 		}
-		.user-info-box{
-			z-index:10;
-			margin:39rpx 24rpx 0;
+
+		.user-info-box {
+			z-index: 10;
+			margin: 39rpx 24rpx 0;
 			display: flex;
-			.left-img-box{
-				width:132rpx;
-				height:132rpx;
+
+			.left-img-box {
+				width: 132rpx;
+				height: 132rpx;
 				position: relative;
-				margin-right:22rpx;
-				.avatar-img{
+				margin-right: 22rpx;
+
+				.avatar-img {
 					position: absolute;
-					top:6rpx;
-					left:6rpx;
-					width:116rpx;
-					height:116rpx;
-					border-radius:50%;
-					border:2rpx solid #fff;
+					top: 6rpx;
+					left: 6rpx;
+					width: 116rpx;
+					height: 116rpx;
+					border-radius: 50%;
+					border: 2rpx solid #fff;
 				}
-				.edit-img{
-					z-index:5;
+
+				.edit-img {
+					z-index: 5;
 					position: absolute;
-					right:0;
-					bottom:6rpx;
-					width:40rpx;
-					height:40rpx;
+					right: 0;
+					bottom: 6rpx;
+					width: 40rpx;
+					height: 40rpx;
 				}
 			}
-			.right-name-box{
-				padding-top:6rpx;
-				.right-name-top-box{
+
+			.right-name-box {
+				padding-top: 6rpx;
+
+				.right-name-top-box {
 					display: flex;
-					view:nth-child(1){
-						height:68rpx;
-						line-height:62rpx;
-						font-size:32rpx;
-						color:#fff;
+
+					view:nth-child(1) {
+						height: 68rpx;
+						line-height: 62rpx;
+						font-size: 32rpx;
+						color: #fff;
 					}
-					view:nth-child(2){
-						margin-top:14rpx;
-						margin-left:30rpx;
+
+					view:nth-child(2) {
+						margin-top: 14rpx;
+						margin-left: 30rpx;
 						width: 120rpx;
-						height:40rpx;
-						line-height:40rpx;
+						height: 40rpx;
+						line-height: 40rpx;
 						background: #FF8C00;
 						border-radius: 50rpx;
-						font-size:24rpx;
-						color:#fff;
+						font-size: 24rpx;
+						color: #fff;
 						text-align: center;
 					}
 				}
-				.right-name-bottom-box{
-						height:50rpx;
-						line-height:50rpx;
-						font-size:28rpx;
-						color:#fff;
+
+				.right-name-bottom-box {
+					height: 50rpx;
+					line-height: 50rpx;
+					font-size: 28rpx;
+					color: #fff;
 				}
 			}
 		}
-		.points-max-box{
-			z-index:10;
+
+		.points-max-box {
+			z-index: 10;
 			width: 690rpx;
 			height: 160rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx;
-			margin:38rpx 30rpx 0;
+			margin: 38rpx 30rpx 0;
 			display: flex;
-			.points-big-box{
-				flex:1;
-				.num-p{
-					margin:39rpx 0 19rpx 0;
+
+			.points-big-box {
+				flex: 1;
+
+				.num-p {
+					margin: 39rpx 0 19rpx 0;
 					text-align: center;
-					font-size:28rpx;
-					line-height:39rpx;
+					font-size: 28rpx;
+					line-height: 39rpx;
 				}
-				.img-box{
+
+				.img-box {
 					display: flex;
-					img{
-						width:30rpx;
-						height:30rpx;
+
+					img {
+						width: 30rpx;
+						height: 30rpx;
 						display: block;
-						margin:0 20rpx 0 42rpx;
+						margin: 0 20rpx 0 42rpx;
 					}
-					view{
-						color:#333333;
-						line-height:30rpx;
-						font-size:28rpx;
+
+					view {
+						color: #333333;
+						line-height: 30rpx;
+						font-size: 28rpx;
 					}
 				}
-				.colorA{
-					color:#0183FA;
+
+				.colorA {
+					color: #0183FA;
 				}
-				.colorB{
-					color:#26C736;
+
+				.colorB {
+					color: #26C736;
 				}
-				.colorC{
-					color:#333333;
+
+				.colorC {
+					color: #333333;
 				}
 			}
-			.border-null-p{
-				width:1rpx;
-				height:40rpx;
-				margin:60rpx 0 0;
+
+			.border-null-p {
+				width: 1rpx;
+				height: 40rpx;
+				margin: 60rpx 0 0;
 				background-color: #e0e0e0;
 			}
 		}
-		.button-max-big-box{
+
+		.button-max-big-box {
 			background-color: #fff;
-			border-radius:20rpx;
-			margin:20rpx 30rpx 0;
-			.button-big-box:nth-child(1){
-				border-top:none;
+			border-radius: 20rpx;
+			margin: 20rpx 30rpx 0;
+
+			.button-big-box:nth-child(1) {
+				border-top: none;
 			}
-			.button-big-box{
-				border-top:1px solid #E0E0E0;
+
+			.button-big-box {
+				border-top: 1px solid #E0E0E0;
 				display: flex;
-				padding:0 30rpx 0 26rpx;
-				.left-img{
+				padding: 0 30rpx 0 26rpx;
+
+				.left-img {
 					display: block;
-					width:36rpx;
-					height:36rpx;
-					margin-top:25rpx;
-					margin-right:21rpx;
+					width: 36rpx;
+					height: 36rpx;
+					margin-top: 25rpx;
+					margin-right: 21rpx;
 				}
-				.left-text-p{
-					flex:1;
-					front-size:30rpx;
-					line-height:40rpx;
-					margin:20rpx 0;
+
+				.left-text-p {
+					flex: 1;
+					front-size: 30rpx;
+					line-height: 40rpx;
+					margin: 20rpx 0;
 				}
-				.right-text-p{
-					front-size:30rpx;
-					line-height:40rpx;
-					margin:20rpx 0;
+
+				.right-text-p {
+					front-size: 30rpx;
+					line-height: 40rpx;
+					margin: 20rpx 0;
 				}
-				.right-img{
+
+				.right-img {
 					display: block;
-					width:30rpx;
-					height:30rpx;
-					margin-top:28rpx;
+					width: 30rpx;
+					height: 30rpx;
+					margin-top: 28rpx;
 				}
 			}
+			.color-D{
+				color:#0183FA!important;
+			}
 		}
+
 		.out-button {
 			position absolute;
 			bottom: 140rpx;
@@ -462,4 +513,4 @@
 			margin: 0 auto;
 		}
 	}
-</style>
+</style>

+ 170 - 120
pages/views/teacherPage/teacherMine.vue

@@ -75,7 +75,7 @@
 			<view class="button-big-box" @click="goPage('electronicSignature')">
 				<img class="left-img" src="@/pages/images/newImage/icon_wd_dzqm@1x.png">
 				<view class="left-text-p">电子签名</view>
-				<view class="right-text-p"></view>
+				<view class="right-text-p" :class="isUpload?'color-D':''" >{{!isUpload?'未上传':'已上传'}}</view>
 				<img class="right-img" src="@/pages/images/newImage/icon_wd_gd@1x.png">
 			</view>
 		</view>
@@ -94,6 +94,9 @@
 		studentinfoFacemy,
 		examPointsRecordGetMyPointsLogInfo,
 	} from '@/pages/api/index.js'
+	import {
+		querySignature,
+	} from '@/pages_basics/api/index.js'
 	import {
 		pageRestrictVerify
 	} from '@/utils/index'
@@ -107,11 +110,12 @@
 		},
 		data() {
 			return {
-				userData:{},
-				bonusPoints:null,
-				creditScore:null,
-				ifFaceFeature:false,
-				isUpload:false,
+				userData: {},
+				bonusPoints: null,
+				creditScore: null,
+				ifFaceFeature: false,
+				isUpload: false,
+				signatureUrl: '',
 			}
 		},
 		created() {
@@ -120,22 +124,34 @@
 		mounted() {
 			this.systemUserProfile();
 			this.studentinfoFacemy();
+			this.querySignature();
 			this.examPointsRecordGetMyPointsLogInfo();
 		},
 		methods: {
-			scanCode(){
+			//查询用户电子签名
+			async querySignature() {
+				let self = this;
+				const {
+					data
+				} = await querySignature();
+				if (data.code == 200) {
+					self.isUpload = data.data.isUpload;
+					self.signatureUrl = data.data.signature;
+				}
+			},
+			scanCode() {
 				uni.scanCode({
 					onlyFromCamera: true,
 					success: function(res) {
-						if(res.result.indexOf('mid') != -1 &&
-							 res.result.indexOf('sid') != -1 &&
-							 res.result.indexOf('pid') != -1 &&
-							 res.result.indexOf('pri') != -1 ){
+						if (res.result.indexOf('mid') != -1 &&
+							res.result.indexOf('sid') != -1 &&
+							res.result.indexOf('pid') != -1 &&
+							res.result.indexOf('pri') != -1) {
 							uni.navigateTo({
 								url: '/pages_student/views/integralManage/codeSuccess?q=' +
 									encodeURIComponent(JSON.stringify(res.result))
 							});
-						}else{
+						} else {
 							uni.showToast({
 								title: '请扫描正确的二维码',
 								icon: "none",
@@ -147,7 +163,7 @@
 				});
 			},
 			goPage(type) {
-				if(!type){
+				if (!type) {
 					uni.showToast({
 						title: '暂未开放',
 						icon: "none",
@@ -188,7 +204,7 @@
 				} else if (type == 'electronicSignature') {
 					//电子签名
 					uni.navigateTo({
-						url: "/pages_basics/views/signature/signature",
+						url: "/pages_basics/views/signature/signature?item="+this.signatureUrl,//电子签名
 					});
 				}
 			},
@@ -213,12 +229,14 @@
 				}
 			},
 			//获取当前身份人脸验证状态与学生卡上传状态
-			async studentinfoFacemy(){
+			async studentinfoFacemy() {
 				let obj = {
-					studentsId:uni.getStorageSync('userId')
+					studentsId: uni.getStorageSync('userId')
 				}
-				const {data} = await studentinfoFacemy(obj)
-				if(data.code == 200){
+				const {
+					data
+				} = await studentinfoFacemy(obj)
+				if (data.code == 200) {
 					this.certification = data.data;
 					this.ifFaceFeature = data.data.ifFaceFeature;
 				}
@@ -286,7 +304,8 @@
 						let res = JSON.parse(uploadFileRes.data);
 						if (res.code == 200) {
 							uni.navigateTo({
-								url: '/pages_basics/views/avatar?src=' + config.base_url + res.data.url,
+								url: '/pages_basics/views/avatar?src=' + config.base_url + res.data
+									.url,
 							});
 
 
@@ -316,157 +335,188 @@
 		display: flex;
 		flex-direction: column;
 		overflow: hidden;
-		.back-img-box{
-			z-index:0;
+
+		.back-img-box {
+			z-index: 0;
 			position: absolute;
-			top:0;
+			top: 0;
 			left: 0;
-			width:750rpx;
-			height:291rpx;
-      background: linear-gradient(180deg, rgba(1,131,250,1) 0%, rgba(255,255,255,0) 100%);
+			width: 750rpx;
+			height: 291rpx;
+			background: linear-gradient(180deg, rgba(1, 131, 250, 1) 0%, rgba(255, 255, 255, 0) 100%);
 		}
-		.user-info-box{
-			z-index:10;
-			margin:39rpx 24rpx 0;
+
+		.user-info-box {
+			z-index: 10;
+			margin: 39rpx 24rpx 0;
 			display: flex;
-			.left-img-box{
-				width:132rpx;
-				height:132rpx;
+
+			.left-img-box {
+				width: 132rpx;
+				height: 132rpx;
 				position: relative;
-				margin-right:22rpx;
-				.avatar-img{
+				margin-right: 22rpx;
+
+				.avatar-img {
 					position: absolute;
-					top:6rpx;
-					left:6rpx;
-					width:116rpx;
-					height:116rpx;
-					border-radius:50%;
-					border:2rpx solid #fff;
+					top: 6rpx;
+					left: 6rpx;
+					width: 116rpx;
+					height: 116rpx;
+					border-radius: 50%;
+					border: 2rpx solid #fff;
 				}
-				.edit-img{
-					z-index:5;
+
+				.edit-img {
+					z-index: 5;
 					position: absolute;
-					right:0;
-					bottom:6rpx;
-					width:40rpx;
-					height:40rpx;
+					right: 0;
+					bottom: 6rpx;
+					width: 40rpx;
+					height: 40rpx;
 				}
 			}
-			.right-name-box{
-				padding-top:6rpx;
-				.right-name-top-box{
+
+			.right-name-box {
+				padding-top: 6rpx;
+
+				.right-name-top-box {
 					display: flex;
-					view:nth-child(1){
-						height:68rpx;
-						line-height:62rpx;
-						font-size:32rpx;
-						color:#fff;
+
+					view:nth-child(1) {
+						height: 68rpx;
+						line-height: 62rpx;
+						font-size: 32rpx;
+						color: #fff;
 					}
-					view:nth-child(2){
-						margin-top:14rpx;
-						margin-left:30rpx;
+
+					view:nth-child(2) {
+						margin-top: 14rpx;
+						margin-left: 30rpx;
 						width: 120rpx;
-						height:40rpx;
-						line-height:40rpx;
+						height: 40rpx;
+						line-height: 40rpx;
 						background: #FF8C00;
 						border-radius: 50rpx;
-						font-size:24rpx;
-						color:#fff;
+						font-size: 24rpx;
+						color: #fff;
 						text-align: center;
 					}
 				}
-				.right-name-bottom-box{
-						height:50rpx;
-						line-height:50rpx;
-						font-size:28rpx;
-						color:#fff;
+
+				.right-name-bottom-box {
+					height: 50rpx;
+					line-height: 50rpx;
+					font-size: 28rpx;
+					color: #fff;
 				}
 			}
 		}
-		.points-max-box{
-			z-index:10;
+
+		.points-max-box {
+			z-index: 10;
 			width: 690rpx;
 			height: 160rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx;
-			margin:38rpx 30rpx 0;
+			margin: 38rpx 30rpx 0;
 			display: flex;
-			.points-big-box{
-				flex:1;
-				.num-p{
-					margin:39rpx 0 19rpx 0;
+
+			.points-big-box {
+				flex: 1;
+
+				.num-p {
+					margin: 39rpx 0 19rpx 0;
 					text-align: center;
-					font-size:28rpx;
-					line-height:39rpx;
+					font-size: 28rpx;
+					line-height: 39rpx;
 				}
-				.img-box{
+
+				.img-box {
 					display: flex;
-					img{
-						width:30rpx;
-						height:30rpx;
+
+					img {
+						width: 30rpx;
+						height: 30rpx;
 						display: block;
-						margin:0 20rpx 0 42rpx;
+						margin: 0 20rpx 0 42rpx;
 					}
-					view{
-						color:#333333;
-						line-height:30rpx;
-						font-size:28rpx;
+
+					view {
+						color: #333333;
+						line-height: 30rpx;
+						font-size: 28rpx;
 					}
 				}
-				.colorA{
-					color:#0183FA;
+
+				.colorA {
+					color: #0183FA;
 				}
-				.colorB{
-					color:#26C736;
+
+				.colorB {
+					color: #26C736;
 				}
-				.colorC{
-					color:#333333;
+
+				.colorC {
+					color: #333333;
 				}
 			}
-			.border-null-p{
-				width:1rpx;
-				height:40rpx;
-				margin:60rpx 0 0;
+
+			.border-null-p {
+				width: 1rpx;
+				height: 40rpx;
+				margin: 60rpx 0 0;
 				background-color: #e0e0e0;
 			}
 		}
-		.button-max-big-box{
+
+		.button-max-big-box {
 			background-color: #fff;
-			border-radius:20rpx;
-			margin:20rpx 30rpx 0;
-			.button-big-box:nth-child(1){
-				border-top:none;
+			border-radius: 20rpx;
+			margin: 20rpx 30rpx 0;
+
+			.button-big-box:nth-child(1) {
+				border-top: none;
 			}
-			.button-big-box{
-				border-top:1px solid #E0E0E0;
+
+			.button-big-box {
+				border-top: 1px solid #E0E0E0;
 				display: flex;
-				padding:0 30rpx 0 26rpx;
-				.left-img{
+				padding: 0 30rpx 0 26rpx;
+
+				.left-img {
 					display: block;
-					width:36rpx;
-					height:36rpx;
-					margin-top:25rpx;
-					margin-right:21rpx;
+					width: 36rpx;
+					height: 36rpx;
+					margin-top: 25rpx;
+					margin-right: 21rpx;
 				}
-				.left-text-p{
-					flex:1;
-					front-size:30rpx;
-					line-height:40rpx;
-					margin:20rpx 0;
+
+				.left-text-p {
+					flex: 1;
+					front-size: 30rpx;
+					line-height: 40rpx;
+					margin: 20rpx 0;
 				}
-				.right-text-p{
-					front-size:30rpx;
-					line-height:40rpx;
-					margin:20rpx 0;
+
+				.right-text-p {
+					front-size: 30rpx;
+					line-height: 40rpx;
+					margin: 20rpx 0;
 				}
-				.right-img{
+
+				.right-img {
 					display: block;
-					width:30rpx;
-					height:30rpx;
-					margin-top:28rpx;
+					width: 30rpx;
+					height: 30rpx;
+					margin-top: 28rpx;
 				}
 			}
+			.color-D{
+				color:#0183FA!important;
+			}
 		}
+
 		.out-button {
 			position absolute;
 			bottom: 140rpx;
@@ -482,4 +532,4 @@
 			margin: 0 auto;
 		}
 	}
-</style>
+</style>

+ 6 - 6
pages_basics/api/index.js

@@ -83,12 +83,12 @@ export const laboratoryAppletAddPhotoInspect = (data) => {
 
 
 //查询用户电子签名
-export const querySignature  = (data) => {
-    return apiResquest({
-        url: `/system/user/querySignature`,
-        method: 'POST',
-        data: {...data}
-    })
+export const querySignature = (data) => {
+	return apiResquest({
+		  url: `/system/user/querySignature`,
+		method: 'get',
+		data: { ...data }
+	})
 };
 //小程序电子签名抠图生成图片
 export const querygenSign  = (data) => {