diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index a97fd25..4bbcf3c 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -14,6 +14,10 @@
{
"launchtype" : "local"
},
+ "mp-weixin" :
+ {
+ "launchtype" : "local"
+ },
"type" : "uniCloud"
}
]
diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue
new file mode 100644
index 0000000..94f3263
--- /dev/null
+++ b/pages/im/components/friendApplyCell.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+ {{ user.name }}
+
+
+ {{ message.message }}
+
+
+
+
+ 通过
+ 拒绝
+
+
+
+
+
+
+
diff --git a/components/friend-apply-reject-agree/index.vue b/pages/im/components/friendApplyList.vue
similarity index 86%
rename from components/friend-apply-reject-agree/index.vue
rename to pages/im/components/friendApplyList.vue
index c05d136..10e2762 100644
--- a/components/friend-apply-reject-agree/index.vue
+++ b/pages/im/components/friendApplyList.vue
@@ -1,15 +1,14 @@
-
+
-
+
{{ item.name }}
- {{ item.address || '这家伙很懒,什么都没有添加~' }}
- {{ item.remark || '你好,听说你很优秀想认识~' }}
+ {{ item.latestMessage.message }}
通过
@@ -44,8 +43,8 @@ export default {
default: false
}
},
- data() {
- return {};
+ created() {
+ console.log(this.lists);
},
methods: {
action(type, item) {
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index c1e8c93..6747487 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -1,18 +1,16 @@
+
+
+
+ 新的朋友
+
+
+
+ 我的群聊
+
+
-
-
-
-
- 新的朋友 ({{ pendingCount }})
-
-
-
-
- 我的群聊
-
-
@@ -24,8 +22,8 @@
-
+
{{ friend(friendItem.userId).name }}
@@ -42,10 +40,10 @@