Merge branch 'feature/fix_policy' into 'master'

fix: 添加自动续保协议、修改跳转路由页面不更新问题

See merge request !72

src/App.vue

 <template>
   <div id="app">
     <transition :name="transitionName">
-      <router-view />
+      <router-view :key="$route.fullPath" />
     </transition>
     <div class="loading-container" v-if="isLoading">
       <cr-loading class="loading" size="24px">加载中...</cr-loading>

src/api/settings.js

@@ -5,6 +5,10 @@ export default {
     "https://mangobaoxian.sobot.com/chat/h5/v2/index.html?sysnum=cfe2ac6677f94698be2e2d842f23066d",
   icp: "京ICP备15059975号",
   copyright: "全天候保险代理股份有限公司",
+  renewalAgreement: {
+    title: "自动续保协议",
+    url: "http://mangguo-contract.qthbx.com/zi-dong-xu-bao-fu-wu-xie-yi-v1/"
+  },
   consultant: {
     name: "赵玉龙",
     role: "金牌保险顾问",

src/router/routes.js

@@ -114,7 +114,7 @@ export default [
   },
   {
     path: "/policy/detail/:orderNo",
-    name: "Detail",
+    name: "PolicyDetail",
     component: () => import("../views/Policy/Detail/index.vue"),
     meta: { title: "保单详情" }
   },

src/views/Goods/Detail/modules/detailPay.mixin.js

@@ -81,7 +81,7 @@ export default {
     },
     getPayResult() {
       const { payOrderNo, orderNo } = this.orderInfo;
-      placeOrder.polling({ payOrderNo, payOrderType: 1 }).then(payRes => {
+      placeOrder.polling({ payOrderNo, payOrderType: 1 }).then(payRes => { 
         if (!payRes.result && payRes.payState === 2) {
           this.payTimer = setTimeout(() => {
             this.getPayResult();
@@ -89,6 +89,10 @@ export default {
         } else {
           this.setIsPayWait(false);
           this.setIsLoading(false);
+          if (this.$route.name === "PolicyDetail") {
+            this.getPolicy();
+            return;
+          }
           this.$router.replace({ path: "/policy/detail/" + orderNo });
         }
       });

src/views/Policy/Renewal/index.less

@@ -21,6 +21,12 @@
 
   &_closed {
     background: #F65D5D;
+    .renewal-status {
+      color: #FFFFFF;
+    }
+    .renewal-desc {
+      color: #FFFFFF;
+    }
   }
 
   &-status {

src/views/Policy/Renewal/index.vue

@@ -18,7 +18,9 @@
           <span class="Rcc-item-text">续保保费按照续保应交保费，自动扣款</span>
         </div>
       </div>
-      <p class="renewal-container-read">阅读并同意《<span>次年自动续保服务协议</span>》</p>
+      <p class="renewal-container-read" @click="popupShow = true">
+        阅读并同意《<span>次年自动续保服务协议</span>》
+      </p>
       <div class="renewal-container-detail" v-if="!isOpened"></div>
       <div class="renewal-container-detail" v-if="isOpened">
         <div class="Rc-detail-item">
@@ -32,17 +34,25 @@
       </div>
       <cr-button class="renewal-container-button" @click="submit">{{ buttonText }}</cr-button>
     </div>
+    <popup-with-iframe v-model="popupShow" :title="pupopData.title" :url="pupopData.url" />
   </div>
 </template>
 <script>
+import PopupWithIframe from "@/components/PopupWithIframe";
 import { getPolicyDetail, updateRenewal } from "@/api/policy";
+import settings from "@/api/settings";
 
 export default {
   name: "Renewal",
+  components: {
+    PopupWithIframe
+  },
   data() {
     return {
       isOpened: false,
-      nextYear: "-"
+      nextYear: "-",
+      popupShow: false,
+      pupopData: settings.renewalAgreement
     };
   },
   async created() {