Merge branch 'feature/test_popstate' into 'master'

fix: 去掉保存图片，测试返回监听

See merge request !220

src/views/Home/Activity/index.vue

@@ -24,7 +24,6 @@
         <p class="Aa-container-public">快关注「芒果保险」公众号</p>
         <p class="Aa-container-progress">查看红包进度</p>
         <cr-image
-          v-longProgress="showPopup"
           class="Aa-container-qrcode"
           width=""
           height=""
@@ -78,7 +77,6 @@
           </div>
         </div>
         <cr-button
-          v-longProgress="showPopup"
           :class="[{ 'Av-body-right_winning': status === 'HAS_WINNING' }, 'Av-body-right']"
         >
           {{ voteButtonText }}
@@ -222,6 +220,7 @@ export default {
         this.status = "HAS_NOT_CHANCE";
       }
     },
+    // 客户端不支持
     saveImg() {
       saveAs(qrCodeImg, "test_save.jpg");
       console.log("saveImg");

src/views/Policy/Detail/index.vue

@@ -11,10 +11,11 @@ import Refund from "./Types/Refund";
 import policyStatusMixin from "../mixin/policyStatus.mixin";
 import detailPayMixin from "@/views/Goods/Detail/modules/detailPay.mixin";
 import { getPolicyDetail } from "@/api/policy";
+import routerMixin from "../mixin/router.mixin";
 
 export default {
   name: "PolicyList",
-  mixins: [policyStatusMixin, detailPayMixin],
+  mixins: [policyStatusMixin, detailPayMixin, routerMixin],
   provide() {
     return {
       getPolicy: this.getPolicy

src/views/Policy/Success/index.vue

@@ -15,10 +15,11 @@ import StatusDesc from "../Detail/modules/StatusDesc";
 import InsuranceRecommend from "../modules/InsuranceRecommend";
 import { getGenPolicyDetail } from "@/api/policy";
 import policyStatusMixin from "../mixin/policyStatus.mixin";
+import routerMixin from "../mixin/router.mixin";
 
 export default {
   name: "Sucess",
-  mixins: [policyStatusMixin],
+  mixins: [policyStatusMixin, routerMixin],
   components: {
     StatusDesc,
     PayInfo,

src/views/Policy/index.vue

@@ -21,9 +21,11 @@
 <script>
 import InsuranceRecommend from "./modules/InsuranceRecommend";
 import PolicyItem from "./modules/PolicyItem";
+import routerMixin from "./mixin/router.mixin";
 
 export default {
   name: "PolicyList",
+  mixins: [routerMixin],
   components: {
     InsuranceRecommend,
     PolicyItem

src/views/Policy/mixin/router.mixin.js

+export default {
+  mounted() {
+    if (window.history && window.history.pushState) {
+      // 向历史记录中插入了当前页
+      history.pushState(null, null, document.URL);
+      window.addEventListener("popstate", this.goBack, false);
+    }
+  },
+  destroyed() {
+    window.removeEventListener("popstate", this.goBack, false);
+  },
+  methods: {
+    goBack() {
+      console.log("popstate", history, this.$route);
+      // 点击了浏览器的返回按钮
+      if (this.$route.name === "PolicyDetail") {
+        this.$router.replace("/policy");
+      } else if (this.$route.name === "Policy") {
+        this.$router.replace("/user");
+      }
+    }
+  }
+};