From 1df03872a0f7d11f4c2301a74e7ffa71a7d6a481 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Thu, 28 Apr 2022 16:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=A6=E6=83=85=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsFile/tools.js                     | 15 +++++++++++----
 pagesA/workOrder/workOrderThree.vue |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/jsFile/tools.js b/jsFile/tools.js
index 9027185..51c61c8 100644
--- a/jsFile/tools.js
+++ b/jsFile/tools.js
@@ -651,10 +651,9 @@ const tools = {
 			return arrEntities[t];
 		})
 		.replace('<section', '<div')
-		// .replace(/\<img/g, '<img style="max-width:100%!important;width:100%!important;height:auto" mode="widthFix" ')
-		.replace(/\<img/g, '<img mode="widthFix" ')
-		.replace(/src=\"/g,'src="https://7and5.cn')
-		.replace(/style="[^\"]*?"/g,'style="max-width:100%!important;width:100%!important;height:auto" ');
+		.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/gi, (match, p1) => {
+		    return `<img mode="widthFix" style="max-width:100%!important;height:auto" src='${p1.indexOf('http') > -1 ? p1 : 'https://7and5.cn' + p1}' />`
+		})
 	},
 	// 检查网络状态
 	networkStatus(){
@@ -864,6 +863,14 @@ const tools = {
 			})
 		}
 	},
+	/**
+	 * @description 自动返回上一页事件
+	 */
+	automaticBack() {
+		setTimeout(()=>{
+			uni.navigateBack({delta:1})
+		},2000)
+	}
 }
 
 
diff --git a/pagesA/workOrder/workOrderThree.vue b/pagesA/workOrder/workOrderThree.vue
index 1b8d3f4..f75ce3d 100644
--- a/pagesA/workOrder/workOrderThree.vue
+++ b/pagesA/workOrder/workOrderThree.vue
@@ -272,6 +272,7 @@
 						this.allPrice = res.data.pay_price;//费用合计
 					} else {
 						this.$toolAll.tools.showToast(res.msg);
+						this.$toolAll.tools.automaticBack();
 					}
 				})
 			},