From 15c83ad6bd4372a7a812006d3b6dadb27a77fbfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Mon, 24 Jan 2022 14:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=81=8A=E8=81=8A=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store           | Bin 10244 -> 10244 bytes
 App.vue             |   2 +-
 manifest.json       |   4 +--
 pages.json          |  24 ++-------------
 pages/im/index.vue  |  73 ++++++++++++++++++++++++++++++++++++++++----
 static/.DS_Store    | Bin 8196 -> 8196 bytes
 static/iconfont.css |   4 +++
 static/iconfont.ttf | Bin 3016 -> 3300 bytes
 8 files changed, 76 insertions(+), 31 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index fbf1f23ae88d376b346095e502824ea1d1a918e7..cf3b25fe5992aaea75a08bf2b3dd8d8ffc09ec7c 100644
GIT binary patch
literal 10244
zcmeHN&1+m$6hCifGM!8k8!_6I^1%90O@^c?Vi%RkBtb$c6sOunlyp8~GCDJFIv<%P
zF=Y@1LBWL^MUZTCp@NG30ZKN7Zn_bnAcz|krKsSdtNJ_l-OQZ(=Dkcdg35bk-g)!x
z@7#NSzkBZ2q(o$8TE!V6n}`zlupJ-8&FA8B{`6fD{bmK$f<KklX0ipRQtLy8FG2-E
z1wsWv1wsWv1^z7xV9n+$G2+_r9x4zj5Gv4BfaeDrAGT?2JFZnz2X5*J02{+=b>VrO
zA7E{5)7o}iixOOx>k8|-TKb4#x$byxYg}5}j%!_avh?A@(k)y1gkq`IQNOL=WTjmj
z-a`dK1^N}>vwMtEv_>Ur%JX~lM4>FpD$c?}zU<`jF7bBssc-(czBgx<7Y{72t@nN#
zh@QRyS4yJYb;?r<ZI`J?t5l~eG6u{qr-E=Yo;Nn<u4mkMeCw<@z1Rj}Wt@60i&2hh
zh_SI$b_!Ypo@SVT>W;eb#5!u6$zf?rmdUsa?|0+w`pQ`S%8mG}8n=4{k<{=nMH|p^
z)f44sm<;a{Q6{NC4po46s0z)i)a+vhAA^~%kIC}O<M8ptNycYh%k+B6Cl1Me5Y|wF
zes`6qpbtvml%kistgPD}CB~pa4%iaC2pt;GL3yz*riPJk`#h`gY{GK`o;74|OO2pv
zUz_)PlpI5Q0iIIN$d5nYg69Efsp{URT~!bC=#7HIc}RsLzn*7>M-jiH#_9^x<EIwb
zLp@V5>rD^uKtIWv_U`-bpf)7uUFX%gd3VeQ)-AK?FnGz=dMu4l=x+3G4kPAe+}FT!
z3Tz$qJs?+jR<N#$@iywIA;^!%sq`CCe%z*4Tja4ZIt9{DGq%fJCQ7A#A0NNGKN1Z@
zFGu_lQX`7*q5+J0)<{JfG=eOQ1A|>0J}u1sWsISMnLCj+)G6mx18Xp((Z_)`$|c7;
zUs*MsBOXkTWe~>TNj93HVS0uZ(Z36H4mO4SFPf2a)_Yjiku5FE6j<9#EYB$(mI7<C
zw7v#5j@7YSmt>h-?)Iby(_<NgF<FkI8LVOr<afiHb!xTyK;(57XT~~oS=J%r%;maq
zc75dt^(*&@FRo^4cMkPr4)MArV>Gb&cB7_O?`!#5xzuP*Pk(1cqOqa)kwhYyNRB06
z$gVr>Y%|wvH8Q#SGJiXtYp&<@^99E#cb{|l=Sr*XmGOyrr`pVws;hP7Tq>>t^8Ce8
zwdk}nPODmMsCu$)K_W4n7+x7aw!Qu2$w_;5W_D-N-adVDdeS~M`^3)9aN^iQGiR1A
zRW`S_U)j0(E_VoW%5p6o)pp;!hX;eB(H9rb{^Tu}{c+Q3?au&49kNe?Fh;*Dt8k1u
zHnR0<*{SkK=Gcc+pE<~2&+dfh1*69V(%?c9pP2PXChvT7;r93LS|I!-4}XNgf~L^`
zPN6NeBS`s=0yU4x-PDN24_*yrUIus>j30b}_u2tS$^Pbt=l0nLqI)yJV6>si!=JM%
zM>WfNwfeQN>Q7<D=ec{6OU#*#_gO}t4)8WuQ*v=|dy@UL6WuHx(2mT9!+RNO5HF}$
z2RKKJeSxWfTES$0`*=v!(R;Rj@UK@gZNK&UpHI74?o*#+cQ8^iiaw(HcL<DlH(U13
z`f8PuOaxLgAnN=A2BK6(zWBw|ExisKh+bCuBV?pRH_!lf#OjQL)t65XRqWhL*m?Nu
z_PGx%Ia1@)RyoVN)u!2BYR?vkHF=)+3sD$#Nv8Lnz0#XgMSHS$f-ojqooSnhxelHw
zHS(|zH6vF$4jDOXbl5BE0__o4jJlw|{~xxx5Em*CD)1jvz=|zo7cvNZf1By$z`wQI
z_*}w=FUECTt6Xqn2)|c9$KwnC9RH|(H_etWl&7`rxK_F2y>f?jf6f2L{}>SP8-|>L
U!}EW5{_p)?Hk;G+e|7%<8@`3UcK`qY

