From 4484958cd61b39a5f9a55a9788c9acda35acb1b0 Mon Sep 17 00:00:00 2001
From: wangliang <wangliang0612@dhcc.com.cn>
Date: Thu, 15 Sep 2022 17:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=AE=97=E8=BF=94=E5=9B=9E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/goBackEntity.ts                  |  8 +++++++
 .../DepositInterestTrial/CountResult.vue      | 15 ++++++++-----
 .../DepositInterestTrial/CountResultB.vue     | 22 +++++++++++--------
 .../DepositInterestTrial.vue                  | 17 ++++++++++----
 4 files changed, 43 insertions(+), 19 deletions(-)
 create mode 100644 src/services/goBackEntity.ts

diff --git a/src/services/goBackEntity.ts b/src/services/goBackEntity.ts
new file mode 100644
index 0000000..6990d3b
--- /dev/null
+++ b/src/services/goBackEntity.ts
@@ -0,0 +1,8 @@
+
+import Vue from 'vue'
+
+/**
+ * 定义空的vue实例，作为 goBackEntity实现非父子组件之间的通信(vue2.x中去掉了broadcast)
+ */
+var goBackEntity = new Vue({});
+export default goBackEntity;
diff --git a/src/views/DepositInterestTrial/CountResult.vue b/src/views/DepositInterestTrial/CountResult.vue
index 443beb0..8bf2ffe 100644
--- a/src/views/DepositInterestTrial/CountResult.vue
+++ b/src/views/DepositInterestTrial/CountResult.vue
@@ -79,6 +79,7 @@ import {Component, Prop, Vue} from "vue-property-decorator";
 import router from "@/router";
 import VueRouter, { Route, RouteConfig } from "vue-router";
 import {RouteMeta} from "vue-router/types/router";
+import eventBus from "@/services/goBackEntity";
 Vue.use(VueRouter);
 @Component({
   name: "CountResult",
@@ -134,12 +135,14 @@ export default class CountResult extends Vue{
     this.$router.back();
   }
   returnCountReset() {
-    this.$router.push({
-      name: "DepositInterestTrial",
-      params: {
-        reset: "1",
-      },
-    });
+    // this.$router.push({
+    //   name: "DepositInterestTrial",
+    //   params: {
+    //     reset: "1",
+    //   },
+    // });
+    eventBus.$emit("reset",-1);
+    this.$router.back();
   }
   toSeeRepayPlan() {
     window.localStorage.setItem("result",this.result);
diff --git a/src/views/DepositInterestTrial/CountResultB.vue b/src/views/DepositInterestTrial/CountResultB.vue
index 8117833..107381e 100644
--- a/src/views/DepositInterestTrial/CountResultB.vue
+++ b/src/views/DepositInterestTrial/CountResultB.vue
@@ -63,6 +63,7 @@
 
 <script lang="ts">
 import {Component, Prop, Vue} from "vue-property-decorator";
+import eventBus from "@/services/goBackEntity"
 @Component({
   name: "CountResultB",
 })
@@ -77,17 +78,20 @@ export default class CountResultB extends Vue{
   titleName="试算结果";
   titleflag=true;
   returnCount() {
-    this.$router.push({
-      name: "DepositInterestTrial",
-    });
+    // this.$router.push({
+    //   name: "DepositInterestTrial",
+    // });
+    this.$router.back();
   }
   returnCountReset() {
-    this.$router.push({
-      name: "DepositInterestTrial",
-      params: {
-        reset: "1",
-      },
-    });
+    eventBus.$emit("reset",-1);
+    // this.$router.push({
+    //   name: "DepositInterestTrial",
+    //   params: {
+    //     reset: "1",
+    //   },
+    // });
+    this.$router.back();
   }
   mounted() {
     this.saveType = this.$route.params.saveType;
diff --git a/src/views/DepositInterestTrial/DepositInterestTrial.vue b/src/views/DepositInterestTrial/DepositInterestTrial.vue
index 9d05107..221dd36 100644
--- a/src/views/DepositInterestTrial/DepositInterestTrial.vue
+++ b/src/views/DepositInterestTrial/DepositInterestTrial.vue
@@ -196,6 +196,7 @@
 import {Component, Vue} from "vue-property-decorator";
 import {Test} from "@/views/DepositInterestTrial/Test";
 import {Toast} from "vant";
+import eventBus from "@/services/goBackEntity"
 @Component({
   name: "DepositInterestTrial",
 })
@@ -405,10 +406,18 @@ export default class DepositInterestTrial extends Vue{
     });
   }
   activated(){
-    if(this.$route.params.reset=="1"){
-      this.clearData();
-      this.clearDataB();
-    }
+    eventBus.$on("reset",function (data){
+      console.log("@#######@@#@#@#@"+data);
+      if(data==-1){
+        this.clearData();
+        this.clearDataB();
+      }
+
+    }.bind(this));
+    // if(this.$route.params.reset=="1"){
+    //   this.clearData();
+    //   this.clearDataB();
+    // }
   }
 }
 </script>
-- 
2.22.0