Merge branch 'master' into pre

components/message-item/pay-message.vue

@@ -8,9 +8,11 @@
         @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">
-            <span :class="icon" class="icon"></span>
-            <div class="texts flex-fill">
-                <div class="text-left">{{ title }}</div>
+            <span :class="icon" class="icon flex-none"></span>
+            <div class="texts flex-fill overflow-hidden">
+                <div class="text-left text-nowrap text-truncate">
+                    {{ title }}
+                </div>
                 <div class="d-flex justify-content-between">
                 <div class="d-flex justify-content-between">
                     <span>{{ amount | currency }}</span>
                     <span>{{ amount | currency }}</span>
                     <span>{{ status }}</span>
                     <span>{{ status }}</span>

model/order.ts

@@ -37,6 +37,7 @@ export interface OrderTableListItem {
     chat: number;
     chat: number;
     status: OrderStatus;
     status: OrderStatus;
     status_label: string;
     status_label: string;
+    editTitle: string;
     remark: string;
     remark: string;
     /**
     /**
      * 待支付金额
      * 待支付金额
@@ -54,8 +55,6 @@ export interface OrderTableListItem {
      * 已退款金额
      * 已退款金额
      */
      */
     RefundedAmount: number;
     RefundedAmount: number;
-    remarkTitle: string;
-    remarkContent: string;
     chatTypeCode: string;
     chatTypeCode: string;
     lastMsgContent: string;
     lastMsgContent: string;
     lastMsgTime: string;
     lastMsgTime: string;
@@ -83,8 +82,6 @@ export const orderPredict = {
     RefundAmount: "RefundAmount",
     RefundAmount: "RefundAmount",
     RefundedAmount: "RefundedAmount",
     RefundedAmount: "RefundedAmount",
     chat: "UniplatImChatId",
     chat: "UniplatImChatId",
-    remarkTitle: "Title",
-    remarkContent: "Remark",
     chatTypeCode: "UniplatChatTypeCode",
     chatTypeCode: "UniplatChatTypeCode",
     lastMsgContent: "UniplatLastMsgContent",
     lastMsgContent: "UniplatLastMsgContent",
     lastMsgTime: "UniplatLastMsgTime",
     lastMsgTime: "UniplatLastMsgTime",

utils/chat-info.ts

@@ -37,9 +37,9 @@ export async function getChatModelInfo(
     forceReload = false
     forceReload = false
 ) {
 ) {
     buildCache();
     buildCache();
-    const key = `${modelName}-${id}`;
+    const detail = model2DetailNameMapping.get(modelName) || detailname;
 
 
-    const detail = detailname ? model2DetailNameMapping.get(modelName) || detailname : detailname;
+    const key = `${modelName}-${id}-${detail}`;
 
 
     if (loadingKeys.has(key)) {
     if (loadingKeys.has(key)) {
         return new Promise<ChatModelInfoData>((resolve) =>
         return new Promise<ChatModelInfoData>((resolve) =>