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

src/components/nav-bar/index.vue

@@ -38,9 +38,7 @@
       <div class="user pointer flex-ac" @click.stop="onClickMine">
         <template v-if="state.userInfo">
           <i class="icon-mine"></i>
-          <span class="user-name ellipsis">{{
-            state.userInfo ? state.userInfo.name : 'Sign in'
-          }}</span>
+          <span class="user-name ellipsis">{{ state.userInfo.name }}</span>
         </template>
         <span v-else class="u-no">LOGIN</span>
       </div>

src/pages/fill-order/index.vue

@@ -30,7 +30,7 @@ const step = ref(0)
 const Component = computed(() => [StepOne, StepTwo, StepThree][step.value])
 const { from, invitee, renewal } = useRoute().query as any
 
-state.form.from = from || ''
+state.form.from = from || (renewal ? 'renew' : '')
 state.form.invitor = invitee || ''
 if (renewal) {
   state.form.renewal = +renewal

src/pages/pay-result/index.vue

@@ -90,7 +90,7 @@ export default defineComponent({
   },
   methods: {
     toHomePage() {
-      location.href = '/'
+      location.href = '/ptc/'
     },
   },
 })