更新代码

src/actions/comment.js

@@ -1,3 +1,5 @@
+import grapgQLClient from '../common/grapgql-client'
+
 
 import Ajax from '../common/ajax'
 import { DateDiff } from '../common/date'
@@ -246,7 +248,7 @@ export function loadCommentList({ name, filters = {}, restart = false }) {
       name,
       restart,
       filters,
-
+      
       processList: processCommentList,
 
       schemaName: 'comments',
@@ -257,6 +259,66 @@ export function loadCommentList({ name, filters = {}, restart = false }) {
   }
 }
 
+
+export function updateComment(filters) {
+  return async (dispatch, getState) => {
+
+    let accessToken = getState().user.accessToken
+
+    let variables = []
+
+    for (let i in filters) {
+
+      let v = ''
+
+      switch (typeof filters[i]) {
+        case 'string':
+          v = '"'+filters[i]+'"'
+          break
+        case 'number':
+          v = filters[i]
+          break
+        default:
+          v = filters[i]
+          break
+      }
+
+      variables.push(i+':'+v)
+    }
+
+    let sql = `
+      mutation {
+      	updateComment(${variables}){
+          success
+        }
+      }
+    `
+
+    let [ err, res ] = await grapgQLClient({
+      mutation:sql,
+      headers: accessToken ? { 'AccessToken': accessToken } : null
+    })
+
+    if (err) return alert('提交失败')
+
+    let _id = filters._id
+
+    delete filters._id
+
+    dispatch({ type: 'UPDATE_COMMENT', id: _id, update: filters })
+    let list = getState().comment
+
+    for (let i in list) {
+      if (list[i].data) {
+        list[i].data = processPostsList(list[i].data)
+      }
+    }
+
+    dispatch({ type: 'UPDATE_COMMENT', state: list })
+  }
+}
+
+/*
 export function updateComment({ query = {}, update = {}, options = {} }) {
   return (dispatch, getState) => {
 
@@ -287,6 +349,7 @@ export function updateComment({ query = {}, update = {}, options = {} }) {
     })
   }
 }
+*/
 
 /*
 export function loadCommentList({ name, filters = {}, callback = ()=>{} }) {

src/actions/notification.js

@@ -1,10 +1,59 @@
 import Ajax from '../common/ajax'
 import merge from 'lodash/merge'
 
-import loadList from './common/load-list'
+import loadList from './common/new-load-list'
 
 export function loadNotifications({ name, filters = {}, restart = false }) {
   return (dispatch, getState) => {
+
+    if (!filters.select) {
+      filters.select = `
+        has_read
+        deleted
+        create_at
+        _id
+        type
+        comment_id {
+          _id
+          content_html
+          posts_id {
+            _id
+            title
+            content_html
+          }
+          reply_id {
+            _id
+            content_html
+          }
+          parent_id {
+            _id
+            content_html
+          }
+        }
+        sender_id {
+          create_at
+          avatar
+          _id
+          nickname
+          avatar_url
+          id
+        }
+        addressee_id {
+          create_at
+          avatar
+          _id
+          nickname
+          avatar_url
+          id
+        }
+        posts_id {
+          title
+          content_html
+          _id
+        }
+      `
+    }
+
     return loadList({
       dispatch,
       getState,
@@ -15,6 +64,7 @@ export function loadNotifications({ name, filters = {}, restart = false }) {
 
       // processList: processPostsList,
 
+      schemaName: 'userNotifications',
       reducerName: 'notification',
       api: '/user-notifications',
       type: 'post',

src/components/comment/list-item/index.js

@@ -58,12 +58,8 @@ export class CommentItem extends PureComponent {
   updateComment(e, data) {
     this.stopPropagation(e)
     const { comment, updateComment } = this.props
-    updateComment({
-      query: {
-        _id: comment._id
-      },
-      update: data
-    })
+    data._id = comment._id
+    updateComment(data)
   }
 
   // 用户的dom
@@ -107,11 +103,11 @@ export class CommentItem extends PureComponent {
                   {comment._create_at}
                 </td>
                 <td width="200">
-                  <a href="javascript:void(0)" onClick={updateComment({ weaken: comment.weaken ? false : true })}>弱化</a>
+                  <a href="javascript:void(0)" onClick={updateComment({ weaken: comment.weaken ? false : true })}>{comment.weaken ? '已弱化' : '弱化'}</a>
                   {' '}
-                  <a href="javascript:void(0)" onClick={updateComment({ recommend: comment.recommend ? false : true })}>推荐</a>
+                  <a href="javascript:void(0)" onClick={updateComment({ recommend: comment.recommend ? false : true })}>{comment.recommend ? '已推荐' : '推荐'}</a>
                   {' '}
-                  <a href="javascript:void(0)" onClick={updateComment({ deleted: comment.deleted ? false : true })}>删除</a>
+                  <a href="javascript:void(0)" onClick={updateComment({ deleted: comment.deleted ? false : true })}>{comment.deleted ? '已删除' : '删除'}</a>
                 </td>
               </tr>
             </tbody>

src/components/comment/list/index.js

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types'
 import { getCommentListByName } from '../../../reducers/comment'
 import { loadCommentList } from '../../../actions/comment'
 
-// import ListLoading from '../list-loading'
+import ListLoading from '../../list-loading'
 import CommentItem from '../list-item'
 
 import connectReudx from '../../../common/connect-redux'
@@ -63,10 +63,13 @@ export class CommentList extends Component {
 
     if (!list.data) return null
 
+    const { data, loading, more } = list
+
     return (
       <div>
+        <div>
           {/* <div className={styles.comments}> */}
-            {list.data.map((comment)=>{
+            {data.map((comment)=>{
               return (<div key={comment._id}><CommentItem comment={comment} /></div>)
             })}
             {/*commentList.data.length == 0 ?
@@ -79,6 +82,8 @@ export class CommentList extends Component {
           {/*<div className={styles.nothing}>目前尚无回复</div>*/}
 
         {/* </div> */}
+        </div>
+        <ListLoading loading={loading} more={more} handleLoad={this.load} />
       </div>
     )
   }

src/components/notification/list/index.js

@@ -205,7 +205,7 @@ export class NotificationList extends Component {
               }
 
               if (content) {
-                
+
                 let backgroundColor = ''
                 if (notice.deleted) {
                   backgroundColor = '#ffe3e3'