Merge branch 'master' of https://gitee.com/ifcheng/ptc

src/pages/benefits/index.vue

@@ -20,7 +20,7 @@
             Renewal management >
           </router-link>
         </p>
-        <p v-else-if="subscribe_type == 3 && info.status == 1" class="l4">
+        <p v-else-if="info.subscribe_type == 3 && info.status == 1" class="l4">
           <button
             class="ptc-button ptc-button--stroke"
             @click="$router.push(`/fill-order?renewal=${info.id}`)"

src/pages/pay-result/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="p-pay-result">
-    <div v-if="status === 'success' && info" class="pay-success ptc-inner">
+    <div
+      v-if="$route.params.status === 'success' && info"
+      class="pay-success ptc-inner"
+    >
       <div class="alert">
         <i class="alert-icon icon-success"></i>
         <p class="alert-message">
@@ -41,7 +44,9 @@
         >
           CHECK ORDER
         </button>
-        <button class="ptc-button ptc-button--stroke">HOMEPAGE</button>
+        <button class="ptc-button ptc-button--stroke" @click="toHomePage">
+          HOMEPAGE
+        </button>
       </div>
     </div>
 
@@ -53,7 +58,9 @@
       <!-- <p class="reason">Insufficient bank card balance</p> -->
       <div class="button-group">
         <button class="ptc-button">CUSTOMER SERVICE</button>
-        <button class="ptc-button ptc-button--stroke">HOMEPAGE</button>
+        <button class="ptc-button ptc-button--stroke" @click="toHomePage">
+          HOMEPAGE
+        </button>
       </div>
     </div>
   </div>
@@ -65,7 +72,6 @@ import { state, getCurrentOrder } from '@/store'
 
 export default defineComponent({
   name: 'PayResult',
-  props: ['status'], // 'success' | 'fail'
   async beforeRouteEnter(to) {
     if (to.params.status === 'success') {
       await getCurrentOrder(to.query.id)
@@ -82,6 +88,11 @@ export default defineComponent({
   created() {
     state.bgWhite = true
   },
+  methods: {
+    toHomePage() {
+      location.href = '/'
+    },
+  },
 })
 </script>
 

src/router.ts

@@ -43,7 +43,6 @@ const router = createRouter({
     {
       path: '/pay-result/:status',
       component: () => import('./pages/pay-result/index.vue'),
-      props: true,
       meta: { auth: true },
     },
     {
@@ -74,13 +73,11 @@ const router = createRouter({
     {
       path: '/renewal',
       component: () => import('./pages/renewal/index.vue'),
-      props: true,
       meta: { auth: true },
     },
     {
       path: '/repair/appointment',
       component: () => import('./pages/repair/appointment.vue'),
-      props: true,
       meta: { auth: true },
     },
     {