修复一波 bug

src/components/nav-bar/index.vue

@@ -529,8 +529,10 @@ async function signOut() {
     }
 
     .name {
+      position: relative;
       font-size: 48px;
       font-weight: 600;
+      z-index: 2;
     }
     .intro {
       margin-top: 16px;

src/pages/benefits/index.vue

@@ -9,7 +9,15 @@
           >{{ info.start_time }} to {{ info.end_time }}
         </div>
         <p class="l2">{{ info.phone_info }}</p>
-        <p class="l3">{{ info.phone_imei }}</p>
+        <p class="l3">
+          <span v-if="info.phone_imei">{{ info.phone_imei }}</span>
+          <router-link
+            v-else
+            class="primary bold"
+            :to="`/imei/bind?id=${info.id}`"
+            >BIND IMEI ></router-link
+          >
+        </p>
         <p
           v-if="
             info.subscribe_type != 3 && info.status == 1 && info.cancel_sub != 1
@@ -46,7 +54,7 @@
             <template v-if="item.available">
               Member price：<span class="highlight">${{ item.price }}</span>
             </template>
-            <template v-else
+            <template v-else-if="item.left_times > 0"
               >Available after {{ item.next_available_at }}</template
             >
           </p>
@@ -84,13 +92,13 @@ export default defineComponent({
     getButtonText(item) {
       switch (+item.type) {
         case 1:
-          return +item.need_apply ? 'Apply' : 'Nearby shops'
+          return +item.need_apply ? 'Apply' : 'Find Nearby Store'
         case 2:
           return item.button_type === 'contact_us'
             ? 'Contact us'
             : item.button_type && item.button_name
         case 4:
-          return +item.receive_method === 2 ? 'Nearby shops' : 'Send to me'
+          return +item.receive_method === 2 ? 'Find Nearby Store' : 'Send to me'
         default:
           return ''
       }
@@ -100,14 +108,14 @@ export default defineComponent({
         case 1:
           return +item.need_apply
             ? this.$router.push(`/repair/appointment?right_id=${item.id}`)
-            : 'Nearby shops'
+            : window.open('https://www.ptc.net.au/store-locator/')
         case 2:
           return item.button_type === 'contact_us'
             ? 'Contact us'
             : item.button_type && (location.href = item.button_link)
         case 4:
           return +item.receive_method === 2
-            ? 'Nearby shops'
+            ? window.open('https://www.ptc.net.au/store-locator/')
             : this.$router.push({
                 path: '/mailing',
                 query: {

src/pages/fill-order/StepOne.vue

@@ -74,7 +74,7 @@
             class="ptc-input"
             placeholder="Enter promotional code"
           />
-          <button class="input-btn" @click="checkDiscount">sbumit</button>
+          <button class="input-btn" @click="checkDiscount">Submit</button>
         </div>
         <div v-else class="coupon-wrap">
           <div class="coupon">

src/pages/login/index.vue

@@ -88,7 +88,9 @@ const router = useRouter()
 const { from } = useRoute().query as any
 const { values, handleSubmit } = useForm<ApiUser.Login.Request>({
   schema: {
-    email: string().required().email(),
+    email: string()
+      .required()
+      .email('Username or Password inserted are incorrect'),
     password: string().required(),
   },
 })

src/service/user.ts

@@ -20,6 +20,10 @@ export function resetPassword(data: ApiUser.PasswordReset.Request) {
   return request.post('/user/password/reset', data)
 }
 
+export function resetCheck(data: any) {
+  return request.post('/user/password/reset/check', data)
+}
+
 export function changePassword(data: ApiUser.PasswordChange.Request) {
   return request.post('/user/password/change', data)
 }

src/utils/asyncTask.ts

@@ -1,6 +1,6 @@
 export default class AsyncTask<T> {
-  promise: Promise<T | void>
-  done: (data?: T | PromiseLike<T>) => void
+  promise: Promise<T>
+  done: (data: T | PromiseLike<T>) => void
 
   constructor() {
     this.done = () => {}