From 38361b4beab12caf9c664ec65b232d5f6beae5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Tue, 8 Feb 2022 11:08:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 12292 -> 12292 bytes pages.json | 2 +- pages/.DS_Store | Bin 10244 -> 10244 bytes pages/index/index.vue | 29 ++++++++++++++++++++++-- pages/sign/index.vue | 44 +++++++++++++++++++++++-------------- static/.DS_Store | Bin 10244 -> 10244 bytes static/icon/clock_icon.png | Bin 0 -> 3393 bytes 7 files changed, 56 insertions(+), 19 deletions(-) create mode 100644 static/icon/clock_icon.png diff --git a/.DS_Store b/.DS_Store index ca2f2aa60b403dcf06205b8707b4be0f84953c19..2a302a8794f4b5c8a10dbb656d9dac78105832bc 100644 GIT binary patch delta 51 zcmZokXi1ph<TiV7EM@(PkcnvrL;=m0z$-J}B3rlfszRP5PRr$?6stcKb G!p;EXMG{5; delta 79 zcmZokXi1ph&ls~YV7EM@@n#-{vrHOn3|S1t4Dmpm!jSEmlb@WFlb^)Ez#zcDz$go( d_5Ona!{)0>Z&)_JRTp60d{N~C)8x0};sEC_8>j#P diff --git a/pages.json b/pages.json index fe8c4d6..6ace7f2 100644 --- a/pages.json +++ b/pages.json @@ -268,7 +268,7 @@ "path": "pages/sign/index", "name": "signIndex", "style": { - "navigationBarTitleText": "每日签到", + "navigationBarTitleText": "每日打卡", "navigationBarBackgroundColor": "#FFFFFF" } }, diff --git a/pages/.DS_Store b/pages/.DS_Store index 83144c2e66005ec118d2ffc10146830fb1d3af22..2c2ce98012af140ebbd8049f9c2ae39e641fad60 100644 GIT binary patch delta 277 zcmZn(XbG6$&*--?U^hRb-)0_xXH4};<;4X_Ir&Kp3=Aie3UV@wOAHLIGcqx=u(Gjp zaBy*O@p8omXXKX$mn4>y7CR*tMT2+&i6t3HPcQVcdHI1D1g!NJMF880AFU2SG$q@!SBVN|Q5P;F^s z0Aw4R)z)%yh^rdfdM4ynR#n&3*3AUE76=#_Av6O&l!j5WCO;8s7H4J1WXNMkVMt}D eC<`vi%gN762Wi@zBD{=yGrPhsmdz|8%*+5srcV+8 delta 41 zcmV+^0M`G6P=rvBPXSD^P`eKSOtTCS<^q$|6Lqs>6r&4~fc>)vAo>Ke{uKiQPZ$s% diff --git a/pages/index/index.vue b/pages/index/index.vue index 8ad47fd..96857a8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,7 +4,15 @@ 欢迎使用ZH-HEALTH健康 - + + + + + + 打卡 + + + @@ -101,12 +109,29 @@ align-items: center; .helloe { line-height: 100rpx; - font-size: $title-size + 10; + font-size: $title-size + 4; font-weight: bold; } .btns { margin-left: $margin; display: flex; + .btns-clock { + color: #885100; + height: 50rpx; + font-size: $title-size-sm - 2; + border-radius: 40rpx; + display: flex; + background-image: linear-gradient(to right, #fce938, #ffce36); + image { + width: 48rpx; + display: inline-block; + } + .btns-clock-text { + line-height: 50rpx; + font-weight: 600; + padding: 0 20rpx 0 8rpx; + } + } .btns-item { position: relative; text-align: right; diff --git a/pages/sign/index.vue b/pages/sign/index.vue index 5ac3812..0addd22 100644 --- a/pages/sign/index.vue +++ b/pages/sign/index.vue @@ -9,7 +9,7 @@ {{ dateData.total }}天 - 本月签到 + 本月打卡 @@ -18,7 +18,7 @@ {{ dateData.continue }}天 - 累计签到 + 累计打卡 @@ -50,25 +50,28 @@ 六 - - - {{ items.isSign ? '签' : items.date }} + + + + + {{ items.date }} + - {{ dateData.isSign ? '当日已签' : '立即签到'}} + {{ dateData.isSign ? '今日已打卡' : '今日打卡'}} - ZH大健康用户签到 + ZH大健康用户打卡 - - - + + + - + } + + + diff --git a/static/.DS_Store b/static/.DS_Store index 61af3bdd7bcc51d72116b969c1fe3bdba080208a..9cef02d4feac8305cdf1df5756e8c53c40f8e6d2 100644 GIT binary patch delta 39 vcmZn(XbIR*Dm2+gtd-SVN5Ry5lCa$5_W~-LorI6_Y-UsV%d(k8l#v+#2-yru delta 51 zcmV-30L=e{P=rvhbrJ!|lh7A{3K)BPH90aYAT~0S{}LVnnUnAk9|4-PJ`>0cvj-sj J1hWDa0R!Nf5jg+= diff --git a/static/icon/clock_icon.png b/static/icon/clock_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..43c40664cc26a7f7706a738b2e7005c3ce71a6ca GIT binary patch literal 3393 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 literal 0 HcmV?d00001 From a3ddf46f885338150ff6c1bb297fdcc0b8a0e413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Tue, 8 Feb 2022 13:33:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 12292 -> 12292 bytes lib/emoji.js | 33 +++++++++++++++++++++++++++++ pages/im/components/sentText.nvue | 13 ++++++++++-- pages/im/components/sentVoice.nvue | 2 +- pages/im/private/chat.nvue | 30 ++++++++++++-------------- static/.DS_Store | Bin 10244 -> 10244 bytes 6 files changed, 58 insertions(+), 20 deletions(-) create mode 100644 lib/emoji.js diff --git a/.DS_Store b/.DS_Store index 2a302a8794f4b5c8a10dbb656d9dac78105832bc..29b9dbd7ef013fcc859b955544c1dccf51fdc8b0 100644 GIT binary patch delta 223 zcmZokXi1ph&lo;2Af9zS0|Udnja$O`8I?El2&k}3R#0M@{6Ud-a=D23od%1Sii_(U?46RbcXO74FG*R1QsUQ4^kgSCxD69@UeK w-J9Fg5*a5S6qf|~S`x(%o;mr+P(KK4X3_Y`!cq+M)?`mr`N?jo5o8$y0DV+(9RL6T diff --git a/lib/emoji.js b/lib/emoji.js new file mode 100644 index 0000000..53a62a2 --- /dev/null +++ b/lib/emoji.js @@ -0,0 +1,33 @@ +export default [ + "😀", "😁", "😃", "😄", "😅", "😆", "😉", "😊", "😋", "😎", "😍", + "😘", "😗", "😙", "😚", "☺", "😇", "😐", "😑", "😶", "😏", "😣", "😥", "😮", "😯", "😪", + "😫", "😴", "😌", "😛", "😜", "😝", "😒", "😓", "😔", "😕", "😲", "😷", "😖", "😞", "😟", + "😤", "😢", "😭", "😦", "😧", "😨", "😬", "😰", "😱", "😳", "😵", "😡", "😠", + "👦", "👧", "👨", "👩", "👴", "👵", "👶", "👱", "👮", "👲", "👳", "👷", "👸", "💂", "🎅", "👰", "👼", + "💆", "💇", "🙍", "🙎", "🙅", "🙆", "💁", "🙋", "🙇", "🙌", "🙏", "👤", "👥", "🚶", "🏃", "👯", + "💃", "👫", "👬", "👭", "💏", "💑", "👪", "💪", "👈", "👉", "☝", "👆", "👇", "✌", "✋", "👌", + "👍", "👎", "✊", "👊", "👋", "👏", "👐", "✍", "👣", "👀", "👂", "👃", "👅", "👄", "💋", "👓", + "👔", "👙", "👛", "👜", "👝", "🎒", "💼", "👞", "👟", "👠", "👡", "👢", "👑", + "👒", "🎩", "🎓", "💄", "💅", "💍", "🌂", "📶", "📳", "📴", "♻", "🏧","🚮", "🚰", "♿", "🚹", "🚺", + "🚻", "🚼", "🚾", "⚠", "🚸", "⛔", "🚫", "🚳", "🚭", "🚯", "🚱", "🚷", "🔞", "💈", + "🙈", "🐒", "🐶", "🐕", "🐩", "🐺", "🐱","🐈", "🐯", "🐅", "🐆", "🐴", "🐎", "🐮", "🐂", + "🐃","🐄","🐷","🐖","🐗","🐽","🐏","🐑","🐐","🐪","🐫","🐘","🐭", + "🐁","🐀","🐹","🐰","🐇","🐻","🐨","🐼","🐾","🐔","🐓","🐣","🐤","🐥", + "🐦", "🐧", "🐸", "🐊","🐢", "🐍", "🐲", "🐉", "🐳", "🐋", "🐬", "🐟", "🐠", "🐡", + "🐙", "🐚", "🐌", "🐛", "🐜", "🐝", "🐞", "🦋", "💐", "🌸", "💮", "🌹", "🌺", + "🌻", "🌼", "🌷", "🌱", "🌲", "🌳", "🌴", "🌵", "🌾", "🌿", "🍀", "🍁", "🍂", "🍃", + "🌍","🌎","🌏","🌐","🌑","🌒","🌓","🌔","🌕","🌖","🌗","🌘","🌙","🌚", + "🌛","🌜","☀","🌝","🌞","⭐","🌟","🌠","☁","⛅","☔","⚡","❄","🔥","💧","🌊", + "🏀", "🏈", "🏉", "🎾", "🎱", "🎳", "⛳", "🎣", "🎽", "🎿", + "😈", "👿", "👹", "👺", "💀", "☠", "👻", "👽", "👾", "💣", + "🌋", "🗻", "🏠", "🏡", "🏢", "🏣", "🏤", "🏥", "🏦", "🏨", + "⛲", "🌁", "🌃", "🌆", "🌇", "🎠", "🎡", "🎢", "🚂", + "🚌", "🚍", "🚎", "🚏", "🚐", "🚑", "🚒", "🚓", "🚔", "🚕", "🚖", "🚗", "🚘", + "💌", "💎", "🔪", "💈", "🚪", "🚽", "🚿", "🛁", "⌛", "⏳", "⌚", "⏰", "🎈", "🎉", + "💤", "💢", "💬", "💭", "♨", "🌀", "🔔", "🔕", "✡", "✝", "🔯", "📛", "🔰", "🔱", "⭕", "✅", + "☑", "✔", "✖", "❌", "❎", "➕", "➖", "➗", "➰", "➿", "〽", "✳", "✴", "❇", "‼", "⁉", "❓", "❔", "❕", "❗", + "🕛", "🕧", "🕐", "🕜", "🕑", "🕝", "🕒", "🕞", "🕓", "🕟", "🕔", "🕠", "🕕", "🕡", + "🕖", "🕢", "🕗", "🕣", "🕘", "🕤", "🕙", "🕥", "🕚", "🕦", "⏱", "⏲", "🕰", + "💘", "❤", "💓", "💔", "💕", "💖", "💗", "💙", "💚", "💛", "💜", "💝", "💞", "💟❣", + "🍇", "🍈", "🍉", "🍊", "🍋", "🍌", "🍍", "🍎", "🍏", "🍐", "🍑", "🍒", "🍓", +] \ No newline at end of file diff --git a/pages/im/components/sentText.nvue b/pages/im/components/sentText.nvue index 4bea6a9..c787f6f 100644 --- a/pages/im/components/sentText.nvue +++ b/pages/im/components/sentText.nvue @@ -1,6 +1,15 @@ @@ -71,7 +80,7 @@ .input { background: #F3F6FB; height: 70rpx; - width: 460rpx; + width: 500rpx; border-radius: 10rpx; margin-right: 15rpx; padding: 0 20rpx; diff --git a/pages/im/components/sentVoice.nvue b/pages/im/components/sentVoice.nvue index 197d54a..8ab1148 100644 --- a/pages/im/components/sentVoice.nvue +++ b/pages/im/components/sentVoice.nvue @@ -102,7 +102,7 @@ line-height: 70rpx; justify-content: center; align-items: center; - width: 460rpx; + width: 500rpx; border-radius: 10rpx; margin-right: 15rpx; diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue index f91fb03..f94ae6c 100644 --- a/pages/im/private/chat.nvue +++ b/pages/im/private/chat.nvue @@ -36,13 +36,12 @@ @success="getMessageList" /> - + - + @@ -148,10 +147,14 @@ }) }, // 滚动到底部 - scrollBottom() { + scrollBottom(type) { + if(type === 'msgPopups'){ + this.showPopups = !this.showPopups + } setTimeout(() => { let el = this.$refs.chatBottom - ChatList.scrollToElement(el, { + ChatList.scrollToElement(el, { + offset: 0, animated: false }) }, 50) @@ -165,19 +168,14 @@ .chat { background: $window-color; flex: 1; - - - .body { - flex: 1; - - .cell { + .body { + flex: 1; + .cell { padding: 10rpx 30rpx; - .time { justify-content: center; align-items: center; - padding-bottom: 20rpx; - + padding-bottom: 20rpx; .text { background: #fff; font-size: 24rpx; @@ -238,12 +236,10 @@ padding: 20rpx 30rpx; display: flex; justify-content: space-between; - flex-direction: row; - + flex-direction: row; .msg-type { width: 70rpx; height: 70rpx; - .icon { margin: 5rpx; width: 60rpx; diff --git a/static/.DS_Store b/static/.DS_Store index 9cef02d4feac8305cdf1df5756e8c53c40f8e6d2..a81ade7433a38163cee5ca2c259b24132f6990d5 100644 GIT binary patch delta 227 zcmZn(XbIR*A2B_==7q@6#ule;?$DKVj{lvAQc(;<(@!Y0Y#~0nW^Pq6~P6G$(ecS%Jv@^z(Cm{ z0LIXOFa#KsAq)lvWrq+4Fq=bwF(fZPFO`#1*})qs%fX<{;K<;`5X_LlP|ncDFpFUg v!w!a{47V8GFnnW_WMLFzRASU-G-0%5v}g2S3}g&q3}K99jN1H3L`WC_bSgFj delta 227 zcmZn(XbIR*A?oF{JhD$BEIzznLsVUnN_J^rNIS>$(ecS%Jv@^z<^WP zK?A}PU{HoI7#NftLLp2J0mhKL{Jd14ssMV|dK)mEk`lFQXWv5~DVwjsT-6qdB7kqbH*mqYq;sW6 Date: Tue, 8 Feb 2022 14:10:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BE=A4=E8=81=8A?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/im/index.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pages/im/index.vue b/pages/im/index.vue index 6b45f7a..c8db817 100644 --- a/pages/im/index.vue +++ b/pages/im/index.vue @@ -5,8 +5,12 @@ - 私聊 - 群聊 + + 私聊 + + + 群聊 + @@ -265,20 +269,18 @@ justify-content: space-between; height: 60rpx; line-height: 60rpx; - .tabs { - .item { + .item { + position: relative; margin-left: $margin; display: inline-block; font-size: $title-size-lg; color: $text-gray; padding: 0 ($padding - 10); border-radius: 30rpx; - &:first-child { margin: 0; } - &.show { background: rgba($color: $main-color, $alpha: .1); color: $main-color;