From 2d406f79fb27c0fb6eb259c35f9da734865f4360 Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Wed, 27 Jul 2022 14:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=8C=96=E6=8E=98=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BA=8C=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/consumer/consumerDetail.vue | 4 ++--
 pages/mine/details2.vue                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue
index 1bac4cd..492af18 100644
--- a/pages/center/consumer/consumerDetail.vue
+++ b/pages/center/consumer/consumerDetail.vue
@@ -535,12 +535,12 @@
 						if (res[0].merge == 0) {
 							let newobj = res[0];
 							uni.navigateTo({
-								url: `/pages/mine/details2?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`
+								url: `/pages/mine/details2?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=2&wordFraction=${this.customerInfo.wordFraction}`
 							})
 						} else {
 							let newobj = res[0];
 							uni.navigateTo({
-								url: `/pages/mine/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"1"}`
+								url: `/pages/mine/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=1&wordFraction=${this.customerInfo.wordFraction}`
 							})
 						}
 					})
diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue
index 2346899..44dbac6 100644
--- a/pages/mine/details2.vue
+++ b/pages/mine/details2.vue
@@ -631,7 +631,7 @@
 			this.eqLog = menu.findIndex(item=>item.name=='设备日志');
 			this.status = options.status;
 			this.customerId = options.customerId;
-			this.KeyWordsfraction = options.wordFraction||0;
+			this.KeyWordsfraction = options.wordFraction=='undefined'?0:options.wordFraction;
 			this.itemobj = uni.getStorageSync('searchobj');
 			console.log(this.itemobj)
 			this.stateisshow = options.stateisshow;
@@ -1620,7 +1620,7 @@
 			changanxiaoguo(item, index, i) {
 				this.messagelisy = [];
 				this.changanitem = {};
-				this.duihuawenjianid = "",
+				this.duihuawenjianid = "";
 					this.cancelBeast()
 				this.changanitem = item;
 				this.duihuawenjianid = this.luyinList[this.csdFileindex].id;