0.0.26

src/api/chat.js

@@ -77,7 +77,7 @@ export function getFriendsApplyList(data) {
   })
 }
 
-//2.2 添加当前用户为好友
+//2.2 添加当前用户为好友 - 点击好友名片弹窗 添加好友
 export function applyFriend(data) {
   return request({
     url: '/chat/applyFriend',
@@ -136,4 +136,123 @@ export function getGroupMembers(data) {
     data
   })
 }
-//5.群聊 end ------------------------------------->
+
+//5.3 获取群列表 - 后期将会从会话列表中获得，该方法将移除
+export function getGroupList(data) {
+  return request({
+    url: '/chat/getGroupList',
+    method: 'post',
+    data
+  })
+}
+
+//5.4 获取群消息
+export function getGroupInfo(data) {
+  return request({
+    url: '/chat/getGroupInfo',
+    method: 'post',
+    data
+  })
+}
+
+//5.4 加入群聊 - 消息里面邀请加群 接受加入群聊
+export function joinGroup(data) {
+  return request({
+    url: '/chat/joinGroup',
+    method: 'post',
+    data
+  })
+}
+
+//5.5 获取群聊的聊天记录
+export function getGroupChatRecords(data) {
+  return request({
+    url: '/chat/getGroupChatRecords',
+    method: 'post',
+    data
+  })
+}
+
+//5.6 删除群聊
+export function delGroup(data) {
+  return request({
+    url: '/chat/delGroup',
+    method: 'post',
+    data
+  })
+}
+
+//5.7 编辑群聊
+export function updateGroup(data) {
+  return request({
+    url: '/chat/updateGroup',
+    method: 'post',
+    data
+  })
+}
+//5.群聊 end ------------------------------------->
+
+//6.商圈 start ------------------------------------->
+//6.1 商圈列表
+export function getTopicsList(data) {
+  return request({
+    url: '/chat/getTopicsList',
+    method: 'post',
+    data
+  })
+}
+
+//6.2 新增商圈
+export function addTopic(data) {
+  return request({
+    url: '/chat/addTopic',
+    method: 'post',
+    data
+  })
+}
+
+//6.3 商圈信息
+export function getTopicInfo(data) {
+  return request({
+    url: '/chat/getTopicInfo',
+    method: 'post',
+    data
+  })
+}
+
+//6.4 审核商圈
+export function updateTopic(data) {
+  return request({
+    url: '/chat/updateTopic',
+    method: 'post',
+    data
+  })
+}
+
+//6.5 删除商圈
+export function delTopic(data) {
+  return request({
+    url: '/chat/delTopic',
+    method: 'post',
+    data
+  })
+}
+
+//6.6 回复商圈 
+export function addReply(data) {
+  return request({
+    url: '/chat/addReply',
+    method: 'post',
+    data
+  })
+}
+
+//6.7 回复商圈列表
+export function getTopicReply(data) {
+  return request({
+    url: '/chat/getTopicReply',
+    method: 'post',
+    data
+  })
+}
+//6.商圈 end ------------------------------------->

src/store/modules/chat.js

@@ -1,5 +1,7 @@
 import {getTalkSessionList,addFriend,getFriendsList,delFriend,updateFriend,getFriendsApplyList,
-  applyFriend,isFriend,getConversation,getChatRecords,addGroup,getGroupMembers,searchFriend,getFriendInfo
+  applyFriend,isFriend,getConversation,getChatRecords,addGroup,getGroupMembers,searchFriend,getFriendInfo,
+  getGroupList,getGroupInfo,joinGroup,getGroupChatRecords,delGroup,updateGroup,
+  getTopicsList,addTopic,getTopicInfo,updateTopic,delTopic,addReply,getTopicReply
 } from '@/api/chat'
 
 const state = {
@@ -139,7 +141,7 @@ const actions = {
   },
   //4.会话关系 end ------------------------------------->
 
-  //5.会话关系 start ------------------------------------->
+  //5.群聊 start ------------------------------------->
   addGroup({commit},data) {
     return new Promise((resolve, reject) => {
       addGroup(data).then(response => {
@@ -157,8 +159,128 @@ const actions = {
         reject(error)
       })
     })
+  },
+  getGroupList({commit},data) {
+    return new Promise((resolve, reject) => {
+      getGroupList(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  getGroupInfo({commit},data) {
+    return new Promise((resolve, reject) => {
+      getGroupInfo(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  joinGroup({commit},data) {
+    return new Promise((resolve, reject) => {
+      joinGroup(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  getGroupChatRecords({commit},data) {
+    return new Promise((resolve, reject) => {
+      getGroupChatRecords(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  delGroup({commit},data) {
+    return new Promise((resolve, reject) => {
+      delGroup(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  updateGroup({commit},data) {
+    return new Promise((resolve, reject) => {
+      updateGroup(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  //5.群聊 end ------------------------------------->
+
+  //6.商圈 start ------------------------------------->
+  getTopicsList({commit},data) {
+    return new Promise((resolve, reject) => {
+      getTopicsList(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  addTopic({commit},data) {
+    return new Promise((resolve, reject) => {
+      addTopic(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  getTopicInfo({commit},data) {
+    return new Promise((resolve, reject) => {
+      getTopicInfo(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  updateTopic({commit},data) {
+    return new Promise((resolve, reject) => {
+      updateTopic(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  delTopic({commit},data) {
+    return new Promise((resolve, reject) => {
+      delTopic(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  addReply({commit},data) {
+    return new Promise((resolve, reject) => {
+      addReply(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  getTopicReply({commit},data) {
+    return new Promise((resolve, reject) => {
+      getTopicReply(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
   }
-  //5.会话关系 end ------------------------------------->
+  //6.商圈 end ------------------------------------->
 }
 
 

src/utils/baseUrl.js

@@ -3,7 +3,7 @@ const URL = {
   liuUrl: 'http://192.168.1.127:9501',//刘剑的电脑
   baseUrl: 'http://183.131.25.186:9501',//测试服务器
   servUrl: 'https://admin.bjzxtw.org.cn/zxtapi',//服务端
-  WebsocketUrl: 'ws://192.168.1.201:9506',//老刘websocket地址
+  //WebsocketUrl: 'ws://192.168.1.201:9506',//老刘websocket地址
   //WebsocketUrl: 'ws://183.131.25.186:9506'//测试服务器websocket地址
 }
 

src/utils/request.js

@@ -8,8 +8,8 @@ import URL from '@/utils/baseUrl';
 const service = axios.create({
   //千万不能在这里使用绝对地址，这会导致webpack的devserve不生效
   //baseURL: URL.testUrl, //刘佳伟的电脑
-  baseURL: URL.liuUrl, //刘剑的电脑
-  //baseURL: URL.baseUrl, //测试服务器
+  //baseURL: URL.liuUrl, //刘剑的电脑
+  baseURL: URL.baseUrl, //测试服务器
   //baseURL: URL.servUrl, //正式服务器
   //baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   //withCredentials: true, // send cookies when cross-domain requests

src/views/chat/topic.vue

@@ -134,13 +134,8 @@ export default {
       tableData:[],//内容
       editId:0,//要修改的网站id
       getApiData:{
-        title:"",//标题
-        category_name:"",//导航池id
-        author:"",//作者
-        islink:"",//是否使用外链
-        status:"",//资讯状态
         page:1,//当前是第几页
-        pageSize:10,//一共多少条
+        page_size:10,//一共多少条
       },
       allCount:0,//总条数
       form:{
@@ -152,25 +147,26 @@ export default {
   },
   methods: {
     //1.列表和分页相关 start ------------------------------------------------------------>
-    //1.1 开始请求列表信息方法
+    //1.1 开始请求商圈列表
     getData(type){
       if(type=="search"){
         this.getApiData.page = 1;
       }
-      this.$store.dispatch('news/getArticleList',this.getApiData).then(res=> {
+      this.$store.dispatch('chat/getTopicsList',this.getApiData).then(res=> {
+        console.log(res)
         //格式化：islink=0为不使用外面 islink=1为使用外链
         //status=1为显示 status=2为不显示
-        let data = [];
-        for(let item of res.data.rows){
-          // if(item.status==0){item.status="隐藏"}
-          // if(item.status==1){item.status="显示"}
-          // if(item.status==404){item.status="已删除"}
-          if(item.islink==0){item.islink="否"}
-          if(item.islink==1){item.islink="是"}
-          data.push(item)
-        }
-        this.tableData = res.data.rows; //给与内容
-        this.allCount = res.data.count; //给与总条数
+        // let data = [];
+        // for(let item of res.data.rows){
+        //   // if(item.status==0){item.status="隐藏"}
+        //   // if(item.status==1){item.status="显示"}
+        //   // if(item.status==404){item.status="已删除"}
+        //   if(item.islink==0){item.islink="否"}
+        //   if(item.islink==1){item.islink="是"}
+        //   data.push(item)
+        // }
+        // this.tableData = res.data.rows; //给与内容
+        // this.allCount = res.data.count; //给与总条数
       }).catch(() => {
         this.$message({
           type: 'warning',