Skip to content

foreign / customer-service

Go to a project
Commit d6a7d544 by 杨铁龙
Options

Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/uniplat/customer-service

parents 5336fa0f da7ea43b
Expand all
Inline Side-by-side
Showing with 86 additions and 4 deletions
components/chat-room.vue
...@@ -13,7 +13,10 @@ ...@@ -13,7 +13,10 @@
> >
{{ getCurrentInputingPeople }}正在输入 {{ getCurrentInputingPeople }}正在输入
</div> </div>
<messages class="flex-fill" /> <messages
class="flex-fill"
@open-pay-message="openPayMessage"
/>
<slot name="chat-right-panel"></slot> <slot name="chat-right-panel"></slot>
</div> </div>
<div <div
...@@ -163,6 +166,10 @@ ...@@ -163,6 +166,10 @@
((this.refBottom as HTMLElement).style.height = ((this.refBottom as HTMLElement).style.height =
this.chatBox.clientHeight - this.refTop.clientHeight + "px"); this.chatBox.clientHeight - this.refTop.clientHeight + "px");
} }
private openPayMessage(id: number) {
this.$emit("open-pay-message", id);
}
} }
</script> </script>
......
components/message-item/pay-message.vue
<template> <template>
<div <div
class="pay-message d-flex flex-column" class="pay-message d-flex flex-column"
:class="messageClass" :class="[
messageClass,
{ 'user-side': !backend || !isChatMember, click: isChatMember },
]"
@click="view" @click="view"
> >
<div class="d-flex align-items-center flex-fill pay-msg-body"> <div class="d-flex align-items-center flex-fill pay-msg-body">
...@@ -28,9 +31,16 @@ ...@@ -28,9 +31,16 @@
import { PayMessageBody } from "@/customer-service/xim/models/chat"; import { PayMessageBody } from "@/customer-service/xim/models/chat";
import { Component } from "vue-property-decorator"; import { Component } from "vue-property-decorator";
import BaseMessage from "./index"; import BaseMessage from "./index";
import Chat from "@/customer-service/xim";
import { ChatStore, chatStore } from "@/customer-service/store/model";
@Component({ components: {} }) @Component({ components: {} })
export default class Index extends BaseMessage { export default class Index extends BaseMessage {
@chatStore.State(ChatStore.STATE_CHAT_CURRENT_IS_CHAT_MEMBER)
private readonly isChatMember!: ChatStore.STATE_CHAT_CURRENT_IS_CHAT_MEMBER;
protected backend = Chat.isBackend();
private get payData() { private get payData() {
return this.messageBody.msg as PayMessageBody; return this.messageBody.msg as PayMessageBody;
} }
...@@ -96,7 +106,8 @@ ...@@ -96,7 +106,8 @@
} }
private view() { private view() {
this.$emit("view-pay-message", this.payData.paymentId); this.isChatMember &&
this.$emit("open-pay-message", this.payData.paymentId);
} }
} }
</script> </script>
...@@ -108,6 +119,14 @@ ...@@ -108,6 +119,14 @@
height: 106px; height: 106px;
color: #fff; color: #fff;
&.click {
cursor: pointer;
}
&.user-side {
border-radius: 0 10px 10px 10px;
}
&.default, &.default,
&.balance-unpay { &.balance-unpay {
background: linear-gradient(180deg, #f95b3c 0%, #f94623 100%); background: linear-gradient(180deg, #f95b3c 0%, #f94623 100%);
...@@ -148,6 +167,7 @@ ...@@ -148,6 +167,7 @@
height: 40px; height: 40px;
display: inline-block; display: inline-block;
margin-right: 20px; margin-right: 20px;
background-repeat: no-repeat;
&.icon-1 { &.icon-1 {
background-image: url("./pay-status-1.svg"); background-image: url("./pay-status-1.svg");
......
components/message-item/pay-user-icon.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>bg_head</title>
<defs>
<circle id="path-1" cx="20" cy="20" r="20"></circle>
<filter x="-17.5%" y="-12.5%" width="135.0%" height="135.0%" filterUnits="objectBoundingBox" id="filter-3">
<feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0.846 0 0 0 0 0.8712 0 0 0 0 0.9 0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-4">
<stop stop-color="#FF884D" offset="0%"></stop>
<stop stop-color="#FF7A38" offset="100%"></stop>
</linearGradient>
</defs>
<g id="专项订单" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="专项订单-结束订单的咨询-通知" transform="translate(-12.000000, -302.000000)">
<g id="交易卡片类型" transform="translate(12.000000, 20.000000)">
<g id="扣费类型-copy" transform="translate(0.000000, 282.000982)">
<g id="deal_payment" transform="translate(0.000000, 0.000491)">
<g id="bg_head" transform="translate(4.000000, 2.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="Oval-Copy-3">
<use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-1"></use>
<use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
<g id="Group-2" mask="url(#mask-2)" stroke="url(#linearGradient-4)" stroke-linecap="square" stroke-width="1.5">
<g transform="translate(10.000000, 10.000000)" id="Path">
<path d="M18.7826906,13.1628256 C17.0173047,17.962065 11.6541847,20.4365721 6.80382687,18.6897918 C4.18958638,17.7483141 2.25786975,15.7727157 1.30878809,13.3998042 L1.31645476,13.4253106 C1.04844898,12.760693 0.856118915,12.0580905 0.75,11.3279273 L2.54646139,11.9748947 M1.21799099,6.83717444 C2.98337687,2.03793495 8.34649684,-0.436572119 13.1968547,1.3102082 C15.5497413,2.15756341 17.3788653,3.91239048 18.6842268,6.57468939 C18.9516598,7.23788655 19.1437402,7.93890651 19.25,8.66739159 L17.4571018,8.0217074 M6.91666667,8.76666667 L13.0833333,8.76666667 M6.91666667,11.2333333 L13.0833333,11.2333333 M10,13.7 L10,8.76666667 M10,8.76666667 L12.4666667,6.3 M10,8.76666667 L7.53333333,6.3"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
components/message-list.vue
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
:shape="shape" :shape="shape"
@open="open" @open="open"
@withdraw="refresh" @withdraw="refresh"
@open-pay-message="openPayMessage"
/> />
</div> </div>
</template> </template>
...@@ -395,6 +396,10 @@ ...@@ -395,6 +396,10 @@
private refresh() { private refresh() {
this.fetchNewMsg(); this.fetchNewMsg();
} }
private openPayMessage(id: number) {
this.$emit("open-pay-message", id);
}
} }
</script> </script>
......
components/message.vue
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
v-if="messageComponent" v-if="messageComponent"
v-model="data" v-model="data"
@open="openFile" @open="openFile"
@open-pay-message="openPayMessage"
/> />
<avatar <avatar
v-if="!isQuestionAnswerMessage && !isWithdrawMessage" v-if="!isQuestionAnswerMessage && !isWithdrawMessage"
...@@ -506,6 +507,10 @@ ...@@ -506,6 +507,10 @@
private closeKeywordPopover() { private closeKeywordPopover() {
document.body.click(); document.body.click();
} }
private openPayMessage(id: number) {
this.$emit("open-pay-message", id);
}
} }
</script> </script>
......
service/order.ts
...@@ -31,10 +31,14 @@ class OrderService { ...@@ -31,10 +31,14 @@ class OrderService {
productCode: string; productCode: string;
srcPlatform: SrcPlatform; srcPlatform: SrcPlatform;
createdType: OperationType; createdType: OperationType;
/**
* 是否强制开启新订单，默认如果有已存在处理中的订单时会直接返回
*/
forceNewOrder?: boolean;
}) { }) {
return this.getSdk() return this.getSdk()
.model(this.generalOrder) .model(this.generalOrder)
.action("addOrder") .action(params.forceNewOrder ? "addOrder" : 'getOrAddOrder')
.addInputs_parameter({ .addInputs_parameter({
ProductCode: params.productCode, ProductCode: params.productCode,
SrcPlatform: params.srcPlatform, SrcPlatform: params.srcPlatform,
......
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