xiaoning
/
yogaApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
main
15004070936 4 weeks ago
parent 95e91728a0
commit 3a8228ac4f
14 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File

8
pages/book/booklist.vue
Unescape View File

@ -47,11 +47,11 @@
</view> </view>
<!-- 1：待上课，2：预约中，3：待评价 ，4：已完成 5：已取消--> <!-- 1：待上课，2：预约中，3：待评价 ，4：已完成 5：已取消-->
<!-- 描述:0->预约中;1->教练确认;2->店长确认/预约成功/待上课 3->已取消;4->已完成/待评价; --> <!-- 描述:0->预约中;1->教练确认;2->店长确认/预约成功/待上课 3->已取消;4->已完成/待评价; -->
<button type="primary" class="conbtn" @click="gototeacher(item)">联系教练</button> <button class="conbtn" @click="gototeacher(item)">联系教练</button>
<!-- <button v-if="item.bookStatus==2||item.bookStatus==1" type="primary" class="cancelbtn" :data-id="item.courseTimeId" @click="cancelkcdo">取消课程</button>--> <!-- <button v-if="item.bookStatus==2||item.bookStatus==1" type="primary" class="cancelbtn" :data-id="item.courseTimeId" @click="cancelkcdo">取消课程</button>-->
<button v-if="'0,1,2'.includes(item.bookStatus)" type="primary" class="cancelbtn" :data-id="item.courseTimeId" @click="cancelyydo">取消预约</button> <button v-if="'0,1,2'.includes(item.bookStatus)" class="cancelbtn" :data-id="item.courseTimeId" @click="cancelyydo">取消预约</button>
<!-- <button v-if="item.bookStatus==0" type="primary" class="paybtn" :data-id="item.courseTimeId" @click="checkdo($event,item)">确认上课</button>--> <!-- <button v-if="item.bookStatus==0" type="primary" class="paybtn" :data-id="item.courseTimeId" @click="checkdo($event,item)">确认上课</button>-->
<button v-if="item.bookStatus==4" type="primary" class="viewbtn" :data-id="item.courseTimeId" @click="orderdo($event,item)">再次预约</button> <button v-if="item.bookStatus==4" class="viewbtn" :data-id="item.courseTimeId" @click="orderdo($event,item)">再次预约</button>
<!-- <button v-if="item.bookStatus==4" type="primary" class="gzbtn" :data-id="item.courseTimeId" @click="gotoevaluate($event,item)">评价</button>--> <!-- <button v-if="item.bookStatus==4" type="primary" class="gzbtn" :data-id="item.courseTimeId" @click="gotoevaluate($event,item)">评价</button>-->
</view> </view>
@ -514,7 +514,7 @@ import { mapState, mapGetters, mapActions } from 'vuex';
// 直接跳转到聊天框 // 直接跳转到聊天框
let chat = { let chat = {
type: 'PRIVATE', type: 'PRIVATE',
targetId: this.userid, targetId: item.teacherAppId,
showName: item.teacherName, showName: item.teacherName,
headImage: item.pic?item.pic:'/static/image/kf.png', headImage: item.pic?item.pic:'/static/image/kf.png',
}; };

2
pages/chat/chat.vue
Unescape View File

