feat:订单接口

src/api/user.ts

@@ -108,15 +108,9 @@ export function logout() {
 }
 
 export function fetchWallet(type: number, page: number, pageSize: number) {
-  return userHttp
-    .get<{
-      data: any[];
-    }>(`/account/walletDetail?page=${page}&page_size=${pageSize}&type=${type}`)
-    .then((res) => {
-      return res.data;
-    });
+  return userHttp.get(`/account/walletDetail?page=${page}&page_size=${pageSize}&type=${type}`);
 }
 
 export function fetchOrder(orderid: string) {
-  return userHttp.get(`/charge/orderInfo?order_id=${orderid}`);
+  return userHttp.get(`/charge/orderDetail/${orderid}`);
 }

src/pages-charge/order/order.vue

@@ -13,11 +13,10 @@ const list = ref<any[]>();
 onLoad((options: any) => {
   fetchOrder(options.id)
     .then((res) => {
-      // console.log(res);
-      const total_money = (res.total_money / 100).toFixed(2);
+      const total_money = (res.totalMoney / 100).toFixed(2);
       const reg = new RegExp("\B(?=(\d{3})+(?!\d))", "g");
-      const start = new Date(res.start_time.replace(/-/g, "/"));
-      const end = new Date(res.end_time.replace(/-/g, "/"));
+      const start = new Date(res.startTime.replace(/-/g, "/"));
+      const end = new Date(res.endTime.replace(/-/g, "/"));
       const diff = parseInt(`${(end.getTime() - start.getTime()) / 1000}`);
       const min = parseInt(`${diff / 60}`);
       const time =
@@ -29,7 +28,7 @@ onLoad((options: any) => {
       list.value = [
         {
           label: "累计充电量",
-          value: `${res.total_power}度`,
+          value: `${res.totalPower}度`,
         },
         {
           label: "累计费用",
@@ -37,11 +36,11 @@ onLoad((options: any) => {
         },
         {
           label: "开始时间",
-          value: res.start_time,
+          value: res.startTime,
         },
         {
           label: "结束时间",
-          value: res.end_time,
+          value: res.endTime,
         },
         {
           label: "累计用时",

src/pages-charge/orders/orders.vue

@@ -12,7 +12,7 @@
       <view>
         <view class="fs-30 fw-500" key="title" duration="300">充电费用</view>
         <view class="fs-24 mt-10" style="color: rgba(0, 0, 0, 0.4)">{{
-          item.transaction_time
+          item.transactionTime
         }}</view>
       </view>
       <view class="ml-auto" style="text-align: right">
@@ -54,7 +54,7 @@ const detail = (index: number) => {
     return;
   }
   uni.navigateTo({
-    url: `/pages-charge/order/order?id=${infiniteScroller.list[index].transaction_id}`,
+    url: `/pages-charge/order/order?id=${infiniteScroller.list[index].orderNo}`,
   });
 };
 onLoad(() => {

src/pages-user/wallet-detail/wallet-detail.vue

@@ -97,7 +97,7 @@ const detail = (index: number) => {
   }
   if (infiniteScroller.list[index].type === 3) {
     uni.navigateTo({
-      url: `/pages-charge/order/order?id=${infiniteScroller.list[index].transactionId}`,
+      url: `/pages-charge/order/order?id=${infiniteScroller.list[index].orderNo}`,
     });
   }
 };