From 088327eaff5798b46e210a8b6dac19ca2162b4ad Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 20 Jan 2022 16:15:24 +0800
Subject: [PATCH] rename

---
 .DS_Store                    | Bin 6148 -> 10244 bytes
 components/.DS_Store         | Bin 0 -> 8196 bytes
 pages/.DS_Store              | Bin 0 -> 10244 bytes
 pages/im/friends/index.vue   |   8 +-
 pages/im/friends/info.vue    |   4 +-
 pages/im/index.vue           | 314 ++++++++++++++++----------------
 pages/im/private/index.vue   | 336 +++++++++++++++++++----------------
 pages/im/private/setting.vue |   8 +-
 static/.DS_Store             | Bin 0 -> 8196 bytes
 store/modules/im.js          |   2 +-
 uni_modules/.DS_Store        | Bin 0 -> 10244 bytes
 utils/.DS_Store              | Bin 0 -> 6148 bytes
 utils/im/api.js              |  44 -----
 utils/im/sqlite.js           |  44 -----
 14 files changed, 348 insertions(+), 412 deletions(-)
 create mode 100644 components/.DS_Store
 create mode 100644 pages/.DS_Store
 create mode 100644 static/.DS_Store
 create mode 100644 uni_modules/.DS_Store
 create mode 100644 utils/.DS_Store
 delete mode 100644 utils/im/api.js
 delete mode 100644 utils/im/sqlite.js

