diff --git a/src/App.vue b/src/App.vue index ec45ddb..e0f8099 100644 --- a/src/App.vue +++ b/src/App.vue @@ -43,6 +43,7 @@ export default { const routeDeep = [ '/message', '/attention', '/home', '/me', '/publish', + '/country-choose', '/edit-userinfo', '/edit-userinfo-item', '/video-detail', diff --git a/src/assets/img/icon/arrow-up.png b/src/assets/img/icon/arrow-up.png new file mode 100644 index 0000000..85299dd Binary files /dev/null and b/src/assets/img/icon/arrow-up.png differ diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss index b8f53f4..c44fa22 100644 --- a/src/assets/scss/custom.scss +++ b/src/assets/scss/custom.scss @@ -29,6 +29,13 @@ background: $main-bg; } } + &.no-padding { + padding:0; + } + + &.border{ + border-bottom: 1px solid $line-color; + } &:active { background: $active-main-bg; diff --git a/src/components/BaseHeader.vue b/src/components/BaseHeader.vue index e5d94d2..44eb375 100644 --- a/src/components/BaseHeader.vue +++ b/src/components/BaseHeader.vue @@ -38,6 +38,7 @@ export default { width: 100%; position: fixed; background: $main-bg; + z-index: 2; .header { display: flex; diff --git a/src/components/Search.vue b/src/components/Search.vue index 924e35e..5dd60b7 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -5,10 +5,10 @@
- +
-
搜索
+
搜索
diff --git a/src/pages/home/Attention.vue b/src/pages/home/Attention.vue index 0bff876..1b00b38 100644 --- a/src/pages/home/Attention.vue +++ b/src/pages/home/Attention.vue @@ -1,7 +1,7 @@ @@ -335,6 +295,7 @@ export default { margin-bottom: 2rem; display: flex; align-items: center; + //background: #fff; &:nth-child(1) { margin-top: 1rem; @@ -355,7 +316,7 @@ export default { justify-content: space-between; img { - height: 1.5rem; + height: 2rem; } } } @@ -430,7 +391,7 @@ export default { } img { - height: 1.5rem; + height: 2rem; } } } diff --git a/src/utils/global-methods.js b/src/utils/global-methods.js index ec50b61..cb960d8 100644 --- a/src/utils/global-methods.js +++ b/src/utils/global-methods.js @@ -134,7 +134,7 @@ export default { return parseFloat(val) }, $setCss(el, key, value) { - // console.log(value) + console.log(value) if (key === 'transform') { //直接设置不生效 el.style.webkitTransform = el.style.MsTransform = el.style.msTransform = el.style.MozTransform = el.style.OTransform = el.style.transform = value;