diff --git a/manifest.json b/manifest.json index 8157569..c3c4baf 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ } }, "compatible" : { - "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 + "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 }, "splashscreen" : { "alwaysShowBeforeRender" : true, diff --git a/pages/book/booklist.vue b/pages/book/booklist.vue index 749a584..59090d4 100644 --- a/pages/book/booklist.vue +++ b/pages/book/booklist.vue @@ -47,11 +47,11 @@ - + - + - + @@ -514,7 +514,7 @@ import { mapState, mapGetters, mapActions } from 'vuex'; // 直接跳转到聊天框 let chat = { type: 'PRIVATE', - targetId: this.userid, + targetId: item.teacherAppId, showName: item.teacherName, headImage: item.pic?item.pic:'/static/image/kf.png', }; diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue index eaffc1f..8f7cf4e 100644 --- a/pages/chat/chat.vue +++ b/pages/chat/chat.vue @@ -345,7 +345,7 @@ let socketTask = null; socketTask=uni.connectSocket({ - url: "ws://192.168.13.9:8528/im", + url: "wss://www.sanduolantoyoga.com/yoga-imserver", header: { // 'content-type': 'application/json', Authorization: uni.getStorageSync("token"), diff --git a/pages/chat/chat1.vue b/pages/chat/chat1.vue index 82ab91e..15970ef 100644 --- a/pages/chat/chat1.vue +++ b/pages/chat/chat1.vue @@ -519,7 +519,7 @@ socketinit(){ var that = this; this.socketTask=uni.connectSocket({ - url: "ws://192.168.13.9:8528/im", + url: "wss://www.sanduolantoyoga.com/yoga-imserver", header: { // 'content-type': 'application/json', Authorization: uni.getStorageSync("token"), diff --git a/pages/chat/groupchat.vue b/pages/chat/groupchat.vue index adfa8e4..5455291 100644 --- a/pages/chat/groupchat.vue +++ b/pages/chat/groupchat.vue @@ -474,7 +474,7 @@ var that = this; if (!this.isConnected) { uni.connectSocket({ - url: "ws://192.168.13.9:8528/im", + url: "wss://www.sanduolantoyoga.com/yoga-imserver", header: { // 'content-type': 'application/json', Authorization: uni.getStorageSync("token"), diff --git a/pages/chat/groupchat1.vue b/pages/chat/groupchat1.vue index 4df45a8..b44d7df 100644 --- a/pages/chat/groupchat1.vue +++ b/pages/chat/groupchat1.vue @@ -538,7 +538,7 @@ var that = this; if (!this.isConnected) { this.socketTask=uni.connectSocket({ - url: "ws://192.168.13.9:8528/im", + url: "wss://www.sanduolantoyoga.com/yoga-imserver", header: { // 'content-type': 'application/json', Authorization: uni.getStorageSync("token"), diff --git a/pages/chat/groupchat3.vue b/pages/chat/groupchat3.vue index 2487a68..77a90dc 100644 --- a/pages/chat/groupchat3.vue +++ b/pages/chat/groupchat3.vue @@ -671,7 +671,7 @@ var that = this; if (!this.isConnected) { this.socketTask=uni.connectSocket({ - url: "ws://192.168.13.9:8528/im", + url: "wss://www.sanduolantoyoga.com/yoga-imserver", header: { // 'content-type': 'application/json', Authorization: uni.getStorageSync("token"), diff --git a/pages/chatbox/chat-box.vue b/pages/chatbox/chat-box.vue index a5543cc..5a9fe7f 100644 --- a/pages/chatbox/chat-box.vue +++ b/pages/chatbox/chat-box.vue @@ -162,6 +162,7 @@ export default { } }, onLoad(options) { + // 从 Vuex state 中获取当前会话 this.chat = this.chats[options.chatIdx]; const size = this.messageSize; @@ -1115,17 +1116,17 @@ export default { } .scroll-to-bottom { - //position: absolute; + position: absolute; // - //right: 30rpx; + right: 30rpx; //bottom: 30rpx; font-size: $im-font-size; color: $im-color-primary; font-weight: 600; background: white; - //padding: 10rpx 30rpx; + padding: 10rpx 30rpx; border-radius: 25rpx; - //box-shadow: $im-box-shadow-dark; + box-shadow: $im-box-shadow-dark; } } diff --git a/pages/message/group.vue b/pages/message/group.vue index c94b18d..03b8031 100644 --- a/pages/message/group.vue +++ b/pages/message/group.vue @@ -157,7 +157,7 @@ var that = this; let socketTask = null; socketTask=uni.connectSocket({ - url: "ws://192.168.13.9:8528/im", + url: "wss://www.sanduolantoyoga.com/yoga-imserver", header: { // 'content-type': 'application/json', Authorization: uni.getStorageSync("token"), diff --git a/pages/message/group0.vue b/pages/message/group0.vue index 13a0b22..30c6c65 100644 --- a/pages/message/group0.vue +++ b/pages/message/group0.vue @@ -132,9 +132,9 @@ socketinit(){ var that = this; if (!that.isConnected) { - console.log("ws://192.168.13.9:8528/im") + console.log("wss://www.sanduolantoyoga.com/yoga-imserver") this.socketTask=uni.connectSocket({ - url: "ws://192.168.13.9:8528/im", + url: "wss://www.sanduolantoyoga.com/yoga-imserver", header: { // 'content-type': 'application/json', Authorization: uni.getStorageSync("token"), diff --git a/pages/message/group1.vue b/pages/message/group1.vue index 3b4f2fd..aadba40 100644 --- a/pages/message/group1.vue +++ b/pages/message/group1.vue @@ -169,7 +169,7 @@ // if (!that.isConnected) { that.socketTask=uni.connectSocket({ - url: "ws://192.168.13.9:8528/im", + url: "wss://www.sanduolantoyoga.com/yoga-imserver", header: { // 'content-type': 'application/json', Authorization: uni.getStorageSync("token"), diff --git a/pages/message/group2.vue b/pages/message/group2.vue index 47b794d..db17955 100644 --- a/pages/message/group2.vue +++ b/pages/message/group2.vue @@ -171,7 +171,7 @@ socketinit(){ var that = this; that.socketTask=uni.connectSocket({ - url: "ws://192.168.13.9:8528/im", + url: "wss://www.sanduolantoyoga.com/yoga-imserver", header: { // 'content-type': 'application/json', Authorization: uni.getStorageSync("token"), diff --git a/pages/product/cdetail.vue b/pages/product/cdetail.vue index ff47029..2793795 100644 --- a/pages/product/cdetail.vue +++ b/pages/product/cdetail.vue @@ -796,7 +796,7 @@ // 直接跳转到聊天框 let chat = { type: 'PRIVATE', - targetId: this.product.instructor, + targetId: this.product.customerService?this.product.customerService:this.product.instructor, showName: nickName, headImage: headImage, }; diff --git a/pages/product/detail.vue b/pages/product/detail.vue index 4a90d0a..d222805 100644 --- a/pages/product/detail.vue +++ b/pages/product/detail.vue @@ -662,6 +662,7 @@ import { mapState, mapGetters, mapActions } from 'vuex'; uni.showLoading({ title: '会话创建中...' }); + const {data: res} = await uni.$http.get("/api/friend/find/"+this.product.customerService); if(res.data){ // 客服头像和名称 @@ -679,15 +680,16 @@ import { mapState, mapGetters, mapActions } from 'vuex'; // 在线客服 // 私聊 // 直接跳转到聊天框 - let chat = { + let chat = { type: 'PRIVATE', - targetId: this.userid, + targetId: this.product.customerService, showName: nickName, headImage: headImage?headImage:'/static/image/kf.png', }; this.openChat(chat); let chatIdx = this.findChatIdx(chat); uni.navigateTo({ url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}` }); + // var timestamp = new Date().getTime(); // var chatid="privatechat-" + this.userid +"-"+ this.product.customerService; // var info={