diff --git a/api/bussness.js b/api/bussness.js
index 7b3ee17..dc0dcd7 100644
--- a/api/bussness.js
+++ b/api/bussness.js
@@ -3,8 +3,10 @@ import oahttp from "@/utils/aa.js";
/**
* 绑定scoket
*/
-export const bindScoket = (data) => oahttp.post('/im/doBindUid', data)
+export const bindScoket = (data) => oahttp.post('/common/im/doBindUid', data)
// 发送消息
-export const sendMsgApi = (data) => oahttp.post('/im/sendMessage', data)
+export const sendMsgApi = (data) => oahttp.post('/common/im/sendMessage', data)
// 发送文件
-// export const sendFileApi = (data) => oahttp.post('/im/doBindUid', data)
\ No newline at end of file
+export const sendFileApi = (data) => oahttp.post('/common/im/sendFileMsg', data)
+// 消息列表
+export const getMsgListApi = (data) => oahttp.post('/common/im/msgList', data)
diff --git a/components/business/talk.vue b/components/business/talk.vue
index 5b54724..2380032 100644
--- a/components/business/talk.vue
+++ b/components/business/talk.vue
@@ -627,8 +627,12 @@
padding: 20rpx 0;
position: fixed;
box-sizing: border-box;
+ // bottom: 400px;
+ padding-bottom: 500px;
+ /* #ifdef APP-PLUS */
bottom: 0px;
padding-bottom: 10px;
+ /* #endif */
.send-col {
display: flex;
diff --git a/config/app.js b/config/app.js
index 7094130..45f647e 100644
--- a/config/app.js
+++ b/config/app.js
@@ -22,7 +22,7 @@ switch (env) {
httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试
httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境
- httpApiTest = 'http://192.168.1.12:8081' //测试环境
+ httpApiTest = 'http://192.168.1.16:8081' //测试环境
}
diff --git a/pages/business/business.vue b/pages/business/business.vue
index 15a1b68..c708f3f 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -1,189 +1,728 @@
-
-
+
-
-
-
-
- 搜索
-
+
-
-
-
- 10
-
+
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 张三
-
-
- 张三的消息sdfksdgflkgkdfgdfkjghkjdfh g的身份和迪斯科解放和恐惧受到攻击速度来看
+
+ {{item.content}}
+
+
+
+
+
+
+
+
+
+ 点击预览
+
+
+
+
+
+
+
+ {{item.sendTime}}
+
+
+
+
+
+
+
+ {{item.content}}
+
+
+
+
+
+
+
+
+
+ 点击预览
-
- 10:58
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 图片
+
+
+
+
+ 视频
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
\ No newline at end of file
diff --git a/pages/business/talkDetail.vue b/pages/business/talkDetail.vue
index f41c76a..1f2d4ad 100644
--- a/pages/business/talkDetail.vue
+++ b/pages/business/talkDetail.vue
@@ -170,11 +170,6 @@
return {
a: "https://img1.baidu.com/it/u=716638254,3920932970&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1695920400&t=aeec3d0e86c23759d5f82b3757e9b442",
list: [
-
-
-
-
-
],
value: "",
showPlus: false,
@@ -597,8 +592,8 @@
.content {
padding: 0 20rpx;
- min-height: 100vh;
- // height: 89vh;
+ // min-height: 100vh;
+ height: 89vh;
background-color: #F6F7FD;
overflow: auto;
padding-top: 10rpx;
diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue
index d637c6f..b97bd63 100644
--- a/pages/logistics/logisticDetil.vue
+++ b/pages/logistics/logisticDetil.vue
@@ -97,7 +97,7 @@
- 收获详情
+ 收货详情
diff --git a/utils/aa.js b/utils/aa.js
index 629a9f0..1a7164a 100644
--- a/utils/aa.js
+++ b/utils/aa.js
@@ -48,7 +48,7 @@ function baseRequestTwo(url, method, data, {
// })
uni.request({
// url: Url + '/api/v1' + url,
- url: Url + '/api' + url,
+ url: Url + url,
method: method || 'GET',
header: {
...header