feat: 产品迭代7月份

src/views/order-management/order-list/index.vue

@@ -413,7 +413,7 @@
       options: [
         { label: '钱包支付', value: 'wallet' },
         { label: '微信支付', value: 'wechat' },
-        // { label: '支付宝支付', value: 'alipay' },
+        { label: '支付宝支付', value: 'alipay' },
         { label: '线下支付', value: 'offline' }
       ],
       config: {
@@ -468,9 +468,9 @@
       placeholder: '请选择订单渠道',
       options: [
         { label: '自己购买', value: 'self_purchase' },
-        // { label: '上级代理购买', value: 'purchased_by_parent' },
-        { label: '平台代购', value: 'purchased_by_platform' }
-        // { label: '给下级购买', value: 'purchase_for_subordinate' }
+        { label: '上级代理购买', value: 'purchased_by_parent' },
+        { label: '平台代购', value: 'purchased_by_platform' },
+        { label: '给下级购买', value: 'purchase_for_subordinate' }
       ],
       config: {
         clearable: true
@@ -504,17 +504,22 @@
       { label: '买家手机号', prop: 'buyer_phone' },
       { label: '买家昵称', prop: 'buyer_nickname' },
       { label: '订单类型', prop: 'order_type' },
+      { label: '资产类型', prop: 'asset_type' },
       { label: '买家类型', prop: 'buyer_type' },
       { label: '资产标识符', prop: 'asset_identifier' },
       { label: '订单渠道', prop: 'purchase_role' },
       { label: '购买备注', prop: 'purchase_remark' },
+      { label: '是否代购', prop: 'is_purchase_on_behalf' },
+      { label: '是否上级代购', prop: 'is_purchased_by_parent' },
       { label: '下单时间', prop: 'created_at' },
       { label: '操作者', prop: 'operator_name' },
       { label: '销售店铺', prop: 'seller_shop_name' },
       { label: '支付状态', prop: 'payment_status' },
       { label: '佣金流程状态', prop: 'commission_status_name' },
       { label: '佣金业务结果', prop: 'commission_result_name' },
-      { label: '订单金额', prop: 'total_amount' }
+      { label: '订单金额', prop: 'total_amount' },
+      { label: '是否过期', prop: 'is_expired' },
+      { label: '超时时间', prop: 'expires_at' }
     ]
 
     // 只有非代理账号和非企业账号才能看到实付金额选项
@@ -854,6 +859,13 @@
           )
         }
       },
+      {
+        prop: 'asset_type',
+        label: '资产类型',
+        width: 110,
+        formatter: (row: Order) =>
+          row.asset_type === 'card' ? 'IoT卡' : row.asset_type === 'device' ? '设备' : '-'
+      },
       {
         prop: 'buyer_type',
         label: '买家类型',
@@ -876,6 +888,18 @@
           )
         }
       },
+      {
+        prop: 'is_expired',
+        label: '是否过期',
+        width: 100,
+        formatter: (row: Order) => (row.is_expired === undefined ? '-' : row.is_expired ? '是' : '否')
+      },
+      {
+        prop: 'expires_at',
+        label: '超时时间',
+        width: 180,
+        formatter: (row: Order) => (row.expires_at ? formatDateTime(row.expires_at) : '-')
+      },
       {
         prop: 'asset_identifier',
         label: '资产标识符',
@@ -909,6 +933,20 @@
         showOverflowTooltip: true,
         formatter: (row: Order) => row.purchase_remark || '-'
       },
+      {
+        prop: 'is_purchase_on_behalf',
+        label: '是否代购',
+        width: 100,
+        formatter: (row: Order) =>
+          row.is_purchase_on_behalf === undefined ? '-' : row.is_purchase_on_behalf ? '是' : '否'
+      },
+      {
+        prop: 'is_purchased_by_parent',
+        label: '是否上级代购',
+        width: 110,
+        formatter: (row: Order) =>
+          row.is_purchased_by_parent === undefined ? '-' : row.is_purchased_by_parent ? '是' : '否'
+      },
       {
         prop: 'created_at',
         label: '下单时间',