feat(page)：后支付更多订单页面接口完成

pages/moreOrder/moreOrder.js

@@ -1,24 +1,23 @@
 // pages/moreOrder/moreOrder.js
+const { default: api } = require("../../js/api");
+const util = require('../../utils/util.js')
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    buttonMessage2:'去支付',
     orders:[
       {
-        buttonMessage2:'去支付',
-        buttonColor2:'#91cdcc',
-        order:{
-          nozzle:5,
-          oilName:"92#",
-          volume:20.0,
-          amount:46.8,
-          payAmount:46.8,
-          discount:0.00,
-          orderId:'1',
-          time:'2024-11-24 09:08'
-        }
+        nozzle:5,
+        oilName:"92#",
+        volume:20.0,
+        amount:46.8,
+        payAmount:46.8,
+        discount:0.00,
+        orderId:'1',
+        time:'2024-11-24 09:08'
       }
     ]
   },
@@ -27,7 +26,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    console.log("更多订单页",options)
+    this.getOrder(options.nozzle)
   },
 
   /**
@@ -82,6 +82,38 @@ Page({
   /** 点击去支付 */
   toPay(event) {
     console.log(event)
+    const eventChannel = this.getOpenerEventChannel()
+    eventChannel.emit('acceptOrderFromMoreOrder', event.detail.order);
+    wx.navigateBack()
     //跳转回支付页
-  }
+  },
+
+  /** 获取订单信息 */
+  getOrder(nozzle) {
+    api.request_GetMiniProgramTransactionsUnpaidNozzle(Number(nozzle))
+    .then(res => {
+      console.log("获取到未支付订单",res)
+      var datas = res.data.data;
+      var getOrders = datas.map(order => {
+        var time = util.formatDateNotSecond(order.fuelItemTransactionEndTime);
+        return {
+          oilName:order.productName,
+          nozzle:order.nozzleId,
+          volume:order.originalQty,
+          amount:order.originalAmount,
+          payAmount:order.actualPaymentAmount,
+          discount:order.originalAmount - order.actualPaymentAmount,
+          orderId:order.id,
+          time:time
+        }
+      })
+      
+      this.setData({
+        orders:getOrders
+      })
+      
+    }).catch(err => {
+      console.log("未获取到未支付订单")
+    })
+  },
 })

pages/moreOrder/moreOrder.wxml

@@ -4,8 +4,8 @@
     <icon color="#fbac15" type="warn" />
     <text>请勿在油机旁使用手机</text>
   </view>
-  <view class="order" wx:for="{{orders}}">
-    <orderItem class="orderItem" order="{{item.order}}" buttonMessage2="{{item.buttonMessage2}}" buttonColor="{{item.buttonColor2}}" bind:bottonEvent2="toPay" />
+  <view class="order" wx:for="{{orders}}" wx:key="{{index}}">
+    <orderItem class="orderItem" order="{{item}}" bottonText2="{{buttonMessage2}}" bind:bottonEvent2="toPay" />
   </view>
 
   <text style="margin-top: 3%;margin-bottom: 10%;color: #b29a9a;">没有找到？请联系油站工作人员</text>

pages/orderConfirm/orderConfirm.js

@@ -10,16 +10,7 @@ Page({
   data: {
     nozzle:0,
     type:'后支付',
-    order:{
-      oilName:"92#",
-      nozzle:5,
-      volume:20.0,
-      amount:46.8,
-      payAmount:46.8,
-      discount:0.00,
-      orderId:'1',
-      time:'2025-02-20 09:08'
-    },
+    order:{},
     oprationBtn1:'',
     oprationBtn2:'对此订单有疑问？',
   },
@@ -110,14 +101,23 @@ Page({
 
   /** 后支付查看更多交易 */
   toMordOrderPage(){
+    var that = this;
     wx.navigateTo({
-      url: '../moreOrder/moreOrder',
+      url: '../moreOrder/moreOrder?nozzle='+this.data.nozzle,
+      events:{
+        acceptOrderFromMoreOrder:function(data) {
+          console.log("获取到更多订单页发送过来的订单",data)
+          that.setData({
+            order:data
+          })
+        }
+      }
     })
   },
 
   /** 支付按钮点击事件 */
   toPay(){
-    api.request_wechatPay(this.data.order.orderId).then(res => {
+    api.request_wechatPay(19).then(res => {
       console.log("支付结果",res)
       this.pay()
     }).catch(err => {