From 531046e32e471e03364ae556a2f7fe06131d053e Mon Sep 17 00:00:00 2001 From: zyronon Date: Mon, 2 Aug 2021 00:30:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=94=B7=E5=AE=B6=E6=88=96?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 + src/assets/img/icon/arrow-up.png | Bin 0 -> 2302 bytes src/assets/scss/custom.scss | 7 + src/components/BaseHeader.vue | 1 + src/components/Search.vue | 4 +- src/pages/home/Attention.vue | 2 +- src/pages/login/countryChoose.vue | 4968 +++++++++++----------- src/pages/me/Me.vue | 12 +- src/pages/me/userinfo/ChooseLocation.vue | 1176 ++++- src/pages/message/Chat.vue | 39 +- src/pages/message/ChatDetail.vue | 12 +- src/pages/message/Message.vue | 69 +- src/utils/global-methods.js | 2 +- 13 files changed, 3686 insertions(+), 2607 deletions(-) create mode 100644 src/assets/img/icon/arrow-up.png 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 0000000000000000000000000000000000000000..85299dd06ae40929c061ba7b5e0bbd11f500042a GIT binary patch literal 2302 zcmeH}`&W_&7{_0T*ee>nqFFPnmr0T3w6roZ6HrkyUzN(Frd`yUW?qpu4e*HMY<*pzB2dF1BMbnnnli*Enkvqo7}ZaX;(13LP{Oh{q@*3dHH4R%nd01&=Q zW&q4&JiOcfj@jOU)?cl#V1M!VT{V^rXrWtaA;f@aKGmhUfUvu6)!mKiG`m|qNQ|rM&9gn`dXZ%>ZIM2>~vVgHc zV+j@KeSGlepYe_9Q@y@Cn?ufv?d3Q3c)ht}FkBc(KQV0V0@as|1^0Uzqw^aVvy%B| zz>JXP$|m-JVJJQ4mGK6s&NkWdQ>zaKWJ4%1zG&O>CocO5O!iY>syN$=XQluizI0LXSLqbL zxs*Uem3w1{^y)WpJZXrwLX*8er*5rgIvb$*2?ALdTH8SM-+ke`Ge9ok?L^XbK}p}VC`H!%n_vXg?dnyXTp;ne4#Z^t%xtH&+U-yd_g+!IRz1s zLkWfCw1zWYc^zR`W)~O|MC^@|Uf# z7{oyaI*-Z}ElD7E2&e~5ud zzuf3?IhFHV0xPcnK~77UND;!mZTvcM^9wT}IjlpsgS1@;XY+_Mw9XPo?{duc=X?hW z$#SI*LDl9a=+JFKxhBX`>e#57V1f=E3+0-?QAt$eB<9wDVnwy`S^SX>Nx(pV3>bFUvWLsIS_|?aI zyV`^lTjt9l&#!ML4&;q`fq^YpabX8(GHUGQx9&u{ry1_}jh&#&#*OZFtnqyoLCQK8 z0hOaVk!zPu!y~~U|9yXp;D9F1`@J(_QDPn$`{tP}_0z+LLH=+@j^#xtG9~4RL3J)w zd-Wc5*ANbmk9ihYxGqgPc6{ch3xTC5r`ype$!xWB>&3YEpZSV0TC_1?!)qZ-Q( z2Gy~W45xrcD-JuUYK{KqcSzrsYqAHm^SmjF5`S^b_G>fK+rbN6+8y##1ow8dr#d1* zQxO)8XjZ&-2?nbwKTS@`sV9iPTAYFUf{JB?C*sXDu=%(A))WF!7$<$(QkPU z&g(-E)vf$eonQVw=cSx(l2wu?@AL>IQe5_=J+|?P{?USolOdv#%D|$Tcf+e2Woufo z?fLSMvYC|W$)=*c+H2Or=5XxaKbpbE;@qfKa3+jh0x`va&~V7h1%m~@3Bp8}AeK8SY(Yq#(pk9nKU literal 0 HcmV?d00001 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;