diff --git a/.env b/.env index 2ee8936..8b13789 100644 --- a/.env +++ b/.env @@ -1,2 +1 @@ -VITE_APP_IMG_URL = 'https://shop.h888.fun/' diff --git a/.env.development b/.env.development index 7f6a777..c60b2c6 100644 --- a/.env.development +++ b/.env.development @@ -3,3 +3,7 @@ VITE_APP_IMG_URL = 'https://shop.h888.fun/' VITE_APP_API_URL = 'https://shop.h888.fun/appapi/v1' VITE_APP_SSO_URL = 'https://sso.h888.fun/api/v1' + +VITE_APP_LINE_CLIENT_ID = '1661025693' + +VITE_APP_LINE_CLIENT_SECRET = '914cc067cb11ffbd47640de8f3f4a00a' diff --git a/.env.h888 b/.env.h888 new file mode 100644 index 0000000..66a4fec --- /dev/null +++ b/.env.h888 @@ -0,0 +1,9 @@ +VITE_APP_IMG_URL = 'https://shop.h888.fun/' + +VITE_APP_API_URL = 'https://shop.h888.fun/appapi/v1' + +VITE_APP_SSO_URL = 'https://sso.h888.fun/api/v1' + +VITE_APP_LINE_CLIENT_ID = '1657876696' + +VITE_APP_LINE_CLIENT_SECRET = '2a7930d6143a00ff421812b942cde200' diff --git a/.env.production b/.env.production index 4030c4b..face6d7 100644 --- a/.env.production +++ b/.env.production @@ -3,3 +3,7 @@ VITE_APP_IMG_URL = 'https://shop.slash1000.com/' VITE_APP_API_URL = 'https://shop.slash1000.com/appapi/v1' VITE_APP_SSO_URL = 'https://sso.slash1000.com/api/v1' + +VITE_APP_LINE_CLIENT_ID = '1661025693' + +VITE_APP_LINE_CLIENT_SECRET = '914cc067cb11ffbd47640de8f3f4a00a' \ No newline at end of file diff --git a/.env.slash b/.env.slash new file mode 100644 index 0000000..a01540d --- /dev/null +++ b/.env.slash @@ -0,0 +1,11 @@ +VITE_APP_ENV = slash + +VITE_APP_IMG_URL = 'https://shop.slash1000.com/' + +VITE_APP_API_URL = 'https://shop.slash1000.com/appapi/v1' + +VITE_APP_SSO_URL = 'https://sso.slash1000.com/api/v1' + +VITE_APP_LINE_CLIENT_ID = '1661025693' + +VITE_APP_LINE_CLIENT_SECRET = '914cc067cb11ffbd47640de8f3f4a00a' \ No newline at end of file diff --git a/components.d.ts b/components.d.ts index bbfbc5e..2ab82a2 100644 --- a/components.d.ts +++ b/components.d.ts @@ -17,6 +17,7 @@ declare module '@vue/runtime-core' { VanCollapse: typeof import('vant/es')['Collapse'] VanCollapseItem: typeof import('vant/es')['CollapseItem'] VanDatePicker: typeof import('vant/es')['DatePicker'] + VanDialog: typeof import('vant/es')['Dialog'] VanField: typeof import('vant/es')['Field'] VanForm: typeof import('vant/es')['Form'] VanGrid: typeof import('vant/es')['Grid'] diff --git a/package.json b/package.json index f8884aa..3abf7af 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,8 @@ "scripts": { "dev": "vite", "build": "vue-tsc && vite build", + "build:h888": "vue-tsc && vite build --mode h888", + "build:slash": "vue-tsc && vite build --mode slash", "preview": "vite preview" }, "dependencies": { diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 9a582da..48e0d59 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -615,11 +615,11 @@ li { color: #222 } -p { +/* p { font-size: 14px; line-height: 1.5; color: #222 -} +} */ a { -webkit-transition: 0.5s ease; @@ -657,51 +657,6 @@ a:focus { box-shadow: none } -h1 { - font-size: 38px; - line-height: 33px; - text-transform: capitalize; - margin: 0; - color: #222 -} - -h2 { - font-size: 24px; - line-height: 22px; - margin: 0; - color: #222 -} - -h3 { - font-size: 20px; - line-height: 16px; - margin: 0; - color: #222 -} - -h4 { - font-size: 18px; - line-height: 25px; - margin: 0; - color: #222 -} - -h5 { - font-size: 16px; - line-height: 22px; - margin: 0; - font-weight: 400; - color: #222 -} - -h6 { - font-size: 14px; - line-height: 19px; - font-weight: 400; - margin: 0; - color: #222 -} - .font-base { font-size: 14px !important } diff --git a/src/assets/images/avatar/avatar.png b/src/assets/images/avatar/avatar.png new file mode 100644 index 0000000..c05f641 Binary files /dev/null and b/src/assets/images/avatar/avatar.png differ diff --git a/src/assets/images/feature01.png b/src/assets/images/feature01.png deleted file mode 100644 index 373b4a1..0000000 Binary files a/src/assets/images/feature01.png and /dev/null differ diff --git a/src/assets/images/feature02.png b/src/assets/images/feature02.png deleted file mode 100644 index 75b8696..0000000 Binary files a/src/assets/images/feature02.png and /dev/null differ diff --git a/src/assets/images/home.png b/src/assets/images/home.png new file mode 100644 index 0000000..1399048 Binary files /dev/null and b/src/assets/images/home.png differ diff --git a/src/components/Footer.vue b/src/components/Footer.vue index 0eee1d7..edd7522 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -16,15 +16,21 @@
  • - + 立即購買
    • -
  • + +
  • + + + 電子名片 +
  • diff --git a/src/components/Header.vue b/src/components/Header.vue index 389f54b..f8637a5 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -54,13 +54,13 @@
    • -
  • +
  • diff --git a/src/pages/Address/Index.vue b/src/pages/Address/Index.vue index 324d4a9..080a5c1 100644 --- a/src/pages/Address/Index.vue +++ b/src/pages/Address/Index.vue @@ -37,7 +37,7 @@

    {{ ua.consignee }}

    {{ ua.tel }}

    -

    {{ua.city + '' + ua.district + '' + ua.address }}

    +

    {{ ua.zipcode + ua.city + "" + ua.district + "" + ua.address }}

    @@ -157,16 +157,16 @@ const addrForm = ref(); const form = ref({ name: "住家", - consignee: '', - tel: '', - city: '', - district: '', - zipcode: '', - address: '', + consignee: "", + tel: "", + city: "", + district: "", + zipcode: "", + address: "", is_default: false, }); -const selectedValue = ref(["0"]) +const selectedValue = ref(["0"]); onMounted(async () => { let addrRes = await getUserAddress(); @@ -197,6 +197,7 @@ const onConfirm = ({ selectedOptions }) => { form.value.city = selectedOptions[0].text; form.value.district = selectedOptions[1].text; + form.value.zipcode = selectedOptions[1].zipcode; }; const handleSubmit = () => { @@ -255,13 +256,13 @@ const handleSetDefault = async (id) => { } }); - orderStore.shipping = { - shipping_code: "shipping", - extra_data: { - address: addr.address, - consignee: addr.consignee, - tel: addr.tel, - }, + orderStore.shipping.extra_data = { + city: addr.city, + district: addr.district, + zipcode: addr.zipcode, + address: addr.address, + consignee: addr.consignee, + tel: addr.tel, }; router.replace("/checkout"); diff --git a/src/pages/Card/Index.vue b/src/pages/Card/Index.vue index 5e28298..faea4b2 100644 --- a/src/pages/Card/Index.vue +++ b/src/pages/Card/Index.vue @@ -1,16 +1,16 @@ -