Browse Source

资料合并提交

chenxiong 3 years ago
parent
commit
33d26c7868

+ 10 - 0
common/httpList/base.js

@@ -47,6 +47,16 @@ export default {
 			data: data,
 			noToken: true
 		})
+	},
+	
+	baseProfileStampV2AddWord(data) {
+		return myRequest({
+			url: '/base/profileStamp/V2/addWord',
+			method: 'post',
+			data: data
+		})
 	}
 	
+	
+	
 }

+ 10 - 0
common/httpList/userInfo.js

@@ -60,5 +60,15 @@ export default {
 				data: data,
 			})
 		},
+		
+		userConfirminfo(data) {
+				return myRequest({
+					url: '/user/confirm/info',
+					method: 'post',
+					data: data,
+				})
+			},
+	
+	
 	
 }

+ 1 - 1
common/request.js

@@ -24,7 +24,7 @@ RVQplIVs5z3MxcUa9ptKPHUTgh8xMCBvl8sUJKwkmn4vYWeDfHT22EL7Hr1pTMwU
 hF6WiNlWfQTVoF1rhwIDAQAB
 -----END PUBLIC KEY-----`;
 
-export const version = '5.2.6' 
+export const version = '5.2.5' 
 export const tenantId = '867735392558919680' 
 export const myRequest = (options) => {
 	if (store.state.allowLoading && !options.noLoading) {

+ 29 - 18
pages2/learn/details.vue

@@ -114,26 +114,37 @@ export default {
 		//重学
 		getBtn() {
 			var self = this
-			uni.showModal({
-				title:"注意",
-				content:`如对审核结果有异议,请勿点击确认重学。致电020-87085982咨询`,
-				confirmText:"确认重学",
-				success:function(res){
-					if(res.confirm){
-						self.$api.courseperiodrebuild({
-							goodsId: self.goodsId,
-							gradeId: self.gradeId,
-							orderGoodsId:self.orderGoodsId
-						}).then(res => {
-							if(res.data.code === 200){
-								uni.redirectTo({
-									url: '/pages2/wd/course?gid='+self.gradeId+'&id=' + self.goodsId+'&orderGoodsId='+ self.orderGoodsId
-								})
-							}
-						})
-					}
+			self.$api.courseperiodrebuild({
+				goodsId: self.goodsId,
+				gradeId: self.gradeId,
+				orderGoodsId:self.orderGoodsId
+			}).then(res => {
+				if(res.data.code === 200){
+					uni.redirectTo({
+						url: '/pages2/wd/course?gid='+self.gradeId+'&id=' + self.goodsId+'&orderGoodsId='+ self.orderGoodsId
+					})
 				}
 			})
+			// uni.showModal({
+			// 	title:"注意",
+			// 	content:`如对审核结果有异议,请勿点击确认重学。致电020-87085982咨询`,
+			// 	confirmText:"确认重学",
+			// 	success:function(res){
+			// 		if(res.confirm){
+			// 			self.$api.courseperiodrebuild({
+			// 				goodsId: self.goodsId,
+			// 				gradeId: self.gradeId,
+			// 				orderGoodsId:self.orderGoodsId
+			// 			}).then(res => {
+			// 				if(res.data.code === 200){
+			// 					uni.redirectTo({
+			// 						url: '/pages2/wd/course?gid='+self.gradeId+'&id=' + self.goodsId+'&orderGoodsId='+ self.orderGoodsId
+			// 					})
+			// 				}
+			// 			})
+			// 		}
+			// 	}
+			// })
 		},
 		getTypeName(int) {
 			if (int === 0) {

+ 9 - 6
pages2/learn/my_learn.vue

@@ -38,12 +38,15 @@
 						</view>
 					</view>
 
-					<view class="tip" v-if="item.periodStatus === 1">
-						<view class="label">审核提示:</view>
-						<view>
-							机构已审核通过,需等待注册中心复审后即可获得继续教育学时。审核时间约15个工作日,届时请前往官网申请证书延期。
-							<view class="copySty" @tap="copyText">复制官网链接</view>
-						</view>
+					<view class="tip" v-if="item.periodStatus === 1 ">
+						<template v-if="(item.educationName == '继续教育' && item.businessName == '二级' && item.projectName == '建造师')">
+							
+							<view class="label">审核提示:</view>
+							<view>
+								机构已审核通过,需等待注册中心复审后即可获得继续教育学时。审核时间约15个工作日,届时请前往官网申请证书延期。
+								<view class="copySty" @tap="copyText">复制官网链接</view>
+							</view>
+						</template>
 					</view>
 					<view class="tip" v-else>
 						<view class="label">审核提示:</view>

+ 206 - 14
pages2/verify/input.vue

@@ -275,6 +275,27 @@
 								</view>
 							</u-form-item>
 						</view>
+						<u-form-item
+							v-if="item.inputType == 4"
+							:key="index"
+							:label="item.fieldName"
+							:required="item.required"
+							:label-width="auto"
+							:prop="item.required ? item.fieldKey : ''"
+							label-position="top"
+						>
+							<text style="color: #007AFF;position: absolute;top: 20rpx;left: 180rpx;text-decoration: underline;" @click="downDocx(item.url)">点击下载</text>
+							<view class="dis_stys"><text style="color: #999999;">下载承诺书进行填写并签名盖章后上传(≤2M)</text></view>
+							<image v-if="!form[item.fieldKey]" style="width: 169rpx; height: 169rpx;" @click="getChast" src="@/static/info_4.png"></image>
+							<view class="quzw" v-if="form[item.fieldKey]">
+								<view v-if="form[item.fieldKey].split('.').splice(-1)[0] == 'docx' || form[item.fieldKey].split('.').splice(-1)[0] == 'doc'" class="borsrs">
+									<image src="@/static/icon/jy_icon.png" style="width: 168rpx; height: 168rpx;"></image>
+									<text>{{ titleName }}</text>
+								</view>
+								<image v-else :src="form[item.fieldKey]" style="width: 100%; height: 100%;" mode="aspectFit" @click="seePhotos(form[item.fieldKey])"></image>
+								<u-icon name="close-circle-fill" color="red" size="44" class="optionsAbs" @click="clearWord"></u-icon>
+							</view>
+						</u-form-item>
 					</template>
 				</u-form>
 			</view>
@@ -301,6 +322,8 @@
 				</view>
 			</view>
 		</u-popup>
+		
+		<u-action-sheet :list="list" v-model="showTableDown" @click="clickIndex"></u-action-sheet>
 	</view>
 </template>
 
@@ -311,6 +334,15 @@ import Handwriting from '@/common/signature.js';
 export default {
 	data() {
 		return {
+			list: [
+				{
+					text: '上传图片'
+				},
+				// {
+				// 	text: '上传文件'
+				// }
+			],
+			showTableDown: false,
 			gradeId:0,
 			errorType: ['message'],
 			agreementModal:true,
@@ -339,13 +371,15 @@ export default {
 				recent_photos: '',
 				idcard_face_photo: '',
 				idcard_national_photo: '',
-				commitment_electr_signature: ''
+				commitment_electr_signature: '',
+				commitment_seal: ''
 			},
 			lineColor: 'black',
 			slideValue: 50,
 			handwriting: '',
 			goodsId: null,
 			listData: [], //页面数据
+			ast:[],
 			fileList1: [], //个人近照
 			fileList2: [], //人像
 			fileList3: [], //国徽
@@ -506,6 +540,13 @@ export default {
 						message: '请签写承诺书电子签',
 						trigger: ['change', 'blur']
 					}
+				],
+				commitment_seal: [
+					{
+						required: true,
+						message: '请上传承诺书盖章',
+						trigger: ['change', 'blur']
+					}
 				]
 			},
 			apply_post_disabled:false,
@@ -554,6 +595,103 @@ export default {
 		 },
 	},
 	methods: {
+		
+		clickIndex(inds){
+			if(inds === 0){
+				this.uploadImgs()
+			}
+			if(inds === 1){
+				this.uploadFieds()
+			}
+		},
+		getChast(){
+			this.showTableDown = true;
+		},
+		seePhotos(url) {
+			uni.previewImage({
+				urls: [url]
+			});
+		},
+		async downDocx(url) {
+			let self = this;
+			let data = JSON.parse(JSON.stringify(this.form));
+			var ast = this.listData.some(item => {
+				return item.fieldKey === 'commitment_electr_signature';
+			});
+			if (ast) {
+				await this.subCanvas();
+			}
+			if (data['commitment_electr_signature']) {
+				data.commitment_electr_signature = await this.$method.uploadFile(data.commitment_electr_signature, 0);
+			}
+				console.log(444)
+			let arsty = {};
+			for (let k in data) {
+				for (let j in self.copyData) {
+					if (k === j) {
+						if (self.copyData[j].value === data[k]) {
+							arsty[k] = {
+								fieldKey: k,
+								value: data[k],
+								fieldName: (function() {
+									for (let i = 0; i < self.listData.length; i++) {
+										if (self.listData[i].fieldKey == k) {
+											return self.listData[i].fieldName;
+										}
+									}
+								})(),
+								status: 0
+							};
+						} else {
+							arsty[k] = {
+								fieldKey: k,
+								value: data[k],
+								fieldName: (function() {
+									for (let i = 0; i < self.listData.length; i++) {
+										if (self.listData[i].fieldKey == k) {
+											return self.listData[i].fieldName;
+										}
+									}
+								})(),
+								status: 1
+							};
+						}
+					}
+				}
+			}
+			
+			
+			this.$api.baseProfileStampV2AddWord({ goodsId: this.goodsId,keyValue:JSON.stringify(arsty) }).then(res => {
+				uni.downloadFile({
+					url: this.$method.splitImgHost(res.data.msg),
+					success: result => {
+						if (result.statusCode === 200) {
+							const filePath = result.tempFilePath
+							console.log(this.$method.splitImgHost(res.data.msg));
+							this.$method.showToast('下载成功');
+							uni.saveImageToPhotosAlbum({
+								filePath: filePath,
+								success: function (errMsg) {
+								uni.showToast({
+								  mask: true,
+								  title: '保存成功'
+								  });
+								},
+								fail:(errMsg)=>{
+									uni.showToast({
+										mask: true,
+										title: '保存失败'
+										});
+									},
+									complete:(errMsg)=>{
+													
+									}
+								});     
+						}
+					}
+				});
+			});
+		},
 		getGoodsDetail() {
 			return new Promise(resolve => {
 				
@@ -571,6 +709,54 @@ export default {
 				})
 			})
 		},
+		uploadImgs(){
+			var self = this
+			uni.chooseImage({
+			    count: 1, //默认9
+			    sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
+			    success: function (res) {
+			        if (res.tempFiles[0].size > 2097152) {
+			        	self.$method.showToast('上传图片不得大于2M');
+			        	return;
+			        } else {
+			        	var type = res.tempFiles[0].path.split('.').splice(-1);
+			        	if (type[0] != 'jpg' && type[0] != 'png' && type[0] != 'jpeg') {
+			        		self.$method.showToast('请上传图片格式');
+			        		return;
+			        	}
+			        	self.$set(self.form, 'commitment_seal', res.tempFiles[0].path);
+			        	self.$nextTick(function() {
+			        		this.resultForm();
+			        	});
+			        }
+			    }
+			});
+		},
+		uploadFieds() {
+			var self = this;
+			wx.chooseMessageFile({
+				count: 1,
+				size: 2097152,
+				type: 'file',
+				success(res) {
+					if (res.tempFiles[0].size > 2097152) {
+						self.$method.showToast('上传文件不得大于2M');
+						return;
+					} else {
+						var type = res.tempFiles[0].path.split('.').splice(-1);
+						if (type[0] != 'jpg' && type[0] != 'png' && type[0] != 'jpeg' && type[0] != 'docx' && type[0] != 'doc') {
+							self.$method.showToast('请上传word文档或图片');
+							return;
+						}
+						self.titleName = res.tempFiles[0].name;
+						self.$set(self.form, 'commitment_seal', res.tempFiles[0].path);
+						self.$nextTick(function() {
+							this.resultForm();
+						});
+					}
+				}
+			});
+		},
 		agree() {
 			this.agreementModal = false;
 			setTimeout(() => {
@@ -618,17 +804,17 @@ export default {
 						this.veryIdCard = resData.data.data.IdNum
 						this.veryIdName = resData.data.data.IdName
 						
-						if(this.form.idcard) {
-							if(this.form.idcard != this.veryIdCard) {
-								uni.showModal({
-									title:'提示',
-									content:'输入的身份证号和身份证人像面照片身份证号不匹配',
-									showCancel:false,
-								})
-								this.isUploading = false;
-								return;
-							}
-						}
+						// if(this.form.idcard) {
+						// 	if(this.form.idcard != this.veryIdCard) {
+						// 		uni.showModal({
+						// 			title:'提示',
+						// 			content:'输入的身份证号和身份证人像面照片身份证号不匹配',
+						// 			showCancel:false,
+						// 		})
+						// 		this.isUploading = false;
+						// 		return;
+						// 	}
+						// }
 						
 						uni.downloadFile({
 							url: this.$method.splitImgHost(this.form.recent_photos),
@@ -904,6 +1090,9 @@ export default {
 			if (data['commitment_electr_signature']) {
 				data.commitment_electr_signature = await this.$method.uploadFile(data.commitment_electr_signature, 0);
 			}
+			if (data['commitment_seal']) {
+				data.commitment_seal = await this.$method.uploadFile(data.commitment_seal, 0);
+			}
 			
 			
 			this.uploadDatas(data);
@@ -1125,8 +1314,9 @@ export default {
 			var self = this;
 			this.$api.getbaseprofiletpId(this.goodsId).then(res => {
 				self.listData = JSON.parse(res.data.data.keyValue);
-				
-				
+				var ast = JSON.parse(res.data.data.keyValue2);
+				self.listData = [...self.listData,...ast]
+				console.log(self.listData,'listData')
 				self.listData.forEach(item => {
 					if(item.fieldKey == "idcard") {
 						this.form.idcard = this.userInfo.idCard;
@@ -1201,7 +1391,9 @@ export default {
 							self.remark = result.data.data.text;
 							self.remarkStatus = true;
 							self.id = result.data.data.id;
+							console.log(result.data.data,'result.data.data')
 							var arrays = JSON.parse(result.data.data.keyValue);
+							// var arrays1 = JSON.parse(result.data.data.keyValue2);
 							self.copyData = JSON.parse(JSON.stringify(arrays));
 							for (let k in arrays) {
 								if (k === 'sex') {

+ 141 - 11
pages2/wd/class.vue

@@ -284,6 +284,33 @@
 			</view>
 
 		</u-modal>
+		
+		<u-modal v-model="showUserConfirmInfo" @confirm="confirmUserConfirm"  ref="uModal" :async-close="true" @cancel="cancelUserConfirm" :confirm-text="'确认' + (confirmCount > 0 ? '('+confirmCount+')' : '')" :confirm-color="confirmCount > 0 ? '#999' : '#2979ff'" class="confirm-modal" title="实名验证确认" cancel="取消" :show-cancel-button="true">
+			<view class="slot-content">
+				<view class="content">
+					为避免个人信息不正确导致您的学习时长无效,请认真核对以下信息是否正确,如信息有误请取消当前操作,立刻联系020-38946666
+					
+					<view class="msg-list">
+						<view class="item">
+							<text class="item__left">姓名:</text>
+							<text class="item__right">{{userInfo.realname}}</text>
+						</view>
+						<view class="item">
+							<text class="item__left">手机号:</text>
+							<text class="item__right">{{userInfo.telphone}}</text>
+						</view>
+						<view class="item">
+							<text class="item__left">身份号:</text>
+							<text class="item__right">{{userInfo.idCard}}</text>
+						</view>
+						<view class="item">
+							<u-checkbox v-model="confirmChecked" :label-disabled="false">确认个人信息无误</u-checkbox>
+						</view>
+					</view>
+				</view>
+				
+			</view>
+		</u-modal>
 	</view>
 </template>
 
@@ -291,6 +318,11 @@
 	export default {
 		data() {
 			return {
+				activeItem:{},
+				confirmTimer:null,
+				confirmCount:10,
+				confirmChecked:false,
+				showUserConfirmInfo:false,
 				markContent: 'http://admin.zhujianpeixun.com/',
 				showMark: false,
 				list: [1, 2, 3],
@@ -366,6 +398,61 @@
 			radioGroupChange(e) {
 				console.log(e)
 			},
+			userConfirmInfoDetail(){
+				return new Promise(resolve => {
+					this.$api.userConfirmInfoDetail({
+						orderGoodsId:this.activeItem.orderGoodsId,
+					}).then(res => {
+						if(!res.data.data) {
+							clearInterval(this.confirmTimer);
+							this.confirmCount = 10;
+							this.showUserConfirmInfo = true;
+							 this.confirmTimer = setInterval(() => {
+								if(this.confirmCount > 0) {
+									this.confirmCount-- 
+								} else {
+									
+									clearInterval(this.confirmTimer);
+								}
+								
+							},1000)
+						} else {
+							resolve()
+						}
+					})
+				})
+			},
+			confirmUserConfirm() {
+				this.$refs.uModal.clearLoading();
+				if(this.confirmCount <= 0) {
+					if(this.confirmChecked) {
+						let infoJson = {
+							realname:this.userInfo.realname,
+							idCard:this.userInfo.idCard,
+							telphone:this.userInfo.telphone
+						}
+						this.$api.userConfirminfo({
+							orderGoodsId:this.activeItem.orderGoodsId,
+							infoJson:JSON.stringify(infoJson)
+						}).then(res => {
+							
+							this.showUserConfirmInfo = false;
+						})
+					} else {
+						uni.showToast({
+							icon:'none',
+							title:'请勾选确认个人信息无误'
+						})
+					}
+				} else {
+					return;
+				}
+			},
+			
+			
+			cancelUserConfirm() {
+				clearInterval(this.confirmTimer)
+			},
 			goodsGradeList(id) {
 				let self = this
 				this.$api.goodsGradeList({
@@ -426,7 +513,8 @@
 			},
 			async studyIn(v, i, item, index) {
 
-
+				
+				this.activeItem = item;
 				if (item.interfaceAccountId > 0) { //学习账号已开通
 
 					if (item.learnStatus == 1) { //跳转第三方h5
@@ -535,7 +623,7 @@
 						} else if (res.data.code == 500) { //可以学习
 
 							if (item.courseNum == 1) {
-
+								
 								this.$api.courseCourseList({
 									pageNum: 1,
 									pageSize: 1,
@@ -544,15 +632,22 @@
 									orderGoodsId: item.orderGoodsId,
 								}).then(res => {
 									if (res.data.code == 200) {
-					  			uni.navigateTo({
-											url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}`
-										})
+									// this.userConfirmInfoDetail().then(() => {
+											uni.navigateTo({
+													url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}`
+												})
+									// })
+					  			
 									}
 								});
 								return;
 							}
-							this.$navTo.togo(
-								`/pages2/wd/course?id=${v}&gid=${i}&orderGoodsId=${item.orderGoodsId}`);
+							
+							// this.userConfirmInfoDetail().then(() => {
+									this.$navTo.togo(
+										`/pages2/wd/course?id=${v}&gid=${i}&orderGoodsId=${item.orderGoodsId}`);
+							// })
+							
 						}
 					})
 				} else {
@@ -566,14 +661,20 @@
 							orderGoodsId: item.orderGoodsId,
 						}).then(res => {
 							if (res.data.code == 200) {
-								uni.navigateTo({
-									url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}`
-								})
+								// this.userConfirmInfoDetail().then(() => {
+										uni.navigateTo({
+											url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}`
+										})
+								// })
+								
 							}
 						});
 						return;
 					}
-					this.$navTo.togo(`/pages2/wd/course?id=${v}&gid=${i}&orderGoodsId=${item.orderGoodsId}`);
+					// this.userConfirmInfoDetail().then(() => {
+							this.$navTo.togo(`/pages2/wd/course?id=${v}&gid=${i}&orderGoodsId=${item.orderGoodsId}`);
+					// })
+					
 				}
 
 
@@ -814,4 +915,33 @@
 	.slot-content {
 		padding: 0 20rpx;
 	}
+	
+	.confirm-modal {
+			.slot-content {
+				padding:0 20rpx;
+				.content {
+					color:red;
+					
+					.msg-list {
+						.item {
+							padding:20rpx 0;
+							 
+							 &__left {
+								 color:#666;
+								 margin-right:20rpx;
+							 }
+							 
+							 &__right {
+								 color:#333;
+							 }
+							 
+							
+						}
+						
+					}
+				}
+	}
+	
+		
+	}
 </style>

+ 141 - 133
pages3/polyv/detail.vue

@@ -494,6 +494,8 @@
         </scroll-view>
       </div>
     </u-popup>
+		
+		
   </view>
 </template>
 
@@ -637,133 +639,12 @@ export default {
   onShow() {
     var self = this;
     //相机授权
-		this.userConfirmInfoDetail()
-    this.getCameraSetting();
-    this.$api.getbaseprofiletplists({ goodsId: self.goodsId,orderGoodsId: this.orderGoodsId, }).then((res) => {
-      console.log(res, "res");
-      if (res.data.code === 200 && res.data.rows.length) {
-        if (res.data.rows[0].keyValue) {
-          self.$api.getbaseprofiletpId(self.goodsId).then((baseRes) => {
-            if (baseRes.data.code === 200) {
-              if (baseRes.data.data) {
-                self.$api
-                  .getbaseprofiletpgetInfo({
-                    goodsId: self.goodsId,
-                    orderGoodsId: self.orderGoodsId,
-                  })
-                  .then((result) => {
-                    console.log(result, "result");
-                    if (result.data.code === 200) {
-                      if (
-                        !result.data.data ||
-                        (result.data.data.status === 3 &&
-                          result.data.data.changeStatus === 1)
-                      ) {
-                        if (!result.data.data) {
-                          self.needProfileModal = true;
-                          uni.showModal({
-                            content: "请前往填写资料",
-                            cancelText: "返回",
-                            success: function (resultst) {
-                              if (resultst.confirm) {
-                                self.$navTo.togo("/pages2/verify/input", {
-                                  id: self.goodsId,
-                                  orderGoodsId: self.orderGoodsId,
-                                });
-                              }
-                              if (resultst.cancel) {
-                                uni.navigateBack();
-                              }
-                            },
-                          });
-                        } else {
-                          self.needProfileModal = true;
-                          uni.showModal({
-                            content: "资料审核不通过,请前往重新填写",
-                            cancelText: "返回",
-                            success: function (resultst) {
-                              if (resultst.confirm) {
-                                self.$navTo.togo("/pages2/verify/input", {
-                                  id: self.goodsId,
-                                  orderGoodsId: self.orderGoodsId,
-                                });
-                              }
-                              if (resultst.cancel) {
-                                uni.navigateBack();
-                              }
-                            },
-                          });
-                        }
-                      } else if (
-                        result.data.data.status === 1 &&
-                        JSON.parse(res.data.rows[0].keyValue2)[0]
-                      ) {
-                        self.$api
-                          .getbaseprofileStampgetInfo({
-                            goodsId: self.goodsId,
-                            orderGoodsId: self.orderGoodsId,
-                          })
-                          .then((k) => {
-                            if (k.data.code === 200) {
-                              if (
-                                !k.data.data ||
-                                (k.data.data.status === 3 &&
-                                  k.data.data.changeStatus === 1)
-                              ) {
-                                if (!k.data.data) {
-                                  self.needProfileModal = true;
-                                  uni.showModal({
-                                    cancelText: "返回",
-                                    content: "请前往填写盖章资料",
-                                    success: function (resultst) {
-                                      if (resultst.confirm) {
-                                        self.$navTo.togo(
-                                          "/pages2/verify/input2",
-                                          {
-                                            id: self.goodsId,
-                                            orderGoodsId: self.orderGoodsId,
-                                          }
-                                        );
-                                      }
-                                      if (resultst.cancel) {
-                                        uni.navigateBack();
-                                      }
-                                    },
-                                  });
-                                } else {
-                                  self.needProfileModal = true;
-                                  uni.showModal({
-                                    cancelText: "返回",
-                                    content:
-                                      "资料盖章审核不通过,请前往重新填写",
-                                    success: function (resultst) {
-                                      if (resultst.confirm) {
-                                        self.$navTo.togo(
-                                          "/pages2/verify/input2",
-                                          {
-                                            id: self.goodsId,
-                                            orderGoodsId: self.orderGoodsId,
-                                          }
-                                        );
-                                      }
-                                      if (resultst.cancel) {
-                                        uni.navigateBack();
-                                      }
-                                    },
-                                  });
-                                }
-                              }
-                            }
-                          });
-                      }
-                    }
-                  });
-              }
-            }
-          });
-        }
-      }
-    });
+		// this.userConfirmInfoDetail().then(res => {
+			
+		// })
+		
+		this.getbaseprofiletplists();
+    
     console.log(this.gradeId, 7512);
     if (this.gradeId > 0) {
       //提交完资料返回判断是否已开班
@@ -1039,13 +920,138 @@ export default {
           });
       }
     },
-		userConfirmInfoDetail(){
-			this.$api.userConfirmInfoDetail({
-				orderGoodsId:this.orderGoodsId
-			}).then(res => {
-				console.log(res,'res')
-			})
+		getbaseprofiletplists() {
+			let self = this;
+			this.getCameraSetting();
+			this.$api.getbaseprofiletplists({ goodsId: self.goodsId,orderGoodsId: this.orderGoodsId, }).then((res) => {
+			  console.log(res, "res1");
+			  if (res.data.code === 200 && res.data.rows.length) {
+			    if (res.data.rows[0].keyValue) {
+			      self.$api.getbaseprofiletpId(self.goodsId).then((baseRes) => {
+			        if (baseRes.data.code === 200) {
+			          if (baseRes.data.data) {
+			            self.$api
+			              .getbaseprofiletpgetInfo({
+			                goodsId: self.goodsId,
+			                orderGoodsId: self.orderGoodsId,
+			              })
+			              .then((result) => {
+			                console.log(result, "result");
+			                if (result.data.code === 200) {
+			                  if (
+			                    !result.data.data ||
+			                    (result.data.data.status === 3 &&
+			                      result.data.data.changeStatus === 1)
+			                  ) {
+			                    if (!result.data.data) {
+			                      self.needProfileModal = true;
+			                      uni.showModal({
+			                        content: "请前往填写资料",
+			                        cancelText: "返回",
+			                        success: function (resultst) {
+			                          if (resultst.confirm) {
+			                            self.$navTo.togo("/pages2/verify/input", {
+			                              id: self.goodsId,
+			                              orderGoodsId: self.orderGoodsId,
+			                            });
+			                          }
+			                          if (resultst.cancel) {
+			                            uni.navigateBack();
+			                          }
+			                        },
+			                      });
+			                    } else {
+			                      self.needProfileModal = true;
+			                      uni.showModal({
+			                        content: "资料审核不通过,请前往重新填写",
+			                        cancelText: "返回",
+			                        success: function (resultst) {
+			                          if (resultst.confirm) {
+			                            self.$navTo.togo("/pages2/verify/input", {
+			                              id: self.goodsId,
+			                              orderGoodsId: self.orderGoodsId,
+			                            });
+			                          }
+			                          if (resultst.cancel) {
+			                            uni.navigateBack();
+			                          }
+			                        },
+			                      });
+			                    }
+			                  } 
+												
+												// else if (
+			         //            result.data.data.status === 1 &&
+			         //            JSON.parse(res.data.rows[0].keyValue2)[0]
+			         //          ) {
+			         //            self.$api
+			         //              .getbaseprofileStampgetInfo({
+			         //                goodsId: self.goodsId,
+			         //                orderGoodsId: self.orderGoodsId,
+			         //              })
+			         //              .then((k) => {
+			         //                if (k.data.code === 200) {
+			         //                  if (
+			         //                    !k.data.data ||
+			         //                    (k.data.data.status === 3 &&
+			         //                      k.data.data.changeStatus === 1)
+			         //                  ) {
+			         //                    if (!k.data.data) {
+			         //                      self.needProfileModal = true;
+			         //                      uni.showModal({
+			         //                        cancelText: "返回",
+			         //                        content: "请前往填写盖章资料",
+			         //                        success: function (resultst) {
+			         //                          if (resultst.confirm) {
+			         //                            self.$navTo.togo(
+			         //                              "/pages2/verify/input2",
+			         //                              {
+			         //                                id: self.goodsId,
+			         //                                orderGoodsId: self.orderGoodsId,
+			         //                              }
+			         //                            );
+			         //                          }
+			         //                          if (resultst.cancel) {
+			         //                            uni.navigateBack();
+			         //                          }
+			         //                        },
+			         //                      });
+			         //                    } else {
+			         //                      self.needProfileModal = true;
+			         //                      uni.showModal({
+			         //                        cancelText: "返回",
+			         //                        content:
+			         //                          "资料盖章审核不通过,请前往重新填写",
+			         //                        success: function (resultst) {
+			         //                          if (resultst.confirm) {
+			         //                            self.$navTo.togo(
+			         //                              "/pages2/verify/input2",
+			         //                              {
+			         //                                id: self.goodsId,
+			         //                                orderGoodsId: self.orderGoodsId,
+			         //                              }
+			         //                            );
+			         //                          }
+			         //                          if (resultst.cancel) {
+			         //                            uni.navigateBack();
+			         //                          }
+			         //                        },
+			         //                      });
+			         //                    }
+			         //                  }
+			         //                }
+			         //              });
+			         //          }
+			                }
+			              });
+			          }
+			        }
+			      });
+			    }
+			  }
+			});
 		},
+		
     /**
      * 获取业务层次详情
      */
@@ -2904,4 +2910,6 @@ page {
     }
   }
 }
+
+
 </style>