diff --git a/src/api/index.js b/src/api/index.js index 41d4384..831f18c 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -10,7 +10,11 @@ export const bindCard = async (params) => export const checkLineId = async (lineid) => ajax(`/auth/checkLineId`, { lineid }, "GET"); -export const getUserInfo = async () => ajax(`/user/getUserInfo`); +export const getUserInfo = async () => + ajax(`/user/getUserInfo`); + +export const updateUserInfo = async () => + ajax(`/user/updateUserInfo`); export const setUserLevel = async (level) => ajax(`/user/setUserLevel`, { level }, "POST"); diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 8906a4c..ce5d091 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -27,16 +27,16 @@ } .text-moBlue { - color: #486499 !important; + color: #4a677d !important; } .bg-moBlue { - background-color: #486499 !important; + background-color: #4a677d !important; } .bd-moBlue { border-style: solid; - border-color: #486499 !important; + border-color: #4a677d !important; } .text-darkBlue { @@ -339,13 +339,13 @@ h1, h2, h3, h4, h5, h6 { } .btn-moBlue { - border: 1px solid #486499 !important; + border: 1px solid #4a677d !important; color: #fff; - background-color: #486499; + background-color: #4a677d; } .btn-moBlue:hover { color: #fff; - background-color: #384d76; + background-color: #374d5d; } .btn-darkBlue { @@ -431,14 +431,14 @@ h1, h2, h3, h4, h5, h6 { } .btn-outline-moBlue { - border: 1px solid #486499; - color: #486499; + border: 1px solid #4a677d; + color: #4a677d; background-color: transparent; background-color: #fff; } .btn-outline-moBlue:hover { color: #fff; - background-color: #486499; + background-color: #4a677d; } .btn-outline-darkBlue { @@ -639,6 +639,11 @@ h1, h2, h3, h4, h5, h6 { } /* ========================================= stage ============================================= */ +.page { + min-height: 100vh; + background-color: #f1e6e2; +} + .content { padding: 15px 0; background-color: #b2c4ce; diff --git a/src/assets/sass/base/_global.scss b/src/assets/sass/base/_global.scss index 3e73285..dc3f189 100644 --- a/src/assets/sass/base/_global.scss +++ b/src/assets/sass/base/_global.scss @@ -18,7 +18,7 @@ $radius: ( $basicColor: ( lightBlue:#b2c4ce, skyBlue:#5b7b94, - moBlue:#486499, + moBlue:#4a677d, darkBlue:#345068, lightPink:#f1e6e2, cherry:#E31D64, diff --git a/src/assets/sass/layout/_layout.scss b/src/assets/sass/layout/_layout.scss index b27e847..3ee3198 100644 --- a/src/assets/sass/layout/_layout.scss +++ b/src/assets/sass/layout/_layout.scss @@ -93,6 +93,11 @@ /* ========================================= stage ============================================= */ +.page{ + min-height:100vh; + background-color: #f1e6e2 ; +} + .content{ padding: 15px 0; background-color: #b2c4ce; @@ -103,19 +108,19 @@ justify-content: center; align-items: center; .upload-img{ - width: 100px; - aspect-ratio: 1/1; - border-radius: 50%; - border:1px #d8d8d8 solid; + width: 100px; + aspect-ratio: 1/1; + border-radius: 50%; + border:1px #d8d8d8 solid; } - } - - .cropper { +} + +.cropper { height: 300px; background: #DDD; - } - - .cropper-section{ +} + +.cropper-section{ margin: 0 auto; position: fixed; text-align: center; @@ -124,14 +129,14 @@ max-width: 500px; z-index: 8888; .crop-area{ - margin: 5 auto; - width: 100%; + margin: 5 auto; + width: 100%; } .crop-btn{ - background-color: #666; - text-align: center; + background-color: #666; + text-align: center; } - } +} /* ========================================= other ============================================= */ diff --git a/src/views/Card/Edit.vue b/src/views/Card/Edit.vue index 2c383c4..116edac 100644 --- a/src/views/Card/Edit.vue +++ b/src/views/Card/Edit.vue @@ -1,553 +1,3 @@ - - + + \ No newline at end of file diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 1b5107b..5b3979c 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -199,7 +199,8 @@ const overdue = computed(() => { }); const goCardEdit = () => { - if (userInfo.value.nc_type < 2) { + // if (userInfo.value.nc_type < 2) { + if (userInfo.value.level < 2) { router.push("/card/notice"); } else { router.push("/card/edit"); @@ -225,6 +226,11 @@ const doCopyUid = () => { showToast("已放入剪貼簿"); }; +const doShare = () => { + toClipboard(`https://liff.line.me/${import.meta.env.VITE_APP_LINE_LIFF_ID}/?aid=${store.state.user.userInfo.agent_prefix}`) + showToast("已放入剪貼簿"); +}; + const bindTggo = () => { console.log(userInfo.value); let url = `https://www.tggo.com.tw/u.cgi?&mnm=mybinding&ncode=${userInfo.value.uniqid}&name=${userInfo.value.real_name}&openExternalBrowser=1`; @@ -243,7 +249,7 @@ const handleLogout = () => {