From 335cfc28e912ea036df4a25cf076dcb2af499f2e Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Wed, 7 Sep 2022 11:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/loading.vue | 58 --
src/components/msgList2/msgList2.vue | 217 ------
src/components/nothing/nothing.vue | 36 -
src/components/pageLoading.vue | 89 ---
src/components/topLoading.vue | 71 --
src/manifest.json | 2 +-
src/pages.json | 10 +-
src/pages/PolicyExpress/PolicyExpress.vue | 1 +
src/pages/activity/activity.vue | 1 +
src/pages/my/My.vue | 10 +-
src/pagesA/msg/chat/chat.vue | 782 ++++++++++++++++++++++
src/pagesA/msg/msg.vue | 241 +++++++
src/pagesA/msgTalk/msgTalk.vue | 145 ----
src/request/interface.js | 4 +-
14 files changed, 1037 insertions(+), 630 deletions(-)
delete mode 100644 src/components/loading.vue
delete mode 100644 src/components/msgList2/msgList2.vue
delete mode 100644 src/components/nothing/nothing.vue
delete mode 100644 src/components/pageLoading.vue
delete mode 100644 src/components/topLoading.vue
create mode 100644 src/pagesA/msg/chat/chat.vue
create mode 100644 src/pagesA/msg/msg.vue
delete mode 100644 src/pagesA/msgTalk/msgTalk.vue
diff --git a/src/components/loading.vue b/src/components/loading.vue
deleted file mode 100644
index c6a9ea8..0000000
--- a/src/components/loading.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- 没有更多内容了
-
-
-
-
-
-
-
-
-
diff --git a/src/components/msgList2/msgList2.vue b/src/components/msgList2/msgList2.vue
deleted file mode 100644
index 9c5a7cf..0000000
--- a/src/components/msgList2/msgList2.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
-
-
-
-
- {{item.userChat.unreadCount}}
-
-
-
-
- {{item.toUserAsName}}
-
-
- {{item.userChat.chatType | getOname}}
-
-
-
- {{item.userChat.lastMsg.msg}}
-
-
- {{item.userChat.lastMsg.type | getType}}
-
-
-
- {{item.userChat.lastTime | getTextTimex}}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/nothing/nothing.vue b/src/components/nothing/nothing.vue
deleted file mode 100644
index 9eb2785..0000000
--- a/src/components/nothing/nothing.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- 暂无数据
-
-
-
-
-
-
-
diff --git a/src/components/pageLoading.vue b/src/components/pageLoading.vue
deleted file mode 100644
index 622ca79..0000000
--- a/src/components/pageLoading.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/topLoading.vue b/src/components/topLoading.vue
deleted file mode 100644
index 7b2016c..0000000
--- a/src/components/topLoading.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/manifest.json b/src/manifest.json
index 2d32c21..7d2837f 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "艺象心",
- "appid" : "__UNI__ED9DD86",
+ "appid" : "__UNI__77CA6BC",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/src/pages.json b/src/pages.json
index 3a6c5c5..a609cc2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -548,16 +548,14 @@
{
"root": "pagesA/",
"pages": [{
- "path": "msgTalk/msgTalk",
+ "path": "msg/msg",
"style": {
- "navigationBarTitleText": "我的消息"
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "消息列表"
}
},
{
- "path": "talkPage/talkPage",
- "style": {
- "navigationBarTitleText": "消息"
- }
+ "path": "msg/chat/chat"
},
{
"path": "addArtActivity/addArtActivity",
diff --git a/src/pages/PolicyExpress/PolicyExpress.vue b/src/pages/PolicyExpress/PolicyExpress.vue
index 499bbdf..9c1a870 100644
--- a/src/pages/PolicyExpress/PolicyExpress.vue
+++ b/src/pages/PolicyExpress/PolicyExpress.vue
@@ -12,6 +12,7 @@
{{v.username}} {{v.fbsj}}
+
diff --git a/src/pages/activity/activity.vue b/src/pages/activity/activity.vue
index b472523..1784f05 100644
--- a/src/pages/activity/activity.vue
+++ b/src/pages/activity/activity.vue
@@ -25,6 +25,7 @@
+
diff --git a/src/pages/my/My.vue b/src/pages/my/My.vue
index 466c765..8ebf497 100644
--- a/src/pages/my/My.vue
+++ b/src/pages/my/My.vue
@@ -116,8 +116,8 @@
-
-
+
+
消息
@@ -296,9 +296,9 @@
// 消息
myNews(){
- // uni.navigateTo({
- // url: "/pagesA/msgTalk/msgTalk"
- // })
+ uni.navigateTo({
+ url: "/pagesA/msg/msg"
+ })
}
}
}
diff --git a/src/pagesA/msg/chat/chat.vue b/src/pagesA/msg/chat/chat.vue
new file mode 100644
index 0000000..8cfb5b5
--- /dev/null
+++ b/src/pagesA/msg/chat/chat.vue
@@ -0,0 +1,782 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{row.msg.length}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{row.username}} {{row.time}}
+
+
+
+
+
+
+ {{row.msg.length}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{voiceTis}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{recordTis}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesA/msg/msg.vue b/src/pagesA/msg/msg.vue
new file mode 100644
index 0000000..21ee4aa
--- /dev/null
+++ b/src/pagesA/msg/msg.vue
@@ -0,0 +1,241 @@
+
+
+
+
+
+
+
+
+
+
+ {{chat.username}}
+ {{chat.time}}
+
+
+ {{chat.msg}}
+ {{chat.tisNum}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pagesA/msgTalk/msgTalk.vue b/src/pagesA/msgTalk/msgTalk.vue
deleted file mode 100644
index 0d0eb6d..0000000
--- a/src/pagesA/msgTalk/msgTalk.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/request/interface.js b/src/request/interface.js
index 39151d0..59753d1 100644
--- a/src/request/interface.js
+++ b/src/request/interface.js
@@ -6,9 +6,9 @@
export default {
config: {
// baseUrl: "http://192.168.0.57:8080/h5/api", //王锡
- // baseUrl: "/pre", //俞燕红-跨域
+ baseUrl: "/pre", //俞燕红-跨域
// baseUrl: "http://10.0.0.36:8080/h5/api", //俞燕红
- baseUrl: "https://yxx.ydool.net/h5/api", //线上
+ // baseUrl: "https://yxx.ydool.net/h5/api", //线上
header: {
'Content-Type': 'application/json;charset=UTF-8',
// 'Content-Type':'application/x-www-form-urlencoded'