diff --git a/src/app.wpy b/src/app.wpy index aea1b34..037aace 100644 --- a/src/app.wpy +++ b/src/app.wpy @@ -186,6 +186,7 @@ subPackages: [ 'review', 'systemNews', 'visitor', +'visitorNum', ] }, { @@ -231,7 +232,7 @@ navigationBarTextStyle: 'black' }, tabBar: { color: '#999999', -selectedColor: '#5AC7A0', +selectedColor: '#333333', backgroundColor: '#ffffff', borderStyle: 'black', list: [ diff --git a/src/components/cuCustom.wpy b/src/components/cuCustom.wpy index 4841482..38e3a32 100644 --- a/src/components/cuCustom.wpy +++ b/src/components/cuCustom.wpy @@ -19,7 +19,7 @@ - + {{searchName}} diff --git a/src/components/dynamicList.wpy b/src/components/dynamicList.wpy index ba7b64e..372743a 100644 --- a/src/components/dynamicList.wpy +++ b/src/components/dynamicList.wpy @@ -161,7 +161,7 @@ scroll-view { font-size: 24rpx; color: #666666; position: relative; - margin-right: 50rpx; + margin-left: 50rpx; .ui-like-icon{ width: 30rpx; @@ -191,6 +191,7 @@ scroll-view { .ui-cuIcon-moreandroid{ width: 6rpx; height: 26rpx; + display: block; } } @@ -214,7 +215,7 @@ scroll-view { {{item.work_user_tag}} - + 参与了投票: @@ -273,8 +274,8 @@ scroll-view { {{ item.liker_count }} - - + + @@ -305,7 +306,9 @@ scroll-view { let vm = this if (vm.dynamicList && vm.dynamicList.length > 0) { vm.list = vm.dynamicList - vm.textAll(vm.dynamicList) + if (vm.from != 'dynamicDetail') { + vm.textAll(vm.dynamicList) + } } } }, diff --git a/src/pages/dynamic/issue.wpy b/src/pages/dynamic/issue.wpy index 05234b5..c26c6b7 100644 --- a/src/pages/dynamic/issue.wpy +++ b/src/pages/dynamic/issue.wpy @@ -283,7 +283,7 @@ page { - + @@ -353,7 +353,6 @@ wepy.page({ } if (!vm.value) { vm.$showToast('请输入动态内容') - return } if (vm.throttle) { vm.throttle = false @@ -362,6 +361,13 @@ wepy.page({ if (code == 0) { vm.$showToast('动态已发布') setTimeout(() => { + // 发布成功后返回列表并且切换到最新tab + const pages = getCurrentPages() + const prevPage = pages[pages.length - 2] + prevPage.$wepy.dynamicTabsIndex = 1 + prevPage.$wepy.page = 1 + prevPage.$wepy.scrollTopHandle = -1 + prevPage.$wepy.getList() wx.navigateBack({delta: 1}) }, 1200) } diff --git a/src/pages/dynamic/searchPopular.wpy b/src/pages/dynamic/searchPopular.wpy index 5aa7653..95da338 100644 --- a/src/pages/dynamic/searchPopular.wpy +++ b/src/pages/dynamic/searchPopular.wpy @@ -126,8 +126,8 @@ wepy.page({ vm.$get({url: `${service.host}/moment/topic/list`, data}).then(({code, data}) => { if (code === 0) { if (vm.list.length === 0 || vm.page === 1) { - vm.list = data.data - vm.arr = data.data + vm.list = JSON.parse(JSON.stringify(data.data)) + vm.arr = JSON.parse(JSON.stringify(data.data)) } else { data.data.map(function (item) { vm.list.push(item) diff --git a/src/pages/home/singleSquare.wpy b/src/pages/home/singleSquare.wpy index 626fc34..c9679d6 100644 --- a/src/pages/home/singleSquare.wpy +++ b/src/pages/home/singleSquare.wpy @@ -61,7 +61,7 @@ page { width: 336rpx; height: 336rpx; border-radius: 16rpx; - background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.7) 100%); + background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.3) 100%); } .recommended_user_data{ color: #fff; diff --git a/src/pages/news/groupChitchat.wpy b/src/pages/news/groupChitchat.wpy index 746553f..9a0a191 100644 --- a/src/pages/news/groupChitchat.wpy +++ b/src/pages/news/groupChitchat.wpy @@ -989,6 +989,9 @@ wepy.page({ // 在当前页面接收到别人发送过来的消息 reception(e) { let vm = this + if (e.to != vm.otherUserId) { + return + } // 标记IM消息已读 vm.sendMsgReceipt() if (e.type == 'text' && /\[[^\]]+\]/.test(e.body)) { @@ -997,7 +1000,6 @@ wepy.page({ app.globalData.nim.user.getUsersNameCardFromServer({ accounts: [e.from] }).then((res) => { - console.log(res, e, '777222') vm.msgList.push({ text: e.body, attach: vm.calculatePic(e.attach, e.type), diff --git a/src/pages/news/visitor.wpy b/src/pages/news/visitor.wpy index 02faecd..1a3dbbe 100644 --- a/src/pages/news/visitor.wpy +++ b/src/pages/news/visitor.wpy @@ -308,7 +308,7 @@ page { {{item.create_time}} - 来访{{item.count}}次 + 来访{{item.count}}次 @@ -524,6 +524,9 @@ wepy.page({ return } wx.navigateTo({url: `/pages/home/information?id=${e.id}`}) + }, + jumpDetail(e) { + wx.navigateTo({url: `/pages/news/visitorNum?id=${e.id}`}) } }, // 上拉获取更多数据 diff --git a/src/pages/news/visitorNum.wpy b/src/pages/news/visitorNum.wpy new file mode 100644 index 0000000..e508fca --- /dev/null +++ b/src/pages/news/visitorNum.wpy @@ -0,0 +1,347 @@ + + + + + +{ +navigationBarTitleText: '来访记录', +enablePullDownRefresh: true, +backgroundColorTop: '#ffffff', +backgroundColorBottom: '#ffffff', +} + diff --git a/src/pages/tabBar/dynamic.wpy b/src/pages/tabBar/dynamic.wpy index af5670f..f3c2e8f 100644 --- a/src/pages/tabBar/dynamic.wpy +++ b/src/pages/tabBar/dynamic.wpy @@ -24,9 +24,9 @@ page { } .ui-more { - width: 125rpx; - height: 34rpx; - font-size: 24rpx; + width: fit-content; + height: 36rpx; + font-size: 26rpx; font-weight: 400; color: #f33b6c; line-height: 34rpx; diff --git a/src/pages/tabBar/home.wpy b/src/pages/tabBar/home.wpy index a3e6120..84e9b42 100644 --- a/src/pages/tabBar/home.wpy +++ b/src/pages/tabBar/home.wpy @@ -328,7 +328,7 @@ page { - + 回看今日推荐 @@ -383,7 +383,7 @@ page { {{ item.nickname }} - + @@ -523,7 +523,7 @@ wepy.page({ vm.squareList.push(item) }) } - if (vm.squareList.length < 15 || data.data.length < 15) { + if (vm.squarePage == data.total_pages) { vm.no_more = true } vm.squarePage++ @@ -612,6 +612,16 @@ wepy.page({ vm.cardCur = e.$wx.detail.current } }, + // 初始化每日推荐 + refreshFn() { + let vm = this + vm.getEveryday() + }, + // 每日推荐回到第一张 + backFirst() { + let vm = this + vm.cardCur = 0 + }, jumpPath(url) { let vm = this // 校验是否完成注册资料 diff --git a/src/pages/tabBar/news.wpy b/src/pages/tabBar/news.wpy index 6b24661..70aef2b 100644 --- a/src/pages/tabBar/news.wpy +++ b/src/pages/tabBar/news.wpy @@ -150,7 +150,7 @@ page {