Skip to content

foreign / customer-service

Go to a project
Commit f2fd5722 by Sixong.Zhu
Options

Merge branch 'master' into pre

parents 7abbf4ee f99c45d2
Expand all
Inline Side-by-side
Showing with 226 additions and 16 deletions
components/chat-room.vue
...@@ -13,10 +13,7 @@ ...@@ -13,10 +13,7 @@
> >
{{ getCurrentInputingPeople }}正在输入 {{ getCurrentInputingPeople }}正在输入
</div> </div>
<messages <messages class="flex-fill" @open-message="openMessage" />
class="flex-fill"
@open-pay-message="openPayMessage"
/>
<slot name="chat-right-panel"></slot> <slot name="chat-right-panel"></slot>
</div> </div>
<div <div
...@@ -31,7 +28,7 @@ ...@@ -31,7 +28,7 @@
class="chat-input flex-none h-100" class="chat-input flex-none h-100"
v-if="hasInput" v-if="hasInput"
> >
<message-input @error="onError" /> <message-input @error="onError" @sent="onMessageSent" />
</div> </div>
</div> </div>
</div> </div>
...@@ -44,6 +41,7 @@ ...@@ -44,6 +41,7 @@
import messages from "@/customer-service/components/message-list.vue"; import messages from "@/customer-service/components/message-list.vue";
import { ChatStore, chatStore } from "@/customer-service/store/model"; import { ChatStore, chatStore } from "@/customer-service/store/model";
import Chat from "@/customer-service/xim"; import Chat from "@/customer-service/xim";
import { CustomerServiceEvent } from "../event";
@Component({ components: { MessageInput, messages } }) @Component({ components: { MessageInput, messages } })
export default class ChatRoom extends Vue { export default class ChatRoom extends Vue {
...@@ -70,6 +68,11 @@ ...@@ -70,6 +68,11 @@
@chatStore.State(ChatStore.STATE_CHAT_CURRENT_IS_CHAT_ERROR) @chatStore.State(ChatStore.STATE_CHAT_CURRENT_IS_CHAT_ERROR)
private readonly chatError!: ChatStore.STATE_CHAT_CURRENT_IS_CHAT_ERROR; private readonly chatError!: ChatStore.STATE_CHAT_CURRENT_IS_CHAT_ERROR;
@chatStore.Getter(ChatStore.GETTER_CURRENT_CURRENT_CHAT)
private readonly currentChat!: ChatStore.GETTER_CURRENT_CURRENT_CHAT;
private setting = 0;
private get hasInput() { private get hasInput() {
return this.isChatMember && this.chatError !== this.chatId; return this.isChatMember && this.chatError !== this.chatId;
} }
...@@ -128,8 +131,23 @@ ...@@ -128,8 +131,23 @@
this.chatBox.clientHeight - this.refTop.clientHeight + "px"); this.chatBox.clientHeight - this.refTop.clientHeight + "px");
} }
private openPayMessage(id: number) { private openMessage(o: any) {
this.$emit("open-pay-message", id); CustomerServiceEvent.emit(this, o);
}
private onMessageSent() {
if (this.setting) {
clearTimeout(this.setting);
}
this.setting = setTimeout(
() =>
this.currentChat &&
Chat.setRead(
this.currentChat.model_name,
this.currentChat.obj_id
),
300
);
} }
} }
</script> </script>
......
components/message-item/pay-message.vue
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
import BaseMessage from "./index"; import BaseMessage from "./index";
import Chat from "@/customer-service/xim"; import Chat from "@/customer-service/xim";
import { ChatStore, chatStore } from "@/customer-service/store/model"; import { ChatStore, chatStore } from "@/customer-service/store/model";
import { CustomerServiceEvent, MessageEvent } from "@/customer-service/event";
@Component({ components: {} }) @Component({ components: {} })
export default class Index extends BaseMessage { export default class Index extends BaseMessage {
...@@ -112,7 +113,11 @@ ...@@ -112,7 +113,11 @@
private view() { private view() {
this.isChatMember && this.isChatMember &&
this.$emit("open-pay-message", this.payData.paymentId); CustomerServiceEvent.open(
this,
MessageEvent.PayMessage,
+this.payData.paymentId
);
} }
} }
</script> </script>
......
components/message-item/position-message.vue 0 → 100644
<template>
<div class="position-message" @click="openPosition">
<div class="d-flex justify-content-between align-items-center">
<span class="d-flex align-items-center">
<span class="title">{{ title }}</span>
<span
v-for="item in tags"
:key="item.title"
:style="{ 'background-color': item.color }"
class="tag"
>{{ item.title }}</span
>
</span>
<span class="salary">{{ salary }}</span>
</div>
<div class="summary">
<span v-for="item in summary" :key="item">{{ item }}</span>
</div>
<div class="msg-content" v-html="positionBody"></div>
<div class="msg-tail d-flex justify-content-between">
<span v-for="item in tail" :key="item" class="text-truncate">{{
item
}}</span>
</div>
</div>
</template>
<script lang="ts">
import { CustomerServiceEvent, MessageEvent } from "@/customer-service/event";
import { PositionMessage } from "@/customer-service/xim/models/chat";
import { Component } from "vue-property-decorator";
import BaseMessage from "./index";
@Component({ components: {} })
export default class Index extends BaseMessage {
private get positionData() {
return this.messageBody.msg as PositionMessage;
}
private get title() {
return this.positionData.title;
}
private get tags() {
return this.positionData.tags;
}
private get salary() {
return this.positionData.salary;
}
private get positionBody() {
return this.positionData.post_require;
}
private get summary() {
return [
this.positionData.address,
this.positionData.education_require,
this.positionData.recruit_count,
];
}
private get tail() {
return [
this.positionData.company_name,
this.positionData.business_scope,
];
}
private openPosition() {
CustomerServiceEvent.open(
this,
MessageEvent.PositionMessage,
this.positionData.post_id
);
}
}
</script>
<style lang="less" scoped>
.position-message {
border: 1px solid #ccc;
border-radius: 10px;
padding: 10px;
max-width: 300px;
cursor: pointer;
}
.title {
font-size: 16px;
font-weight: 500;
}
.tag {
border-radius: 4px;
padding: 0 2px;
margin-left: 10px;
color: #fff;
font-size: 12px;
}
.salary {
color: #e87005;
margin-left: 50px;
}
.summary {
border-bottom: 1px solid #f0f0f0;
margin: 6px -10px 10px -10px;
font-size: 12px;
color: #999;
padding: 0 10px 8px 10px;
span + span {
margin-left: 20px;
}
}
.msg-content {
line-height: 1.4;
}
.msg-tail {
margin: 15px -10px 0 -10px;
padding: 10px 10px 0 10px;
border-top: 1px solid #f0f0f0;
span {
max-width: 200px;
}
}
</style>
\ No newline at end of file
components/message-list.vue
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
:shape="shape" :shape="shape"
@open="open" @open="open"
@withdraw="refresh" @withdraw="refresh"
@open-pay-message="openPayMessage" @open-message="openMessage"
/> />
</div> </div>
</template> </template>
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
import { ChatStore, chatStore } from "@/customer-service/store/model"; import { ChatStore, chatStore } from "@/customer-service/store/model";
import { dbController } from "../database"; import { dbController } from "../database";
import { getLastMessageId } from "../store"; import { getLastMessageId } from "../store";
import { CustomerServiceEvent } from "../event";
@Component({ components: { message, ImagePreview, VideoPreview } }) @Component({ components: { message, ImagePreview, VideoPreview } })
export default class MessageList extends Vue { export default class MessageList extends Vue {
...@@ -415,8 +416,8 @@ ...@@ -415,8 +416,8 @@
this.fetchNewMsg(); this.fetchNewMsg();
} }
private openPayMessage(id: number) { private openMessage(o: any) {
this.$emit("open-pay-message", id); CustomerServiceEvent.emit(this, o);
} }
} }
</script> </script>
......
components/message.vue
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
v-if="messageComponent" v-if="messageComponent"
v-model="data" v-model="data"
@open="openFile" @open="openFile"
@open-pay-message="openPayMessage" @open-message="openMessage"
/> />
<avatar <avatar
v-if="!isQuestionAnswerMessage && !isWithdrawMessage" v-if="!isQuestionAnswerMessage && !isWithdrawMessage"
...@@ -164,11 +164,13 @@ ...@@ -164,11 +164,13 @@
import PurchasePlanMessage from "./message-item/purchase-plan-message.vue"; import PurchasePlanMessage from "./message-item/purchase-plan-message.vue";
import MyWelfareMessage from "./message-item/my-welfare-message.vue"; import MyWelfareMessage from "./message-item/my-welfare-message.vue";
import QuestionAnswerMessage from "./message-item/question-answer-message.vue"; import QuestionAnswerMessage from "./message-item/question-answer-message.vue";
import PositionMessage from "./message-item/position-message.vue";
import PayMessage from "./message-item/pay-message.vue"; import PayMessage from "./message-item/pay-message.vue";
import NotifyMessage from "./message-item/notify-message.vue"; import NotifyMessage from "./message-item/notify-message.vue";
import { ChatRole } from "@/customer-service/model"; import { ChatRole } from "@/customer-service/model";
import { getUserMapping } from "../utils/user-info"; import { getUserMapping } from "../utils/user-info";
import Xim from "@/customer-service/xim"; import Xim from "@/customer-service/xim";
import { CustomerServiceEvent } from "../event";
const twoMinutes = 2 * 60 * 1000; const twoMinutes = 2 * 60 * 1000;
const twoHours = 2 * 60 * 60 * 1000; const twoHours = 2 * 60 * 60 * 1000;
...@@ -191,6 +193,7 @@ ...@@ -191,6 +193,7 @@
[dto.MessageType.RefundV1, "pay-message"], [dto.MessageType.RefundV1, "pay-message"],
[dto.MessageType.PayResult, "notify-message"], [dto.MessageType.PayResult, "notify-message"],
[dto.MessageType.Notify, "notify-message"], [dto.MessageType.Notify, "notify-message"],
[dto.MessageType.Position, "position-message"],
]); ]);
@Component({ @Component({
...@@ -209,6 +212,7 @@ ...@@ -209,6 +212,7 @@
ActionMessage, ActionMessage,
PayMessage, PayMessage,
NotifyMessage, NotifyMessage,
PositionMessage,
}, },
}) })
export default class Message extends Vue { export default class Message extends Vue {
...@@ -535,8 +539,8 @@ ...@@ -535,8 +539,8 @@
document.body.click(); document.body.click();
} }
private openPayMessage(id: number) { private openMessage(o: any) {
this.$emit("open-pay-message", id); CustomerServiceEvent.emit(this, o);
} }
} }
</script> </script>
......
database/index.ts
...@@ -16,6 +16,8 @@ class ChatCacheDatabaseController { ...@@ -16,6 +16,8 @@ class ChatCacheDatabaseController {
private setuping = false; private setuping = false;
private setupError = false; private setupError = false;
public readonly historyOrderModelName = 'order_info';
private waitSetupCompleted() { private waitSetupCompleted() {
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
const checker = () => { const checker = () => {
......
event/index.ts 0 → 100644
export const enum MessageEvent {
Default = "open-message",
PayMessage = "pay-message",
PositionMessage = "position-message",
}
export class CustomerServiceEvent {
public static open(vue: Vue, type: MessageEvent, model: any) {
return this.emit(vue, { type, model });
}
public static emit(vue: Vue, o: { type: MessageEvent; model: any }) {
return vue.$emit(MessageEvent.Default, o);
}
}
model/index.ts
...@@ -121,6 +121,7 @@ export const enum MessageType { ...@@ -121,6 +121,7 @@ export const enum MessageType {
RefundV1 = "grefund", RefundV1 = "grefund",
Refund = "grefund2", Refund = "grefund2",
Card = "card", Card = "card",
Position = "position",
} }
export const enum MessageHandled { export const enum MessageHandled {
......
model/order.ts
import { Chat } from "../xim/models/chat"; import { Chat } from "../xim/models/chat";
import { GeneralOrderDirection } from './order-product';
export interface ChatGroup extends Chat { export interface ChatGroup extends Chat {
children?: ChatGroup[]; children?: ChatGroup[];
...@@ -58,7 +59,11 @@ export interface OrderTableListItem { ...@@ -58,7 +59,11 @@ export interface OrderTableListItem {
lastMsgContent: string; lastMsgContent: string;
lastMsgTime: string; lastMsgTime: string;
unreadCount: number; unreadCount: number;
PayPaymentNum?: string | number; //付款笔数 /**
* 付款笔数
*/
PayPaymentNum?: string | number;
product: GeneralOrderDirection;
} }
export const orderPredict = { export const orderPredict = {
...@@ -82,6 +87,7 @@ export const orderPredict = { ...@@ -82,6 +87,7 @@ export const orderPredict = {
lastMsgTime: "UniplatLastMsgTime", lastMsgTime: "UniplatLastMsgTime",
unreadCount: 0, unreadCount: 0,
PayPaymentNum: "PayPaymentNum", PayPaymentNum: "PayPaymentNum",
product: 'ProductId#product.Code'
}; };
export const enum PayStatus { export const enum PayStatus {
......
xim/index.ts
...@@ -146,7 +146,9 @@ class Chat { ...@@ -146,7 +146,9 @@ class Chat {
return Promise.resolve(uri); return Promise.resolve(uri);
} }
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
xim.open(uri, this.token).catch(reject).finally(() => { xim.open(uri, this.token)
.catch(reject)
.finally(() => {
this.registerXimEvent(); this.registerXimEvent();
if (xim.isConnected()) { if (xim.isConnected()) {
resolve(); resolve();
...@@ -203,6 +205,15 @@ class Chat { ...@@ -203,6 +205,15 @@ class Chat {
public getAvatar() { public getAvatar() {
return this.defaultAvatar; return this.defaultAvatar;
} }
public setRead(model: string, obj: string) {
if (this.isBackend()) {
const sdk = this.getSdk();
if (sdk) {
sdk.getAxios().post(`/general/xim/model/${model}/${obj}/read`);
}
}
}
} }
export default new Chat(); export default new Chat();
xim/models/chat.ts
...@@ -219,6 +219,19 @@ export interface PayMessageBody { ...@@ -219,6 +219,19 @@ export interface PayMessageBody {
totalMoney?: string; totalMoney?: string;
} }
export interface PositionMessage {
title: string;
tags: { title: string; color: string }[];
salary: string;
address: string;
education_require: string;
recruit_count: string;
post_require: string;
company_name: string;
business_scope: string;
post_id: number;
}
export interface CsUser { export interface CsUser {
id: number; id: number;
oid: string; oid: string;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment