调整代码

components/upload-car-img/upload-car-img.vue

@@ -59,7 +59,7 @@
 				// console.log(res.tempFiles[0]);
 				console.time('translate')
 				uni.showLoading({
-					title: '正在识别图片',
+					title: '正在上传图片',
 					mask: true
 				});
 				console.log(res, '图片地址');
@@ -208,15 +208,9 @@
 			if (this.readyState === 4) {
 				uni.hideLoading()
 				const data = JSON.parse(this.responseText).data;
-				let url = data.ossFilePath;
-				let pathDomain = data.ossFilePath;
-				if (import.meta.env.VITE_APP_TYPE === 'production' || true) {
-					url = 'http://100.64.2.113:9000/default-bucket/' + url;
-					pathDomain = 'https://qtzl.etcjz.cn/default-bucket/' + pathDomain;
-				} else {
-					url = 'http://192.168.101.145:9000/default-bucket/' + url;
-				}
-				console.log(url, '图片上传完地址');
+				let url = 'http://100.64.2.113:9000/default-bucket/' + data.ossFilePath;
+				let pathDomain = 'https://qtzl.etcjz.cn/default-bucket/' + data.ossFilePath;
+				console.log(url,pathDomain, '图片上传完地址');
 				// uni.hideLoading()
 				emits('uploadImgHandle', {
 					path: imgURL,

pages/payment/payment.vue

@@ -79,7 +79,7 @@
 		handleToTypes,
 		isWeb,
 		handleToZhifubao,
-		handleTonei
+		handleTonei,isWxDuan
 	} from '@/utils/utils';
 	const {
 		CustomHeader, //头部组件
@@ -406,7 +406,7 @@
 		if (!h5ReturnQdUrl) {
 			return;
 		}
-		if (isWeb(h5ReturnQdUrl) ) {
+		if (isWeb(h5ReturnQdUrl) ||isWxDuan(h5ReturnQdUrl)) {
 			window.open(h5ReturnQdUrl, '_self');
 		} else {
 			handleOther(h5ReturnQdUrl);

pages/userInfoUploading/ocrHandle.ts

@@ -64,7 +64,10 @@ export default function () {
 			// imageBase64: fileList.path,
 			url: fileList.url,
 		};
-
+		uni.showLoading({
+			title: '正在识别图片...',
+			mask: true
+		});
 		requestNew('/iaw/ocr/idCardOcr', {
 			data: data
 		}).then(res => {
@@ -139,6 +142,8 @@ export default function () {
 		// 处理数据展示
 		handleDataList(ocrData, data, formData);
 		console.log(formData, 'formData');
+	}).finally(()=>{
+		uni.hideLoading();
 	});
 }
 //图像文件上传

pages/userInfoUploading/userInfoUploading.vue

@@ -216,11 +216,7 @@
 				showLoading: true
 			}
 			console.log(options, '请求参数')
-			uni.navigateTo({
-				url: '/' + jumpPage + `?qdOrderNo=${qdOrderVal.value.orderNo}`,
-				animationType: 'pop-in',
-				animationDuration: 500
-			})
+			// return
 			await request('ISSUES_ORDER_USERUPLOAD', options).then((res) => {
 				console.log(res, 'res')
 				if (res.statusCode === 0) {

utils/utils.ts

@@ -43,6 +43,12 @@ export const isWeb = (str) => {
 		/(https?:\/\/)?(([0-9a-z.]+\.[a-z]+)|(([0-9]{1,3}\.){3}[0-9]{1,3}))(:[0-9]+)?(\/[0-9a-z%/.\-_]*)?(\?[0-9a-z=&%_\-]*)?(\#[0-9a-z=&%_\-]*)?/gi;
 	return reg.test(str);
 };
+// 判断是否为微信短链
+export const isWxDuan = (str) => {
+	const reg =
+		/^weixin:/;
+	return reg.test(str);
+};
 
 export const handleToZhifubao = (path) => {
 	my.navigateTo({