Commit 5973674a by Sixong.Zhu

u

parent d6a7d544
......@@ -184,6 +184,7 @@
[dto.MessageType.QuestionAnswer, "question-answer-message"],
[dto.MessageType.Action, "action-message"],
[dto.MessageType.Pay, "pay-message"],
[dto.MessageType.Refund, "pay-message"],
]);
@Component({
......@@ -265,7 +266,10 @@
}
private get needReadTip() {
return this.data.type !== dto.MessageType.Pay;
return (
this.data.type !== dto.MessageType.Pay &&
this.data.type !== dto.MessageType.Refund
);
}
private get isWithdrawMessage() {
......
......@@ -115,6 +115,7 @@ export const enum MessageType {
Notify = "notify",
MpNavigate = "mp-navigate",
Pay = "gpay2",
Refund = "grefund2",
}
export const enum MessageHandled {
......
......@@ -38,7 +38,7 @@ class OrderService {
}) {
return this.getSdk()
.model(this.generalOrder)
.action(params.forceNewOrder ? "addOrder" : 'getOrAddOrder')
.action(params.forceNewOrder ? "addOrder" : "getOrAddOrder")
.addInputs_parameter({
ProductCode: params.productCode,
SrcPlatform: params.srcPlatform,
......@@ -75,10 +75,9 @@ class OrderService {
list: this.handler.buildRows<OrderTableListItem>(
r.pageData.rows,
orderPredict
)
}
}
);
),
};
});
}
/**
......@@ -89,7 +88,7 @@ class OrderService {
public getPayments(id: number, withActions = false) {
return this.getSdk()
.model(orderService.generalOrderPaymentModel)
.list('userOrderPaymentList')
.list(withActions ? "" : "userOrderPaymentList")
.addPrefilter({ OrderId: id })
.query({ pageIndex: 1, item_size: 100 })
.then((r) => {
......@@ -153,13 +152,17 @@ class OrderService {
}
/** 设置备注 */
public setRemark(id: string, v: number, data: { Title: string, Remark: string }) {
public setRemark(
id: string,
v: number,
data: { Title: string; Remark: string }
) {
return Chat.getSdk()
.model(this.generalOrder)
.action('editTitle')
.action("editTitle")
.updateInitialParams({ selected_list: [{ v, id: +id }] })
.addInputs_parameter(data)
.execute()
.execute();
}
}
......
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