fix

common/config.js

@@ -1,7 +1,7 @@
 // test 测试环境
 const test = {
-	// BASE_URL: "https://testapi.xyyxt.net",
-	BASE_URL: "http://120.79.166.78:19012",
+	BASE_URL: "https://testapi.xyyxt.net",
+	// BASE_URL: "http://120.79.166.78:19012",
 	BASE_IMG_URL: "https://file-dev.xyyxt.net/",
 	domain: "h.xyyxt.net",
 	tenantId: "867735392558919680", //详粤云学堂

common/httpList/profileTp.js

@@ -18,6 +18,14 @@ export default {
 			data: data
 		})
 	},
+	//更新七大员承诺书
+	updateCommitment(data) {
+		return myRequest({
+			url: '/base/profile/tp/commitment/upload',
+			method: 'post',
+			data: data
+		})
+	},
 	//获取所有使用商品ID
 	getbaseprofiletplist(data) {
 		return myRequest({
@@ -57,5 +65,13 @@ export default {
 			method: 'get'
 		})
 	},
-
+	//预约考试跳转判断
+	courseoldgoodsredirect(data) {
+		return myRequest({
+			url: '/course/old/goods/redirect',
+			method: 'get',
+			data: data
+		})
+	},
+	
 }

common/methodTool.js

@@ -314,7 +314,8 @@ export default {
 					success: (result) => {
 						result.data = result.data || '{}'
 						let jsonData = JSON.parse(result.data)
-						if (jsonData.resultContent && jsonData.resultContent.size) {
+						if (jsonData.resultContent && Number(jsonData.resultContent.size) >
+							0) {
 							resolve(ossToken.dir);
 						} else {
 							uni.showToast({
@@ -776,4 +777,83 @@ export default {
 				});
 		});
 	},
+
+	myBrowser() {
+		var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+		console.log(userAgent)
+		var isOpera = userAgent.indexOf("Opera") > -1 ||
+			userAgent.indexOf("OPR") > -1; //判断是否Opera浏览器
+
+		var isQQ = userAgent.indexOf("QQBrowser") > -1; //判断是否QQBrowser浏览器
+
+		var isUC = userAgent.indexOf("UCBrowser") > -1; //判断是否UC浏览器
+
+		var isIE = userAgent.indexOf("compatible") > -1 &&
+			userAgent.indexOf("MSIE") > -1; //判断是否IE7~IE10浏览器
+
+		var isIE11 = userAgent.indexOf("compatible") === -1 &&
+			userAgent.indexOf("Trident") > -1; //判断是否IE11浏览器
+
+		var isEdge = userAgent.indexOf("Edge") > -1; //判断是否IE的Edge浏览器
+
+		var isFF = userAgent.indexOf("Firefox") > -1; //判断是否Firefox浏览器
+
+		var isSafari = userAgent.indexOf("Safari") > -1 &&
+			userAgent.indexOf("Chrome") === -1; //判断是否Safari浏览器
+
+		var isChrome = userAgent.indexOf("Chrome") > -1 &&
+			userAgent.indexOf("; Win") > -1 &&
+			userAgent.indexOf("Safari") > -1; //判断Chrome浏览器
+
+		var is360 = userAgent.indexOf("Chrome") > -1 &&
+			userAgent.indexOf("; WOW") > -1 &&
+			userAgent.indexOf("Safari") > -1; //判断360浏览器
+
+
+		if (isIE) {
+			var reIE = /MSIE (\d+)\.\d+;/;
+			// match() 返回一个数组。数组第一项是匹配到的所有文本；数组第二项是正则中小括号匹配到的文本
+			var matchReg = userAgent.match(reIE)
+			var fIEVersion = matchReg[1];
+			if (fIEVersion == 7) {
+				return "IE7及其以下";
+			} else if (fIEVersion == 8) {
+				return "IE8";
+			} else if (fIEVersion == 9) {
+				return "IE9";
+			} else if (fIEVersion == 10) {
+				return "IE10";
+			} else {
+				return "0";
+			} //IE版本过低
+			return "IE";
+		}
+		if (isUC) {
+			return "UC";
+		}
+		if (isQQ) {
+			return "QQBrowser";
+		}
+		if (isIE11) {
+			return "IE11";
+		}
+		if (isOpera) {
+			return "Opera";
+		}
+		if (isEdge) {
+			return "Edge";
+		}
+		if (isFF) {
+			return "Firefox";
+		}
+		if (isSafari) {
+			return "Safari";
+		}
+		if (isChrome) {
+			return "Chrome";
+		}
+		if (is360) {
+			return "360";
+		}
+	},
 };

components/popup/camera.vue

@@ -120,9 +120,10 @@
 					return;
 				}
 				this.uploadLock = true;
