diff --git a/src/App.vue b/src/App.vue index e7a3676..a184b28 100644 --- a/src/App.vue +++ b/src/App.vue @@ -52,7 +52,7 @@ router.beforeEach((to, from) => { } :root { - --r:24; + --r: 24; --g: 124; --b: 170; --r-lighter: calc(var(--r) + (255 - var(--r)) * 0.2); @@ -74,13 +74,12 @@ router.beforeEach((to, from) => { --el-color-primary-dark-2: rgb(var(--r-darker), var(--g-darker), var(--b-darker)) !important; --el-color-primary-light-5: rgb(var(--r-lighter2), var(--g-lighter2), var(--b-lighter2)) !important; - --el-font-size-base: 20px !important; - --el-message-close-size: 20px !important; + --el-font-size-base: 16px !important; + --el-message-close-size: var(--el-font-size-base) !important; --el-component-size-large: 50px !important; --el-mask-color: rgba(255, 255, 255, 0.6) !important; } - @font-face { font-family: 'num'; src: url('@/assets/font/Ignotum-Regular.ttf'); diff --git a/src/components/leftMenu.vue b/src/components/leftMenu.vue index ffe83f0..bcefb94 100644 --- a/src/components/leftMenu.vue +++ b/src/components/leftMenu.vue @@ -64,7 +64,7 @@ const menus = ref([ \ No newline at end of file diff --git a/src/components/skuModal.vue b/src/components/skuModal.vue index c58ea38..4339db3 100644 --- a/src/components/skuModal.vue +++ b/src/components/skuModal.vue @@ -176,34 +176,20 @@ defineExpose({ .row { border-bottom: 1px solid #ececec; - margin-top: 20px; + margin-top: var(--el-font-size-base); .title { - font-size: 20px; + font-size: var(--el-font-size-base); } .sku_wrap { display: flex; padding: 14px 0; - - .item { - color: var(--primary-color); - padding: 8px 16px; - font-size: 18px; - border: 1px solid var(--primary-color); - margin-right: 14px; - border-radius: 2px; - - &.active { - background-color: var(--primary-color); - color: #fff; - } - } } } .footer { - padding-top: 100px; + padding-top: 30px; .info { height: 50px; diff --git a/src/views/home/components/cartOperation.vue b/src/views/home/components/cartOperation.vue index ea63eaf..3b2c699 100644 --- a/src/views/home/components/cartOperation.vue +++ b/src/views/home/components/cartOperation.vue @@ -122,14 +122,14 @@ function skuConfirm(e) {