+ (this.Message2()} Mtab={(i)=>this.myxiaoxisixintab(i)}> )
+ (props) => (this.Message2()} Mtab={(i)=>this.myxiaoxisixintab(i)}> )
}
>
{/*/!*私信*! name 是letter/*/}
(this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)} Mtab={(i)=>this.myxiaoxisixintab(i)}> )
+ (props) => (this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)} Mtab={(i)=>this.myxiaoxisixintab(i)}> )
}
>
{/*/!*私信聊天页面*! letters/*/}
(this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}> )
+ (props) => (this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}> )
}
>
From a0f073438824294d0b92046baf7275bbe2eee92c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 2 Aug 2019 17:17:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/message/js/MessagChat.js | 3 +++
public/react/src/modules/message/js/MessagSub.js | 16 ++++++++++------
.../src/modules/message/js/Messagerouting.js | 2 --
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js
index e7d1dd082..b731ace23 100644
--- a/public/react/src/modules/message/js/MessagChat.js
+++ b/public/react/src/modules/message/js/MessagChat.js
@@ -110,6 +110,7 @@ class MessagChat extends Component{
// }
};
+
shuaxingetChatList=(page,listl,target_ids,bool)=>{
this.setState({
isSpin:true,
@@ -385,7 +386,9 @@ class MessagChat extends Component{
// console.log(i);
this.props.Modifyur(i);
};
+ getdatas2=()=>{
+ }
// 点击了用户
Clickedontheuser=(user)=>{
// debugger
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 0a0dec81e..cf8c77fc3 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -428,14 +428,18 @@ class MessagSub extends Component{
//教学案例详情 :id = container_id
return window.location.href=`/moop_cases/${item.container_id}`;
}
- case "ProjectPackage" :
- if (item.tiding_type === 'Apply') {
- ///managements/project_package_applies
- return window.location.href=`/managements/project_package_applies`;
- }
- if(item.tiding_type === 'System'){
+ case "ProjectPackage" :
+ if(item.tiding_type==="Destroyed_end"){
+ return ;
+ }else {
+ // if (item.tiding_type === 'Apply') {
+ // ///managements/project_package_applies
+ // return window.location.href=`/managements/project_package_applies`;
+ // }
+ // if(item.tiding_type === 'System'){
//众包详情 :id = container_id
return window.location.href=`/crowdsourcing/${item.container_id}`;
+ // }
}
default :
return window.location.href="/";
diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js
index 651253ae3..430bf7836 100644
--- a/public/react/src/modules/message/js/Messagerouting.js
+++ b/public/react/src/modules/message/js/Messagerouting.js
@@ -46,9 +46,7 @@ class Messagerouting extends Component{
}
- getdatas2=()=>{
- }
componentDidUpdate(prevProps) {
// console.log("11111111111");
// console.log(prevProps);
From 2eb8948aa6cbc310a69d8a4dc185339dd5c6968e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 2 Aug 2019 17:27:00 +0800
Subject: [PATCH 3/3] b
---
public/react/src/search/SearchPage.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js
index ccdb9e12a..68efca036 100644
--- a/public/react/src/search/SearchPage.js
+++ b/public/react/src/search/SearchPage.js
@@ -150,9 +150,9 @@ class SearchPage extends Component{
this.gettourl(item)}>
![]()
this.myCome(item)} src={getImageUrl("/images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js
index fa5531c80..0d2889cef 100644
--- a/public/react/src/modules/message/js/MessagePrivate.js
+++ b/public/react/src/modules/message/js/MessagePrivate.js
@@ -31,6 +31,7 @@ class MessagePrivate extends Component{
}catch (e) {
}
+ this.props.triggerRef(this)
// console.log("MessagePrivate");
// console.log(this.props);
// console.log(this.props.match.params.userid);
@@ -80,6 +81,40 @@ class MessagePrivate extends Component{
})
})
};
+ getdatas2=()=>{
+ this.setState({
+ isSpin:true,
+ });
+ let{limit,page}=this.state;
+ let url = `/users/${this.props.match&&this.props.match.params.userid}/private_messages.json`;
+ // let url = `/users/71519/private_messages.json`;
+ axios.get((url),{params:{
+ page:page,
+ per_page:limit,
+ }}).then((result) => {
+ if (result) {
+ // console.log(types);
+ // console.log(result);
+
+ // console.log("调用了消失的方法");
+ // console.log("5454545454");
+ // if (result.data.status === 0) {
+
+ this.setState({
+ page: page,
+ count: result.data.count,
+ isSpin: false,
+ data: result.data.private_messages === null ? undefined : result.data.private_messages === undefined ? undefined : result.data.private_messages === [] ? undefined : result.data.private_messages === "[]" ? undefined : result.data.private_messages.length === 0 ? undefined : result.data.private_messages,
+ })
+ // }
+ }
+ }).catch((error) => {
+ console.log(error);
+ this.setState({
+ isSpin:false,
+ })
+ })
+ };
paginationonChanges=(pageNumber)=>{
this.setState({
diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js
index 2c649c23c..651253ae3 100644
--- a/public/react/src/modules/message/js/Messagerouting.js
+++ b/public/react/src/modules/message/js/Messagerouting.js
@@ -45,6 +45,9 @@ class Messagerouting extends Component{
// console.log(courstype);
+ }
+ getdatas2=()=>{
+
}
componentDidUpdate(prevProps) {
// console.log("11111111111");
@@ -74,17 +77,21 @@ class Messagerouting extends Component{
})
};
- SwitchonClick=(value)=>{
+ SwitchonClick=(value,child)=>{
this.setState({
routing:value,
});
this.Messageprivatemessageunreadmessage(this.props.current_user.user_id);
if(value===1){
this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`);
+ this.homeworkendss1(child);
}
if(value===2){
- this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`);;
+ this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`);
+ this.homeworkendss2(child);
}
+
+
};
@@ -145,6 +152,21 @@ class Messagerouting extends Component{
routing:3,
});
}
+ };
+ bindRef = ref => { this.child = ref };
+ homeworkendss1(child){
+ // console.log(child);
+ // // console.log(this.refs.childModel);
+ // console.log(child);
+ child.getdatas();
+ //
+ }
+ homeworkendss2(child){
+ // console.log(child);
+ // // console.log(this.refs.childModel);
+ // console.log(child);
+ child.getdatas2();
+ //
}
render() {
let{routing,unread_message_count,unread_tiding_count} =this.state;
@@ -171,12 +193,12 @@ class Messagerouting extends Component{
{/*路由跳转*/}
@@ -197,19 +219,19 @@ class Messagerouting extends Component{
{/*/!*消息自路由*! name 是 /message/info/:userid/*/}
@@ -136,12 +499,15 @@ class MessagSub extends Component{ ):""}
-+ +
- - this.SwitchonClick(1)}>消息 - {unread_tiding_count>0?{unread_message_count}:""} + this.SwitchonClick(1,this.child)}>消息 + {unread_message_count===0?"":unread_message_count>0?{unread_message_count}:""}
- - this.SwitchonClick(2)}>私信 - {unread_tiding_count>0?{unread_tiding_count}:""} + this.SwitchonClick(2,this.child)}>私信 + {unread_tiding_count===0?"":unread_tiding_count>0?{unread_tiding_count}:""}