From c13b8914228e6a404bd60ee36bf2479383da8f23 Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Sun, 09 Nov 2025 10:55:14 +0800
Subject: [PATCH] 111

---
 mobile/pages/branch/activity/index/index.vue |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/mobile/pages/branch/activity/index/index.vue b/mobile/pages/branch/activity/index/index.vue
index c1dc22c..281da7d 100644
--- a/mobile/pages/branch/activity/index/index.vue
+++ b/mobile/pages/branch/activity/index/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="activity-container" :data-theme='theme()' :class="theme() || ''">
 		<!--内容-->
-		<view class="activity-box" v-if="!loading">
+		<view class="activity-box">
 			<scroll-view scroll-y="true" class="scroll-Y" :style="'height:' + scrollviewHigh + 'px;'" lower-threshold="50" @scrolltolower="scrolltolowerFunc">
 				<view :class="topRefresh ? 'top-refresh open' : 'top-refresh'">
 					<view class="circle" v-for="(circle, n) in 3" :key="n"></view>
@@ -77,6 +77,8 @@
 				loading: true,
 				/*顶部刷新*/
 				topRefresh: false,
+				branch_id: 0, // 分会ID
+				is_first_show: true, // 处理授权返回加载数据空白的问题
 			};
 		},
 		computed: {
@@ -93,14 +95,19 @@
 				}
 			}
 		},
-		onLoad(e) {},
+		onLoad(e) {
+			if (e.branch_id != undefined) {
+				this.branch_id = e.branch_id;
+			}
+		},
 		onShow() {
 			/*获取列表*/
-			this.getlist();
+			if (this.is_first_show) {
+				this.getData();
+			}
 		},
 		mounted() {
 			this.init();
-
 		},
 		onReachBottom() {},
 		methods: {
@@ -115,27 +122,31 @@
 			},
 
 			/*获取活动列表*/
-			getlist() {
+			getData() {
 				let self = this;
-				uni.showLoading({
-					title: '加载中'
-				});
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
 				let status = self.status;
 				self.loading = true;
 				self._get(
 					'branch.activity/index', {
-						status: status
+						branch_id: self.branch_id,
+						status: status,
+						page: self.page || 1,
+						list_rows: self.list_rows,
 					},
 					function(res) {
-						self.listData = res.data.list.data;
+						self.listData = self.listData.concat(res.data.list.data);
 						self.last_page = res.data.list.last_page;
 						if (res.data.list.last_page <= 1) {
 							self.no_more = true;
 						} else {
 							self.no_more = false;
 						}
-						uni.hideLoading();
+						// uni.hideLoading();
 						self.loading = false;
+						self.is_first_show = false;
 					}
 				);
 			},

--
Gitblit v1.9.2