From 69c05c491116a375e609b8438dd95684f8b8e401 Mon Sep 17 00:00:00 2001
From: minimaxagent1 <minimaxagent1@gmail.com>
Date: Wed, 6 Aug 2025 14:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=9A=AEtest1.3=20=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=EF=BC=8C=E8=83=8C=E6=99=AF=E5=9B=BE?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?temple/index=E6=8E=A5=E5=8F=A3=E8=BF=9B=E8=A1=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index/index.js           |   4 +-
 pages/nearbystores/index.vue | 257 ++++++++++++-----------------------
 2 files changed, 90 insertions(+), 171 deletions(-)

diff --git a/api/index/index.js b/api/index/index.js
index 1a57517..ed39999 100644
--- a/api/index/index.js
+++ b/api/index/index.js
@@ -5,8 +5,8 @@ import { get, request } from '@/utils/request'
  * 获取寺庙介绍信息
  * @returns {Promise} 返回寺庙介绍数据
  */
-export function getTempleInfo() {
-  return get('/app/temple/introduced', {}, {
+export function getTempleIndex() {
+  return get('/app/temple/index', {}, {
     timeout: 10000,
     showLoading: false
   })
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index d2bebd7..ed376a8 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -8,13 +8,13 @@
 		</view>
 		
 		<!-- 背景图 -->
-        <image class="bj" :src="pageConfig.background.img" mode="aspectFill"></image>
+        <image class="bj" :src="templeData.imgUrl" mode="aspectFill"></image>
 		<!-- 公告 -->
 		<view class="announcement">
 			<image class="ggimg" :src="pageConfig.announcement.icon" mode="" />
 			<view class="marquee-wrap">
 				<view class="marquee" :style="{ transform: `translateX(${marqueeX}rpx)` }">
-					{{ pageConfig.announcement.text }}
+					{{ templeData.bulletinContent }}
 				</view>
 			</view>
 		</view>
@@ -34,7 +34,7 @@
 			       <image :src="bottomSection.openingTime.decorationImg" mode=""></image>	<text>{{ bottomSection.openingTime.title }}</text>  <image :src="bottomSection.openingTime.decorationImg" mode=""></image>
 			</view>
 			<view class="time">
-				{{ bottomSection.openingTime.time }}
+				{{ templeData.startTime }} - {{ templeData.endTime }}
 			</view>
 			<view class="hua">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uyz1LDPTjPqeOzBMjLZ7" mode=""></image>
@@ -87,7 +87,7 @@
 
 <script>
 import { navigateToPage } from "../../utils/router.js";
-import { getHomeConfig } from "../../api/index/index.js";
+import { getHomeConfig,getTempleIndex } from "../../api/index/index.js";
 import { getArticleById } from "../../api/article/article.js";
 
 	export default {
@@ -113,149 +113,96 @@ import { getArticleById } from "../../api/article/article.js";
 						time: '',
 						decorationImg: ''
 					}
-				}
+				},
+				templeData: {
+					imgUrl: '',
+					bulletinContent: '',
+					startTime: '',
+					endTime: '',
+					audioUrl: ''
+				},
+				isAudioPlaying: false,
+				audioContext: null
 			}
 		},
 		onLoad() {
 			// 页面加载时获取配置
 			this.loadHomeConfig();
+			// 获取寺庙数据
+			this.loadTempleData();
 		},
 		
 		// 添加下拉刷新支持
 		onPullDownRefresh() {
 			console.log('用户触发下拉刷新');
-			this.loadHomeConfig().finally(() => {
+			Promise.all([
+				this.loadHomeConfig(),
+				this.loadTempleData()
+			]).finally(() => {
 				uni.stopPullDownRefresh();
 			});
 		},
 		onShow() {
-			// 如果配置已加载，启动跑马灯
-			if (this.pageConfig && this.pageConfig.announcement && this.pageConfig.announcement.text) {
-				this.startMarquee();
-			}
+			// 启动跑马灯（方法内部会检查是否有文本）
+			this.startMarquee();
 		},
 		onUnload() {
 			this.stopMarquee();
+			// 停止音频播放
+			this.stopAudio();
 		},
 		methods: {
 			/**
 			 * 获取首页配置
 			 */
 			async loadHomeConfig() {
-				// 添加调试信息
-				console.log('=== 开始获取首页配置 ===');
-				console.log('当前时间:', new Date().toISOString());
-				console.log('页面路径:', this.$mp?.page?.route || 'unknown');
-				
-				this.loading = true;
 				console.log('开始获取首页配置...');
+				this.loading = true;
 				
 				// 重试机制
 				const maxRetries = 3;
 				let retryCount = 0;
 				
-				while (retryCount < maxRetries) {
+								while (retryCount < maxRetries) {
 					try {
 						console.log(`第 ${retryCount + 1} 次尝试获取配置...`);
 						
-											// 检查网络状态
-					const isNetworkAvailable = await this.checkNetworkStatus();
-					if (!isNetworkAvailable) {
-						console.error('网络不可用，使用默认配置');
-						this.useDefaultConfig();
-						this.loading = false;
-						return;
-					}
-						
-						console.log('网络状态正常，开始请求API...');
 						const response = await getHomeConfig();
 						console.log('API响应:', response);
-					
-					// 检查响应状态
-					if (!response) {
-						console.error('API响应为空');
-						throw new Error('API响应为空');
-					}
-					
-					// 检查响应码
-					if (response.code !== 200) {
-						console.error('API响应码错误:', response.code, response.msg);
-						throw new Error(`API响应码错误: ${response.code}`);
-					}
-					
-					// 检查数据是否存在
-					if (!response.data) {
-						console.error('API响应数据为空');
-						throw new Error('API响应数据为空');
-					}
-					
-					// 检查数据是否为数组且有内容
-					if (!Array.isArray(response.data) || response.data.length === 0) {
-						console.error('API响应数据格式错误或为空数组');
-						throw new Error('API响应数据格式错误');
-					}
-					
-					// 获取第一条配置数据
-					const configData = response.data[0];
-					console.log('配置数据:', configData);
-					
-					// 检查body字段是否存在
-					if (!configData.body) {
-						console.error('配置数据缺少body字段');
-						throw new Error('配置数据缺少body字段');
-					}
-					
-					// 解析JSON配置
-					try {
-						const parsedConfig = JSON.parse(configData.body);
-						console.log('解析后的配置数据:', parsedConfig);
 						
-						// 验证配置数据完整性
-						if (!this.validateConfig(parsedConfig)) {
-							console.error('配置数据验证失败');
-							throw new Error('配置数据验证失败');
+						// 简化验证：只检查关键字段
+						if (response?.code === 200 && response?.data?.[0]?.body) {
+							const parsedConfig = JSON.parse(response.data[0].body);
+							
+							// 更新页面配置
+							this.updatePageConfig(parsedConfig);
+							
+							// 重新启动跑马灯
+							this.stopMarquee();
+							this.startMarquee();
+							
+							console.log('配置加载成功');
+							break;
+						} else {
+							throw new Error('API响应数据无效');
 						}
 						
-						// 更新页面配置
-						this.updatePageConfig(parsedConfig);
-						
-						// 重新启动跑马灯
-						this.stopMarquee();
-						this.startMarquee();
-						
-						console.log('配置加载成功');
-						
-					} catch (parseError) {
-						console.error('解析配置JSON失败:', parseError);
-						console.log('原始body数据:', configData.body);
-						throw new Error('解析配置JSON失败: ' + parseError.message);
-					}
-					
-						// 如果成功获取到数据，跳出重试循环
-						break;
-						
 					} catch (error) {
 						retryCount++;
-						console.error(`第 ${retryCount} 次尝试失败:`, error);
-						console.error('错误详情:', {
-							message: error.message,
-							stack: error.stack,
-							name: error.name
-						});
+						console.error(`第 ${retryCount} 次尝试失败:`, error.message);
 						
 						if (retryCount >= maxRetries) {
-							console.error('所有重试都失败了，使用默认配置');
+							console.error('所有重试都失败了');
 							this.useDefaultConfig();
 							break;
 						} else {
-							console.log(`等待 ${retryCount * 1000}ms 后重试...`);
 							await new Promise(resolve => setTimeout(resolve, retryCount * 1000));
 						}
 					}
 				}
 				
 				this.loading = false;
-				console.log('配置加载完成，loading状态:', this.loading);
+				console.log('配置加载完成');
 			},
 			
 			/**
@@ -282,102 +229,74 @@ import { getArticleById } from "../../api/article/article.js";
 				});
 			},
 			
-			/**
-			 * 验证配置数据完整性
-			 */
-			validateConfig(config) {
-				if (!config) {
-					console.error('配置对象为空');
-					return false;
-				}
-				
-				// 检查必需的配置项
-				const requiredFields = ['pageConfig', 'navigationItems', 'bottomSection'];
-				for (const field of requiredFields) {
-					if (!config[field]) {
-						console.error(`配置缺少必需字段: ${field}`);
-						return false;
-					}
-				}
-				
-				// 检查pageConfig的必需子字段
-				const requiredPageConfigFields = ['background', 'announcement', 'topIcons'];
-				for (const field of requiredPageConfigFields) {
-					if (!config.pageConfig[field]) {
-						console.error(`pageConfig缺少必需字段: ${field}`);
-						return false;
-					}
-				}
-				
-				// 检查announcement的必需子字段
-				if (!config.pageConfig.announcement.text) {
-					console.error('announcement缺少text字段');
-					return false;
-				}
-				
-				console.log('配置数据验证通过');
-				return true;
-			},
+
 			
 			/**
 			 * 更新页面配置
 			 */
 			updatePageConfig(parsedConfig) {
-				if (parsedConfig.pageConfig) {
-					this.pageConfig = parsedConfig.pageConfig;
-					console.log('更新pageConfig成功');
-				}
-				if (parsedConfig.navigationItems) {
-					this.navigationItems = parsedConfig.navigationItems;
-					console.log('更新navigationItems成功');
-				}
-				if (parsedConfig.bottomSection) {
-					this.bottomSection = parsedConfig.bottomSection;
-					console.log('更新bottomSection成功');
-				}
+				// 直接更新配置，使用默认值防止undefined
+				this.pageConfig = parsedConfig.pageConfig || this.pageConfig;
+				this.navigationItems = parsedConfig.navigationItems || [];
+				this.bottomSection = parsedConfig.bottomSection || this.bottomSection;
+				console.log('配置更新完成');
 			},
 			
 			/**
-			 * 检查网络状态
+			 * 获取寺庙数据
 			 */
-			checkNetworkStatus() {
-				return new Promise((resolve) => {
-					uni.getNetworkType({
-						success: (res) => {
-							console.log('网络类型:', res.networkType);
-							if (res.networkType === 'none') {
-								console.error('网络连接不可用');
-								resolve(false);
-							} else {
-								resolve(true);
-							}
-						},
-						fail: () => {
-							console.error('获取网络状态失败');
-							resolve(false);
-						}
+			async loadTempleData() {
+				try {
+					console.log('开始获取寺庙数据...');
+					const response = await getTempleIndex();
+					console.log('寺庙数据API响应:', response);
+					
+					if (response?.code === 200 && response?.data) {
+						this.templeData = {
+							imgUrl: response.data.imgUrl || '',
+							bulletinContent: response.data.bulletinContent || '',
+							startTime: response.data.startTime || '',
+							endTime: response.data.endTime || '',
+							audioUrl: response.data.audioUrl || ''
+						};
+						
+						// 重新启动跑马灯
+						this.stopMarquee();
+						this.startMarquee();
+						
+						console.log('寺庙数据加载成功');
+					} else {
+						throw new Error('寺庙数据API响应无效');
+					}
+				} catch (error) {
+					console.error('获取寺庙数据失败:', error);
+					uni.showToast({
+						title: '获取寺庙数据失败',
+						icon: 'none'
 					});
-				});
+				}
 			},
 			
+
+			
 			startMarquee() {
-				// 确保配置数据存在
-				if (!this.pageConfig || !this.pageConfig.announcement || !this.pageConfig.announcement.text) {
-					console.warn('配置数据不完整，无法启动跑马灯');
+				// 简单检查公告文本是否存在
+				const announcementText = this.templeData?.bulletinContent || this.pageConfig?.announcement?.text;
+				if (!announcementText) {
 					return;
 				}
 				
 				// 停止之前的定时器
 				this.stopMarquee();
 				
-				// 估算文字宽度（每个字24rpx，可根据实际字体大小调整）
-				const textWidth = this.pageConfig.announcement.text.length * 24;
+				// 估算文字宽度（每个字24rpx）
+				const textWidth = announcementText.length * 24;
 				this.timer = setInterval(() => {
 					this.marqueeX--;
 					if (this.marqueeX < -textWidth) {
 						this.marqueeX = 600;
 					}
-				}, 16); // 约60帧
+				}, 16);
 			},
 			
 			stopMarquee() {