zhengyiming
2025-02-24 284493e11197bce2e3dfeff7fb5c2ef93d1b5b79
Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
4个文件已修改
26 ■■■■ 已修改文件
packages/components/src/views/Order/components/ElectricOrder.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/views/Order/components/PhoneOrder.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/core/src/lifeRechargeServices.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/api/typings.d.ts 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/views/Order/components/ElectricOrder.vue
@@ -8,11 +8,13 @@
      >
        <OrderCardItem
          label="充值地区:"
          :value="JSON.parse(item?.orderParamDetailJsonStr)?.phone"
          :value="`${JSON.parse(item?.orderParamDetailJsonStr)?.province ?? ''} ${
            JSON.parse(item?.orderParamDetailJsonStr)?.city ?? ''
          }`"
        />
        <OrderCardItem
          label="充值户号:"
          :value="JSON.parse(item?.orderParamDetailJsonStr)?.phone"
          :value="JSON.parse(item?.orderParamDetailJsonStr)?.electricAccount"
        />
        <OrderCardItem
          label="下单时间:"
@@ -26,6 +28,13 @@
          :value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
        />
        <OrderCardItem
          v-if="item.payStatus === BlLifeRecharge.constants.LifePayStatusEnum.已退款"
          label="退款时间:"
          :value="item?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
        >
        </OrderCardItem>
        <OrderCardItem
          v-else
          label="完成时间:"
          :value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
        />
packages/components/src/views/Order/components/PhoneOrder.vue
@@ -22,6 +22,13 @@
          :value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
        />
        <OrderCardItem
          v-if="item.payStatus === BlLifeRecharge.constants.LifePayStatusEnum.已退款"
          label="退款时间:"
          :value="item?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
        >
        </OrderCardItem>
        <OrderCardItem
          v-else
          label="完成时间:"
          :value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
        />
packages/core/src/lifeRechargeServices.ts
@@ -281,4 +281,6 @@
  orderParamDetailJsonStr?: string;
  /** 下单时间 */
  creationTime?: string;
  /** 退款时间 */
  refundTime?: string;
}
packages/services/api/typings.d.ts
@@ -12161,7 +12161,7 @@
    /** 省份。 */
    province: string;
    /** 城市。 */
    city: string;
    city?: string;
    /** 客户身份证后6位,南网必传。 */
    sixID?: string;
  }
@@ -20213,6 +20213,8 @@
    orderParamDetailJsonStr?: string;
    /** 下单时间 */
    creationTime?: string;
    /** 退款时间 */
    refundTime?: string;
  }
  interface UserLifePayOrderOutputPageOutput {