提交

pages/index/index.vue

@@ -51,11 +51,11 @@
 		<view v-if="calendarItem">
 			<image src="https://static.ticket.sz-trip.com/changshu/images/index/title2.png" mode="heightFix" class="title-img"></image>
 			
-			<view class="calendar-item" @click="calendarItem.type='calendar';gotoDetailByTypeToJdsz(calendarItem)">
-				<image :src="showImgs(calendarItem.post_url)" mode="aspectFill" class="calendar-img"></image>
+			<view class="calendar-item" @click="gotoWebUrl(calendarItem)">
+				<image :src="showImg(calendarItem.image)" mode="aspectFill" class="calendar-img"></image>
 				<view class="calendar-content flex-column">
-					<view class="title text-overflow">{{calendarItem.name}}</view>
-					<view class="subtitle text-overflow">活动时间：{{ calendarItem.begin_date }}—{{ calendarItem.end_date }}</view>
+					<view class="title text-overflow">{{calendarItem.title}}</view>
+					<view class="subtitle text-overflow">活动时间：{{ calendarItem.start_time }}—{{ calendarItem.end_time }}</view>
 				</view>
 			</view>
 			
@@ -90,7 +90,7 @@
 				<view v-for="(item,indexs) in getColumnItems(index)" :key="indexs" class="hot-item" @click="gotoHotDetail(item)">
 					<view class="image-container">
 						<image :src="item.src" mode="widthFix" class="hot-img"></image>
-						<image src="https://static.ticket.sz-trip.com/changshu/images/index/play.png" mode="" class="play-img" v-if="typeIndex == 5"></image>
+						<image src="https://static.ticket.sz-trip.com/changshu/images/index/play.png" mode="widthFix" class="play-img" v-if="typeIndex == 5"></image>
 					</view>
 					<view class="hot-content">
 						<view class="title text-overflowRows">{{item.title || item.name}}</view>
@@ -447,13 +447,12 @@
 			// 周边特惠活动
 			getCalendarList() {
 				this.Post({
-					apiType: 'jdsz',
-					page_no: 1,
-					page_num: 1
-				}, '/api/pbservice/Actcalendar/getActList').then(res => {
-					if(res) {
-						this.calendarItem = res.data.rows[0]
-					}
+					date: '',
+					offset: 0,
+					limit: 100,
+					type_id: 6
+				},'/api/activity/getActivityCalendar').then(res => {
+					this.calendarItem = res.data[0]
 				})
 			},
 			// 更改热门推荐类型
@@ -797,7 +796,7 @@
 				position: relative;
 				
 				.hot-img {
-					height: 267rpx;
+					width: 340rpx;
 				}
 				
 				.play-img {

static/js/CommonFunction.js

@@ -387,4 +387,13 @@ Vue.prototype.exploit = () => {
 		title: '开发中',
 		icon: 'none'
 	})
+}
+
+// 周边特惠活动跳转详情
+Vue.prototype.gotoWebUrl = item => {
+	if(item.url) {
+		uni.navigateTo({
+			url: '/subPackages/webPage/webPage?url=' + encodeURIComponent(item.url)
+		});
+	}
 }

subPackages/order/detail.vue

@@ -206,6 +206,15 @@
 
 					<!-- 商品价格 -->
 					<view class="public-price">
+						<view class="flex-between">
+							使用日期：
+							<span>
+								{{info.order_child[0].use_date}}  
+								<span v-if="info.order_child[0].start_time && info.order_child[0].end_time" style="margin-left: 10rpx;">
+									{{info.order_child[0].start_time}}-{{info.order_child[0].end_time}}
+								</span>入园
+							</span>
+						</view>
 						<view class="flex-between">
 							商品总额：<span>￥{{info.money / 100}}</span>
 						</view>

subPackages/peripheralActivity/peripheralActivity.vue

@@ -3,11 +3,11 @@
 		<image :src="topImg" mode="aspectFill" class="topImg"></image>
 		
 		<view class="box">
-			<view v-for="(item,index) in list" :key="index" class="item" @click="item.type='calendar';gotoDetailByTypeToJdsz(item)">
-				<image :src="showImgs(item.post_url)" mode="aspectFill" class="img"></image>
+			<view v-for="(item,index) in list" :key="index" class="item" @click="gotoWebUrl(item)">
+				<image :src="showImg(item.image)" mode="aspectFill" class="img"></image>
 				<view class="content flex-column">
-					<view class="title text-overflow">{{item.name}}</view>
-					<view class="subtitle text-overflow">活动时间：{{ item.begin_date }}—{{ item.end_date }}</view>
+					<view class="title text-overflow">{{item.title}}</view>
+					<view class="subtitle text-overflow">活动时间：{{ item.start_time }}—{{ item.end_time }}</view>
 				</view>
 			</view>
 		</view>
@@ -41,15 +41,14 @@
 			},
 			getList() {
 				this.Post({
-					apiType: 'jdsz',
-					page_no: this.pageNo,
-					page_num: this.limit
-				}, '/api/pbservice/Actcalendar/getActList').then(res => {
-					if(res) {
-						if(res.data.rows.length < this.limit) this.isLoading = true
-						this.list = this.list.concat(res.data.rows)
-						this.pageNo ++
-					}
+					date: '',
+					offset: this.list.length,
+					limit: this.limit,
+					type_id: 6
+				},'/api/activity/getActivityCalendar').then(res => {
+					this.calendarItem = res.data[0]
+					if(res.data.length < this.limit) this.isLoading = true
+					this.list = this.list.concat(res.data)
 				})
 			}
 		}