From 33dcaf6e9eee56eea1e991db34c672668e124826 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Wed, 15 Nov 2023 11:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=87=91=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=95=86?=
=?UTF-8?q?=E6=88=B7=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../activity_Funds_activityList.vue | 3 ++-
pages/index/merchant-details/merchant-details.vue | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pages/index/activity_Funds_activityList/activity_Funds_activityList.vue b/pages/index/activity_Funds_activityList/activity_Funds_activityList.vue
index 3e124ff..0c066cd 100644
--- a/pages/index/activity_Funds_activityList/activity_Funds_activityList.vue
+++ b/pages/index/activity_Funds_activityList/activity_Funds_activityList.vue
@@ -158,7 +158,8 @@
let datas = {
status: this.statusid,
pageNum: pagenum,
- pageSize: this.pageSize
+ pageSize: this.pageSize,
+ merNo:app.globalData.userInfo.mer.merNo,
}
getActivityList(datas).then(res => {
uni.hideLoading();
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index 9939fa0..cbaa166 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -93,7 +93,7 @@
-
+