處理衝突

FrontEnd/pages/service/done/_id.vue

@@ -101,7 +101,7 @@ export default {
           bookingNo: ret.BookingNo,
           service_date: ret.ServiceDateSFormat,
           created_at: ret.BookingDateFormat,
-          currency: ret.CurrencyID,
+          currency: ret.CurrencyName,
         };
       }
     }

FrontEnd/pages/user/forgot.vue

@@ -47,7 +47,6 @@
             <div class="md:tw-flex md:tw-justify-center md:tw-items-center">
               <button
                 @click="sendForgotMail"
-                  :disabled="!resendValid"
                 :class="[
                   'tw-block tw-w-full tw-py-[10px] tw-rounded-[16px] tw-border tw-border-solid tw-body-3 tw-font-normal tw-transition-all tw-duration-200 tw-ease-in-out',
                   resendValid
@@ -222,6 +221,7 @@
                 </v-btn> -->
               </v-card>
           </v-dialog>
+          
         </div>
       </div>
     </div>
@@ -449,9 +449,7 @@ export default {
   letter-spacing: 0.02em;
   color: #232323;
 }
-
 </style>
-
 <style lang="scss" scoped>
 #app {
   overflow-y: hidden;