delta 368
zcmZn(XbG6$&*-)>U^hRb+h!gC9mdHCg87pTg;q><6qcSmO?cnr9+CNz&x<xpUN6=$
zd8+ut$$k<wx=H251xY#iNem1O+mi}%GK)(L46ZRUF|)9;v2(C<aC5{4XXKX$mn4>y
z7CTKgl=SxI<lu}K5U;K_G1gHqF*UE%QK+^wG61rT&1!2oIYgE9t%KsTb8_?YJAsA*
z0V5-XX5fX=Fsf_vDalQfmr0dQZj?ShxliWE<QCZ(lilP>Co9T#Y)qA8-OR4=i)Hd_
Oarw#5#2p5ebL{}M2x340

diff --git a/App.vue b/App.vue
index 6861729..2fca784 100644
--- a/App.vue
+++ b/App.vue
@@ -4,7 +4,7 @@
 
     export default {
         onLaunch: function() {
-            im.initIm('lmxuhwaglu76d')
+            // im.initIm('lmxuhwaglu76d')
             //#ifdef APP-PLUS
             // 获取系统版本号
             getVersions({
diff --git a/manifest.json b/manifest.json
index 94c26d4..0e9d6e6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "ZH-HEALTH",
     "appid" : "__UNI__C29473D",
     "description" : "ZH-HEALTH，您手上的健康管理专家",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.3",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index c297e34..ceade35 100644
--- a/pages.json
+++ b/pages.json
@@ -363,28 +363,8 @@
             "path": "pages/im/index",
             "name": "IM",
             "style": {
-                "navigationBarTitleText": "聊聊",
-                "navigationBarBackgroundColor": "#FFFFFF",
-                "app-plus": {
-                    "titleNView": {
-                        "buttons": [
-                            {
-                                "float": "left",
-                                "text": "\ue605",
-                                "fontSrc": "/static/iconfont.ttf",
-                                "color": "#000",
-                                "fontSize": "20px"
-                            },
-                            {
-                                "float": "right",
-                                "text": "\ue606",
-                                "fontSrc": "/static/iconfont.ttf",
-                                "color": "#000",
-                                "fontSize": "20px"
-                            }
-                        ]
-                    }
-                }
+                "navigationBarBackgroundColor": "#FFFFFF",
+				"navigationStyle":"custom"
             }
         },
         {
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 5634ccc..bc198ec 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -1,5 +1,25 @@
 <template>
-    <view class="content">
+    <view class="content">
+		<!-- header -->
+		<view class="custom-header">
+			<view class="header-flex">
+				<view class="tabs">
+					<view class="item show">私聊</view>
+					<view class="item">群聊</view>
+				</view>
+				<view class="btns">
+					<view class="item">
+						<uni-icons color="#555" custom-prefix="iconfont" type="icon-sousuo" size="22"></uni-icons>
+					</view>
+					<view class="item">
+						<uni-icons color="#555" custom-prefix="iconfont" type="icon-gengduo2" size="22"></uni-icons>
+					</view>
+					<view class="item">
+						<uni-icons color="#555" custom-prefix="iconfont" type="icon-tuandui" size="22"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
         <view v-if="$store.state.token != ''">
             <block v-if="conversations.length < 1">
                 <view class="vertical null-list">
@@ -14,9 +34,7 @@
                 <view v-for="(item, index) in conversations" :key="index" class="mssage-box" @click="toDetail(item)">
                     <view class="mssage-action">
                         <block v-if="!friend(item.targetId).portraitUrl">
-                            <u-avatar clsss="mssage-action-cover" size="44"
-                                :text="friend(item.targetId).name ? friend(item.targetId).name.substring(0,1) : '未'"
-                                font-size="14" randomBgColor></u-avatar>
+                            <u-avatar clsss="mssage-action-cover" size="44" :text="friend(item.targetId).name ? friend(item.targetId).name.substring(0,1) : '未'" font-size="14" randomBgColor></u-avatar>
                         </block>
                         <block v-else>
                             <u-avatar clsss="mssage-action-cover" :src="friend(item.targetId).portraitUrl" size="44">
@@ -138,7 +156,50 @@
     }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+	// header
+	.custom-header{
+		@extend .ios-top;
+		background: white;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 99;
+		.header-flex{
+			padding: 20rpx $padding;
+			display: flex;
+			justify-content: space-between;
+			height: 60rpx;
+			line-height: 60rpx;
+			.tabs{
+				.item{
+					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;
+						font-weight: bold;
+					}
+				}
+			}
+			.btns{
+				.item{
+					display: inline-block;
+					margin-left: $margin;
+				}
+			}
+		}
+	}
+	
+	// content
     .content {
         background-color: $window-color;
         min-height: 100vh;
@@ -151,7 +212,7 @@
                 margin-top: $margin * 2;
                 line-height: 70rpx;
                 color: $main-color;
-                border: solid 1rpx $main-color;
+                border: solid 2rpx $main-color;
                 padding: 0 ($padding*3);
                 font-size: $title-size-m;
                 border-radius: 35rpx;
diff --git a/static/.DS_Store b/static/.DS_Store
index c45d1ef15595685f4d4f1b997e538cdf96f30331..b073f032cf3576cd790f8d6afd4d9ff8b9a1b533 100644
GIT binary patch
delta 539
zcmZp1XmOa}FRahNz`)4BAi$8HoRpKF1mp>9ES$zZv4MXxI|mDgI!K<GA%!88q0BP}
zp#~`G2*i5-!GM8bGLJxwG@63-ND3xb3$&uiGs+^%e-@~z=V8cXNM^`q$YV$YlO+s#
zKz=bpF{;5}jq_kO0}a8ZuY{q5Aq`DmH&89IJ{F*TxeVzr^F<-v2ZjeoA<S!&vjw}+
zUH%hU{;}YEG<l|UWcgyDiRkiIk>x)NO+}Lj2QAE@ldFY0rBFS>018>C{Nzu<-5ZOS
UFm7g-_{K6hTUeH2vlcP}0E4Nt;s5{u

delta 92
zcmZp1XmOa}FRH@8z`)4BAi!W4oSdIq0OT<+aBeJ|#y+uucQZQ&3kRdhWFvu^$=3ub
wCYK53Pp%bepKK)DGx>#Z)8uI)Et8!@YbL)Et=wG8)5W}*UE&+d#tL?30EQVHpa1{>

diff --git a/static/iconfont.css b/static/iconfont.css
index ea0d6a9..e3beb58 100644
--- a/static/iconfont.css
+++ b/static/iconfont.css
@@ -11,6 +11,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-gengduo2:before {
+  content: "\e608";
+}
+
 .icon-gengduo:before {
   content: "\e607";
 }
diff --git a/static/iconfont.ttf b/static/iconfont.ttf
index 36c0377f725b95f3ce9b6f46d1986e5e89206df9..bc0ec3ad4b8413a2cb685c28a98bd70cc26d5025 100644
GIT binary patch
delta 734
zcmY*UO=}ZT6g_v|WM*uWSenpDO{g_3=|)TwLn<Vx-3hJ?$<Bq2&Bs)l53xe(!U(Pe
z7wT+utNs9s8--xiin!3?O1df{GP-ah#ckq!lS1o*^X|F#o^$VeAI%?=_h-600Nn#{
zdAVV=KVPi80u(>jKGj#(Ym3jmp8&*fK%2FzR^|A)&?DA<V`ObE=)2-B^B!Z?Zme~t
znXs4jm|kryTiP#QjQzX=;|;6RCKFBWM`XWgHL7DzkL8~OBV)X@-fmrA>wW#u2K*fs
zTz$}+IctEJGD`2u=Pw=2|HY`v1z<PybNe6;HdTlv&J8HC%18PPXNoq+aK6x)hl=VL
zN~mOe4d4od$4+t_VYLkvS+-~#35qLRV=w?*a(y!LA?~q~Zyi2%sl1Apkmg)d`pz5j
zIW3`eE1njtVeb&^fXmO4@alp&gQvjV2hW2mbqt;iSNa+9JFYQ=_g>%@UQ(XkDKX`V
z7#~g<Y>K!1eLp5+NFav`{H*X4r57o4isC^shlyk9p>8NXmzYar7P1T3v^il;gmq2V
zL|oosnWtqZBQ>-gh(yg`(2Pa`uf5yL`*#lbpY@e$zEH?lSN7~$u29I;?3-4(m`tUT
z#qw6EIG;+*7t3@zxIZQkSqdERL$rTddiVaDCK89Il(ytt;Kh#E(4z(^BuFJ6X{3`u
TM_|;e&3ffVEA2cUO%nbAdv=dq

delta 449
zcmYLEze_?<7(L&;Pp@gD5cCWC0ZBCkEg=y?OG^aJZT2wDK~t!qCfA0B;<>am)IU(v
zC=N}ILPOCY4)JJcXsDpc&V2@5IQKi>`Odj~_jSBAdNx~o0^}6HPOj`$>o4seKt-rE
z_e#fw$?x<9pr3)zLNV{|PS1B+^md7Kk%H;y6Y>U;DwYqAk|fN&^GcQ~IagmfAI#fK
zqU;`3Wd!@2kFlTGcgy+2^+e_d7+|mVs+EJohoQ$$AXcQ1J#Wme83-v6t<7y@<C!nS
z911|k*(&_kUe|%1W*>pFDv!+>Z%S^(cx_qn2G#IpAyD~O=zuM<Mrkd;!7}|}R)O-h
zZ+bnz7e8bxk8nmOLV-s?-<4Eca@)bs25Iht7WiDkBG5HC!KdNd8DW?7ZHC|q@J%0o
h>jA51%DP;tl&asoIkzTZM2QwhLJ}4u5qS55OTQ33RK)-Q