From 7ddac44f87be4623b0b3b9a5bc4826f78c3f5393 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Wed, 4 Sep 2024 15:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          |  14 +++
 pages/index/index.vue               |   6 +-
 subPackages/notice/noticeDetail.vue |  66 +++++++++++++
 subPackages/notice/noticeList.vue   | 147 ++++++++++++++++++++++++++++
 subPackages/order/detail.vue        |  24 ++++-
 5 files changed, 252 insertions(+), 5 deletions(-)
 create mode 100644 subPackages/notice/noticeDetail.vue
 create mode 100644 subPackages/notice/noticeList.vue

diff --git a/pages.json b/pages.json
index d86519f..f37acca 100644
--- a/pages.json
+++ b/pages.json
@@ -261,6 +261,20 @@
 			    "style" : {
 			        "navigationBarTitleText" : "修改手机号"
 			    }
+			},
+			{
+			    "path" : "notice/noticeList",
+			    "style" : {
+			        "navigationBarTitleText" : "公告",
+					"navigationStyle": "custom"
+			    }
+			},
+			{
+			    "path" : "notice/noticeDetail",
+			    "style" : {
+			        "navigationBarTitleText" : "公告详情",
+					"navigationStyle": "custom"
+			    }
 			}
 		]
 	}],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index aeea83a..bbd4926 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -19,7 +19,7 @@
 		<view class="nav-box">
 			<view class="nav-top">
 				<view class="nav-topLeft">
-					<image src="https://static.ticket.sz-trip.com/yandu/images/index/consultImg.png" class="consultImg"></image>
+					<image src="https://static.ticket.sz-trip.com/yandu/images/index/consultImg.png" class="consultImg" @click="gotoPath('/subPackages/notice/noticeList')"></image>
 					<view class="text-overflow">{{notice}}</view>
 				</view>
 				
@@ -57,7 +57,7 @@
 		
 		<!-- 活动日历、盐都美宿 -->
 		<view class="flex-between" style="padding: 0 27rpx;margin-top: 20rpx;" v-if="homeUi.hdrl && homeUi.ydms_hotel">
-			<view class="calendar-box" :style="{backgroundImage: 'url('+showImg(homeUi.hdrl)+')',backgroundSize: 'cover'}">
+			<view @click="gotoPath('/subPackages/eventCalendar/eventCalendar')" class="calendar-box" :style="{backgroundImage: 'url('+showImg(homeUi.hdrl)+')',backgroundSize: 'cover'}">
 				<view class="calendar-title">今日共有{{eventCalendarNum}}个活动 >>></view>
 				<view class="calendar-line"></view>
 				<view class="calendar-subtitle">活动日历</view>
@@ -65,7 +65,7 @@
 					<span>{{day}}</span>日/{{month}}月
 				</view>
 			</view>
-			<view class="calendar-box" :style="{backgroundImage: 'url('+showImg(homeUi.ydms_hotel)+')',backgroundSize: 'cover'}">
+			<view @click="gotoPath('/subPackages/hotelHomestay/hotelHomestay')" class="calendar-box" :style="{backgroundImage: 'url('+showImg(homeUi.ydms_hotel)+')',backgroundSize: 'cover'}">
 				<view class="calendar-title">享受家一般的舒适 >>></view>
 				<view class="calendar-line"></view>
 				<view class="calendar-subtitle">盐都美宿</view>
