diff --git a/src/components/cuCustom.wpy b/src/components/cuCustom.wpy
index 3ed89f3..4841482 100644
--- a/src/components/cuCustom.wpy
+++ b/src/components/cuCustom.wpy
@@ -38,7 +38,7 @@
},
searchName: {
type: String,
- default: '搜索...'
+ default: '搜索昵称'
}
},
data: {
diff --git a/src/pages/news/chitchat.wpy b/src/pages/news/chitchat.wpy
index 00faffc..0760d23 100644
--- a/src/pages/news/chitchat.wpy
+++ b/src/pages/news/chitchat.wpy
@@ -786,6 +786,7 @@ wepy.page({
vm.$showToast('请输入聊天内容')
return
}
+ let msg = vm.msg
if (/\[[^\]]+\]/.test(vm.msg)) {
vm.msg = vm.transitionMsg(vm.msg)
}
@@ -807,7 +808,7 @@ wepy.page({
app.globalData.nim.msg.sendTextMsg({
scene: 'p2p',
to: vm.otherUserId,
- body: vm.msg,
+ body: msg,
isSend: 0,
onSendBefore: function (msg) {
console.log('get msg before', msg)
diff --git a/src/pages/news/groupChitchat.wpy b/src/pages/news/groupChitchat.wpy
index aa1d283..522688c 100644
--- a/src/pages/news/groupChitchat.wpy
+++ b/src/pages/news/groupChitchat.wpy
@@ -1057,9 +1057,8 @@ wepy.page({
vm.lastTime = format(item.time)
// 获取成员头像后再循环获取数据
app.globalData.nim.user.getUsersNameCardFromServer({
- accounts: [item.from]
+ accounts: [`${item.id}`]
}).then((res) => {
- item.avatar = res[0].avatar
if (index + 1 == data.length) {
vm.lastMsgId = data[data.length - 1].id
vm.beginTime = data[data.length - 1].time
diff --git a/src/pages/news/newsSearch.wpy b/src/pages/news/newsSearch.wpy
new file mode 100644
index 0000000..f720a76
--- /dev/null
+++ b/src/pages/news/newsSearch.wpy
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+{
+navigationBarTitleText: '',
+enablePullDownRefresh: true,
+backgroundColorTop: '#ffffff',
+backgroundColorBottom: '#ffffff',
+usingComponents: { }
+}
+
diff --git a/src/pages/tabBar/home.wpy b/src/pages/tabBar/home.wpy
index 101f698..4f2a142 100644
--- a/src/pages/tabBar/home.wpy
+++ b/src/pages/tabBar/home.wpy
@@ -281,7 +281,7 @@ page {
}
-
+
置顶推荐
@@ -303,7 +303,7 @@ page {
{{item.title}}
-
+
为你推荐
@@ -442,6 +442,7 @@ wepy.page({
mixins: [https, base],
data: {
+ pageLoading: false,
loginShow: false,
perfectModal: false,
userInfo: {},
@@ -465,8 +466,10 @@ wepy.page({
if (code === 0) {
vm.topList = data || []
}
+ vm.pageLoading = true
wx.hideLoading()
}).catch(err => {
+ vm.pageLoading = true
wx.hideLoading()
console.log(err)
})
diff --git a/src/pages/tabBar/news.wpy b/src/pages/tabBar/news.wpy
index 75e31f2..0ad73ae 100644
--- a/src/pages/tabBar/news.wpy
+++ b/src/pages/tabBar/news.wpy
@@ -38,6 +38,15 @@ page {
}
.ui-container{
+ .ui-no-data-box {
+ text-align: center;
+ .ui-no-data-icon {
+ width: 440rpx;
+ height: 360rpx;
+ margin: 160rpx auto -10rpx auto;
+ }
+ }
+
.ui-touch-item {
display: flex;
justify-content: space-between;
@@ -150,33 +159,39 @@ page {
-
-
-
-
-
- {{item.title}}
- 已置顶
-
-
- [有人@你]
- {{item.content}}
-
-
-
- {{item.last_time}}
-
-
-
-
- {{item.new_count}}
- {{item.new_count}}
-
-
-
- 退出
- 删除
+
+
+ 暂无聊天消息
+
+
+
+
+
+
+ {{item.title}}
+ 已置顶
+
+
+ [有人@你]
+ {{item.content}}
+
+
+
+ {{item.last_time}}
+
+
+
+
+ {{item.new_count}}
+ {{item.new_count}}
+
+
+
+ 退出
+ 删除
+
+
@@ -194,6 +209,7 @@ wepy.page({
data: {
loginShow: false,
+ loading: false,
menuList: [
{
icon: 'https://image.fulllinkai.com/202201/21/a2a7445a8b70694056dd7795ef5ecc4e.png',
@@ -290,16 +306,17 @@ wepy.page({
})
}
console.log(vm.list, '777')
- if (vm.list.length < 15 || session.data.length < 15) {
+ if (vm.list.length < 15 || data.data.length < 15) {
vm.no_more = true
}
- setTimeout(() => {
- vm.loading = true
- }, 500)
}
+ setTimeout(() => {
+ vm.loading = true
+ }, 500)
wx.hideLoading()
}).catch(err => {
wx.hideLoading()
+ vm.loading = true
console.log(err)
})
},