@ -345,7 +345,7 @@
let socketTask = null; let socketTask = null;
socketTask=uni.connectSocket({ socketTask=uni.connectSocket({
url: "ws://192.168.13.9:8528/im", url: "wss://www.sanduolantoyoga.com/yoga-imserver",
header: { header: {
// 'content-type': 'application/json', // 'content-type': 'application/json',
Authorization: uni.getStorageSync("token"), Authorization: uni.getStorageSync("token"),

2
pages/chat/chat1.vue
Unescape View File

@ -519,7 +519,7 @@
socketinit(){ socketinit(){
var that = this; var that = this;
this.socketTask=uni.connectSocket({ this.socketTask=uni.connectSocket({
url: "ws://192.168.13.9:8528/im", url: "wss://www.sanduolantoyoga.com/yoga-imserver",
header: { header: {
// 'content-type': 'application/json', // 'content-type': 'application/json',
Authorization: uni.getStorageSync("token"), Authorization: uni.getStorageSync("token"),

2
pages/chat/groupchat.vue
Unescape View File

@ -474,7 +474,7 @@
var that = this; var that = this;
if (!this.isConnected) { if (!this.isConnected) {
uni.connectSocket({ uni.connectSocket({
url: "ws://192.168.13.9:8528/im", url: "wss://www.sanduolantoyoga.com/yoga-imserver",
header: { header: {
// 'content-type': 'application/json', // 'content-type': 'application/json',
Authorization: uni.getStorageSync("token"), Authorization: uni.getStorageSync("token"),

2
pages/chat/groupchat1.vue
Unescape View File

@ -538,7 +538,7 @@
var that = this; var that = this;
if (!this.isConnected) { if (!this.isConnected) {
this.socketTask=uni.connectSocket({ this.socketTask=uni.connectSocket({
url: "ws://192.168.13.9:8528/im", url: "wss://www.sanduolantoyoga.com/yoga-imserver",
header: { header: {
// 'content-type': 'application/json', // 'content-type': 'application/json',
Authorization: uni.getStorageSync("token"), Authorization: uni.getStorageSync("token"),

2
pages/chat/groupchat3.vue
Unescape View File

@ -671,7 +671,7 @@
var that = this; var that = this;
if (!this.isConnected) { if (!this.isConnected) {
this.socketTask=uni.connectSocket({ this.socketTask=uni.connectSocket({
url: "ws://192.168.13.9:8528/im", url: "wss://www.sanduolantoyoga.com/yoga-imserver",
header: { header: {
// 'content-type': 'application/json', // 'content-type': 'application/json',
Authorization: uni.getStorageSync("token"), Authorization: uni.getStorageSync("token"),

9
pages/chatbox/chat-box.vue
Unescape View File

@ -162,6 +162,7 @@ export default {
} }
}, },
onLoad(options) { onLoad(options) {
// 从 Vuex state 中获取当前会话 // 从 Vuex state 中获取当前会话
this.chat = this.chats[options.chatIdx]; this.chat = this.chats[options.chatIdx];
const size = this.messageSize; const size = this.messageSize;
@ -1115,17 +1116,17 @@ export default {
} }
.scroll-to-bottom { .scroll-to-bottom {
//position: absolute; position: absolute;
// //
//right: 30rpx; right: 30rpx;
//bottom: 30rpx; //bottom: 30rpx;
font-size: $im-font-size; font-size: $im-font-size;
color: $im-color-primary; color: $im-color-primary;
font-weight: 600; font-weight: 600;
background: white; background: white;
//padding: 10rpx 30rpx; padding: 10rpx 30rpx;
border-radius: 25rpx; border-radius: 25rpx;
//box-shadow: $im-box-shadow-dark; box-shadow: $im-box-shadow-dark;
} }
} }

2
pages/message/group.vue
Unescape View File

@ -157,7 +157,7 @@
var that = this; var that = this;
let socketTask = null; let socketTask = null;
socketTask=uni.connectSocket({ socketTask=uni.connectSocket({
url: "ws://192.168.13.9:8528/im", url: "wss://www.sanduolantoyoga.com/yoga-imserver",
header: { header: {
// 'content-type': 'application/json', // 'content-type': 'application/json',
Authorization: uni.getStorageSync("token"), Authorization: uni.getStorageSync("token"),

4
pages/message/group0.vue
Unescape View File

@ -132,9 +132,9 @@
socketinit(){ socketinit(){
var that = this; var that = this;
if (!that.isConnected) { if (!that.isConnected) {
console.log("ws://192.168.13.9:8528/im") console.log("wss://www.sanduolantoyoga.com/yoga-imserver")
this.socketTask=uni.connectSocket({ this.socketTask=uni.connectSocket({
url: "ws://192.168.13.9:8528/im", url: "wss://www.sanduolantoyoga.com/yoga-imserver",
header: { header: {
// 'content-type': 'application/json', // 'content-type': 'application/json',
Authorization: uni.getStorageSync("token"), Authorization: uni.getStorageSync("token"),

2
pages/message/group1.vue
Unescape View File

@ -169,7 +169,7 @@
// if (!that.isConnected) { // if (!that.isConnected) {
that.socketTask=uni.connectSocket({ that.socketTask=uni.connectSocket({
url: "ws://192.168.13.9:8528/im", url: "wss://www.sanduolantoyoga.com/yoga-imserver",
header: { header: {
// 'content-type': 'application/json', // 'content-type': 'application/json',
Authorization: uni.getStorageSync("token"), Authorization: uni.getStorageSync("token"),

2
pages/message/group2.vue
Unescape View File

@ -171,7 +171,7 @@
socketinit(){ socketinit(){
var that = this; var that = this;
that.socketTask=uni.connectSocket({ that.socketTask=uni.connectSocket({
url: "ws://192.168.13.9:8528/im", url: "wss://www.sanduolantoyoga.com/yoga-imserver",
header: { header: {
// 'content-type': 'application/json', // 'content-type': 'application/json',
Authorization: uni.getStorageSync("token"), Authorization: uni.getStorageSync("token"),

2
pages/product/cdetail.vue
Unescape View File

@ -796,7 +796,7 @@
// 直接跳转到聊天框 // 直接跳转到聊天框
let chat = { let chat = {
type: 'PRIVATE', type: 'PRIVATE',
targetId: this.product.instructor, targetId: this.product.customerService?this.product.customerService:this.product.instructor,
showName: nickName, showName: nickName,
headImage: headImage, headImage: headImage,
}; };

6
pages/product/detail.vue
Unescape View File

@ -662,6 +662,7 @@ import { mapState, mapGetters, mapActions } from 'vuex';
uni.showLoading({ uni.showLoading({
title: '会话创建中...' title: '会话创建中...'
}); });
const {data: res} = await uni.$http.get("/api/friend/find/"+this.product.customerService); const {data: res} = await uni.$http.get("/api/friend/find/"+this.product.customerService);
if(res.data){ if(res.data){
// 客服头像和名称 // 客服头像和名称
@ -679,15 +680,16 @@ import { mapState, mapGetters, mapActions } from 'vuex';
// 在线客服 // 在线客服
// 私聊 // 私聊
// 直接跳转到聊天框 // 直接跳转到聊天框
let chat = { let chat = {
type: 'PRIVATE', type: 'PRIVATE',
targetId: this.userid, targetId: this.product.customerService,
showName: nickName, showName: nickName,
headImage: headImage?headImage:'/static/image/kf.png', headImage: headImage?headImage:'/static/image/kf.png',
}; };
this.openChat(chat); this.openChat(chat);
let chatIdx = this.findChatIdx(chat); let chatIdx = this.findChatIdx(chat);
uni.navigateTo({ url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}` }); uni.navigateTo({ url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}` });
// var timestamp = new Date().getTime(); // var timestamp = new Date().getTime();
// var chatid="privatechat-" + this.userid +"-"+ this.product.customerService; // var chatid="privatechat-" + this.userid +"-"+ this.product.customerService;
// var info={ // var info={

Write Preview
Loading…
Cancel
Save