diff --git a/src/api/index.js b/src/api/index.js index 0ff48c4..83bcf10 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -85,3 +85,9 @@ export const getUserFaviList = async (params) => export const addUserFavi = async (params) => ajax(`/UserFavi/addUserFavi`, params , "POST"); +export const getUserCateList = async () => + ajax(`/UserCate/getUserCateList`); + +export const updateUserCate = async (params) => + ajax(`/UserCate/updateUserCate`, params , "POST"); + diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 8065886..fddbdaa 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -541,8 +541,17 @@ h1, h2, h3, h4, h5, h6 { } /* ========================================= vant ============================================= */ +.van-nav-bar { + position: sticky; + top: 0; + z-index: 10001; +} + .van-notice-bar { + position: sticky; + top: 78px; font-size: 18px; + z-index: 10000; } .van-popup.van-toast { @@ -704,6 +713,12 @@ h1, h2, h3, h4, h5, h6 { object-fit: cover; } +.bottomBtnCnt { + padding: 15px; + background: -webkit-gradient(linear, left bottom, left top, from(#b2c4ce), color-stop(80%, #b2c4ce), color-stop(90%, rgba(178, 196, 206, 0.5)), to(rgba(178, 196, 206, 0))); + background: linear-gradient(to top, #b2c4ce 0%, #b2c4ce 80%, rgba(178, 196, 206, 0.5) 90%, rgba(178, 196, 206, 0) 100%); +} + /*! * Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) diff --git a/src/assets/sass/layout/_layout.scss b/src/assets/sass/layout/_layout.scss index d179cf1..0ceec24 100644 --- a/src/assets/sass/layout/_layout.scss +++ b/src/assets/sass/layout/_layout.scss @@ -4,10 +4,21 @@ /* ========================================= vant ============================================= */ + +.van-nav-bar{ + position: sticky; + top:0; + z-index: 10001; +} + .van-notice-bar{ + position: sticky; + top:78px; font-size: 18px; + z-index: 10000; } + .van-popup{ &.van-toast{ display: flex; @@ -153,6 +164,11 @@ } } +.bottomBtnCnt{ + padding: 15px; + background: linear-gradient(to top,#b2c4ce 0%,#b2c4ce 80%,rgba(178,196,206,.5) 90%,rgba(178,196,206,0) 100%); +} + diff --git a/src/views/Address/index.vue b/src/views/Address/index.vue index 3b04f75..5b10e79 100644 --- a/src/views/Address/index.vue +++ b/src/views/Address/index.vue @@ -1,59 +1,208 @@ diff --git a/src/views/Card/Edit.vue b/src/views/Card/Edit.vue index 555bc67..76857a5 100644 --- a/src/views/Card/Edit.vue +++ b/src/views/Card/Edit.vue @@ -98,8 +98,7 @@ const sizeColumns = ref([ { text: "5xl", value: "5xl" }, ]); -watch( - () => form.value.title, +watch(() => form.value.title, (newVal) => { form.value.json5.altText = newVal; } @@ -301,33 +300,33 @@ const handleSubmit = async () => {