Browse Source

新增(未稅)樣式

Dev
parent
commit
7a32c4e726
  1. 3
      FrontEnd/nuxt.config.js
  2. 3
      FrontEnd/pages/service/_id.vue
  3. 2
      FrontEnd/pages/service/checkout/_id.vue

3
FrontEnd/nuxt.config.js

@ -141,8 +141,9 @@ export default {
proxy: { proxy: {
'/trending': { '/trending': {
// target: 'http://www.origtek.com:3002',// 服務地址 // 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://showeasy.com:3001',// API 測式機 (無SSL)
target: 'http://localhost:3466',// 本機
pathRewrite: { pathRewrite: {
'^/trending': '/' '^/trending': '/'
}, },

3
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-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"> <div class="tw-body-4 tw-text-neutrals-900 tw-mr-[10px] md:t24">
${{ finalPrice }} {{ currencyName }} ${{ finalPrice }} {{ currencyName }}
<span style="font-size: 16px; color: gray;">{{ tax }}</span>
</div> </div>
</div> </div>
<!-- <div class="tw-hidden tw-body-4 tw-text-neutrals-600 md:tw-hidden"> <!-- <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="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"> <div class="t16 tw-text-neutrals-900 tw-mr-[10px] md:t20 md:tw-mr-0">
${{ finalPrice }} {{ currencyName }} ${{ finalPrice }} {{ currencyName }}
<span style="font-size: 16px; color: gray;">{{ tax }}</span>
</div> </div>
</div> </div>
<div class="tw-flex tw-justify-center tw-items-center tw-w-full md:tw-w-fit"> <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, serviceID: false,
stackerDiscountQuota: 0, stackerDiscountQuota: 0,
stackerDiscountQuotaUsed: 0, stackerDiscountQuotaUsed: 0,
tax: '(未稅)'
}; };
}, },
async created() { async created() {

2
FrontEnd/pages/service/checkout/_id.vue

@ -341,7 +341,7 @@ export default {
}, },
async created() { async created() {
console.log(this.$auth.loggedIn)
console.log(this.$auth)
const beforePathCookie = this.$route.fullPath; const beforePathCookie = this.$route.fullPath;
this.$auth.$storage.setUniversal('userBeforePath', beforePathCookie); this.$auth.$storage.setUniversal('userBeforePath', beforePathCookie);

Loading…
Cancel
Save