From eaadae9e03b181a189ead8945b7763bb6b287e18 Mon Sep 17 00:00:00 2001
From: jacobxu666 <jacobxu666@gmail.com>
Date: Mon, 21 Sep 2026 22:09:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=A6=E6=83=85=E9=A1=B5=E6=8C=89?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E6=9D=BF=E5=9D=97=E5=8C=BA=E5=88=86=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E2=80=94=E2=80=94=E6=96=87=E6=97=85=E5=9C=BA=E9=A6=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E6=8A=98=E6=89=A3=E6=98=BE=E7=A4=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF+=E5=95=86=E6=88=B7=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 pages/discount/discount.vue |  3 ++-
 pages/venue/detail.vue      | 39 +++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/pages/discount/discount.vue b/pages/discount/discount.vue
index e1056bf..ff8930e 100644
--- a/pages/discount/discount.vue
+++ b/pages/discount/discount.vue
@@ -133,7 +133,8 @@ export default {
 			}
 		},
 		goDetail(item) {
-			uni.navigateTo({ url: '/pages/venue/detail?id=' + item.shopId })
+			// xuchao: type=2 标记商户折扣入口，详情页据此展示商品信息+商户优惠模块
+			uni.navigateTo({ url: '/pages/venue/detail?id=' + item.shopId + '&type=2' })
 		},
 		onSearch() {
 			this.pageNo = 1
diff --git a/pages/venue/detail.vue b/pages/venue/detail.vue
index 8964b12..94e3fbd 100644
--- a/pages/venue/detail.vue
+++ b/pages/venue/detail.vue
@@ -42,14 +42,25 @@
 			</view>
 		</view>
 
-		<!-- 使用说明（内容取文旅场馆第三方设置里的备注 shop_relation.remark） -->
-		<view class="discount-section" v-if="discountList.length">
+		<!-- 商品信息（仅商户折扣板块展示，内容取商铺门票信息字段） -->
+		<view class="discount-section" v-if="!isVenue && ticketInfoList.length">
 			<view class="section-title">
 				<image src="https://aliyunoss.hn12301.net/hhrs/hhrs_qysm.png" style="width: 30rpx;height: 30rpx;"></image>
-				<text class="discount-title">使用说明</text>
+				<text class="discount-title">商品信息</text>
 			</view>
 			<view class="discount-list">
-				<text class="discount-item" v-for="(item, index) in discountList" :key="index">{{ item }}</text>
+				<text class="discount-item" v-for="(item, index) in ticketInfoList" :key="index">{{ item }}</text>
+			</view>
+		</view>
+
+		<!-- 文旅场馆显示「使用说明」（1001板块备注），商户折扣显示「商户优惠」（1002板块备注） -->
+		<view class="discount-section" v-if="remarkList.length">
+			<view class="section-title">
+				<image src="https://aliyunoss.hn12301.net/hhrs/hhrs_qysm.png" style="width: 30rpx;height: 30rpx;"></image>
+				<text class="discount-title">{{ isVenue ? '使用说明' : '商户优惠' }}</text>
+			</view>
+			<view class="discount-list">
+				<text class="discount-item" v-for="(item, index) in remarkList" :key="index">{{ item }}</text>
 			</view>
 		</view>
 		</view>
@@ -73,13 +84,24 @@ export default {
 	data() {
 		return {
 			store: null,
-			loaded: false
+			loaded: false,
+			detailType: '1'
 		}
 	},
 	computed: {
-		discountList() {
-			if (!this.store || !this.store.merchantDiscount) return []
-			return this.store.merchantDiscount.split('\n')
+		// xuchao: 入口板块：type=2 商户折扣，其余（含缺省）按文旅场馆渲染
+		isVenue() {
+			return this.detailType !== '2'
+		},
+		ticketInfoList() {
+			if (!this.store || !this.store.ticketInfo) return []
+			return this.store.ticketInfo.split('\n')
+		},
+		remarkList() {
+			if (!this.store) return []
+			const text = this.isVenue ? this.store.usageNote : this.store.merchantDiscount
+			if (!text) return []
+			return text.split('\n')
 		},
 		// xuchao: 客服电话列表：按常见分隔符切分；无分隔符连写的多个11位手机号也自动拆开
 		servicePhoneList() {
@@ -106,6 +128,7 @@ export default {
 		}
 	},
 	onLoad(options) {
+		if (options.type) this.detailType = String(options.type)
 		if (options.id) {
 			this.loadDetail(options.id)
 		}