Merge branch 'dev' of http://git.gxwebsoft.com/gxwebsoft/yunxinwei-vue into dev

src/api/order/index.ts

@@ -46,6 +46,19 @@ export async function listOrderPay(params?: OrderParam) {
   return Promise.reject(new Error(res.data.message));
 }
 
+/**
+ * 查询交费记录
+ */
+export async function pageOrderPay(params?: OrderParam) {
+  const res = await request.get<ApiResult<OrderPay[]>>('/shop/order-pay/page', {
+    params
+  });
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 /**
  * 根据id查询订单
  */

src/api/order/model/index.ts

@@ -82,6 +82,35 @@ export interface Order {
   isRefund?:number;
 }
 
+export interface OrderPay {
+  // 订单id
+  orderId?: number;
+  // 订单类型
+  orderType?: string;
+  // 订单来源
+  orderSource?: number;
+  // 来源记录ID
+  orderSourceId?: number;
+  // 来源记录的参数 (json格式)
+  orderSourceData?: string;
+  rentOrderId?: number;
+  // 订单编号
+  orderNo?: string;
+  // 创建时间
+  createTime?: string;
+  startTime?: string;
+  deliveryTime?: string;
+  expirationTime?: string;
+  expirationDay?: number;
+  // 状态
+  status?: string;
+  // 用户ID
+  userId?: any;
+  equipmentCode: string;
+  merchantName?:string;
+}
+
+
 /**
  * 订单搜索条件
  */

src/views/yunxinwei/xufei/index.vue

@@ -23,28 +23,19 @@
             />
           </template>
           <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'goods'">
-              <template v-if="record.equipment">
-                <p class="ele-text">{{ record.equipment.equipmentName }}</p>
-                <p class="ele-text">{{ record.equipment.batteryModel }}</p>
-                <p class="ele-text">{{ record.equipment.equipmentCode }}</p>
-              </template>
-            </template>
-            <template v-if="column.key === 'deliveryType'">
-              <span v-if="record.deliveryType === 10">快递配送</span>
-              <span v-if="record.deliveryType === 20">门店自提</span>
-            </template>
-            <template v-if="column.key === 'nickname'">
-              <User :record="record" />
-            </template>
+
             <template v-if="column.key === 'expirationDay'">
               {{ record.expirationDay }}天
             </template>
             <template v-if="column.key === 'batteryModel'">
-              {{ record.equipmentGoods?.batteryModel }}
+              {{ record.batteryModel }}
             </template>
             <template v-if="column.key === 'equipmentCode'">
-              {{ record.equipment?.equipmentCode }}
+              {{ record.equipmentCode }}
+            </template>
+
+            <template v-if="column.key === 'merchantName'">
+              {{ record.merchantName }}
             </template>
 
             <template v-if="column.key === 'orderSource'">
@@ -54,24 +45,9 @@
               <span v-if="record.orderSource === 20" color="red">禁用</span>
               <span v-if="record.orderSource === 30" color="red">禁用</span>
             </template>
-            <template v-if="column.key === 'nickname'">
-              <a-tooltip :title="`用户ID：${record.userId}`">
-                <a-avatar :src="record.avatar" size="small" />
-                <span style="padding-left: 4px">{{ record.nickname }}</span>
-              </a-tooltip>
-            </template>
             <template v-if="column.key === 'createTime'">
               {{ record.createTime }}
             </template>
-            <template v-if="column.key === 'action'">
-              <a-space>
-                <a-button v-if="record.auditStatus == 10" @click="openEdit(record)">审核</a-button>
-              </a-space>
-            </template>
-            <template v-if="column.key === 'updateTime'">
-              <span v-if="record.auditStatus ===10">-</span>
-              <span v-else>{{ record.updateTime }}</span>
-            </template>
           </template>
         </ele-pro-table>
       </a-card>
@@ -98,7 +74,7 @@
     removeOrderRefund,
     removeBatchOrderRefund
   } from '@/api/order/refund';
-  import { listOrderPay } from '@/api/order';
+  import {listOrderPay, pageOrderPay} from '@/api/order';
   import type { OrderRefund, OrderRefundParam } from '@/api/order/refund/model';
 
   const props = defineProps<{
@@ -119,7 +95,8 @@
     {
       title: '订单号',
       dataIndex: 'orderNo',
-      key: 'orderNo'
+      key: 'orderNo',
+      sorter: true
     },
     {
       title: '电池型号',
@@ -149,9 +126,8 @@
     },
     {
       title: '客户实名',
-      dataIndex: 'updateTime',
-      key: 'updateTime',
-      customRender: ({ text }) => toDateString(text)
+      dataIndex: 'realName',
+      key: 'realName'
     },
     {
       title: '订单金额',
@@ -202,7 +178,7 @@
     where.tenantId = localStorage.getItem('tenantId');
     where.isRenew = 0;
     console.log('isRenew');
-    return listOrderPay({
+    return pageOrderPay({
       ...where,
       ...orders,
       page,