diff --git a/subPackages/notice/noticeDetail.vue b/subPackages/notice/noticeDetail.vue
new file mode 100644
index 0000000..fdcea47
--- /dev/null
+++ b/subPackages/notice/noticeDetail.vue
@@ -0,0 +1,66 @@
+<template>
+	<view class="bg">
+		<span class="iconfont topLeft" @click="goBack">&#xe660;</span>
+		
+		<view class="topBox" :style="{backgroundImage: 'url('+showImg(detail.image)+')', backgroundSize: 'cover'}">
+			<view>{{detail.title}}</view>
+			<view style="font-weight: 500;font-size: 24rpx;margin-top: 22rpx;">{{detail.create_time}}</view>
+		</view>
+		
+		<view class="content" v-html="formateRichText(detail.content)"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				detail: {}
+			}
+		},
+		onLoad(option) {
+			this.Post({
+				id: option.id
+			},'/api/anncmnt/getAnncmntById').then(res => {
+				this.detail = res.data
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		width: 750rpx;
+		min-height: 100vh;
+		background: url('https://static.ticket.sz-trip.com/yandu/images/notice/noticeBg.png') no-repeat bottom;
+		background-size: 100% auto;
+		background-color: #F7F7F7;
+	}
+	
+	.topLeft {
+		position: absolute;
+		left: 26rpx;
+		top: 101rpx;
+		font-size: 40rpx;
+		z-index: 2;
+	}
+	
+	.topBox {
+		width: 750rpx;
+		height: 432rpx;
+		padding: 240rpx 60rpx 0 60rpx;
+		font-weight: bold;
+		font-size: 35rpx;
+		color: #FFFFFF;
+	}
+	
+	.content {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		margin: -28rpx auto 0;
+		padding: 48rpx 21rpx 98rpx;
+		position: relative;
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/notice/noticeList.vue b/subPackages/notice/noticeList.vue
new file mode 100644
index 0000000..ae2f03e
--- /dev/null
+++ b/subPackages/notice/noticeList.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="bg">
+		<span class="iconfont topLeft" @click="goBack">&#xe660;</span>
+		
+		<image src="https://static.ticket.sz-trip.com/yandu/images/notice/topImg.png" mode="" class="topImg"></image>
+		
+		<view class="type-box">
+			<view v-for="(item,index) in typeList" :key="index" :class="{'active': index == typeIndex}" @click="typeIndex=index;getList()">{{item.title}}</view>
+		</view>
+		
+		<navigator :url="'/subPackages/notice/noticeDetail?id=' + item.id" v-for="(item,index) in list" :key="index" class="item">
+			<image :src="showImg(item.image)" mode="aspectFill" class="headImg"></image>
+			<view class="content flex-column">
+				<view class="title">
+					{{item.title}}
+				</view>
+				<view class="time">
+					<image src="https://static.ticket.sz-trip.com/yandu/images/notice/time.png" mode=""></image>
+					{{item.create_time}}
+				</view>
+			</view>
+		</navigator>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				typeList: [
+					{
+						title: '公告信息',
+						id: '4'
+					},
+					{
+						title: '旅游政策',
+						id: '5'
+					}
+				],
+				typeIndex: 0,
+				list: []
+			}
+		},
+		onShow() {
+			this.getList()
+		},
+		methods: {
+			getList() {
+				this.Post({
+					type_id: this.typeList[this.typeIndex].id
+				},'/api/anncmnt/getAnncmntByType').then(res => {
+					this.list = res.data
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		width: 750rpx;
+		min-height: 100vh;
+		background: #F7F7F7;
+		padding-bottom: 100rpx;
+	}
+	
+	.topLeft {
+		position: absolute;
+		left: 26rpx;
+		top: 101rpx;
+		font-size: 40rpx;
+		z-index: 2;
+	}
+	
+	.topImg {
+		width: 750rpx;
+		height: 432rpx;
+	}
+	
+	.type-box {
+		width: 404rpx;
+		height: 77rpx;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #000000;
+		display: flex;
+		margin: -34rpx auto 0;
+		overflow: hidden;
+		position: relative;
+		
+		view {
+			width: 50%;
+			text-align: center;
+			line-height: 77rpx;
+		}
+		
+		.active {
+			background: linear-gradient(90deg, #9EE4FE, #7FD491);
+		}
+	}
+	
+	.item {
+		width: 697rpx;
+		height: 180rpx;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		margin: 28rpx auto;
+		display: flex;
+		padding: 6.67rpx;
+		
+		.headImg {
+			width: 180rpx;
+			height: 167rpx;
+			border-radius: 7rpx;
+		}
+		
+		.content {
+			width: 475rpx;
+			height: 180rpx;
+			padding: 14rpx 0;
+			justify-content: space-between;
+			margin-left: 20rpx;
+			
+			.title {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #000000;
+			}
+			
+			.time {
+				font-weight: 500;
+				font-size: 25rpx;
+				color: #AFAFAF;
+				display: flex;
+				align-items: center;
+				
+				image {
+					width: 26rpx;
+					height: 26rpx;
+					margin-right: 12rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue
index f47268a..f8abfec 100644
--- a/subPackages/order/detail.vue
+++ b/subPackages/order/detail.vue
@@ -54,7 +54,7 @@
 				<!-- 景点详情 -->
 				<view class="scenic-detail">
 					<view>
-						<view class="scenic-title">
+						<view class="scenic-title" @click="gotoDetail">
 							{{info.order_child[0].goods_title}}
 							<image src="https://static.ticket.sz-trip.com/yandu/images/order/rightIcon.png"></image>
 						</view>
@@ -406,7 +406,27 @@
 			},
 			// 再次购买：跳转产品详情
 			gotoDetail() {
-				
+				// 子订单里info.order_child[0].goods_genre：景点ticket、酒店hotel、美食food、邮寄自提pgoods
+				let url = ''
+				switch (this.info.order_child[0].goods_genre){
+					case 'ticket':
+						url = '/subPackages/ticketBooking/detail?id=' + this.info.order_child[0].scenic_data.id
+						break;
+					case 'hotel':
+						url = '/subPackages/hotelHomestay/detail?id=' + this.info.order_child[0].scenic_data.id
+						break;
+					case 'food':
+						url = '/subPackages/food/foodDetail?id=' + this.info.order_child[0].goods_id
+						break;
+					case 'pgoods':
+						url = '/subPackages/techan/detail?id=' + this.info.order_child[0].goods_id
+						break;
+					default:
+						break;
+				}
+				uni.navigateTo({
+					url: url
+				})
 			},
 			// 申请退款
 			refund(id) {