From f05a26bb7e036c3d09c84e295f1b77fdb8d9ba08 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 06 四月 2023 20:46:42 +0800
Subject: [PATCH] 修改定时
---
miniprogram/pages/user/group/index.ts | 77 ++++++++++++++-----
miniprogram/pages/manager/group/message/index.wxss | 3
miniprogram/pages/manager/group/message/member/detail/index.ts | 8 +-
miniprogram/pages/user/group/message/index.ts | 49 ++++++++++++
miniprogram/pages/manager/group/message/index.ts | 62 +++++++++++++++
5 files changed, 173 insertions(+), 26 deletions(-)
diff --git a/miniprogram/pages/manager/group/message/index.ts b/miniprogram/pages/manager/group/message/index.ts
index 8934033..af5a021 100644
--- a/miniprogram/pages/manager/group/message/index.ts
+++ b/miniprogram/pages/manager/group/message/index.ts
@@ -4,6 +4,7 @@
Page({
data: {
+ inter:1,
overLayList:{},
showOverlay:false,
messageList: [],
@@ -21,6 +22,7 @@
// url: '../cause/detail/index?id=' + e.currentTarget.id,
// })
// },
+
onClickHide(e){
console.log(e)
this.setData({
@@ -78,6 +80,7 @@
},
sendMsg(){
+
wx.request(
{
url: message.globalData.url + "/wx/group/manager/sendMsg",
@@ -148,11 +151,64 @@
})
}
},
-
+ getmessage(){
+ wx.request(
+ {
+ url: message.globalData.url + "/wx/message",
+ method: "GET",
+ header: { 'token': wx.getStorageSync('token') },
+ data: {
+ groupId: this.data.groupId
+ },
+ success: (res) => {
+ for (let index = 0; index < res.data.data.length; index++) {
+ if (res.data.data[index].pic != null) {
+ res.data.data[index].pic = message.globalData.imageUrl + "/img/" + res.data.data[index].pic;
+ }
+ }
+ this.setData({
+ messageList: res.data.data,
+
+ })
+ console.log(this.data.messageList)
+ try {
+ wx.setStorageSync('time', 'time')
+ } catch (e) { }
+ // wx.setStorageSync('time','time')
+ this.setData({
+ isInput : 2
+ })
+
+
+
+ wx.createSelectorQuery().select('#chat')
+
+ .boundingClientRect(function(rect){
+ console.log('rectheight',rect);
+
+ /* 灏嗛〉闈㈢Щ鍔ㄥ埌鏈�搴曢儴锛堢敤xxx鐨刪eight瀹氫綅锛� */
+ wx.pageScrollTo({
+ scrollTop: rect.height
+ })
+ }).exec()
+ }
+ })
+ },
+ endInter(){
+ let thit = this
+ clearInterval(thit.data.inter)
+ },
+ onUnload () {
+ this.endInter()
+ },
+ onHide(){
+ this.endInter()
+ },
onLoad(e) {
this.setData({
uid:wx.getStorageSync('id')
})
+
var date = new Date()
var month = date.getMonth() + 1
var day = date.getDate()
@@ -206,5 +262,9 @@
}).exec()
}
})
+ let that = this
+ that.data.inter = setInterval(function(){
+ that.getmessage()
+ },10000)
}
})
diff --git a/miniprogram/pages/manager/group/message/index.wxss b/miniprogram/pages/manager/group/message/index.wxss
index 9d5fdfb..87065b9 100644
--- a/miniprogram/pages/manager/group/message/index.wxss
+++ b/miniprogram/pages/manager/group/message/index.wxss
@@ -14,6 +14,7 @@
}
.chat-item{
+ padding-bottom: 2rem;
background-color: #F5F5F9;
margin-bottom: 20%;
}
@@ -65,7 +66,7 @@
}
.low{
position: fixed;
- bottom: 0rem;
+ bottom: 2rem;
width: 100%;
background-color: white;
/* height: 7%; */
diff --git a/miniprogram/pages/manager/group/message/member/detail/index.ts b/miniprogram/pages/manager/group/message/member/detail/index.ts
index fc592a7..a6c779b 100644
--- a/miniprogram/pages/manager/group/message/member/detail/index.ts
+++ b/miniprogram/pages/manager/group/message/member/detail/index.ts
@@ -61,13 +61,13 @@
var ress = res.data.data
ress.pic = memberDetail.globalData.imageUrl + "/img/" + ress.pic
let imgs = []
- if (ress.idCardMaterials != '') {
+ if (ress.idCardMaterials != ''&&ress.idCardMaterials) {
imgs.push(...ress.idCardMaterials.split(","))
- if (ress.contractMaterials != '') {
+ if (ress.contractMaterials != ''&&ress.contractMaterials) {
imgs.push(...ress.contractMaterials.split(","))
- if (ress.transactionMaterials != '') {
+ if (ress.transactionMaterials != ''&&ress.transactionMaterials) {
imgs.push(...ress.transactionMaterials.split(","))
- if (ress.elseMaterials != '') {
+ if (ress.elseMaterials != ''&&ress.elseMaterials) {
imgs.push(...ress.elseMaterials.split(","))
}
}
diff --git a/miniprogram/pages/user/group/index.ts b/miniprogram/pages/user/group/index.ts
index 5165c9e..a0ae1fa 100644
--- a/miniprogram/pages/user/group/index.ts
+++ b/miniprogram/pages/user/group/index.ts
@@ -10,9 +10,17 @@
wx.navigateBack()
},
openGroup(e) {
- wx.navigateTo({
- url: "../../user/group/message/index?id=" + e.currentTarget.id + "&&ban=" + e.currentTarget.dataset.ban + "&&reportId=" + e.currentTarget.dataset.rptid
- })
+ if (wx.getStorageSync('role')==1) {
+ wx.navigateTo({
+ url: "../../manager/group/message/index?id=" + e.currentTarget.id
+ })
+ }else{
+ wx.navigateTo({
+ url: "../../user/group/message/index?id=" + e.currentTarget.id + "&&ban=" + e.currentTarget.dataset.ban + "&&reportId=" + e.currentTarget.dataset.rptid
+ })
+ }
+
+
},
onLoad() {
var date = new Date()
@@ -39,22 +47,51 @@
}
time = date.getFullYear() + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + secends
var lastTime = wx.getStorageSync('time')
- wx.request(
- {
- url: userGroup.globalData.url + "/wx/user/group/list",
- method: "GET",
- data: {
- id: wx.getStorageSync('id'),
- newDate: time,
- lastDate: lastTime
- },
- header: { 'token': wx.getStorageSync('token') },
- success: (res) => {
- console.log(res.data.data)
- this.setData({
- groupList: res.data.data
- })
- }
- })
+ console.log(wx.getStorageSync('role'));
+
+ if (wx.getStorageSync('role')==1) {
+ wx.request(
+ {
+ url: userGroup.globalData.url + "/wx/manager/group/list",
+ method: "GET",
+ data: {
+ id: wx.getStorageSync('id'),
+ newDate: time,
+ lastDate: lastTime
+ },
+ header: { 'token': wx.getStorageSync('token') },
+ success: (res) => {
+ console.log(res.data.data)
+ res.data.data.map(item => {
+ if (item.time) {
+ item.time = item.time.substr(-8)
+ }
+ })
+ this.setData({
+ groupList: res.data.data
+ })
+ }
+
+ })
+ }else{
+ wx.request(
+ {
+ url: userGroup.globalData.url + "/wx/user/group/list",
+ method: "GET",
+ data: {
+ id: wx.getStorageSync('id'),
+ newDate: time,
+ lastDate: lastTime
+ },
+ header: { 'token': wx.getStorageSync('token') },
+ success: (res) => {
+ console.log(res.data.data)
+ this.setData({
+ groupList: res.data.data
+ })
+ }
+ })
+ }
+
}
})
diff --git a/miniprogram/pages/user/group/message/index.ts b/miniprogram/pages/user/group/message/index.ts
index 725860f..c47f467 100644
--- a/miniprogram/pages/user/group/message/index.ts
+++ b/miniprogram/pages/user/group/message/index.ts
@@ -4,6 +4,7 @@
Page({
data: {
+ inter:1,
messageList: [],
isShow: false,
height: null,
@@ -169,7 +170,51 @@
}
})
},
+ getmessage(){
+ wx.request(
+ {
+ url: userMessage.globalData.url + "/wx/message",
+ method: "GET",
+ header: { 'token': wx.getStorageSync('token') },
+ data: {
+ groupId: this.data.groupId
+ },
+ success: (res) => {
+ for (let index = 0; index < res.data.data.length; index++) {
+ if (res.data.data[index].pic != null) {
+ res.data.data[index].pic = userMessage.globalData.imageUrl + "/img/" + res.data.data[index].pic;
+ }
+ }
+ this.setData({
+ messageList: res.data.data,
+
+ })
+ console.log(this.data.messageList)
+ wx.createSelectorQuery().select('#chat')
+ .boundingClientRect(function(rect){
+ console.log('rectheight',rect);
+ /* 灏嗛〉闈㈢Щ鍔ㄥ埌鏈�搴曢儴锛堢敤xxx鐨刪eight瀹氫綅锛� */
+ wx.pageScrollTo({
+ scrollTop: rect.height
+ })
+ }).exec()
+ }
+ })
+ },
+ endInter(){
+ let thit = this
+ clearInterval(thit.data.inter)
+ },
+ onUnload () {
+ this.endInter()
+ },
+ onHide(){
+ this.endInter()
+ },
onLoad(e) {
+ this.setData({
+ uid:wx.getStorageSync('id')
+ })
console.log(this.data.uid);
this.setData({
uid:wx.getStorageSync('id')
@@ -235,6 +280,10 @@
}).exec()
}
})
+ let that = this
+ that.data.inter = setInterval(function(){
+ that.getmessage()
+ },30000)
},
onShow(){
console.log('123');
--
Gitblit v1.8.0