1

channelBusiManage/src/components/OrderDetail.vue

@@ -101,9 +101,9 @@
                 </span>
                 </span>
               </div>
               </div>
             </div>
             </div>
-            <div v-if="order.remarks" class="col-span-2">
+            <div v-if="orderMemo" class="col-span-2">
               <label class="text-neutral-500 text-sm">备注信息</label>
               <label class="text-neutral-500 text-sm">备注信息</label>
-              <p class="mt-2 text-neutral-700">{{ order.memo||'--' }}</p>
+              <p class="mt-2 text-neutral-700">{{ orderMemo || '--' }}</p>
             </div>
             </div>
           </div>
           </div>
         </el-card>
         </el-card>
@@ -363,6 +363,7 @@ interface Order {
   processRemark?: string
   processRemark?: string
   operationLogs?: OperationLog[]
   operationLogs?: OperationLog[]
   crmOrderMemo?: string
   crmOrderMemo?: string
+  orderContent?: string
 }
 }
 
 
 interface BusinessRule {
 interface BusinessRule {
@@ -463,12 +464,20 @@ const canEditCompleteInfo = computed(() => {
 
 
   return p.status==='-1' || (p.status==='1' && p.auditStatus!=='0' && p.auditStatus!=='1')
   return p.status==='-1' || (p.status==='1' && p.auditStatus!=='0' && p.auditStatus!=='1')
 })
 })
-
 const canEditReward = computed(() => {
 const canEditReward = computed(() => {
   let p = props.order
   let p = props.order
 
 
   return p.status==='1' && p.auditStatus!=='0' && p.auditStatus!=='1'
   return p.status==='1' && p.auditStatus!=='0' && p.auditStatus!=='1'
 })
 })
+const orderMemo = computed(() => {
+  let p = props.order
+
+  if(!p.orderContent){
+    return ''
+  }
+
+  return JSON.parse(p.orderContent).memo
+})
 
 
 // 方法
 // 方法
 // 状态样式映射 - 使用浅色背景样式（与订单监控页保持一致）
 // 状态样式映射 - 使用浅色背景样式（与订单监控页保持一致）