diff --git a/subPackages/hotelHomestay/order.vue b/subPackages/hotelHomestay/order.vue
index 3153603..4705068 100644
--- a/subPackages/hotelHomestay/order.vue
+++ b/subPackages/hotelHomestay/order.vue
@@ -183,10 +183,17 @@
},1000)
}
+
+
this.skuInfo = data.skuInfo
this.selectDate = data.selectDate
this.buyNum = 1
this.roomUser = [{name: ''}]
+ try {
+ this.phone = JSON.parse(uni.getStorageSync('userInfo')).mobile
+ } catch(e) {
+ this.phone = ''
+ }
},
// 查看房型
@@ -213,9 +220,9 @@
order () {
this.roomUser.forEach(v=>v.name = v.name.trim())
// 校验
- if (!this.isTel(this.phone)){
+ if (!this.IsTel(this.phone)){
uni.showToast({
- title: '请输入自提人手机号',
+ title: '手机号格式校验失败',
icon: 'none'
});
return;
@@ -241,7 +248,7 @@
specifications_id: this.skuInfo.id,
start_date: this.selectDate.startDay,
end_date: this.selectDate.endDay,
- customer_name: this.roomUser.map(v=>v.name).join('、'),
+ customer_name: this.roomUser.map(v=>v.name).join(','),
// reserve_mobile: this.phone,
}
goods.push(goodsItem)
diff --git a/subPackages/ticketBooking/detail.vue b/subPackages/ticketBooking/detail.vue
index 677ab2e..585ed3e 100644
--- a/subPackages/ticketBooking/detail.vue
+++ b/subPackages/ticketBooking/detail.vue
@@ -38,33 +38,34 @@
{{info.address}}
-
+
![]()
门票预定
-
+
- {{ item.title }}
-
-
+
+
{{ itemSku.title }}
-
-
- {{ tagSku }}
+
+
+
+ {{ tagSku }}
+
-
-
+
预订须知 >
-
+
+
-
+
{{showNoPriceNew(itemSku.price)}}
@@ -84,16 +85,16 @@
-
@@ -227,6 +228,17 @@
});
},
+ goMap () {
+ uni.openLocation({
+ latitude: Number(this.info.lat),
+ longitude: Number(this.info.lon),
+ name: this.info.title,
+ address: this.info.address,
+ success: function () {
+ console.log('success');
+ }
+ });
+ },
showSkuInfo (itemSku,goods) {
this.skuInfo = itemSku
@@ -509,11 +521,11 @@
}
.box-title {
- margin: 52rpx 0 26rpx 12rpx;
- font-family: PingFang;
- font-weight: bold;
+ margin: 60rpx 12rpx 28rpx;
font-size: 37rpx;
color: #000000;
+ font-family: PingFang SC;
+ font-weight: bold;
}
.address-icon{
@@ -523,31 +535,40 @@
}
.scenic-list{
- .list-title {
- padding-bottom: 20rpx;
- }
.scenic-item {
- /* border-top: 1px solid #d9d9d9; */
- padding: 20rpx;
- text-align: left;
- background: rgba(11, 137, 142, .06);
- border-radius: 20rpx;
- margin-bottom: 20rpx;
+ width: 100%;
+ height: 187rpx;
+ background: #FFFFFF;
+ border-radius: 13rpx;
+ margin-bottom: 20rpx;
+ padding: 26rpx;
display: flex;
+ font-family: PingFang SC;
+ font-weight: 500;
+ font-size: 23rpx;
+ color: #666666;
+
+ .item-left{
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ padding-left: 20rpx;
+ }
.title {
- font-weight: bold;
- color: #333333;
width: 100%;
+ font-family: PingFang SC;
+ font-weight: bold;
+ font-size: 31rpx;
+ color: #000000;
}
.tags-box {
overflow: hidden;
+ padding-bottom: 6rpx;
.tags {
display: flex;
flex-wrap: nowrap;
flex: 1;
- font-weight: 400;
- color: #666666;
}
.tags view::after {
content: '丨'
@@ -557,36 +578,39 @@
}
}
.item-right {
- width: 100rpx;
+ width: 133rpx;
display: flex;
flex-direction: column;
align-items: center;
- justify-content: space-between;
+ justify-content: flex-end;
}
.price {
- font-size: 30rpx;
- font-weight: 400;
- color: #8d8d8d;
+ font-family: PingFangSC;
font-weight: 500;
- color: #d62828;
+ font-size: 36rpx;
+ color: #EE3E3B;
}
.price::before {
display: inline-block;
content: "￥";
font-size: 24rpx;
- font-weight: 400;
- color: #d62828;
+ font-weight: 500;
+ color: #EE3E3B;
}
.btn {
- width: 100rpx;
- height: 60rpx;
- background: #0B898E;
- border-radius: 20rpx;
+ margin-top: 20rpx;
+ width: 133rpx;
+ height: 53rpx;
+ background: linear-gradient(270deg, #FD6F34, #F4A61F);
+ border-radius: 27rpx;
text-align: center;
- line-height: 58rpx;
+ line-height: 53rpx;
font-weight: 500;
- color: #FFFFFF;
+ font-family: PingFang SC;
+ font-weight: bold;
+ font-size: 31rpx;
+ color: #FFFFFF;
}
}
}
@@ -601,11 +625,15 @@
.popup-content-date {
background-color: white;
padding: 0rpx 39rpx 51rpx 39rpx;
- height: auto;
+ height: 70vh;
border-radius: 20rpx 20rpx 0 0 ;
.popup-content-title{
padding: 20rpx 0;
}
+ // 预定须知
+ .content{
+ overflow-y: auto;
+ }
.dateMore{
width: 120rpx;
diff --git a/subPackages/travelGuide/detail.vue b/subPackages/travelGuide/detail.vue
index 5d74e4e..b69ccfd 100644
--- a/subPackages/travelGuide/detail.vue
+++ b/subPackages/travelGuide/detail.vue
@@ -35,7 +35,7 @@
-
+
diff --git a/subPackages/travelGuide/travelGuide.vue b/subPackages/travelGuide/travelGuide.vue
index 526fa01..a711615 100644
--- a/subPackages/travelGuide/travelGuide.vue
+++ b/subPackages/travelGuide/travelGuide.vue
@@ -8,8 +8,8 @@
- 全部
- 景点
+ 全部
+ {{item.name}}
@@ -50,16 +50,19 @@
},
list: [],
+ types: [],
showMore: true,
headImg:"https://tongli.sz-trip.com/uploads/20240902/55c5cbe137790323cc719b5c83d5e2e9.png",
- type_id: 0,//景点分类id
+ type_id: 42,//景点分类id
}
},
onShow() {
this.showMore = true
},
onReady() {
+ this.type_id = 42
+ this.getArticleType()
this.getArticleByType()
},
onLoad(options) {
@@ -79,19 +82,27 @@
methods: {
setTag (item) {
- this.type_id = item
- // this.getArticleByType()
+ this.type_id = item.id
+ this.list = []
+ this.getArticleByType()
+ },
+ // 游记攻略分类
+ getArticleType () {
+ this.Post({
+ type_id: this.type_id,
+ },'/api/article/getType').then(res => {
+ this.types = res.data || []
+ })
},
// 游记攻略
getArticleByType() {
this.Post({
- type_id: 41,
+ type_id: this.type_id,
offset: this.list.length,
limit: 10
},'/api/Article/getArticleByType').then(res => {
this.list = [...this.list, ...res.data]
-
if(res.data.length < 10) this.showMore = false
})
},
