diff --git a/dc-App/pages/Chat/newChat.vue b/dc-App/pages/Chat/newChat.vue
index e35d102..6450813 100644
--- a/dc-App/pages/Chat/newChat.vue
+++ b/dc-App/pages/Chat/newChat.vue
@@ -370,7 +370,6 @@ export default {
msgInfo() {
if (this.msgSocket) {
this.msgSocket.onMessage(res => {
- console.log('this.messagesList', this.messagesList[this.messagesList.length - 1])
if (this.info.conversation == 'Translator') {
if (this.messagesList[this.messagesList.length - 1].inputs.type != 'image') {
this.messagesList[this.messagesList.length - 1].answer = this.messagesList[this
@@ -411,7 +410,6 @@ export default {
this.goBottom()
}
}
- console.log('this.messagesList', this.messagesList)
})
@@ -564,7 +562,6 @@ export default {
'type': '',
'filePath': inputData.filePath,
};
- console.log(msgItem)
if (this.info.conversation == 'Translator') {
msgItem.response_mode = 'blocking'
msgItem.inputs.lang = this.lang
@@ -597,22 +594,30 @@ export default {
'answer': '',
'socketId': this.socketId,
};
- console.log(this.info.conversation, 259)
if (this.info.conversation == 'Translator') {
requestData.response_mode = 'blocking'
requestData.inputs.lang = this.lang
requestData.inputs.sayLang = this.sayLang
} else if (this.info.conversation == 'Trip') {
- // requestData.query = "描述图片"
- // requestData.inputs = {}
- // requestData.files = [
- // {
- // "type": "image",
- // "transfer_method": "local_file",
- // "url": '',
- // "upload_file_id": inputData.message
- // }
- // ]
+ if (requestData.inputs.type == 'image') {
+ requestData.query = "描述图片"
+ // requestData.inputs = {}
+ requestData.files = [
+ {
+ "type": "image",
+ // "type": "image/jpeg",
+ "transfer_method": "local_file",
+ "url": '',
+ "upload_file_id": inputData.message
+ }
+ ]
+ }
+ setTimeout(() => {
+ sendMsg(that.msgSocket, JSON.stringify(requestData))
+ requestData.query = inputData.base64
+ }, 500)
+
+ return
}
setTimeout(() => {
sendMsg(that.msgSocket, JSON.stringify(requestData))
@@ -665,8 +670,9 @@ page {
.po_i {
position: absolute;
- //top: -60px;
+
left: 0px;
+ top: -55px;
box-sizing: border-box;
padding: 10px;
height: 50px;
@@ -760,6 +766,7 @@ page {
padding: 18rpx 24rpx;
white-space: pre-wrap;
word-wrap: break-word;
+ position: relative;
}
.msg-img {
diff --git a/dc-App/pages/Chat/newChat/submit.vue b/dc-App/pages/Chat/newChat/submit.vue
index 6d8dc3c..97c41be 100644
--- a/dc-App/pages/Chat/newChat/submit.vue
+++ b/dc-App/pages/Chat/newChat/submit.vue
@@ -223,7 +223,22 @@ export default {
//将res.data转为json
let json = JSON.parse(res.data)
console.log(json.id,'上传图片返回结果')
- that.send(json.id, 1, res.data)
+ upload({
+ filePath: tempFilePaths[0],
+ url: 'base64Api/upload',
+ name: 'file',
+ }).then(res1 => {
+ request({
+ url: 'base64Api/inputBase64',
+ method: 'post',
+ data: {
+ base64: res1.base64
+ }
+ }).then(res2 => {
+ that.send(json.id, 1, res1.base64)
+ })
+ })
+ // that.send(json.id, 1, res.data)
},
fail: (err) => {
console.log(err,'上传报错')
diff --git a/dc-App/pages/busNavigation/busNavigation.nvue b/dc-App/pages/busNavigation/busNavigation.nvue
index c2d10b8..08c3f10 100644
--- a/dc-App/pages/busNavigation/busNavigation.nvue
+++ b/dc-App/pages/busNavigation/busNavigation.nvue
@@ -1,739 +1,810 @@
-
-
+
+
+
+
+
+
+ {{ Number.parseInt(allData.duration / 60) || 0 }}min
+
+
+ walk distance
+
+ {{ allData.walkingDistance ? Number.parseFloat(allData.walkingDistance / 1000).toFixed(2) : 0 }}km
+
+
+
+
+
-
-
-
-
- {{it.enName.split('(')[0]||''}}
-
-
+
+
+
+
+
+ {{ it.enName.split('(')[0] || '' }}
+
+
+
-
-
-
-
- all cost
- ￥{{allData.cost=='[]'?0:allData.cost}}
+
+
+
+
+ all cost
+ ￥{{ allData.cost == '[]' ? 0 : allData.cost }}
-
-
-
-
-
-
- My Location
-
-
-
-
-
-
-
- Walk {{item.walking.distance}} meters ({{Number.parseInt(item.walking.duration/60)}} minutes)
-
-
- Walk
-
+
+
+
+
+
+
+ My Location
+
+
+
+
+
+
+
+ Walk {{ item.walking.distance }} meters
+ ({{ Number.parseInt(item.walking.duration / 60) }} minutes)
+
+
+
+ Walk
+
-
-
-
-
-
-
-
-
-
-
- {{it.departureStop.enName}} station
-
-
- {{it.enName}}
-
+
+
+
+
+
+
+
+
+
+
+ {{ it.departureStop.enName }} station
+
+
+
+ {{ it.enName }}
+
-
-
- {{it.viaStops.length}} station ({{Number.parseInt(it.duration/60)}} min)
+
+
+ {{ it.viaStops.length }} station
+ ({{ Number.parseInt(it.duration / 60) }} min)
+
-
- {{it.arrivalStop.enName}} station
+
+ {{ it.arrivalStop.enName }} station
-
-
-
+
+
+
-
-
-
- destination
-
-
-
-
+
+
+
+ destination
+
+
+
+
-
-
-
-
-
- {{Number.parseInt(allData.duration/60)||0}}分钟
-
-
- 步行距离
- {{allData.walkingDistance?Number.parseFloat(allData.walkingDistance/1000).toFixed(2):0}}km
-
-
-
-
+
+
+
+
+
+ {{ Number.parseInt(allData.duration / 60) || 0 }}分钟
+
+
+ 步行距离
+
+ {{ allData.walkingDistance ? Number.parseFloat(allData.walkingDistance / 1000).toFixed(2) : 0 }}km
+
+
+
+
+
-
-
-
-
- {{it.name.split('(')[0]||''}}
-
-
+
+
+
+
+
+ {{ it.name.split('(')[0] || '' }}
+
+
+
-
-
-
-
- 总花费
- ￥{{allData.cost}}
+
+
+
+
+ 总花费
+ ￥{{ allData.cost }}
-
-
-
-
-
-
- 我的位置
-
-
-
-
-
-
-
- 步行 {{item.walking.distance}} 米 ({{Number.parseInt(item.walking.duration/60)}} 分钟)
-
-
- 导航
-
+
+
+
+
+
+
+ 我的位置
+
+
+
+
+
+
+
+ 步行 {{ item.walking.distance }} 米
+ ({{ Number.parseInt(item.walking.duration / 60) }} 分钟)
+
+
+
+ 导航
+
-
-
-
-
-
-
-
-
-
-
- {{it.departureStop.name}} 站点
-
-
- {{it.name}}
-
+
+
+
+
+
+
+
+
+
+
+ {{ it.departureStop.name }} 站点
+
+
+ {{ it.name }}
+
-
-
- {{it.viaStops.length}} 站 ({{Number.parseInt(it.duration/60)}} 分钟)
+
+
+ {{ it.viaStops.length }} 站
+ ({{ Number.parseInt(it.duration / 60) }} 分钟)
+
-
- {{it.arrivalStop.name}} 站点
+
+ {{ it.arrivalStop.name }} 站点
-
-
-
+
+
+
-
-
-
- 终点
-
-
-
-
+
+
+
+ 终点
+
+
+
+
-
+