diff --git a/.env.development b/.env.development index db5b13e..25bd16a 100644 --- a/.env.development +++ b/.env.development @@ -6,8 +6,8 @@ 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_ID = '1657876696' -VITE_APP_LINE_CLIENT_SECRET = '914cc067cb11ffbd47640de8f3f4a00a' +VITE_APP_LINE_CLIENT_SECRET = '2a7930d6143a00ff421812b942cde200' VITE_APP_WS_URL = 'wss://ws.h888.fun:8443' \ No newline at end of file diff --git a/components.d.ts b/components.d.ts index 2ab82a2..86eb65c 100644 --- a/components.d.ts +++ b/components.d.ts @@ -14,27 +14,15 @@ declare module '@vue/runtime-core' { UserHeader: typeof import('./src/components/UserHeader.vue')['default'] VanButton: typeof import('vant/es')['Button'] VanCellGroup: typeof import('vant/es')['CellGroup'] - 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'] VanGridItem: typeof import('vant/es')['GridItem'] VanIcon: typeof import('vant/es')['Icon'] - VanList: typeof import('vant/es')['List'] - VanNavBar: typeof import('vant/es')['NavBar'] VanOverlay: typeof import('vant/es')['Overlay'] - VanPicker: typeof import('vant/es')['Picker'] VanPopover: typeof import('vant/es')['Popover'] - VanPopup: typeof import('vant/es')['Popup'] - VanPullRefresh: typeof import('vant/es')['PullRefresh'] - VanRadio: typeof import('vant/es')['Radio'] - VanRadioGroup: typeof import('vant/es')['RadioGroup'] VanSwipe: typeof import('vant/es')['Swipe'] VanSwipeItem: typeof import('vant/es')['SwipeItem'] - VanSwitch: typeof import('vant/es')['Switch'] VanTab: typeof import('vant/es')['Tab'] VanTabs: typeof import('vant/es')['Tabs'] VanUploader: typeof import('vant/es')['Uploader'] diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 48e0d59..55b86ee 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -498,110 +498,6 @@ html { font-size: 16px } -@font-face { - font-family: "Mulish"; - font-style: normal; - font-weight: 200; - src: url("/src/assets/fonts/mulish/mulish-v7-latin-200.eot"); - src: local(""), url("/src/assets/fonts/mulish/mulish-v7-latin-200.eot?") format("embedded-opentype"), url("/src/assets/fonts/mulish/mulish-v7-latin-200.woff2") format("woff2"), url("/src/assets/fonts/mulish/mulish-v7-latin-200.woff") format("woff"), url("/src/assets/fonts/mulish/mulish-v7-latin-200.ttf") format("truetype"), url("/src/assets/fonts/mulish/mulish-v7-latin-200.svg") format("svg") -} - -@font-face { - font-family: "Mulish"; - font-style: normal; - font-weight: 300; - src: url("/src/assets/fonts/mulish/mulish-v7-latin-300.eot"); - src: local(""), url("/src/assets/fonts/mulish/mulish-v7-latin-300.eot?") format("embedded-opentype"), url("/src/assets/fonts/mulish/mulish-v7-latin-300.woff2") format("woff2"), url("/src/assets/fonts/mulish/mulish-v7-latin-300.woff") format("woff"), url("/src/assets/fonts/mulish/mulish-v7-latin-300.ttf") format("truetype"), url("/src/assets/fonts/mulish/mulish-v7-latin-300.svg") format("svg") -} - -@font-face { - font-family: "Mulish"; - font-style: normal; - font-weight: 400; - src: url("/src/assets/fonts/mulish/mulish-v7-latin-regular.eot"); - src: local(""), url("/src/assets/fonts/mulish/mulish-v7-latin-regular.eot?") format("embedded-opentype"), url("/src/assets/fonts/mulish/mulish-v7-latin-regular.woff2") format("woff2"), url("/src/assets/fonts/mulish/mulish-v7-latin-regular.woff") format("woff"), url("/src/assets/fonts/mulish/mulish-v7-latin-regular.ttf") format("truetype"), url("/src/assets/fonts/mulish/mulish-v7-latin-regular.svg") format("svg") -} - -@font-face { - font-family: "Mulish"; - font-style: normal; - font-weight: 500; - src: url("/src/assets/fonts/mulish/mulish-v7-latin-500.eot"); - src: local(""), url("/src/assets/fonts/mulish/mulish-v7-latin-500.eot?") format("embedded-opentype"), url("/src/assets/fonts/mulish/mulish-v7-latin-500.woff2") format("woff2"), url("/src/assets/fonts/mulish/mulish-v7-latin-500.woff") format("woff"), url("/src/assets/fonts/mulish/mulish-v7-latin-500.ttf") format("truetype"), url("/src/assets/fonts/mulish/mulish-v7-latin-500.svg") format("svg") -} - -@font-face { - font-family: "Mulish"; - font-style: normal; - font-weight: 600; - src: url("/src/assets/fonts/mulish/mulish-v7-latin-600.eot"); - src: local(""), url("/src/assets/fonts/mulish/mulish-v7-latin-600.eot?") format("embedded-opentype"), url("/src/assets/fonts/mulish/mulish-v7-latin-600.woff2") format("woff2"), url("/src/assets/fonts/mulish/mulish-v7-latin-600.woff") format("woff"), url("/src/assets/fonts/mulish/mulish-v7-latin-600.ttf") format("truetype"), url("/src/assets/fonts/mulish/mulish-v7-latin-600.svg") format("svg") -} - -@font-face { - font-family: "Mulish"; - font-style: normal; - font-weight: 800; - src: url("/src/assets/fonts/mulish/mulish-v7-latin-800.eot"); - src: local(""), url("/src/assets/fonts/mulish/mulish-v7-latin-800.eot?") format("embedded-opentype"), url("/src/assets/fonts/mulish/mulish-v7-latin-800.woff2") format("woff2"), url("/src/assets/fonts/mulish/mulish-v7-latin-800.woff") format("woff"), url("/src/assets/fonts/mulish/mulish-v7-latin-800.ttf") format("truetype"), url("/src/assets/fonts/mulish/mulish-v7-latin-800.svg") format("svg") -} - -@font-face { - font-family: "Mulish"; - font-style: normal; - font-weight: 700; - src: url("/src/assets/fonts/mulish/mulish-v7-latin-700.eot"); - src: local(""), url("/src/assets/fonts/mulish/mulish-v7-latin-700.eot?") format("embedded-opentype"), url("/src/assets/fonts/mulish/mulish-v7-latin-700.woff2") format("woff2"), url("/src/assets/fonts/mulish/mulish-v7-latin-700.woff") format("woff"), url("/src/assets/fonts/mulish/mulish-v7-latin-700.ttf") format("truetype"), url("/src/assets/fonts/mulish/mulish-v7-latin-700.svg") format("svg") -} - -@font-face { - font-family: "Mulish"; - font-style: normal; - font-weight: 900; - src: url("/src/assets/fonts/mulish/mulish-v7-latin-900.eot"); - src: local(""), url("/src/assets/fonts/mulish/mulish-v7-latin-900.eot?") format("embedded-opentype"), url("/src/assets/fonts/mulish/mulish-v7-latin-900.woff2") format("woff2"), url("/src/assets/fonts/mulish/mulish-v7-latin-900.woff") format("woff"), url("/src/assets/fonts/mulish/mulish-v7-latin-900.ttf") format("truetype"), url("/src/assets/fonts/mulish/mulish-v7-latin-900.svg") format("svg") -} - -@font-face { - font-family: "Quicksand"; - font-style: normal; - font-weight: 300; - src: url("/src/assets/fonts/quicksand/quicksand-v24-latin-300.eot"); - src: local(""), url("/src/assets/fonts/quicksand/quicksand-v24-latin-300.eot?") format("embedded-opentype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-300.woff2") format("woff2"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-300.woff") format("woff"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-300.ttf") format("truetype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-300.svg") format("svg") -} - -@font-face { - font-family: "Quicksand"; - font-style: normal; - font-weight: 400; - src: url("/src/assets/fonts/quicksand/quicksand-v24-latin-regular.eot"); - src: local(""), url("/src/assets/fonts/quicksand/quicksand-v24-latin-regular.eot?") format("embedded-opentype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-regular.woff2") format("woff2"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-regular.woff") format("woff"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-regular.ttf") format("truetype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-regular.svg") format("svg") -} - -@font-face { - font-family: "Quicksand"; - font-style: normal; - font-weight: 500; - src: url("/src/assets/fonts/quicksand/quicksand-v24-latin-500.eot"); - src: local(""), url("/src/assets/fonts/quicksand/quicksand-v24-latin-500.eot?") format("embedded-opentype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-500.woff2") format("woff2"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-500.woff") format("woff"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-500.ttf") format("truetype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-500.svg") format("svg") -} - -@font-face { - font-family: "Quicksand"; - font-style: normal; - font-weight: 600; - src: url("/src/assets/fonts/quicksand/quicksand-v24-latin-600.eot"); - src: local(""), url("/src/assets/fonts/quicksand/quicksand-v24-latin-600.eot?") format("embedded-opentype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-600.woff2") format("woff2"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-600.woff") format("woff"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-600.ttf") format("truetype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-600.svg") format("svg") -} - -@font-face { - font-family: "Quicksand"; - font-style: normal; - font-weight: 700; - src: url("/src/assets/fonts/quicksand/quicksand-v24-latin-700.eot"); - src: local(""), url("/src/assets/fonts/quicksand/quicksand-v24-latin-700.eot?") format("embedded-opentype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-700.woff2") format("woff2"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-700.woff") format("woff"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-700.ttf") format("truetype"), url("/src/assets/fonts/quicksand/quicksand-v24-latin-700.svg") format("svg") -} - body { font-family: "Mulish", "sans-serif" } diff --git a/src/components/Footer.vue b/src/components/Footer.vue index edd7522..3e87f8e 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -11,7 +11,7 @@