-				let compareFaceData = await this.faceRecognition();
+				let imgUrl = await this.imageInfos()
+				let compareFaceData = await this.faceRecognition(imgUrl);
 				if (compareFaceData >= 80) {
-					this.$emit("submitPhoto", await this.imageInfos(), compareFaceData);
+					this.$emit("submitPhoto",imgUrl, compareFaceData);
 				} else {
 					uni.showToast({
 						title: "人脸匹配不通过，请重新拍照上传",
@@ -296,27 +297,28 @@
 			/**
 			 * 人脸匹配
 			 */
-			faceRecognition() {
+			faceRecognition(url) {
 				return new Promise((resolve) => {
-					// #ifdef MP-WEIXIN
-					let fileSystem = uni.getFileSystemManager();
-					fileSystem.readFile({
-						filePath: `${this.avatarUrl}`,
-						encoding: "base64",
-						position: 0,
-						success: (res) => {
-							let base64 = "data:image/jpg;base64," + res.data;
-							this.CompareFace(base64, resolve);
-						},
-						fail(err) {
-							// this.$u.toast('人脸识别错误!')
-							console.error(err, "err-----人脸识别错误");
-						},
-					});
-					// #endif
-					// #ifdef H5
-					this.CompareFace(this.faceUrl, resolve);
-					// #endif
+					// // #ifdef MP-WEIXIN
+					// let fileSystem = uni.getFileSystemManager();
+					// fileSystem.readFile({
+					// 	filePath: `${this.avatarUrl}`,
+					// 	encoding: "base64",
+					// 	position: 0,
+					// 	success: (res) => {
+					// 		let base64 = "data:image/jpg;base64," + res.data;
+					// 		this.CompareFace(base64, resolve);
+					// 	},
+					// 	fail(err) {
+					// 		// this.$u.toast('人脸识别错误!')
+					// 		console.error(err, "err-----人脸识别错误");
+					// 	},
+					// });
+					// // #endif
+					// // #ifdef H5
+					// this.CompareFace(this.faceUrl, resolve);
+					// // #endif
+					this.CompareFace(url, resolve);
 				});
 			},
 			CompareFace(url, resolve) {
@@ -335,7 +337,8 @@
 
 				this.$api
 					.faceCertificationCompareFace({
-						imageA: url,
+						urlA: url,
+						// imageA: url,
 						orderGoodsId: this.params.orderGoodsId,
 						gradeId: this.params.gradeId,
 					})

pages/course/index.vue

@@ -61,7 +61,7 @@
 		</view>
 		<!-- tabbar -->
 		<myTabbar :backTopBtn="backTopBtn"></myTabbar>
-		<filter-show-status ref="filterShowStatus"></filter-show-status>
+		<filter-show-status ref="filterShowStatus" @backFunc="backFunc"></filter-show-status>
 	</view>
 </template>
 <script>
@@ -159,6 +159,7 @@
 		},
 		methods: {
 			backFunc(item) {
+				console.log('asd',item)
 				this.activeData = item
 				this.search()
 			},

pages/index/index.vue

@@ -189,7 +189,7 @@
 	export default {
 		data() {
 			return {
-				backTopBtn:false,
+				backTopBtn: false,
 				currentCourse: 0,
 				currentBank: 0,
 				certificate: [{

pages/learn/index.vue

@@ -297,7 +297,13 @@
 						</view>
 						<!-- 按钮 -->
 						<view class="study_btns">
-							<view v-if="item.userProfile == 1" class="box_appoint" @click="toInput(item)">
+							<view v-if="
+                      (item.profileChangeStatus == 1 &&
+                        (item.profileStatus == 1 || item.profileStatus == 2)) ||
+                        (item.profileChangeStatus == 2 &&
+                          item.profileStatus != -1 &&
+                          item.educationName == '考前培训' &&
+                          item.projectName == '施工现场专业人员')" class="box_appoint" @click="toInput(item)">
 								<view class="exam_word intos">学习资料</view>
 							</view>
 							<template v-if="
@@ -494,7 +500,7 @@
 	export default {
 		data() {
 			return {
-				backTopBtn:false,
+				backTopBtn: false,
 				leftDays: 0,
 				paramC: {
 					pageNum: 1,
@@ -1348,7 +1354,16 @@
 					this.$navTo.togo("/pages2/order/confirm_pay");
 				});
 			},
-			appointment(item) {
+			async appointment(item) {
+				// // #ifdef H5
+				// const {
+				// 	data
+				// } = await this.$api.courseoldgoodsredirect()
+				// if (data.data) {
+				// 	window.open(data.data.h5Url)
+				// 	return
+				// }
+				// // #endif
 				if (item.subscribeSign == 4) {
 					this.$navTo.togo("/pages2/exam/exam_appointment");
 					return;

pages2/class/questionBank.vue

@@ -1020,7 +1020,7 @@
 								this.$u.toast("上传成功");
 								this.ossAvatarUrl = ossToken.dir;
 								console.log("h5上传成功--:", this.ossAvatarUrl);
-								resolve();
+								resolve(this.ossAvatarUrl);
 							},
 							fail: (error) => {
 								console.log("h5上传失败:", error);
@@ -1130,32 +1130,33 @@
 			/**
 			 * 人脸匹配
 			 */
-			faceRecognition() {
+			faceRecognition(url) {
 				return new Promise((resolve) => {
-					// #ifdef MP-WEIXIN
-					let fileSystem = uni.getFileSystemManager();
-					fileSystem.readFile({
-						filePath: `${this.avatarUrl}`,
-						encoding: "base64",
-						position: 0,
-						success: (res) => {
-							let base64 = "data:image/jpg;base64," + res.data;
-
-							console.log("试卷-base64Data人脸识别参数：", {
-								imageA: base64,
-								orderGoodsId: this.orderGoodsId,
-								gradeId: this.gradeId,
-							});
-							this.CompareFace(base64, resolve);
-						},
-						fail(err) {
-							console.error(err, "err");
-						},
-					});
-					// #endif
-					// #ifdef H5
-					this.CompareFace(this.faceUrl, resolve);
-					// #endif
+					// // #ifdef MP-WEIXIN
+					// let fileSystem = uni.getFileSystemManager();
+					// fileSystem.readFile({
+					// 	filePath: `${this.avatarUrl}`,
+					// 	encoding: "base64",
+					// 	position: 0,
+					// 	success: (res) => {
+					// 		let base64 = "data:image/jpg;base64," + res.data;
+
+					// 		console.log("试卷-base64Data人脸识别参数：", {
+					// 			imageA: base64,
+					// 			orderGoodsId: this.orderGoodsId,
+					// 			gradeId: this.gradeId,
+					// 		});
+					// 		this.CompareFace(base64, resolve);
+					// 	},
+					// 	fail(err) {
+					// 		console.error(err, "err");
+					// 	},
+					// });
+					// // #endif
+					// // #ifdef H5
+					// this.CompareFace(this.faceUrl, resolve);
+					// // #endif
+					this.CompareFace(url, resolve);
 				});
 			},
 			CompareFace(url, resolve) {
@@ -1174,7 +1175,8 @@
 
 				this.$api
 					.faceCertificationCompareFace({
-						imageA: url,
+						urlA: url,
+						// imageA: url,
 						orderGoodsId: this.orderGoodsId,
 						gradeId: this.gradeId,
 					})
@@ -1213,11 +1215,10 @@
 					return;
 				}
 				this.uploadLock = true;
-
-				let compareFaceData = await this.faceRecognition();
+				const waitYS = await this.imageInfos();
+				let compareFaceData = await this.faceRecognition(waitYS);
 				this.compareFaceData = compareFaceData;
 				if (compareFaceData >= 80) {
-					const waitYS = await this.imageInfos();
 					this.postStudyRecord(); //提交记录
 					this.photoPopup = false;
 				} else {

pages2/order/index.vue

@@ -133,7 +133,7 @@
 				<view @click="showConfirm = true" class="btn_refund">
 					{{refundForm.applyReasonIndex?refundList[refundForm.applyReasonIndex-1].label:'选择退款原因'}}
 				</view>
-				<u-input v-if="refundForm.applyReasonIndex == 5" v-model="refundForm.applyReason"
+				<u-input v-if="refundForm.applyReasonIndex == 5" v-model.trim="refundForm.applyReason"
 					placeholder-style="color:#999999" placeholder="输入退款原因" class="applyInput" />
 				<u-button type="primary" style="border-radius: 60rpx;" @click="refund">确定</u-button>
 			</view>

pages2/verify/input.vue

@@ -813,7 +813,7 @@
 			async uploadDatas(data) {
 				if (this.form.recent_photos && this.form.idcard_face_photo) {
 					let base64 = await this.$method.imageToBase64(
-						this.form.idcard_face_photo
+						this.form.idcard_face_photo,1
 					);
 					let resData = await this.faceCertificationIDCardOCR(1, base64);
 					if (!resData.data) {
@@ -825,7 +825,7 @@
 						this.isUploading = false;
 						return;
 					}
-					base64 = await this.$method.imageToBase64(this.form.recent_photos);
+					base64 = await this.$method.imageToBase64(this.form.recent_photos,1);
 					let func1 = () => {
 
 						var self = this;
@@ -1193,6 +1193,7 @@
 						lists[0].url.indexOf("//temp") !== -1;
 					// #endif
 					// #ifdef H5
+					console.log(lists,'lists')
 					const isJPG =
 						lists[0].file.type === "image/jpeg" ||
 						lists[0].file.type === "image/png" ||

pages3/live/detail.vue

@@ -1871,7 +1871,7 @@ export default {
               this.$u.toast("上传成功");
               this.ossAvatarUrl = ossToken.dir;
               console.log("h5上传成功--:", this.ossAvatarUrl);
-              resolve();
+              resolve(this.ossAvatarUrl);
             },
             fail: (error) => {
               console.log("h5上传失败:", error);
@@ -1905,7 +1905,7 @@ export default {
               // if (result.statusCode === 200) {
               this.$u.toast("上传成功");
               this.ossAvatarUrl = ossToken.dir;
-              resolve();
+              resolve(this.ossAvatarUrl);
               // } else {
               //   uni.showToast({
               //     title: "上传失败",
@@ -2139,32 +2139,33 @@ export default {
     /**
      * 人脸匹配
      */
-    faceRecognition() {
+    faceRecognition(url) {
       return new Promise((resolve) => {
-        // #ifdef MP-WEIXIN
-        let fileSystem = uni.getFileSystemManager();
-        fileSystem.readFile({
-          filePath: `${this.avatarUrl}`,
-          encoding: "base64",
-          position: 0,
-          success: (res) => {
-            let base64 = "data:image/jpg;base64," + res.data;
+        // // #ifdef MP-WEIXIN
+        // let fileSystem = uni.getFileSystemManager();
+        // fileSystem.readFile({
+        //   filePath: `${this.avatarUrl}`,
+        //   encoding: "base64",
+        //   position: 0,
+        //   success: (res) => {
+        //     let base64 = "data:image/jpg;base64," + res.data;
 
-            console.log("直播课-base64Data人脸识别参数：", {
-              imageA: base64,
-              orderGoodsId: this.orderGoodsId,
-              gradeId: this.gradeId,
-            });
-            this.CompareFace(base64, resolve);
-          },
-          fail(err) {
-            console.error(err, "err");
-          },
-        });
-        // #endif
-        // #ifdef H5
-        this.CompareFace(this.faceUrl, resolve);
-        // #endif
+        //     console.log("直播课-base64Data人脸识别参数：", {
+        //       imageA: base64,
+        //       orderGoodsId: this.orderGoodsId,
+        //       gradeId: this.gradeId,
+        //     });
+        //     this.CompareFace(base64, resolve);
+        //   },
+        //   fail(err) {
+        //     console.error(err, "err");
+        //   },
+        // });
+        // // #endif
+        // // #ifdef H5
+        // this.CompareFace(this.faceUrl, resolve);
+        // // #endif
+		this.CompareFace(url, resolve);
       });
     },
 
@@ -2184,7 +2185,8 @@ export default {
 
       this.$api
         .faceCertificationCompareFace({
-          imageA: url,
+			urlA: url,
+          // imageA: url,
           orderGoodsId: this.orderGoodsId,
           gradeId: this.gradeId,
         })
@@ -2214,11 +2216,10 @@ export default {
         return;
       }
       this.uploadLock = true;
-
-      let compareFaceData = await this.faceRecognition();
+        const waitYS = await this.imageInfos();
+      let compareFaceData = await this.faceRecognition(waitYS);
       this.compareFaceData = compareFaceData;
       if (compareFaceData >= 80) {
-        const waitYS = await this.imageInfos();
         this.postCoursePhotoRecord()
           .then((res) => {
             this.photoHistoryList.push(this.photoIndex);

pages3/polyv/detail copy.vue

@@ -3088,33 +3088,34 @@ export default {
     /**
      * 人脸匹配
      */
-    faceRecognition() {
+    faceRecognition(url) {
       return new Promise((resolve) => {
-        // #ifdef MP-WEIXIN
-        let fileSystem = uni.getFileSystemManager();
-        fileSystem.readFile({
-          filePath: `${this.avatarUrl}`,
-          encoding: "base64",
-          position: 0,
-          success: (res) => {
-            let base64 = "data:image/jpg;base64," + res.data;
-            // console.log('base64Data人脸识别参数：', {
-            //   imageA: base64,
-            //   orderGoodsId: this.orderGoodsId,
-            //   gradeId: this.gradeId,
-            // })
+        // // #ifdef MP-WEIXIN
+        // let fileSystem = uni.getFileSystemManager();
+        // fileSystem.readFile({
+        //   filePath: `${this.avatarUrl}`,
+        //   encoding: "base64",
+        //   position: 0,
+        //   success: (res) => {
+        //     let base64 = "data:image/jpg;base64," + res.data;
+        //     // console.log('base64Data人脸识别参数：', {
+        //     //   imageA: base64,
+        //     //   orderGoodsId: this.orderGoodsId,
+        //     //   gradeId: this.gradeId,
+        //     // })
 
-            this.CompareFace(base64, resolve);
-          },
-          fail(err) {
-            // this.$u.toast('人脸识别错误!')
-            console.error(err, "err-----人脸识别错误");
-          },
-        });
-        // #endif
-        // #ifdef H5
-        this.CompareFace(this.faceUrl, resolve);
-        // #endif
+        //     this.CompareFace(base64, resolve);
+        //   },
+        //   fail(err) {
+        //     // this.$u.toast('人脸识别错误!')
+        //     console.error(err, "err-----人脸识别错误");
+        //   },
+        // });
+        // // #endif
+        // // #ifdef H5
+        // this.CompareFace(this.faceUrl, resolve);
+        // // #endif
+		this.CompareFace(url, resolve);
       });
     },
     CompareFace(url, resolve) {
@@ -3133,7 +3134,8 @@ export default {
 
       this.$api
         .faceCertificationCompareFace({
-          imageA: url,
+			urlA: url,
+          // imageA: url,
           orderGoodsId: this.orderGoodsId,
           gradeId: this.gradeId,
         })
@@ -3163,10 +3165,10 @@ export default {
         return;
       }
       this.uploadLock = true;
-      let compareFaceData = await this.faceRecognition();
+       const imgs = await this.imageInfos();
+      let compareFaceData = await this.faceRecognition(imgs);
       this.compareFaceData = compareFaceData;
       if (compareFaceData >= 80) {
-        await this.imageInfos();
         this.postCoursePhotoRecord()
           .then(async (res) => {
             console.log("🚀 ~ file: detail copy.vue:3176 ~ .then ~ res:", res)

pages3/polyv/detail.vue

@@ -326,6 +326,22 @@
 			},
 		},
 		async onLoad(option) {
+			// #ifdef H5
+			console.error(this.$method.myBrowser(), '浏览器')
+			if (this.$method.myBrowser() == 'UC') {
+				uni.showModal({
+					title: "提示",
+					content: "请使用其他浏览器进行学习",
+					showCancel: false,
+					complete:() => {
+						uni.switchTab({
+							url: "/pages/learn/index",
+						});
+					}
+				})
+				return
+			}
+			// #endif
 			if (option.isOther) {
 				this.showMark = true;
 				return;
@@ -993,7 +1009,7 @@
 								},
 							});
 							return Promise.reject();
-						} else if (data.status === 1 && JSON.parse(rows[0].keyValue2)[0]) {
+						} else if (data.status === 1 && JSON.parse(rows[0].keyValue2)[0] && false) {
 							let {
 								data: {
 									code,