diff --git a/.DS_Store b/.DS_Store
index 4a239b71641900db01ea5ff4963dcd5c8abfb491..fbf1f23ae88d376b346095e502824ea1d1a918e7 100644
GIT binary patch
literal 10244
zcmeHMO^6&t6n?eylinY3z>VIdAwi8MIx(vfM46r4C=vv5qB*Rx_WZCrq^D~#Kba)U
z!XOGNf(MUY_M!*%peT4%_Lxgf9s+`RQBi^l9z5xLRW&`YX1izhB8XH$_v@+mUcIlr
zs(Rg30|27jub&3+0l>qHWMK(!35E1@9Vm0A<{6X%{UO{sU8%`d`+%jZa11yG90QI4
z$ADwtzrp~%v#EHCTDrSqz%k$$h#8>#;NwNIWaLmwl{)aIwg4!zSgi^^7w7?{Z)C~H
zp_Zt@BD5<??JCR`Luhxb_l;f2$f1_n9fa9@2oqVD9g0xVv3*~egD7d~?v4S+z(EFR
z@1BK+VGEkj<NNo_iCV~YExEp44P_PUy!SFsfAjl|{Z(6EpQ>+fkIx1&XK$h_EMVMi
zs6roOhfs$Gbl@t-fca%5&5q-F>)Ps#vc{9xW=oE-&9db<O)kqq0BywBwXr>SUG?AS
zIG)-EF`n3$V@T3lafLcUS%4ZyXkly#5wa6OZxX{7#}z*bb{x-BZ<NRUB-)PonPqF?
zgx@ec+=0jf#MXo>h_a1i*;n%^veC}{@YC(-)*SQxr!nR!?Q>QS=fUyM{qh3gUqbv+
z&A&}#o1XgEhlY(F_V506nk~n^CtqJ()AKR4ZI1jf_8hl(utd0X$aR2BPa@6kQMZ_u
zWBd5{<<VTQEXFe+*@DN1{2s;6WBfj@-w;Q>X0MH<hbHwL!{1+uw&BNWgL9H*W8u&r
z33<#L5|Q+fiH?m!e64UWJ;$-I5p!X+!EvP7*f<Ip2J>haS8R7;-azg$*YWs45XX;w
zdF&*8LfkyY?3oo<s}8ztlc&F`w!>z(S1f)j<}%q_{)l(PTl8M7Y|BBV7xenwa?shJ
zUl*hdtE1<j`f{@|*eoos$*31Jqee$LH0upCdF5g=s>?xH_M>`N`Bt>ToA>573-|2o
zteiRNuRQj|?n!^=?4w0|KJ)nQ?!0&O*dtHAxOpjTMe=Rp3ct|ImmH=KyS#%xtu9$Z
zdhz^^lX_0+EzuuMZ>tSXYnqKk?S=wnwQ;4=i9#7|p@y*M6zvixU&BHO%b(a<j_>`C
zF8uYKP7TbTqf551utAZ)E#j1qaOq7;TF36C7j}vz$93z&=SR3wt;Z>1wzY-#zRw8n
zod)k3CJb7xbvT8SmXgOc(%2j>oSW^z@xQbjkNb=`oa@7TS^WXZuQ0FrLn*ihmvkcL
zeaPH({rhAqj(hO#n}0m3=R-n!9P4yTjxTe+;yZ`<=%pM^CZyrdh>K}Co^zj{x@}Uk
zWicN6WD6c2;3fvZH9Sz`ORrMv(-PpspOboy;pq9R<2B6M;B2JX*f`WU5f)b*1C9a5
zfMb9$kkQXRo&V$OHtqj^=HVV41CD|J8v`P{URf_=uSPqv$qv$4yN}mvcu^s{p_a-8
zZ)8IC>Np;M&~f|&rmjem3hGNn4z*P7Sg+hs>eKvx{m%e%j+wT%=O3DBHui^Rfw~j#
n;rTWIzqH-{-|hcLN9W1Adp_ZkE$r#0R#eJ9-I{#q`~QCcEPGu!

delta 121
zcmZn(XfcprU|?W$DortDU=RQ@Ie-{MGjdE!6q~50D9QxlfW<Nyl9S4d3zBm3lO`rE
zpKPGQGWopdgURON{2Nm^*%q^Na0oI36$60)H;`}z8L~0)JM(0I70by!D$=YVs~9%N
I^UPre086$Pe*gdg

diff --git a/components/.DS_Store b/components/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..2b13e46f4145504f162098066b9c61b8f065b6a5
GIT binary patch
literal 8196
zcmeHMJxc>Y5S{gl0~=8h?G8b^fP$sS8Db^aq_i=~#VFo!A&Ek;xzaykY3&cN^iNn=
z+uHhOcS&}=s8R3(oDI8k?9RKH_wKl5HbkV#=kX@dG7$ynZ0BY%jA*>hz0fA?41*Q$
zL@mnji>XVcg11bF0-}H@APR^AqQGBJ0DCsK;EjFXtjZ_~hywpo0scOO=xifvb7S?V
z1A{IBV5cyx8?I3YXiR8rWNmJ&hT@*4dQcXsY>A-^9P1&w!$#KT#u_*&11Du8D_fx`
z9UZt(yOWBHl~EKB1&RuA?LJR6)a)^8cDH`-QIk??Q-W1oC#}tDBTL)n7F*ln;?k^A
zsV7+-{=v;o`M!LAw>v&I{xY_G;^rG6q~_TH%LbiN2V(+;B{1yZ%%X*{iF1pt&vWT{
zT%61E`oQD)Vazle^875;=NU53MQ}R@mmYYfU>JjM3%y7C;Mk`+=4;>^`&?J~(>XTQ
z<$HTL;QI;ukn>mYKJN|YJx#}8rq7>zW-Cwrs+;@c*&ufZ?>>>y9)A3g;|KO#YD47?
z)b9IP%sh<padSy72e}mP<!1DrpP!fB4FkHs`_QB+-isQ)^?qJ!3p%e?K5ky?S5969
zzu|Ly&(F^b&r9}y$SzG3_%#J4P2^>+|M%WL|Npi8B(NwT3Vgo;YN}GLlo7|))`f_?
wRfp(D=-k*ZH&#P1=-nJvm*cR5KMZjl!j&<RwYjmFL6d_3ErSfAz>g~M0t?v+{Qv*}

literal 0
HcmV?d00001

diff --git a/pages/.DS_Store b/pages/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..83144c2e66005ec118d2ffc10146830fb1d3af22
GIT binary patch
literal 10244
zcmeHMJ#Q015S>fx#6XZtgM^Uagb*Mh1c_)UkS>;81W^E?K+uFF#)+_fjuQvcAS2OG
zL4zo15DgV2RG`qMK~V535Oq4<eq?XvK0+D<LVMQT*gG@(-oD%Wm^BdvwZY;fQAk7;
z?8;UraLCz|U+tM~#I{_84UkXNq*YpNw<c#7;!Lz}@CtYZyaHYUuYgzJUr+$gY_(Mm
z80(K-0k42pz$u{a4<UACBWs7o>RSg6x&(kNp;>SEjygc+gw{sZ4vp2R=+jgWflUo;
zi4mA|_(K&A8(BLv)}&Kl(kZaWfvr#ijgGufhf@$4>yKUmuRvA-RlASVU0TGa&+GS2
z&jcS+s{*NrPF%0gx8r$uDl7YXTeYpt>Aa}LJw)}E)M~*F+64t#0-ph`(UMt7*zp~G
z%zd20m8#?5ayxN?p68dip~5|A#*bqc=*wWyrWt&{N3mp5d$W5q=Qel5aoeST&USAZ
zlK(Zue?OS7Yt{oC)d*thO6D`~isCruCsU4dZl9d(?_woSJ*h^(tRs2dQgcbSa~>yJ
zAKu<DbIbaYbDH)^oR8>^%E0MjUN`BXL_6D-UXFS5wi`Rk=OfOKkofw1l&GWU(m<l0
zJ`8l{<JcQ*ht2%SnDhJ+H$vAmhEd1*{4Y>bVxK&h_H+EFj~u?}gO9!_M)J_taTzT7
zTK~ReacCPXn3r>yc;+~Wh(v|_h#dS;>ft)rkl2;az_uQayYa%|I&XrR^-8=dI>lYG
z54<kj*YmC=aT}Mi5gh;LYlolehpS&4CHd(2H>U6C3+60HHa{+djqr0W-!>hWR7|2s
zQH<bW-p0nUD%=E@b?B0rkr%IPT|@-u^687?lIn-+QXD1tn3u^C_$*T^eQyk3fr;~R
z4llnu4$Pluk>{7V_Ig;wRjICt)Kz)s6p+hcWxX8x{kFpv5ea&Jgv5Ui03fLTd+IF6
z*)WBF0=Sps*UBq9&v%y3wa<@`_>sad;i<0AvqV4tmHRk$qw26-E=SJu=irX&nb(u3
zb#)iE9*#ME++jLzqIK3Q@#fGeuB!+7Dcr`aUz4aUb>|a)j=kA%*r}L=K~aq4q0hJC
z;y15=SHLUa74QnA6&N)Qp<4fM6#xI9PV>LL0$zdtNP(bKpRLz0AiK7n8QKV1LhN(c
z)u!Tx#_ALtRETQV%klW3mgCRZHeLMK?~%1bV|6<6bULhA&Hv+n2Dl2p?p7$X6+W*t
evR?VVT~)(L)$Q`l-`D@X{!c1=IXC`B{r?MYcN-l5

literal 0
HcmV?d00001

diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index 536cf4d..aabaae2 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -1,13 +1,13 @@
 <template>
-    <div>
+    <view>
         <view class="list">
             <view class="list__item" @click="toPending">
-                <u-avatar size="35" icon="plus-people-fill" fontSize="26" randomBgColor></u-avatar>
+                <u-avatar size="35" icon="plus-people-fill" fontSize="26" bg-color="#f0ad4e"></u-avatar>
                 <text class="list__item__user-name">新的朋友</text>
             </view>
             <u-line></u-line>
             <view class="list__item" @click="toGroup">
-                <u-avatar  size="35" icon="account-fill" fontSize="26" randomBgColor></u-avatar>
+                <u-avatar  size="35" icon="account-fill" fontSize="26" bg-color="#4cd964"></u-avatar>
                 <text class="list__item__user-name">我的群聊</text>
             </view>
             <u-line></u-line>
@@ -36,7 +36,7 @@
                 <text class="list__footer">共305位好友</text>
             </view>
         </u-index-list>
-    </div>
+    </view>
 </template>
 
 <script>
diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index f9d78a3..89cfe55 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -1,8 +1,8 @@
 <template>
-    <div>
+    <view>
         好友资料，
         <u-button @click="toPrivate">发送消息</u-button>
-    </div>
+    </view>
 </template>
 
 <script>
diff --git a/pages/im/index.vue b/pages/im/index.vue
index a2bde3b..2000e70 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -1,76 +1,63 @@
-<template>
-	<view class="content">
-		<view v-if="$store.state.token != ''">
-			<block v-if="conversations.length < 1">
-				<view class="vertical null-list">
-					<u-empty
-						icon="http://cdn.uviewui.com/uview/empty/message.png"
-						textColor="#999"
-						text="暂无好友消息"
-					>
-						<template>
-							<view class="null-list-btn">开启聊天</view>
-						</template>
-					</u-empty>
-				</view>
-			</block>
-			<block v-else>
-				<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>
-						</block>
-						<block v-else>
-							<u-avatar
-								clsss="mssage-action-cover"
-								:src="friend(item.targetId).portraitUrl"
-								size="44"
-							></u-avatar>
-						</block>
-						<view class="mssage-action-content">
-							<view class="mssage-header">
-								<view class="header-name">{{ friend(item.targetId).name || '未知用户' }}</view>
-								<view class="header-time">{{ item.sentTime|timeCustomCN }}</view>
-							</view>
-							<view class="mssage-msg">{{ item.latestMessage.content }}</view>
-						</view>
-					</view>
-				</view>
-			</block>
-		</view>
-		<!-- 未登录 -->
-		<view v-else class="vertical null-list">
-			<u-empty
-				icon="http://cdn.uviewui.com/uview/empty/permission.png"
-				textColor="#999"
-				text="登录后开启聊天吧~"
-			>
-				<template>
-					<view class="null-list-btn" @click="toLogin">去登录</view>
-				</template>
-			</u-empty>
-		</view>
-	</view>
+<template>
+    <view class="content">
+        <view v-if="$store.state.token != ''">
+            <block v-if="conversations.length < 1">
+                <view class="vertical null-list">
+                    <u-empty icon="http://cdn.uviewui.com/uview/empty/message.png" textColor="#999" text="暂无好友消息">
+                        <template>
+                            <view class="null-list-btn">开启聊天</view>
+                        </template>
+                    </u-empty>
+                </view>
+            </block>
+            <block v-else>
+                <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>
+                        </block>
+                        <block v-else>
+                            <u-avatar clsss="mssage-action-cover" :src="friend(item.targetId).portraitUrl" size="44">
+                            </u-avatar>
+                        </block>
+                        <view class="mssage-action-content">
+                            <view class="mssage-header">
+                                <view class="header-name">{{ friend(item.targetId).name || '未知用户' }}</view>
+                                <view class="header-time">{{ item.sentTime|timeCustomCN }}</view>
+                            </view>
+                            <view class="mssage-msg">{{ item.latestMessage.content }}</view>
+                        </view>
+                    </view>
+                </view>
+            </block>
+        </view>
+        <!-- 未登录 -->
+        <view v-else class="vertical null-list">
+            <u-empty icon="http://cdn.uviewui.com/uview/empty/permission.png" textColor="#999" text="登录后开启聊天吧~">
+                <template>
+                    <view class="null-list-btn" @click="toLogin">去登录</view>
+                </template>
+            </u-empty>
+        </view>
+    </view>
 </template>
 
 <script>
     import * as RongIMLib from '@rongcloud/imlib-uni'
     import im from '@/utils/im/index.js'
     import userAuth from '@/public/userAuth'
-    import { getImToken } from '@/apis/interfaces/im.js'
+    import {
+        getImToken
+    } from '@/apis/interfaces/im.js'
 
     export default {
         data() {
             return {
                 isShown: true, // 当前页面显示状态
-                conversations: [] ,// 会话列表
-				isImToken: '', // 是否已鉴权
+                conversations: [], // 会话列表
+                isImToken: '', // 是否已鉴权
             }
         },
         computed: {
@@ -80,36 +67,37 @@
                 }
             }
         },
-        onShow() {
-			if (this.$store.state.token !== '') {
-				if(this.isImToken === ''){
-					getImToken().then(res => {
-					    im.syncFriends()
-					    im.connect(res.token, res.userInfo)
-						this.isImToken = res.token
-					    this.getConversationList()
-					})
-				}
-				this.getConversationList()
-				this.isShown = true
-			}
+        onShow() {
+            if (this.$store.state.token !== '') {
+                if (this.isImToken === '') {
+                    getImToken().then(res => {
+                        im.connect(res.token, res.userInfo)
+                        this.isImToken = res.token
+                        this.getConversationList()
+                    })
+                }
+                this.getConversationList()
+                this.isShown = true
+            }
         },
         onHide() {
             this.isShown = false
         },
         onNavigationBarButtonTap(e) {
-            if (e.index == 0) {
-				uni.showToast({
-					title: '开发中暂未开放，敬请期待',
-					icon : 'none'
-				})
-			}
-            if (e.index == 1) {
-				this.$Router.push({name: 'imFriends'})
+            if (e.index == 0) {
+                uni.showToast({
+                    title: '开发中暂未开放，敬请期待',
+                    icon: 'none'
+                })
+            }
+            if (e.index == 1) {
+                this.$Router.push({
+                    name: 'imFriends'
+                })
             }
         },
         watch: {
-            '$store.getters.newMessage': function(n, o) {
+            '$store.getters.newMessage': function(n, o) {
                 if (this.isShown) {
                     this.getConversationList()
                 }
@@ -131,90 +119,102 @@
             getConversationList() {
                 const count = 1000
                 const timestamp = 0 // 会话的时间戳（获取这个时间戳之前的会话列表，0 表示从最新开始获取）会话类型
-                RongIMLib.getConversationList(undefined, count, timestamp, (res) => {
+                RongIMLib.getConversationList(undefined, count, timestamp, (res) => {
                     if (res.code === 0 && res.conversations.length > 0) {
-                        this.conversations = res.conversations
+                        this.conversations = res.conversations
                     }
                 })
             },
             // 进入聊天的详情页面，清理未读消息数量
             toDetail(item) {
                 uni.navigateTo({
-                    url: '/pages/im/private/index?targetId=' + item.targetId + '&conversationType=' + item.conversationType
+                    url: '/pages/im/private/index?targetId=' + item.targetId + '&conversationType=' + item
+                        .conversationType
                 })
             }
         }
     }
 </script>
 
-<style lang="scss" scoped>
-	.content{
-		background-color: $window-color;
-		min-height: 100vh;
-		.null-list{
-			height: 100vh;
-			text-align: center;
-			&-btn{
-				margin-top: $margin * 2;
-				line-height: 70rpx;
-				color: $main-color;
-				border:solid 1rpx $main-color;
-				padding: 0 ($padding*3);
-				font-size: $title-size-m;
-				border-radius: 35rpx;
-				box-sizing: border-box;
-			}
-		}
-		.mssage-box{
-			background: white;
-			.mssage-action{
-				position: relative;
-				padding: 20rpx $padding;
-				&::after{
-					position: absolute;
-					left: $padding + 108;
-					right: 0;
-					bottom: 0;
-					content: " ";
-					height: 1rpx;
-					background: $border-color;
-				}
-				&-content{
-					position: absolute;
-					top: 20rpx;
-					height: 44px;
-					left: $padding + 108;
-					right: $margin;
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					.mssage-header{
-						display: flex;
-						font-size: $title-size;
-						line-height: 40rpx;
-						justify-content: space-between;
-						.header-name{
-							flex: 1;
-							@extend .nowrap;
-						}
-						.header-time{
-							padding-left: $padding;
-							font-size: $title-size-sm - 2;
-							color: $text-gray;
-						}
-					}
-					.mssage-msg{
-						font-size: $title-size-sm - 2;
-						color: $text-gray;
-						@extend .nowrap;
-					}
-				}
-			}
-			&-item:last-child{
-				.mssage-action::after{
-					display: none;
-				}
-			}
-		}
-	}
+<style lang="scss" scoped>
+    .content {
+        background-color: $window-color;
+        min-height: 100vh;
+
+        .null-list {
+            height: 100vh;
+            text-align: center;
+
+            &-btn {
+                margin-top: $margin * 2;
+                line-height: 70rpx;
+                color: $main-color;
+                border: solid 1rpx $main-color;
+                padding: 0 ($padding*3);
+                font-size: $title-size-m;
+                border-radius: 35rpx;
+                box-sizing: border-box;
+            }
+        }
+
+        .mssage-box {
+            background: white;
+
+            .mssage-action {
+                position: relative;
+                padding: 20rpx $padding;
+
+                &::after {
+                    position: absolute;
+                    left: $padding + 108;
+                    right: 0;
+                    bottom: 0;
+                    content: " ";
+                    height: 1rpx;
+                    background: $border-color;
+                }
+
+                &-content {
+                    position: absolute;
+                    top: 20rpx;
+                    height: 44px;
+                    left: $padding + 108;
+                    right: $margin;
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: center;
+
+                    .mssage-header {
+                        display: flex;
+                        font-size: $title-size;
+                        line-height: 40rpx;
+                        justify-content: space-between;
+
+                        .header-name {
+                            flex: 1;
+                            @extend .nowrap;
+                        }
+
+                        .header-time {
+                            padding-left: $padding;
+                            font-size: $title-size-sm - 2;
+                            color: $text-gray;
+                        }
+                    }
+
+                    .mssage-msg {
+                        font-size: $title-size-sm - 2;
+                        color: $text-gray;
+                        @extend .nowrap;
+                    }
+                }
+            }
+
+            &-item:last-child {
+                .mssage-action::after {
+                    display: none;
+                }
+            }
+        }
+    }
 </style>
diff --git a/pages/im/private/index.vue b/pages/im/private/index.vue
index 988a19a..71557cd 100644
--- a/pages/im/private/index.vue
+++ b/pages/im/private/index.vue
@@ -1,33 +1,34 @@
-<template>
-	<view class="chat-content">
-		<scroll-view class="chat-scrool" :scroll-y="true" :scroll-into-view="scrollIntoID" :scroll-with-animation="false">
-			<!-- 聊天窗口 -->
-			<view class="chat-item" v-for="(item,index) in messages" :key="index" :id="'chatId_'+index">
-				<view class="chat-item-time">
-					<text>{{ item.sentTime|timeCustomCN }}</text>
-				</view>
-				<view class="chat-item-article" :class="item.messageDirection == 1 ? 'right' : 'left'">
-					<view class="chat-msg">
-						<view class="chat-msg-text">{{ item.content.content }}</view>
-						<!-- 预留一些图片，语音表情包等位置 -->
-					</view>
-					<view class="chat-status" :class="{'hide': item.sentStatus == 50}" v-if="item.messageDirection == 1">{{ item.sentStatus == 50 ? '已读': '未读'}}</view>
-					<view class="chat-avatar">
-						<!-- <u-avatar :src="userInfo.portraitUrl" @click="showFriend"></u-avatar> -->
-						<u-avatar
-							text="无"
-							fontSize="14"
-							bg-color="rgba(0,0,0,.2)"
-						></u-avatar>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-		<view class="chat-footer">
-			<input class="chat-input" type="text" v-model="inputTxt" confirm-type="发送" @confirm="send" cursor-spacing="10"/>
-			<button class="chat-push" size="mini" @click="send">发送</button>
-		</view>
-	</view>
+<template>
+    <view class="chat-content">
+        <scroll-view class="chat-scrool" :scroll-y="true" :scroll-into-view="scrollIntoID"
+            :scroll-with-animation="false">
+            <!-- 聊天窗口 -->
+            <view class="chat-item" v-for="(item,index) in messages" :key="index" :id="'chatId_'+index">
+                <view class="chat-item-time">
+                    <text>{{ item.sentTime|timeCustomCN }}</text>
+                </view>
+                <view class="chat-item-article" :class="item.messageDirection == 1 ? 'right' : 'left'">
+                    <view class="chat-msg">
+                        <view class="chat-msg-text">{{ item.content.content }}</view>
+                        <!-- 预留一些图片，语音表情包等位置 -->
+                    </view>
+                    <view class="chat-status" :class="{'hide': item.sentStatus == 50}"
+                        v-if="item.messageDirection == 1">{{ item.sentStatus == 50 ? '已读': '未读'}}</view>
+                    <view class="chat-avatar">
+                        <!-- <u-avatar :src="userInfo.portraitUrl" @click="showFriend"></u-avatar> -->
+                        <u-avatar v-if="item.messageDirection == 2" :src="friend(targetId).portraitUrl"></u-avatar>
+                        <u-avatar v-else :src="$store.getters.sender.portraitUrl"/>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+
+        <view class="chat-footer">
+            <input class="chat-input" type="text" v-model="inputTxt" confirm-type="发送" @confirm="send"
+                cursor-spacing="10" />
+            <button class="chat-push" size="mini" @click="send">发送</button>
+        </view>
+    </view>
 </template>
 
 <script>
@@ -74,7 +75,7 @@
             this.getMessageList()
 
             // 监听消息回执
-            RongIMLib.addReadReceiptReceivedListener((result) => {
+            RongIMLib.addReadReceiptReceivedListener((result) => {
                 const res = result.data.message
                 if (res.targetId == this.targetId) {
                     this.getMessageList()
@@ -87,18 +88,23 @@
         computed: {
             showSendButton() {
                 return this.inputTxt.length > 0
+            },
+            friend() {
+                return function(targetId) {
+                    return this.$store.getters.userInfo(targetId)
+                }
             }
         },
         onNavigationBarButtonTap(e) {
-            if (e.index == 0) {
-                uni.navigateTo({
-                    url: '/pages/im/private/setting?targetId=' + this.targetId +
-                        '&conversationType=' + this.conversationType
+            if (e.index == 0) {
+                uni.navigateTo({
+                    url: '/pages/im/private/setting?targetId=' + this.targetId +
+                        '&conversationType=' + this.conversationType
                 })
             }
         },
         watch: {
-            '$store.getters.newMessage': function(msg) {
+            '$store.getters.newMessage': function(msg) {
                 if (msg.targetId == this.targetId) {
                     RongIMLib.clearMessagesUnreadStatus(msg.conversationType, msg.targetId, msg.sentTime)
                     RongIMLib.sendReadReceiptMessage(msg.conversationType, msg.targetId, msg.sentTime)
@@ -132,7 +138,7 @@
                     ({
                         code,
                         messages
-                    }) => {
+                    }) => {
                         if (code === 0) {
                             this.messages = messages.reverse()
                             this.scrollBottom()
@@ -147,14 +153,14 @@
                 })
             },
             showFriend() {
-                uni.navigateTo({
-                    url: '/pages/im/friends/info?targetId=' + this.targetId
-                })
+                // uni.navigateTo({
+                //     url: '/pages/im/friends/info?targetId=' + this.targetId
+                // })
             },
             showMine() {
-                uni.navigateTo({
-                    url: '/pages/im/friends/mine'
-                })
+                // uni.navigateTo({
+                //     url: '/pages/im/friends/mine'
+                // })
             },
             scrollBottom() {
                 this.$nextTick(function() {
@@ -180,117 +186,135 @@
 </script>
 
 <style lang="scss" scoped>
-    .chat-content{
-		height: 100vh;
-		background: $window-color;
-		.chat-scrool{
-			height: calc(100vh - 140rpx);
-			box-sizing: border-box;
-			padding-bottom: $padding;
-			.chat-item{
-				.chat-item-time{
-					text-align: center;
-					padding: $padding/2 $padding;
-					text{
-						background: rgba($color: #000000, $alpha: .2);
-						color: white;
-						font-size: $title-size-sm - 4;
-						line-height: 40rpx;
-						padding: 0 15rpx;
-						display: inline-block;
-						border-radius: $radius-lg;
-					}
-				}
-				.chat-item-article{
-					position: relative;
-					padding: 10rpx ($padding + 110) 0;
-					overflow: hidden;
-					min-height: 40px;
-					.chat-msg{
-						overflow: hidden;
-						.chat-msg-text{
-							display: inline-block;
-							padding: ($padding - 10) $padding;
-							color: $text-color;
-							box-sizing: border-box;
-							font-size: $title-size-lg;
-						}
-					}
-					.chat-status{
-						color: $text-gray;
-						font-size: $title-size-sm;
-						text-align: right;
-						&.hide{
-							color: $text-gray-m;
-						}
-					}
-					.chat-avatar{
-						position: absolute;
-						top: 0;
-					}
-					&.left{
-						.chat-avatar{
-							left: $margin;
-						}
-						.chat-msg{
-							.chat-msg-text{
-								background-color: white;
-								border-radius: 0 $radius*2 $radius*2 $radius*2;
-							}
-						}
-					}
-					&.right{
-						.chat-avatar{
-							right: $margin;
-						}
-						.chat-msg{
-							text-align: right;
-							.chat-msg-text{
-								border-radius: $radius*2 0 $radius*2 $radius*2;
-								background: $main-color;
-								color: white;
-							}
-						}
-					}
-				}
-			}
-		}
-		.chat-footer{
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			height: 140rpx;
-			padding: 20rpx ($padding + 150rpx) 40rpx $padding;
-			background: white;
-			box-sizing: border-box;
-			z-index: 99;
-			.chat-input{
-				background: $window-color;
-				height: 80rpx;
-				border-radius: $radius-lg;
-				font-size: $title-size-m;
-				padding: 0 $padding;
-				box-sizing: border-box;
-			}
-			.chat-push[size='mini']{
-				position: absolute;
-				right: $margin;
-				top: 20rpx;
-				height: 80rpx;
-				line-height: 80rpx;
-				padding: 0;
-				margin: 0;
-				width: 120rpx;
-				background: $main-color;
-				color: white;
-				border-radius: $radius-lg;
-				font-size: $title-size-m;
-				font-weight: bold;
-				&::after{
-					display: none;
-				}
-			}
-		}
-	}
+    .chat-content {
+        height: 100vh;
+        background: $window-color;
+
+        .chat-scrool {
+            height: calc(100vh - 140rpx);
+            box-sizing: border-box;
+            padding-bottom: $padding;
+
+            .chat-item {
+                .chat-item-time {
+                    text-align: center;
+                    padding: $padding/2 $padding;
+
+                    text {
+                        background: rgba($color: #000000, $alpha: .2);
+                        color: white;
+                        font-size: $title-size-sm - 4;
+                        line-height: 40rpx;
+                        padding: 0 15rpx;
+                        display: inline-block;
+                        border-radius: $radius-lg;
+                    }
+                }
+
+                .chat-item-article {
+                    position: relative;
+                    padding: 10rpx ($padding + 110) 0;
+                    overflow: hidden;
+                    min-height: 40px;
+
+                    .chat-msg {
+                        overflow: hidden;
+
+                        .chat-msg-text {
+                            display: inline-block;
+                            padding: ($padding - 10) $padding;
+                            color: $text-color;
+                            box-sizing: border-box;
+                            font-size: $title-size-lg;
+                        }
+                    }
+
+                    .chat-status {
+                        color: $text-gray;
+                        font-size: $title-size-sm;
+                        text-align: right;
+
+                        &.hide {
+                            color: $text-gray-m;
+                        }
+                    }
+
+                    .chat-avatar {
+                        position: absolute;
+                        top: 0;
+                    }
+
+                    &.left {
+                        .chat-avatar {
+                            left: $margin;
+                        }
+
+                        .chat-msg {
+                            .chat-msg-text {
+                                background-color: white;
+                                border-radius: 0 $radius*2 $radius*2 $radius*2;
+                            }
+                        }
+                    }
+
+                    &.right {
+                        .chat-avatar {
+                            right: $margin;
+                        }
+
+                        .chat-msg {
+                            text-align: right;
+
+                            .chat-msg-text {
+                                border-radius: $radius*2 0 $radius*2 $radius*2;
+                                background: $main-color;
+                                color: white;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        .chat-footer {
+            position: fixed;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            height: 140rpx;
+            padding: 20rpx ($padding + 150rpx) 40rpx $padding;
+            background: white;
+            box-sizing: border-box;
+            z-index: 99;
+
+            .chat-input {
+                background: $window-color;
+                height: 80rpx;
+                border-radius: $radius-lg;
+                font-size: $title-size-m;
+                padding: 0 $padding;
+                box-sizing: border-box;
+            }
+
+            .chat-push[size='mini'] {
+                position: absolute;
+                right: $margin;
+                top: 20rpx;
+                height: 80rpx;
+                line-height: 80rpx;
+                padding: 0;
+                margin: 0;
+                width: 120rpx;
+                background: $main-color;
+                color: white;
+                border-radius: $radius-lg;
+                font-size: $title-size-m;
+                font-weight: bold;
+
+                &::after {
+                    display: none;
+                }
+            }
+        }
+    }
 </style>
diff --git a/pages/im/private/setting.vue b/pages/im/private/setting.vue
index 4082d1d..fad9f88 100644
--- a/pages/im/private/setting.vue
+++ b/pages/im/private/setting.vue
@@ -1,11 +1,11 @@
 <template>
-    <div>
+    <view>
         会话设置 {{ targetId}}
-        <div @click="setStatus">免打扰开关 {{status}}</div>
-        <div @click="setTop">置顶会话 {{isTop}}</div>
+        <view @click="setStatus">免打扰开关 {{status}}</view>
+        <view @click="setTop">置顶会话 {{isTop}}</view>
 		
         <u-button @click="toIndex">会首页</u-button>
-    </div>
+    </view>
 </template>
 
 <script>
diff --git a/static/.DS_Store b/static/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c45d1ef15595685f4d4f1b997e538cdf96f30331
GIT binary patch
literal 8196
zcmeHMJ#Q015S_&)F`}`%&|Q%t9ZCl%#bF(yqDqa39bZBuI~N=qkZA4?An_9-AtZhR
z5)BfFCPk?E6={JcZ+16#v-d#<L1Nb0eW#t7eQ%#)-|dBn%y2o`Bw8b)9y(+HCWeN_
zaqhKt&Cjd@4eDugdpDaM+1VSlY@JXC)B$xs9Z(0<fq%gP+_Sm$TJHNUs-rrf4*Zu6
z@b5!}&KP^l9onA`4E6{B>|)wBT=)3`7<r66<_-}-Gp-cqN{v5a7*~$@$mhi#bBC^+
zj6ZxB&ush&#aMQ%AK7#=u|plz0d=760H57EG@+E9Pxs~d{rj+t%(5gIPqQ&*daqBO
zoeobw-<Q$JZ=y#}<*Mf>!#9494(O030plQjFJqE(V=%wuENW+2$=VbTcn6;x?*Z*n
zMu!0}{otK;p~%K0?}wLyw}_X#P4R%&*q0%^_Kf!FIN-hW<e}%aG0FRLYf<jk*UJ4i
z#RJ~E-*~^PU`^>5pAp#8fSn%Qs%J<IUq^+8$~sa>dsd)_-msqQP_lsk^Qx9tx5KE^
zVWx!+Q7<(#XN3GY^RIw?L}MCaoQG~a{#cDm4gGh8hF}e;qAe%Xal$&fw1g9BMT1Gs
zWK8mJ{VMp2TFKoM4|v_pa)n-C=Tm%AT7>(*_ZHkiT=IYEEHD2aD>>zNp)DuSL9u(9
z(EC5^)}{_zsRJFyzQ*VO2kr0wuT-Ows{`u5pLM`=lkJ2bg8kXL#>S5i5&8}~H_po)
n+7b-*2?J=4<G|t{hPaN9$~Cda+#zPr^hJQRK?il<uR3r6h*=(>

literal 0
HcmV?d00001

diff --git a/store/modules/im.js b/store/modules/im.js
index 607eb51..19657d5 100644
--- a/store/modules/im.js
+++ b/store/modules/im.js
@@ -17,7 +17,7 @@ export default {
             if (state.friends[targetId]) {
                 return state.friends[targetId]
             } else {
-                console.log('没找到', targetId);
+                console.log('没找到,， 死循环了，得处理  todo', targetId);
                 im.syncUserInfo(targetId)
                 return {
                     name: '',
diff --git a/uni_modules/.DS_Store b/uni_modules/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ac468330c72f44a2cd852bf485ff126133412405
GIT binary patch
literal 10244
zcmeI1&ubGw6vyAzqN!<XtKzM)qM(<8MG-w2+q6`zqD1ke<X4*(k|wqZ=tXk(B6#S<
zqk8b<y%$CBP!HnCi-H%$|3K7(e&5XQ=1sEMY$}4nY}tL=&G*fI-kZtnz6lXI(~aU3
zkxN7g>}<z|aR}M?bKX0)0q;s0)`34!j*9qOqeWWpP}>VO12zLT12zLT12zNyLI&{6
z<}H!b)*fvJYzAxwf(-Ed;9_T+@@!LEHFe;iN&whFTvi*-Q3og=*Rv_lHnml*Xj4}Y
zj_2xlC5EHj@wv-#*pz3R+G=-lv^zQ8ogJ@2an#-6=PEflDQ)f1X252kGXq?^C#gyW
zs?(%Vzps}|Q<*}wQqxW+X1XgY)pR;vuI8ag+$d+he|+=mT$H-lhq|^bDY9smh63Ia
z&Z<~(Xk*>K6|Rz;XIC%zoFVO1sx8K7rOB6KzL9{hjI$E0U^S$UW1*dM&%J21<h{H*
z;EiZsa>w&9`HwSyBH*uJC1;fy=1AE0Fiay^-)$`Tx$S665=QAlxLW;G#Tru)Y-=Xj
z#6ggSs3hCZ0|8s8veoa=N|P^z8`G{JZ#8_A?wV{<)13;*wRQiZpR=}hWX8IyOr9&u
z(~7SSvKo&-lPP&CTqU`NUtaLJLfVsT(Mpp~jk8fut)dqz)WC6)u2Y7t(gHZ^v}lsv
z{07oUy<~oSIAHGK)9UTGK4u&bIL~8r8_W&FGKo={1APu>1zLt(!++-NG;wP)j*pDz
z)RTF?4|?89_DDZ|MqCr0IIg6MX+_17!}zJ|n9QDe_Ncp3#_)W6&X1u>yOO-O+Tf)Z
z%sVc4d1Ni2S4xVWXEBVa_W9yGR>0$U$vBQI&iZl0xSx!vKTk8hCdW4v#K+GPj?f%g
zj{75ACHY4-(msDkdy+R=Y4AB&=G!UwipD5$KD=-LTr&OIobj2AHY80qjlnVCGKY+-
zsQQ1&prMm<;VQ{=^z*dO6w;m~i&h$Zlx4orAWwL<V)o1P$OLB|eR{_vJ;d)(k$TBI
z@H$}b;nSM;;`*3zsOL)}h-01KZQ4d7U7H7cheq;#eR{^vafq(P7^O3~baA*h;A&vj
zDj~Q0yA(fR3OI(&1WpO8vHT?e<1eRu{+Pb4nELfK;`EASFx$;$z-GW^U^^Mup`Bb_
z|DWyt`~P;DwmvokHUs}j2AsikCe6ze-r9Nx_5iN9*t6JqV_j2Q<$?oC__|t-$3MIr
zf6Tk4ihb`q<=LjT${l{n9agXA|MedOyfp^-7H{i+vCeAif1_5A@BIB$@p6Rq=V`w0
NtFMc!L;tw`{|z~DaM}O>

literal 0
HcmV?d00001

diff --git a/utils/.DS_Store b/utils/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..44a34e7cee313bc4e5a604209ad845e45941ee11
GIT binary patch
literal 6148
zcmeHKu};G<5IvU+kytu*^vK#jFj1Ho`va)0fJzPNg48i9-^E53Bz}nZ?%a};h!G)l
zC)w|O=kvu+iq962P(82bB2y75(TIV{h|oOhn&ioJ2ClJvm@igsvm06DubTMng{-8N
zC%HfSe(vw&YudVAZrden<>qRCs1C2!L;w0m|L(ER4f&RdY@`|Hob8YHe!km}x0iRz
zr!h_YmFwI$%#)bM#Tjr0oB?OR8R#>BnoTJ$4ZU{;oB?Ox!~oBSh(=5qJ3~D>(CHHZ
zSir0TUGKKQNCPls><nRn1PcXPXvj~DVBxUGJTGPJ3@u!OX2v=>^YQT#G&}53r%OnN
z-a7-%z>t9p8%|mOZ}7{EKJtelK5_<}fq%w8DC$LBVN<!be%l^vZA806qi|kF1p-}5
lF;Gh}20TY*>NJ0(4u8tn8FCfcH5}*{0VTvcXW$nY_yiNTLdXCB

literal 0
HcmV?d00001

diff --git a/utils/im/api.js b/utils/im/api.js
deleted file mode 100644
index 259fdfb..0000000
--- a/utils/im/api.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const api_url = 'http://api.zh.shangkelian.cn/api/im'
-
-/**
- * 获取币种余额
- */
-export const getToken = (uid) => {
-    return new Promise((resolve, reject) => {
-        uni.request({
-            method: 'GET',
-            url: api_url + '/token/' + uid,
-            success: (res) => {
-                if (res.statusCode === 200) {
-                    resolve(res.data.data)
-                } else {
-                    reject(res.message)
-                }
-            }
-        })
-    })
-}
-
-/**
- * 获取好友列表
- */
-export const getFriends = () => {
-    return new Promise((resolve, reject) => {
-        uni.request({
-            method: 'GET',
-            url: api_url + '/friends',
-            success: (res) => {
-                if (res.statusCode === 200) {
-                    resolve(res.data.data)
-                } else {
-                    reject(res.message)
-                }
-            }
-        })
-    })
-}
-
-export default {
-    getToken,
-    getFriends
-}
diff --git a/utils/im/sqlite.js b/utils/im/sqlite.js
deleted file mode 100644
index 100cda2..0000000
--- a/utils/im/sqlite.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const openSqlite = (callback) => {
-    plus.sqlite.openDatabase({
-        name: 'friends',
-        path: '_doc/friends.db',
-        success: (res) => {
-            callback(res)
-        },
-        fail: (err) => {
-            callback(err)
-        }
-    })
-}
-
-const executeSQL = (callback) => {
-    plus.sqlite.selectSql({
-        name: 'friends',
-        sql: sql,
-        success: (res) => {
-            callback(res)
-        },
-        fail: (err) => {
-            callback(err)
-        }
-    })
-}
-
-const closeSqlite = (callback) => {
-    plus.sqlite.closeDatabase({
-        name: 'friends',
-        path: '_doc/friends.db',
-        success: (res) => {
-            callback(res)
-        },
-        fail: (err) => {
-            callback(err)
-        }
-    })
-}
-
-export {
-    openSqlite,
-    executeSQL,
-    closeSqlite
-}
\ No newline at end of file