diff --git a/src/App.vue b/src/App.vue
index d4a3e3f6..e12c05c4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -510,10 +510,10 @@
this.closeSplashscreen(1000); // 延迟1s,避免用户看到页面跳转
uni.setStorageSync('loginInfo', {
accessToken:
- 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIyIiwiZXhwIjoxNzY0MDU5ODk2LCJpbmZvIjoie1wibmlja05hbWVcIjpcInd3d1wiLFwidGVybWluYWxcIjoxLFwidXNlcklkXCI6MixcInVzZXJOYW1lXCI6XCJ3d3dcIn0ifQ.xBfQJg6FFHQGzkK_IUGZUjVN8g5tex3VtWsTr1gGjzg',
+ 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIyIiwiZXhwIjoxNzY0MTQ1MDQyLCJpbmZvIjoie1wibmlja05hbWVcIjpcInd3d1wiLFwidGVybWluYWxcIjoxLFwidXNlcklkXCI6MixcInVzZXJOYW1lXCI6XCJ3d3dcIn0ifQ.yO8o-DM4mied_C5PFzqentfiETV38jmVjFzLVljouz4',
accessTokenExpiresIn: 1800,
refreshToken:
- 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIyIiwiZXhwIjoxNzY0NjYyODk2LCJpbmZvIjoie1wibmlja05hbWVcIjpcInd3d1wiLFwidGVybWluYWxcIjoxLFwidXNlcklkXCI6MixcInVzZXJOYW1lXCI6XCJ3d3dcIn0ifQ.o87SSm-pWBkPKROeNBP45VmpBVSdw__Kps4YfiJPZwg',
+ 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIyIiwiZXhwIjoxNzY0NzQ4MDQyLCJpbmZvIjoie1wibmlja05hbWVcIjpcInd3d1wiLFwidGVybWluYWxcIjoxLFwidXNlcklkXCI6MixcInVzZXJOYW1lXCI6XCJ3d3dcIn0ifQ.O2Ge2P-n3JSjEqr7P5sH5jaSWZosopHycsuS-vk-WEU',
refreshTokenExpiresIn: 604800,
});
// 登录状态校验
diff --git a/src/components/friend-item/friend-item.vue b/src/components/friend-item/friend-item.vue
index 543ef876..47abad9a 100644
--- a/src/components/friend-item/friend-item.vue
+++ b/src/components/friend-item/friend-item.vue
@@ -1,82 +1,97 @@
-
-
-
- {{ friend.nickName }}
-
-
-
-
-
-
-
+
+
+
+ {{ friend.nickName }}
+
+
+
+
+
+
+
\ No newline at end of file
+ .online {
+ padding-right: 4rpx;
+ width: 24rpx;
+ height: 24rpx;
+ }
+ }
+ }
+ }
+
diff --git a/src/im-var.scss b/src/im-var.scss
index f22e7eb9..7363fb59 100644
--- a/src/im-var.scss
+++ b/src/im-var.scss
@@ -62,4 +62,4 @@ $im-title-size: 26px;
$im-title-size-1: 22px;
$im-title-size-2: 18px;
-$im-nav-bar-height: 50px;
+$im-nav-bar-height: 44px;
diff --git a/src/pages.json b/src/pages.json
index cbde688a..4e4e012c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -171,6 +171,13 @@
"navigationBarTitleText": "用户信息",
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "friend",
+ "style": {
+ "navigationBarTitleText": "朋友",
+ "navigationStyle": "custom"
+ }
}
]
},
diff --git a/src/pages/message/friend.vue b/src/pages/message/friend.vue
new file mode 100644
index 00000000..61e46ef4
--- /dev/null
+++ b/src/pages/message/friend.vue
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 还没有好友
+ 添加好友,开始精彩的聊天之旅
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/message/message.vue b/src/pages/message/message.vue
index d0aa83d8..32e64fe6 100644
--- a/src/pages/message/message.vue
+++ b/src/pages/message/message.vue
@@ -5,7 +5,13 @@
消息
- 缘友
+
+ 友友
+
diff --git a/src/pages/profile/profile.vue b/src/pages/profile/profile.vue
index 8d181fad..9c3abae3 100644
--- a/src/pages/profile/profile.vue
+++ b/src/pages/profile/profile.vue
@@ -26,7 +26,10 @@
{{ userInfo.nickname }}
ID: {{ userInfo.id }}
-
+
{{ userCity?.t || '' }}