diff --git a/manifest.json b/manifest.json
index 600220b..d58dbc8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "ZH-HEALTH",
"appid" : "__UNI__C29473D",
"description" : "ZH-HEALTH,您手上的健康管理专家",
- "versionName" : "1.0.15",
- "versionCode" : 113,
+ "versionName" : "1.0.16",
+ "versionCode" : 100,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue
index b962aa9..ad345ab 100644
--- a/pages/im/components/friendApplyCell.vue
+++ b/pages/im/components/friendApplyCell.vue
@@ -1,7 +1,7 @@
-
+
{{ user.name }}
@@ -20,8 +20,12 @@
resolveFriend,
rejectFriend
} from '@/apis/interfaces/im.js'
+ import imBase from '../mixins/imBase.js'
export default {
+ mixins: [
+ imBase
+ ],
props: {
message: {
type: Object,
@@ -35,7 +39,7 @@
},
methods: {
resolve() {
- resolveFriend(this.message.sourceUserId).then(res => {
+ resolveFriend(this.message.sourceUserId).then(res => {
uni.showToast({
icon: 'none',
title: '通过好友申请'
@@ -46,8 +50,8 @@
icon: 'none',
title: err.message
})
- }).finally(() => {
- this.clearMessages()
+ }).finally(() => {
+ this.clearMessages()
})
},
reject() {
@@ -68,11 +72,11 @@
})
},
// 不管是通过还是拒绝,都要把相关的信息清理
- clearMessages() {
+ clearMessages() {
RongIMLib.deleteMessages(RongIMLib.ConversationType.SYSTEM, this.message.sourceUserId)
- this.$emit('success')
- uni.$emit('onNewContactConversation')
- uni.$emit('onNewContactFriends')
+ this.$emit('success')
+ uni.$emit('onNewContactConversation')
+ uni.$emit('onNewContactFriends')
uni.$emit('onNewContactPendings')
}
}
diff --git a/pages/im/components/friendApplyList.vue b/pages/im/components/friendApplyList.vue
index 4fa31b6..56feed3 100644
--- a/pages/im/components/friendApplyList.vue
+++ b/pages/im/components/friendApplyList.vue
@@ -1,126 +1,147 @@
-
-
-
-
-
-
-
-
-
- {{ item.name }}
- {{ item.latestMessage.message || '--' }}
-
-
- 通过
- 拒绝
- 查看
- 已是好友
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/im/components/friendSearchList.vue b/pages/im/components/friendSearchList.vue
index 0bbb506..0e92d43 100644
--- a/pages/im/components/friendSearchList.vue
+++ b/pages/im/components/friendSearchList.vue
@@ -3,7 +3,7 @@
-
+
@@ -21,7 +21,12 @@