From 73423084e71bd511457e0713417c7c6a4b57391c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Wed, 26 Jan 2022 17:58:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/App.vue b/App.vue
index 185135f..6861729 100644
--- a/App.vue
+++ b/App.vue
@@ -5,7 +5,6 @@
export default {
onLaunch: function() {
im.initIm('lmxuhwaglu76d')
- return
//#ifdef APP-PLUS
// 获取系统版本号
getVersions({
From a79c694509070162babf3a8bc0142b1908b56c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Thu, 27 Jan 2022 16:46:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/im/chat/chat.nvue | 19 -------------------
pages/im/index.vue | 5 +----
2 files changed, 1 insertion(+), 23 deletions(-)
delete mode 100644 pages/im/chat/chat.nvue
diff --git a/pages/im/chat/chat.nvue b/pages/im/chat/chat.nvue
deleted file mode 100644
index dd51b43..0000000
--- a/pages/im/chat/chat.nvue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
- 聊天窗口
-
-
-
-
-
-
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 84b13d1..f1a0aad 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -76,10 +76,7 @@
import * as RongIMLib from "@/uni_modules/RongCloud-IMWrapper/js_sdk/index"
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 {
From e147e1c09ce2cc644d36f49d6c466f9d61df6088 Mon Sep 17 00:00:00 2001
From: zhangdongxue
Date: Thu, 27 Jan 2022 17:40:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/im/friends/info.vue | 521 ++++++++++++++++++--------------------
1 file changed, 247 insertions(+), 274 deletions(-)
diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index 5e55e6c..b30252b 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -1,302 +1,275 @@
-
-
-
-
- {{userInfo.name}}
- 地址:{{userInfo.address}}
-
-
-
-
-
-
- 保密
- 男
- 女
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 2ac0add20dea5cdf163503ff8c7251e503f4599a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Thu, 27 Jan 2022 17:58:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=81=8A=E5=A4=A9?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/im/imAUDIO.vue | 20 ++++++
components/im/imIMG.vue | 20 ++++++
components/im/imTXT.vue | 20 ++++++
pages.json | 10 +--
pages/im/friends/group/index.vue | 20 ------
pages/im/index.vue | 2 -
pages/im/private/chat.nvue | 112 +++++++++++++++++++++++++++++++
7 files changed, 178 insertions(+), 26 deletions(-)
create mode 100644 components/im/imAUDIO.vue
create mode 100644 components/im/imIMG.vue
create mode 100644 components/im/imTXT.vue
delete mode 100644 pages/im/friends/group/index.vue
create mode 100644 pages/im/private/chat.nvue
diff --git a/components/im/imAUDIO.vue b/components/im/imAUDIO.vue
new file mode 100644
index 0000000..c820dab
--- /dev/null
+++ b/components/im/imAUDIO.vue
@@ -0,0 +1,20 @@
+
+
+ 语音消息
+
+
+
+
+
+
diff --git a/components/im/imIMG.vue b/components/im/imIMG.vue
new file mode 100644
index 0000000..3454b79
--- /dev/null
+++ b/components/im/imIMG.vue
@@ -0,0 +1,20 @@
+
+
+ 图片消息
+
+
+
+
+
+
diff --git a/components/im/imTXT.vue b/components/im/imTXT.vue
new file mode 100644
index 0000000..d3155be
--- /dev/null
+++ b/components/im/imTXT.vue
@@ -0,0 +1,20 @@
+
+
+ 文字消息
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index ea02ea7..0b02e9b 100644
--- a/pages.json
+++ b/pages.json
@@ -574,10 +574,12 @@
"navigationBarTextStyle": "white"
}
},{
- "path" : "pages/im/chat/chat",
- "style": {
- "navigationBarTitleText": "chat",
- "enablePullDownRefresh": false
+ "path" : "pages/im/private/chat",
+ "style" : {
+ "disableScroll": true,
+ "navigationBarTitleText": "聊天",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor":"#F3F6FB"
}
}
],
diff --git a/pages/im/friends/group/index.vue b/pages/im/friends/group/index.vue
deleted file mode 100644
index 047b2fb..0000000
--- a/pages/im/friends/group/index.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- 会首页
-
-
-
-
-
-
diff --git a/pages/im/index.vue b/pages/im/index.vue
index f1a0aad..9a40fc2 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -57,8 +57,6 @@
-
- 进入NVUE
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue
new file mode 100644
index 0000000..8bdedef
--- /dev/null
+++ b/pages/im/private/chat.nvue
@@ -0,0 +1,112 @@
+
+
+
+
+ {{toMsg || '-'}} / msg{{item}} - {{index}}
+
+
+
+
+
+
+
+
+