mirror of
				https://gitee.com/hhyykk/ipms-sjy-ui.git
				synced 2025-11-04 12:18:43 +08:00 
			
		
		
		
	mall-order:修复 todo 提到的问题
This commit is contained in:
		@@ -51,11 +51,10 @@ export interface OrderVO {
 | 
			
		||||
    avatar?: string
 | 
			
		||||
  }
 | 
			
		||||
  // 订单操作日志
 | 
			
		||||
  logs?: logs[]
 | 
			
		||||
  logs?: OrderLogRespVO[]
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// TODO @puhui999:OrderLogRespVO 会不会更好哈。
 | 
			
		||||
export interface logs {
 | 
			
		||||
export interface OrderLogRespVO {
 | 
			
		||||
  content?: string
 | 
			
		||||
  createTime?: Date
 | 
			
		||||
  userType?: number
 | 
			
		||||
 
 | 
			
		||||
@@ -191,11 +191,6 @@ service.interceptors.response.use(
 | 
			
		||||
      }
 | 
			
		||||
      return Promise.reject('error')
 | 
			
		||||
    } else {
 | 
			
		||||
      // TODO @puhui999:这个先不用支持哈;
 | 
			
		||||
      // 前端处理 data 为 null 的情况,进行提示
 | 
			
		||||
      if (data.msg !== '') {
 | 
			
		||||
        ElNotification.error({ title: msg })
 | 
			
		||||
      }
 | 
			
		||||
      return data
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
 
 | 
			
		||||
@@ -195,7 +195,8 @@ const getDetail = async () => {
 | 
			
		||||
  if (id) {
 | 
			
		||||
    const res = await AfterSaleApi.getAfterSale(id)
 | 
			
		||||
    // 没有表单信息则关闭页面返回
 | 
			
		||||
    if (res === null) {
 | 
			
		||||
    if (res == null) {
 | 
			
		||||
      message.notifyError('售后订单不存在')
 | 
			
		||||
      close()
 | 
			
		||||
    }
 | 
			
		||||
    formData.value = res
 | 
			
		||||
 
 | 
			
		||||
@@ -245,9 +245,10 @@ const { params } = useRoute() // 查询参数
 | 
			
		||||
const getDetail = async () => {
 | 
			
		||||
  const id = params.orderId as unknown as number
 | 
			
		||||
  if (id) {
 | 
			
		||||
    const res = (await TradeOrderApi.getOrder(id)) as TradeOrderApi.OrderVO
 | 
			
		||||
    const res = (await TradeOrderApi.getOrder(66666)) as TradeOrderApi.OrderVO
 | 
			
		||||
    // 没有表单信息则关闭页面返回
 | 
			
		||||
    if (res === null) {
 | 
			
		||||
    if (res == null) {
 | 
			
		||||
      message.error('交易订单不存在')
 | 
			
		||||
      close()
 | 
			
		||||
    }
 | 
			
		||||
    formData.value = res
 | 
			
		||||
@@ -259,7 +260,7 @@ const { delView } = useTagsViewStore() // 视图操作
 | 
			
		||||
const { push, currentRoute } = useRouter() // 路由
 | 
			
		||||
const close = () => {
 | 
			
		||||
  delView(unref(currentRoute))
 | 
			
		||||
  push({ name: 'TradeAfterSale' })
 | 
			
		||||
  push({ name: 'TradeOrder' })
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/** 复制 */
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user