Browse Source

Merge branch 'master' into dev_jzp

master
jiazhipeng 1 year ago
parent
commit
f48d820d79
  1. 14
      pages.json
  2. 6
      pages/index/index.vue
  3. 2
      subPackages/food/foodOrder.vue
  4. 66
      subPackages/notice/noticeDetail.vue
  5. 147
      subPackages/notice/noticeList.vue
  6. 24
      subPackages/order/detail.vue

14
pages.json

@ -261,6 +261,20 @@
"style" : { "style" : {
"navigationBarTitleText" : "修改手机号" "navigationBarTitleText" : "修改手机号"
} }
},
{
"path" : "notice/noticeList",
"style" : {
"navigationBarTitleText" : "公告",
"navigationStyle": "custom"
}
},
{
"path" : "notice/noticeDetail",
"style" : {
"navigationBarTitleText" : "公告详情",
"navigationStyle": "custom"
}
} }
] ]
}], }],

6
pages/index/index.vue

@ -19,7 +19,7 @@
<view class="nav-box"> <view class="nav-box">
<view class="nav-top"> <view class="nav-top">
<view class="nav-topLeft"> <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 class="text-overflow">{{notice}}</view>
</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="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-title">今日共有{{eventCalendarNum}}个活动 >>></view>
<view class="calendar-line"></view> <view class="calendar-line"></view>
<view class="calendar-subtitle">活动日历</view> <view class="calendar-subtitle">活动日历</view>
@ -65,7 +65,7 @@
<span>{{day}}</span>/{{month}} <span>{{day}}</span>/{{month}}
</view> </view>
</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-title">享受家一般的舒适 >>></view>
<view class="calendar-line"></view> <view class="calendar-line"></view>
<view class="calendar-subtitle">盐都美宿</view> <view class="calendar-subtitle">盐都美宿</view>

2
subPackages/food/foodOrder.vue

@ -20,7 +20,7 @@
</view> </view>
</view> </view>
<!-- 优惠券 --> <!-- 优惠券 -->
<navigator :url="'/subPackages/order/OrderCoupon?allprice='+ allprice*100 + '&sku_ids='+ info.id" class="tickets-box flex-between msg-box"> <navigator :url="'/subPackages/order/orderCoupon?allprice='+ allprice*100 + '&sku_ids='+ info.id" class="tickets-box flex-between msg-box">
<div class="order-title">优惠券</div> <div class="order-title">优惠券</div>
<div class="coupon-btn" v-if="coupon==''"> <div class="coupon-btn" v-if="coupon==''">
请选择 请选择

66
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>

147
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>

24
subPackages/order/detail.vue

@ -54,7 +54,7 @@
<!-- 景点详情 --> <!-- 景点详情 -->
<view class="scenic-detail"> <view class="scenic-detail">
<view> <view>
<view class="scenic-title"> <view class="scenic-title" @click="gotoDetail">
{{info.order_child[0].goods_title}} {{info.order_child[0].goods_title}}
<image src="https://static.ticket.sz-trip.com/yandu/images/order/rightIcon.png"></image> <image src="https://static.ticket.sz-trip.com/yandu/images/order/rightIcon.png"></image>
</view> </view>
@ -406,7 +406,27 @@
}, },
// //
gotoDetail() { gotoDetail() {
// info.order_child[0].goods_genretickethotelfoodpgoods
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) { refund(id) {

Loading…
Cancel
Save