From 9a22a5d77b412f20f3ced939a5b1c6e9e28a2397 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 5 Sep 2021 01:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8D=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/homemaking/homemaking.vue | 38 +++++++++++++++++++++++----------
 pages/mall/mall.vue             | 14 +++++++++---
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/pages/homemaking/homemaking.vue b/pages/homemaking/homemaking.vue
index 94151b3..7dd60fe 100644
--- a/pages/homemaking/homemaking.vue
+++ b/pages/homemaking/homemaking.vue
@@ -1,17 +1,24 @@
 <template>
 	<view class="h5-html">
-		 <web-view ref="webview"  :src="url"  @onPostMessage="onReciveMessage"></web-view>
+		 <web-view ref="webview" id="homemarkingWebView" class="wuixw"  :src="url"  @onPostMessage="onReciveMessage">
+		</web-view>
 	</view>
 </template>
 
 <script>
 	import conf from '../../conf/config.js'
 	import {
-		reciveMessage,getHcCode
+		reciveMessage,
+		getHcCode
 	} from '../../api/webView/webViewApi.js'
 
-	import {decodeUrl} from '../../utils/UrlUtil.js';
-
+	import {
+		decodeUrl
+	} from '../../utils/UrlUtil.js';
+	import {
+		getStorageSync,
+		setStorageSync
+	} from '../../utils/StorageUtil.js'
 	export default {
 		data() {
 			return {
@@ -23,24 +30,33 @@
 			let _that = this;
 			let _url = options.url;
 			_url = decodeUrl(_url);
+			setStorageSync('_go_back_refresh', 0);
 			//刷新hcCode
 			this.vc.getCurCommunity()
 				.then(function(_communityInfo) {
 					_that.communityId = _communityInfo.communityId;
 				})
 				.then(function() {
-					_that.url = conf.mallUrl+"#/pages/homemaking/index?mallFrom=HC&hcCommunityId="+_that.communityId;
+					_that.url = conf.mallUrl + "#/pages/homemaking/index?mallFrom=HC&hcCommunityId=" + _that
+						.communityId;
 				})
 
 		},
 		onShow() {
+			let that = this;
 			let _goBackRefresh = getStorageSync('_go_back_refresh');
-			if(_goBackRefresh == 1){
-				let wv = this.$refs.webview
-				wv.reload(true);
+			if (_goBackRefresh == 1) {
+				// #ifdef H5
+				document.getElementsByTagName('iframe').forEach(item => {
+					console.log(item.id);
+					if('homemarkingWebView' == item.id){
+						item.contentWindow.location.href = that.url;
+					}
+				})
+				// #endif
 			}
-			setStorageSync('_go_back_refresh',0)
-			
+			setStorageSync('_go_back_refresh', 0);
+
 		},
 		methods: {
 			onReciveMessage: function(event) {
@@ -55,4 +71,4 @@
 		width: 100%;
 		height: 100%;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/mall/mall.vue b/pages/mall/mall.vue
index a39fa25..cfdeb55 100644
--- a/pages/mall/mall.vue
+++ b/pages/mall/mall.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="h5-html">
-		 <web-view ref="webview"  :src="url"  @onPostMessage="onReciveMessage"></web-view>
+		 <web-view ref="webview" id="mallWebView" :src="url"  @onPostMessage="onReciveMessage"></web-view>
 	</view>
 </template>
 
@@ -30,6 +30,7 @@
 			let _that = this;
 			let _url = options.url;
 			_url = decodeUrl(_url);
+			setStorageSync('_go_back_refresh', 0);
 			//刷新hcCode
 			this.vc.getCurCommunity()
 				.then(function(_communityInfo) {
@@ -41,10 +42,17 @@
 
 		},
 		onShow() {
+			let that = this;
 			let _goBackRefresh = getStorageSync('_go_back_refresh');
 			if (_goBackRefresh == 1) {
-				let wv = this.$refs.webview
-				wv.currentWebview().reload(true);
+				// #ifdef H5
+				document.getElementsByTagName('iframe').forEach(item => {
+					console.log(item.id);
+					if('mallWebView' == item.id){
+						item.contentWindow.location.href = that.url;
+					}
+				})
+				// #endif
 			}
 			setStorageSync('_go_back_refresh', 0);