diff --git a/.DS_Store b/.DS_Store
index 66544f0..4a239b7 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/pages.json b/pages.json
index 72c7d45..aa9dec8 100644
--- a/pages.json
+++ b/pages.json
@@ -356,14 +356,14 @@
"app-plus": {
"titleNView": {
"buttons": [{
- "float": "right",
+ "float": "left",
"text": "\ue605",
"fontSrc": "/static/iconfont.ttf",
"color": "#000",
"fontSize": "20px"
},
{
- "float": "left",
+ "float": "right",
"text": "\ue606",
"fontSrc": "/static/iconfont.ttf",
"color": "#000",
@@ -375,20 +375,57 @@
}
},
{
- "path": "pages/im/detail",
+ "path": "pages/im/private/index",
"style": {
- "navigationBarTitleText": "",
+ "navigationBarTitleText": "单聊",
"app-plus": {
"titleNView": {
"type": "default",
"buttons": [{
"float": "right",
- "fontSrc": "/static/uniicons.ttf",
- "text": "\ue607"
+ "fontSrc": "/static/iconfont.ttf",
+ "text": "\ue607",
+ "fontSize": "20px"
}]
}
}
}
+ },
+ {
+ "path": "pages/im/private/setting",
+ "style": {
+ "navigationBarTitleText": "设置"
+ }
+ },
+ {
+ "path": "pages/im/friends/index",
+ "style": {
+ "navigationBarTitleText": "我的好友"
+ }
+ },
+ {
+ "path": "pages/im/friends/pending",
+ "style": {
+ "navigationBarTitleText": "新的朋友"
+ }
+ },
+ {
+ "path": "pages/im/friends/info",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "pages/im/friends/mine",
+ "style": {
+ "navigationBarTitleText": "我的资料"
+ }
+ },
+ {
+ "path": "pages/im/group/index",
+ "style": {
+ "navigationBarTitleText": "我的群聊"
+ }
},
{
"path": "pages/wallet/add",
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index fabc223..d4cca29 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -1,14 +1,139 @@