From e13b06ece0292ac10e8aabf21e3599f1a70dbf72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Mon, 29 Sep 2025 16:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A5=BD=E5=BA=97=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BB=98=E6=AC=BE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/localLife/pay/index.vue     |  2 +-
 packages/localLife/payInfo/index.vue | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/localLife/pay/index.vue b/packages/localLife/pay/index.vue
index 6d3ecd33..cc07cb55 100644
--- a/packages/localLife/pay/index.vue
+++ b/packages/localLife/pay/index.vue
@@ -268,7 +268,7 @@ export default {
         },
 
         payList() {
-            NavgateTo("../payInfo/index")
+            NavgateTo("../payInfo/index?id=" + this.info.id)
         },
         homeMoneList() {
             NavgateTo("../houseProvident/index")
diff --git a/packages/localLife/payInfo/index.vue b/packages/localLife/payInfo/index.vue
index ccd425a3..044d9f97 100644
--- a/packages/localLife/payInfo/index.vue
+++ b/packages/localLife/payInfo/index.vue
@@ -7,20 +7,20 @@
                     <view class="row_con">￥{{ item.order_amount }}</view>
                 </view>
                 <view class="row">
-                    <view class="row_label2">{{item.create_time}}</view>
+                    <view class="row_label2">{{ item.create_time }}</view>
                     <view class="row_label2" v-if="false">Adapay微信小程序支付</view>
-                    <view class="row_label2">{{item.payment_method}}</view>
+                    <view class="row_label2">{{ item.payment_method }}</view>
                 </view>
                 <view class="line"></view>
 
                 <view class="row2">
                     <view class="label">订单号</view>
-                    <view class="con3">{{item.order_no}}</view>
+                    <view class="con3">{{ item.order_no }}</view>
                 </view>
 
                 <view class="row2">
                     <view class="label">消费门店</view>
-                    <view class="con3">{{item.merchant_info.merchant_name}}</view>
+                    <view class="con3">{{ item.merchant_info.merchant_name }}</view>
                 </view>
 
                 <view class="row2">
@@ -74,14 +74,16 @@ export default {
             localHeight: "",
             page_num: 1,
             page_size: 10,
-            flag:false,
-            payList:[]
+            flag: false,
+            payList: [],
+            id: "",
         }
     },
     onLoad(options) {
         const meun = menuButtonInfo();
         this.top = meun.top;
         this.localHeight = meun.height;
+        this.id = options.id
         this.getPayList()
     },
 
@@ -97,12 +99,13 @@ export default {
         getPayList() {
             let that = this
             request(apiArr.getPayList, "POST", {
-                page_num:that.page_num,
-                page_size:that.page_size
-            }).then(res=>{
-                if(res.rows.length == that.page_size){
+                merchant_id: that.id,
+                page_num: that.page_num,
+                page_size: that.page_size
+            }).then(res => {
+                if (res.rows.length == that.page_size) {
                     that.flag = true
-                }else{
+                } else {
                     that.flag = false
                 }
                 that.payList = that.payList.concat(res.rows)