Browse Source

销售公司更新 10.23 zyp

阿拉蕾 1 year ago
parent
commit
5ad92c4014

+ 8 - 8
src/api/store/material.js

@@ -3,16 +3,16 @@ import request from '@/utils/request'
 // 查询素材库列表
 export function listMaterial(query) {
   return request({
-    url: '/store/material/list',
+    url: '/qw/material/list',
     method: 'get',
     params: query
   })
 }
 
 // 查询素材库详细
-export function getMaterial(materialId) {
+export function getMaterial(id) {
   return request({
-    url: '/store/material/' + materialId,
+    url: '/qw/material/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getMaterial(materialId) {
 // 新增素材库
 export function addMaterial(data) {
   return request({
-    url: '/store/material',
+    url: '/qw/material/add',
     method: 'post',
     data: data
   })
@@ -29,16 +29,16 @@ export function addMaterial(data) {
 // 修改素材库
 export function updateMaterial(data) {
   return request({
-    url: '/store/material',
+    url: '/qw/material',
     method: 'put',
     data: data
   })
 }
 
 // 删除素材库
-export function delMaterial(materialId) {
+export function delMaterial(id) {
   return request({
-    url: '/store/material/' + materialId,
+    url: '/qw/material/' + id,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delMaterial(materialId) {
 // 导出素材库
 export function exportMaterial(query) {
   return request({
-    url: '/store/material/export',
+    url: '/qw/material/export',
     method: 'get',
     params: query
   })

+ 7 - 7
src/api/store/materialGroup.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 查询素材分组列表
 export function listMaterialGroup(query) {
   return request({
-    url: '/store/materialGroup/list',
+    url: '/qw/materialGroup/list',
     method: 'get',
     params: query
   })
 }
 export function getAllMaterialGroup(query) {
   return request({
-    url: '/store/materialGroup/getAllList',
+    url: '/qw/materialGroup/getAllList',
     method: 'get',
     params: query
   })
@@ -20,7 +20,7 @@ export function getAllMaterialGroup(query) {
 // 查询素材分组详细
 export function getMaterialGroup(groupId) {
   return request({
-    url: '/store/materialGroup/' + groupId,
+    url: '/qw/materialGroup/' + groupId,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function getMaterialGroup(groupId) {
 // 新增素材分组
 export function addMaterialGroup(data) {
   return request({
-    url: '/store/materialGroup',
+    url: '/qw/materialGroup',
     method: 'post',
     data: data
   })
@@ -37,7 +37,7 @@ export function addMaterialGroup(data) {
 // 修改素材分组
 export function updateMaterialGroup(data) {
   return request({
-    url: '/store/materialGroup',
+    url: '/qw/materialGroup',
     method: 'put',
     data: data
   })
@@ -46,7 +46,7 @@ export function updateMaterialGroup(data) {
 // 删除素材分组
 export function delMaterialGroup(groupId) {
   return request({
-    url: '/store/materialGroup/' + groupId,
+    url: '/qw/materialGroup/' + groupId,
     method: 'delete'
   })
 }
@@ -54,7 +54,7 @@ export function delMaterialGroup(groupId) {
 // 导出素材分组
 export function exportMaterialGroup(query) {
   return request({
-    url: '/store/materialGroup/export',
+    url: '/qw/materialGroup/export',
     method: 'get',
     params: query
   })

+ 173 - 148
src/components/LemonUI/database/contacts.js

@@ -1,148 +1,173 @@
-export default [
-  {
-    id: 1,
-    displayName: "像梦一样自由",
-    avatar: "https://p.qqan.com/up/2020-2/2020022821001845128.jpg",
-    index: "X",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "你开心吗",
-  },
-  {
-    id: 2,
-    displayName: "梦醒时分、",
-    avatar: "https://p.qqan.com/up/2021-1/20211301122243621.jpg",
-    index: "M",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "不错哟",
-  },
-  {
-    id: 3,
-    displayName: "凌云",
-    avatar: "https://p.qqan.com/up/2021-1/2021129102387841.jpg",
-    index: "L",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-  {
-    id: 4,
-    displayName: "小郭",
-    avatar: "https://p.qqan.com/up/2021-1/2021122135507881.jpg",
-    index: "X",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-  {
-    id: 5,
-    displayName: "杨玉泉",
-    avatar: "https://p.qqan.com/up/2021-1/20211211131598147.jpg",
-    index: "Y",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-  {
-    id: 6,
-    displayName: "森系Style",
-    avatar: "https://p.qqan.com/up/2021-1/2021113104111220.jpg",
-    index: "S",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-  {
-    id: 7,
-    displayName: "霸王花",
-    avatar: "https://p.qqan.com/up/2021-1/20211411391666.jpg",
-    index: "B",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "你怎么还不睡呀?",
-  },
-  {
-    id: 8,
-    displayName: "曾平",
-    avatar: "https://p.qqan.com/up/2020-12/202012291044425822.jpg",
-    index: "Z",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-  {
-    id: 9,
-    displayName: "淡然",
-    avatar: "https://p.qqan.com/up/2020-12/202012141813343503.jpg",
-    index: "D",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-  {
-    id: 10,
-    displayName: "叶子。",
-    avatar: "https://p.qqan.com/up/2021-1/20211301122243621.jpg",
-    index: "Y",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-  {
-    id: 11,
-    displayName: "土豆",
-    avatar: "https://p.qqan.com/up/2020-12/202012111157268739.jpg",
-    index: "T",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-  {
-    id: 12,
-    displayName: "清沫",
-    avatar: "https://p.qqan.com/up/2020-12/202012415467996.jpg",
-    index: "Q",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-  {
-    id: 13,
-    displayName: "Lemon-imui交流群",
-    avatar: "https://p.qqan.com/up/2020-11/20201127157109035.jpg",
-    index: "L",
-    isGroup: true,
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "这个咋处理啊?",
-  },
-  {
-    id: 14,
-    displayName: "系统通知",
-    avatar: "https://p.qqan.com/up/2020-6/2020061117234279854.jpg",
-    index: "[1]系統通知",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "宁静致远通过了你的好友请求",
-    renderContainer() {
-      return (
-        ""
-        // <div style="padding:15px;">
-        //   <div>宁静致远通过了你的好友请求</div>
-        //   <div>宁静致远通过了你的好友请求</div>
-        //   <div>宁静致远通过了你的好友请求</div>
-        // </div>
-      );
-    },
-  },
-  {
-    id: 15,
-    displayName: "宁静致远。",
-    avatar: "https://p.qqan.com/up/2020-6/2020060308522797777.jpg",
-    index: "N",
-    unread: 0,
-    lastSendTime: 1566047865417,
-    lastContent: "",
-  },
-];
+import request from '@/utils/request'
+export function getContacts(deviceId) {
+  return request({
+    url: '/qw/contact/list/'+deviceId,
+    method: 'get'
+  })
+}
+// export default [
+//   {
+//     id: 1,
+//     displayName: "像梦一样自由",
+//     avatar: "https://p.qqan.com/up/2020-2/2020022821001845128.jpg",
+//     index: "X",
+//     unread: 5,
+//     lastSendTime: 1566047865417,
+//     lastContent: "你开心吗",
+//   },
+//   {
+//     id: 2,
+//     displayName: "zyp",
+//     avatar: "https://p.qqan.com/up/2021-1/20211301122243621.jpg",
+//     index: "Z",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "不错哟",
+//   },
+//   {
+//     id: 3,
+//     displayName: "凌云",
+//     avatar: "https://p.qqan.com/up/2021-1/2021129102387841.jpg",
+//     index: "L",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "",
+//   },
+//   {
+//     id: 4,
+//     displayName: "小郭",
+//     avatar: "https://p.qqan.com/up/2021-1/2021122135507881.jpg",
+//     index: "X",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "",
+//   },
+//   {
+//     id: 5,
+//     displayName: "杨玉泉",
+//     avatar: "https://p.qqan.com/up/2021-1/20211211131598147.jpg",
+//     index: "Y",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "",
+//   },
+//   {
+//     id: 6,
+//     displayName: "森系Style",
+//     avatar: "https://p.qqan.com/up/2021-1/2021113104111220.jpg",
+//     index: "S",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "",
+//   },
+//   {
+//     id: 7,
+//     displayName: "霸王花",
+//     avatar: "https://p.qqan.com/up/2021-1/20211411391666.jpg",
+//     index: "B",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "你怎么还不睡呀?",
+//   },
+//   {
+//     id: 8,
+//     displayName: "曾平",
+//     avatar: "https://p.qqan.com/up/2020-12/202012291044425822.jpg",
+//     index: "Z",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "",
+//   },
+//   {
+//     id: 9,
+//     displayName: "淡然",
+//     avatar: "https://p.qqan.com/up/2020-12/202012141813343503.jpg",
+//     index: "D",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "",
+//   },
+//   {
+//     "id": 7881300287915556,
+//     "displayName": "RつE",
+//     "avatar": "http://wx.qlogo.cn/mmhead/Q3auHgzwzM4qCB1MNA6PTO8MDXiavEEklbYx0BlX1uRP7KbleAg1rmw/0",
+//     "index": "R",
+//     "unread": 0,
+//     "lastSendTime": 1697678814,
+//     "lastContent": "[视频]"
+//   },
+//   {
+//     "id": 7881301063988639,
+//     "displayName": "初衷",
+//     "avatar": "http://wx.qlogo.cn/mmhead/AVK3Oz5sfA6fLpRL1OrA42xflZXL6zY56I7joCVoX2pXP0ABs28QySOdria474v2grXSHibHShRP8/0",
+//     "index": "C",
+//     "unread": 0,
+//     "lastSendTime": 0,
+//     "lastContent": ""
+// },
+// {
+//     "id": 7881303019934662,
+//     "displayName": "AllMight",
+//     "avatar": "http://wx.qlogo.cn/mmhead/oYwP0cFmRU1Zd0HX9qibZiaIy78ibQDz3H7hlyicAFhUQGfldYYXfdoTeA/0",
+//     "index": "A",
+//     "unread": 0,
+//     "lastSendTime": 1697678592,
+//     "lastContent": "[视频]"
+// },
+// {
+//     "id": 7881303630026525,
+//     "displayName": "咕咕咕",
+//     "avatar": "http://wx.qlogo.cn/mmhead/Q3auHgzwzM4RPPP6vuW2YyHnmJZOkEZMCNYdcMhkFu4q9MGz6iaul4g/0",
+//     "index": "G",
+//     "unread": 0,
+//     "lastSendTime": 0,
+//     "lastContent": ""
+// },
+// {
+//     "id": 7881301068952363,
+//     "displayName": "Ximi",
+//     "avatar": "http://wx.qlogo.cn/mmhead/icYBDgv87Hlam1ib5FZ9LurxDoCtBCevQHGo1Gugg0Cz4/0",
+//     "index": "X",
+//     "unread": 0,
+//     "lastSendTime": 1697621742,
+//     "lastContent": "[视频]"
+// },
+//   {
+//     id: 13,
+//     displayName: "Lemon-imui交流群",
+//     avatar: "https://p.qqan.com/up/2020-11/20201127157109035.jpg",
+//     index: "L",
+//     isGroup: true,
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "这个咋处理啊?",
+//   },
+//   {
+//     id: 14,
+//     displayName: "系统通知",
+//     avatar: "https://p.qqan.com/up/2020-6/2020061117234279854.jpg",
+//     index: "[1]系統通知",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "宁静致远通过了你的好友请求",
+//     renderContainer() {
+//       return (
+//         ""
+//         // <div style="padding:15px;">
+//         //   <div>宁静致远通过了你的好友请求</div>
+//         //   <div>宁静致远通过了你的好友请求</div>
+//         //   <div>宁静致远通过了你的好友请求</div>
+//         // </div>
+//       );
+//     },
+//   },
+//   {
+//     id: 15,
+//     displayName: "宁静致远。",
+//     avatar: "https://p.qqan.com/up/2020-6/2020060308522797777.jpg",
+//     index: "N",
+//     unread: 0,
+//     lastSendTime: 1566047865417,
+//     lastContent: "",
+//   },
+// ];

+ 153 - 153
src/components/LemonUI/database/messages.js

@@ -28,7 +28,7 @@ export default {
       sendTime: 1566047865417,
       content: "啥子。",
       toContactId: 1,
-      fromUser: getContact(1),
+      fromUser: getContact(7881300287915556),
     },
     {
       id: generateRandId(),
@@ -55,7 +55,7 @@ export default {
       sendTime: 1566047865417,
       content: "因为我矮啊。[!1f600][!1f600][!1f600]",
       toContactId: 1,
-      fromUser: getContact(1),
+      fromUser: getContact(7881300287915556),
     },
     {
       id: generateRandId(),
@@ -64,157 +64,157 @@ export default {
       sendTime: 1566047865417,
       content: "你开心吗",
       toContactId: 1,
-      fromUser: getContact(1),
+      fromUser: getContact(7881300287915556),
     },
   ],
-  2: [],
-  3: [],
-  4: [],
-  5: [],
-  6: [],
-  7: [],
-  8: [],
-  9: [],
-  10: [],
-  11: [],
-  12: [],
-  13: [
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1670481209000,
-      content: "我是测试时候看到的",
-      toContactId: 1,
-      fromUser: getContact(4),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1670541395000,
-      content: "上新版本了,玩玩",
-      toContactId: 1,
-      fromUser: getContact(4),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1670544995000,
-      content: "项目内没有搞这个",
-      toContactId: 1,
-      fromUser: getContact(4),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1670545175000,
-      content: "@awesome 最新的,不然哪有这功能",
-      toContactId: 1,
-      fromUser: getContact(5),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1670631575000,
-      content: "其实是跟你的遮罩层有冲突",
-      toContactId: 1,
-      fromUser: getContact(4),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1670804375000,
-      content: "自己修改index哈",
-      toContactId: 1,
-      fromUser: UserData,
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1670977175000,
-      content: "你们升级到最近版了吗?",
-      toContactId: 1,
-      fromUser: getContact(6),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1670980775000,
-      content: "wo 现在用的142",
-      toContactId: 1,
-      fromUser: getContact(7),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1671247175000,
-      content: "问你件事",
-      toContactId: 1,
-      fromUser: UserData,
-    },
-    {
-      id: generateRandId(),
-      status: "failed",
-      type: "text",
-      sendTime: 1671340182000,
-      content: "啥子。",
-      toContactId: 1,
-      fromUser: getContact(1),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1696907382000,
-      content: "为什么",
-      toContactId: 1,
-      fromUser: UserData,
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1696920042000,
-      content: "你穿了高跟鞋还这么矮[!1f62c][!1f601][!1f602]",
-      toContactId: 1,
-      fromUser: UserData,
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1696995642000,
-      content: "因为我矮啊。[!1f600][!1f600][!1f600]",
-      toContactId: 1,
-      fromUser: getContact(1),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1696995642000,
-      content: "你有意见吗。[!1f643][!1f643][!1f643]",
-      toContactId: 1,
-      fromUser: getContact(1),
-    },
-    {
-      id: generateRandId(),
-      status: "succeed",
-      type: "text",
-      sendTime: 1696995942000,
-      content: "你开心吗",
-      toContactId: 1,
-      fromUser: getContact(1),
-    },
-  ],
-  14: [],
-  15: [],
+  // 2: [],
+  // 3: [],
+  // 4: [],
+  // 5: [],
+  // 6: [],
+  // 7: [],
+  // 8: [],
+  // 9: [],
+  // 10: [],
+  // 11: [],
+  // 12: [],
+  // 13: [
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1670481209000,
+  //     content: "我是测试时候看到的",
+  //     toContactId: 1,
+  //     fromUser: getContact(4),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1670541395000,
+  //     content: "上新版本了,玩玩",
+  //     toContactId: 1,
+  //     fromUser: getContact(4),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1670544995000,
+  //     content: "项目内没有搞这个",
+  //     toContactId: 1,
+  //     fromUser: getContact(4),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1670545175000,
+  //     content: "@awesome 最新的,不然哪有这功能",
+  //     toContactId: 1,
+  //     fromUser: getContact(5),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1670631575000,
+  //     content: "其实是跟你的遮罩层有冲突",
+  //     toContactId: 1,
+  //     fromUser: getContact(4),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1670804375000,
+  //     content: "自己修改index哈",
+  //     toContactId: 1,
+  //     fromUser: UserData,
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1670977175000,
+  //     content: "你们升级到最近版了吗?",
+  //     toContactId: 1,
+  //     fromUser: getContact(6),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1670980775000,
+  //     content: "wo 现在用的142",
+  //     toContactId: 1,
+  //     fromUser: getContact(7),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1671247175000,
+  //     content: "问你件事",
+  //     toContactId: 1,
+  //     fromUser: UserData,
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "failed",
+  //     type: "text",
+  //     sendTime: 1671340182000,
+  //     content: "啥子。",
+  //     toContactId: 1,
+  //     fromUser: getContact(1),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1696907382000,
+  //     content: "为什么",
+  //     toContactId: 1,
+  //     fromUser: UserData,
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1696920042000,
+  //     content: "你穿了高跟鞋还这么矮[!1f62c][!1f601][!1f602]",
+  //     toContactId: 1,
+  //     fromUser: UserData,
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1696995642000,
+  //     content: "因为我矮啊。[!1f600][!1f600][!1f600]",
+  //     toContactId: 1,
+  //     fromUser: getContact(1),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1696995642000,
+  //     content: "你有意见吗。[!1f643][!1f643][!1f643]",
+  //     toContactId: 1,
+  //     fromUser: getContact(1),
+  //   },
+  //   {
+  //     id: generateRandId(),
+  //     status: "succeed",
+  //     type: "text",
+  //     sendTime: 1696995942000,
+  //     content: "你开心吗",
+  //     toContactId: 1,
+  //     fromUser: getContact(1),
+  //   },
+  // ],
+  // 14: [],
+  // 15: [],
 };

+ 14 - 14
src/components/Material/index.vue

@@ -178,7 +178,7 @@ export default {
   },
   data() {
     return {
-      uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
+      uploadUrl:process.env.VUE_APP_BASE_API+"/qw/material/add",
       dialogVisible: false,
       url: '',
       listDialogVisible: false,
@@ -324,19 +324,19 @@ export default {
     handleProgress(event, file, fileList) {
     },
     handleSuccess(response, file, fileList) {
-      const that = this
-      addMaterial({
-        type: '1',
-        groupId: this.queryParams.groupId,
-        name: file.name,
-        url: response.url
-      }).then(() => {
-        this.resultNumber++
-        if (fileList.length === this.resultNumber) {
-          that.getMaterialList()
-          this.resultNumber = 0
-        }
-      })
+      // const that = this
+      // addMaterial({
+      //   type: '1',
+      //   groupId: this.queryParams.groupId,
+      //   name: file.name,
+      //   url: response.url
+      // }).then(() => {
+      //   this.resultNumber++
+      //   if (fileList.length === this.resultNumber) {
+      //     that.getMaterialList()
+      //     this.resultNumber = 0
+      //   }
+      // })
     },
     beforeUpload(file) {
       const isPic =

+ 18 - 9
src/views/qw/qwChat/qq.vue

@@ -102,8 +102,8 @@ import { getQrCode } from '@/api/qw/login';
 import { getDeviceId} from '@/api/qw/account';
 
 import LemonMessageVoice from "@/components/LemonUI/components/lemon-message-voice";
-
-import ContactsData from "@/components/LemonUI/database/contacts";
+// import ContactsData from "@/components/LemonUI/database/contacts";
+import {getContacts} from "@/components/LemonUI/database/contacts";
 import MessagesData from "@/components/LemonUI/database/messages";
 import EmojiData from "@/components/LemonUI/database/emoji";
 import '@/components/LemonUI/index.css';
@@ -114,6 +114,8 @@ export default {
   data() {
     return {
       theme: "default",
+      contactData:[],
+      deviceId:'4eea1292408044beb49c02d3197871b0',
       contactContextmenu: [
         {
           text: "删除该聊天",
@@ -249,6 +251,9 @@ export default {
       windowHeight: document.documentElement.clientHeight*0.7,   //实时屏幕高度
     };
   },
+  created(){
+    this.getContacts();
+  },
   mounted() {
     const contactData1 = {
             id: "contact-1",
@@ -284,13 +289,13 @@ export default {
             lastContent: "你好123",
     };
     const IMUI = this.$refs.IMUI;
-    IMUI.initContacts(ContactsData);
+    IMUI.initContacts(this.contactData);
 
-    var converData = ContactsData.filter(item => item.id<=7);
-    converData.sort((a1, a2) => {
-      return a2.lastSendTime - a1.lastSendTime;
-    });
-    IMUI.initConversations(converData);
+    // var conversationData = this.contactData.filter(item => item.id<=7);
+    // conversationData.sort((a1, a2) => {
+    //   return a2.lastSendTime - a1.lastSendTime;
+    // });
+    // IMUI.initConversations(conversationData);
   
     IMUI.initMenus([
       {
@@ -351,7 +356,11 @@ export default {
     IMUI.changeContact(13);
   },
   methods: {
-
+    getContacts(){
+      getContacts(this.deviceId).then(response => {
+        this.contactData = response.data;
+      });
+    },
     messageTimeFormat(time) {
       console.log("qxj messageTimeFormat:"+time);
       return this.friendlyDate(time);