修复一波 bug

src/pages/benefits/index.vue

@@ -52,6 +52,8 @@
                 ? 'Apply'
                 : item.type == 2
                 ? item.button_name
+                : item.receive_method == 2
+                ? 'Nearby shops'
                 : 'Send to me'
             }}
           </button>
@@ -85,7 +87,7 @@ export default defineComponent({
       right.type === '1'
         ? this.$router.push(`/repaire/appointment?right_id=${right.id}`)
         : right.type === '2'
-        ? (location.href = right.link)
+        ? (location.href = right.button_link)
         : this.$router.push({
             path: '/mailing',
             query: {
@@ -191,7 +193,9 @@ export default defineComponent({
     }
     .ptc-button {
       margin-top: 24px;
-      width: 248px;
+      padding: 0 24px;
+      width: auto;
+      min-width: 248px;
       height: 68px;
       font-size: 32px;
     }

src/pages/fill-order/StepThree.vue

@@ -15,21 +15,30 @@
         </div>
       </div>
     </div>
-    <div class="ptc-block">
-      <div class="ptc-inner">
-        <p class="ptc-label">Phone model</p>
-        <div class="detail">
-          <strong class="s1">{{ getters.modelName }}</strong>
-          <strong class="s4" @click="$emit('go', -1)">Modify ></strong>
+    <div class="ptc-wrapper">
+      <div class="ptc-block">
+        <div class="ptc-inner">
+          <p class="ptc-label">Phone model</p>
+          <div class="detail">
+            <strong class="s1">{{ getters.modelName }}</strong>
+            <strong class="s4" @click="$emit('go', -1)">Modify ></strong>
+          </div>
+        </div>
+      </div>
+      <div v-if="rootState.userInfo" class="ptc-button-group">
+        <div class="ptc-inner">
+          <button class="ptc-button" :loading="loading" @click="submit">
+            SUBMIT
+          </button>
         </div>
       </div>
     </div>
-    <div class="ptc-wrapper">
+    <div v-if="!rootState.userInfo" class="ptc-wrapper">
       <div class="ptc-block">
         <div class="ptc-inner">
           <p class="text">
             Please enter a valid email address, we will send you the latest
-            status of the order through this contact method。
+            status of the order through this contact method.
           </p>
           <input
             v-model="state.form.email"
@@ -66,8 +75,8 @@ const loading = ref(false)
 async function submit() {
   loading.value = true
   try {
-    const schema = string().email('Please enter a valid email address')
-    if (!rootState.userInfo) schema.required('Email is required')
+    let schema = string().email('Please enter a valid email address')
+    if (!rootState.userInfo) schema = schema.required('Email is required')
     await schema.validate(state.form.email)
     const { results } = await checkoutOrder(state.form)
     location.href = results
@@ -79,6 +88,9 @@ async function submit() {
 </script>
 
 <style lang="scss" scoped>
+.ptc-wrapper + .ptc-wrapper {
+  margin-top: 24px;
+}
 .text {
   margin-bottom: 48px;
   line-height: 44px;

src/pages/login/index.vue

@@ -87,7 +87,7 @@ async function handleLogin() {
   const { message } = await login(values as any)
   Toast(message)
   const { need_change } = await getUserInfo()
-  router.replace(+need_change ? '/password/change' : from || '/')
+  ;+need_change ? router.push('/password/change') : router.replace(from || '/')
 }
 </script>
 

src/pages/pay-result/index.vue

@@ -15,7 +15,7 @@
         <p class="info-item">
           <span class="info-label">Duration: </span>
           <span class="info-value"
-            >{{ info.start_time }}-{{ info.end_time }}</span
+            >1 year ({{ info.start_time }}-{{ info.end_time }})</span
           >
         </p>
         <p class="info-item">
@@ -93,8 +93,8 @@ export default defineComponent({
 
 <style lang="scss">
 .p-pay-result {
-  padding-left: 76px;
-  padding-right: 76px;
+  padding-left: 48px;
+  padding-right: 48px;
   .icon-success {
     background-image: url(@img/success.png);
   }