From 7a32c4e726a49ab2e6a0e20c49be456d882fd802 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUS91B7\\Showeasy" <fred870421@gmail.com>
Date: Fri, 31 Mar 2023 11:58:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E(=E6=9C=AA=E7=A8=85)=E6=A8=A3?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontEnd/nuxt.config.js                 | 3 ++-
 FrontEnd/pages/service/_id.vue          | 3 +++
 FrontEnd/pages/service/checkout/_id.vue | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/FrontEnd/nuxt.config.js b/FrontEnd/nuxt.config.js
index d4db147..9dc8e17 100644
--- a/FrontEnd/nuxt.config.js
+++ b/FrontEnd/nuxt.config.js
@@ -141,8 +141,9 @@ export default {
   proxy: {
     '/trending': {
       // target: 'http://www.origtek.com:3002',// 服務地址
-      target: 'https://showeasy.com:5000',// API 正式機
+      // target: 'https://showeasy.com:5000',// API 正式機
       // target: 'http://showeasy.com:3001',// API 測式機 (無SSL)
+      target: 'http://localhost:3466',// 本機
       pathRewrite: {
         '^/trending': '/'
       },
diff --git a/FrontEnd/pages/service/_id.vue b/FrontEnd/pages/service/_id.vue
index d8c1474..caa4dc6 100644
--- a/FrontEnd/pages/service/_id.vue
+++ b/FrontEnd/pages/service/_id.vue
@@ -100,6 +100,7 @@
                   <div class="tw-flex tw-items-center tw-mb-[8px] md:tw-mb-0">
                     <div class="tw-body-4 tw-text-neutrals-900 tw-mr-[10px] md:t24">
                       ${{ finalPrice }} {{ currencyName }}
+                      <span style="font-size: 16px; color: gray;">{{ tax }}</span>
                     </div>
                   </div>
                   <!-- <div class="tw-hidden tw-body-4 tw-text-neutrals-600 md:tw-hidden">
@@ -237,6 +238,7 @@
           <div class="tw-flex tw-items-center tw-mb-[12px] md:tw-mb-0">
             <div class="t16 tw-text-neutrals-900 tw-mr-[10px] md:t20 md:tw-mr-0">
               ${{ finalPrice }} {{ currencyName }}
+              <span style="font-size: 16px; color: gray;">{{ tax }}</span>
             </div>
           </div>
           <div class="tw-flex tw-justify-center tw-items-center tw-w-full md:tw-w-fit">
@@ -445,6 +447,7 @@ export default {
       serviceID: false,
       stackerDiscountQuota: 0,
       stackerDiscountQuotaUsed: 0,
+      tax: '(未稅)'
     };
   },
   async created() {
diff --git a/FrontEnd/pages/service/checkout/_id.vue b/FrontEnd/pages/service/checkout/_id.vue
index 23678e8..f1bab04 100644
--- a/FrontEnd/pages/service/checkout/_id.vue
+++ b/FrontEnd/pages/service/checkout/_id.vue
@@ -341,7 +341,7 @@ export default {
   },
   async created() {
 
-    console.log(this.$auth.loggedIn)
+    console.log(this.$auth)
 
     const beforePathCookie = this.$route.fullPath;
     this.$auth.$storage.setUniversal('userBeforePath', beforePathCookie);