Commit 06e1854b authored by 罗超's avatar 罗超

1

parent a7dfa6a8
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<view class="btn-box"> <view class="btn-box">
<view class="price"> <view class="price">
<text class="price-pre"></text> <text class="price-pre"></text>
{{mealData.LPriceB}} {{$utils.getretailer()==true? mealData.LPriceB:mealData.LPriceC}}
</view> </view>
<view class="btn" @click="subscribe"> <view class="btn" @click="subscribe">
立即预订 立即预订
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
.buy-notice-con{ .buy-notice-con{
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 800; font-weight: 600;
color: #111111; color: #111111;
} }
.btn-box{ .btn-box{
......
...@@ -30,8 +30,9 @@ ...@@ -30,8 +30,9 @@
</view> </view>
<view class="price" style="margin-top:10rpx;"> <view class="price" style="margin-top:10rpx;">
<text class="f11" style="margin-right: 10rpx;"></text> <text class="f11" style="margin-right: 10rpx;"></text>
<text v-if="data.LPriceB">{{data.LPriceB}}</text> <!-- <text v-if="data.LPriceB">{{data.LPriceB}}</text> -->
<text v-if="!data.LPriceB">暂无报价</text> <!-- <text v-if="!data.LPriceB">暂无报价</text> -->
<text>{{$utils.getretailer()==true? data.LPriceB:data.LPriceC}}</text>
</view> </view>
</view> </view>
<view class="rm-opera"> <view class="rm-opera">
...@@ -77,7 +78,15 @@ ...@@ -77,7 +78,15 @@
}, },
buyNoticeSuccess(){ buyNoticeSuccess(){
this.showBuyNotice = false this.showBuyNotice = false
this.previewOrder() if(this.data.RemainingInventory>0){
this.previewOrder()
}else{
uni.showToast({
title:"该套餐已售罄",
icon:"none"
})
}
}, },
seeBuyNotice() { seeBuyNotice() {
this.showBuyNotice = true this.showBuyNotice = true
...@@ -194,12 +203,13 @@ ...@@ -194,12 +203,13 @@
} }
.package-good .rm-left { .package-good .rm-left {
width: 174rpx; width: 175rpx;
height: 257rpx; height: 213rpx;
border-radius: 20rpx; border-radius: 20rpx;
margin-right: 30rpx; margin-right: 30rpx;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
box-shadow: 0px 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
} }
.package-good .rm-left image { .package-good .rm-left image {
......
...@@ -5,13 +5,14 @@ ...@@ -5,13 +5,14 @@
</view> </view>
<view class="restaurant-info"> <view class="restaurant-info">
<view class="restaurant-name">{{data.Name}}</view> <view class="restaurant-name">{{data.Name}}</view>
<view class="restaurant-start"> <!-- <view class="restaurant-start">
<view class="other-rate"> <view class="other-rate">
<text>{{data.Feature}}</text> <text class="feature">{{data.Feature}}</text>
<span class="line"></span> <span class="line"></span>
</view> </view>
</view> </view> -->
<view class="localtion">{{data.Address}}</view> <view class="localtion feature">{{data.Feature}}</view>
<view class="localtion feature addr">{{data.Address}}</view>
<view style="display: flex;flex-wrap: wrap;"> <view style="display: flex;flex-wrap: wrap;">
<view v-for="(item,index) in data.FoodTag" :key="index"> <view v-for="(item,index) in data.FoodTag" :key="index">
<u-tag :text="item" bg-color="#FFF" border-color="#DFBE6E" color="#DFBE6E" size="mini" style="margin-right: 20rpx;" v-if="item"></u-tag> <u-tag :text="item" bg-color="#FFF" border-color="#DFBE6E" color="#DFBE6E" size="mini" style="margin-right: 20rpx;" v-if="item"></u-tag>
...@@ -23,7 +24,8 @@ ...@@ -23,7 +24,8 @@
</view> </view>
<view class="price"> <view class="price">
<text></text> <text></text>
<text class="money">{{data.B2BPrice}}</text> <!-- <text class="money">{{data.B2BPrice}}</text> -->
<text class="money">{{$utils.getretailer()==true? data.B2BPrice:data.B2CPrice}} </text>
<text>/起</text> <text>/起</text>
</view> </view>
</view> </view>
...@@ -61,7 +63,7 @@ ...@@ -61,7 +63,7 @@
padding-bottom: 30rpx; padding-bottom: 30rpx;
border-bottom: 1rpx solid #E2E2E2; border-bottom: 1rpx solid #E2E2E2;
display: flex; display: flex;
align-items: center; /* align-items: center; */
} }
.restaurant-list-item .img-box{ .restaurant-list-item .img-box{
width: 220rpx; width: 220rpx;
...@@ -69,6 +71,7 @@ ...@@ -69,6 +71,7 @@
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
margin-right: 30rpx; margin-right: 30rpx;
box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
} }
.restaurant-list-item .img-box image{ .restaurant-list-item .img-box image{
width: 100%; width: 100%;
...@@ -77,6 +80,7 @@ ...@@ -77,6 +80,7 @@
.restaurant-list-item .restaurant-info{ .restaurant-list-item .restaurant-info{
width: 1px; width: 1px;
flex: 1; flex: 1;
padding-top: 20rpx;
} }
.restaurant-list-item .restaurant-info .restaurant-name{ .restaurant-list-item .restaurant-info .restaurant-name{
font-weight: 500; font-weight: 500;
...@@ -140,4 +144,17 @@ ...@@ -140,4 +144,17 @@
.restaurant-list-item .restaurant-info .price .money{ .restaurant-list-item .restaurant-info .price .money{
font-size: 36rpx; font-size: 36rpx;
} }
.feature{
margin-top: 20rpx;
text-align: justify;
text-align-last: left;
overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.addr{
color: #111111 !important;
}
</style> </style>
...@@ -353,7 +353,7 @@ ...@@ -353,7 +353,7 @@
let data = { let data = {
MealName: item.MealName, MealName: item.MealName,
date: this.Date, date: this.Date,
Unit_Price: item.LPriceB, Unit_Price: this.$utils.getretailer()==true?item.LPriceB:item.LPriceC,
MealId: item.Id, MealId: item.Id,
DiningId: this.details.ID, DiningId: this.details.ID,
MakeDay: item.MakeDay, MakeDay: item.MakeDay,
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
可订时间 可订时间
</view> </view>
<view class="item-desc"> <view class="item-desc">
可订今日 {{TicketData.AllTime}}
</view> </view>
</view> </view>
<view class="detail-info-item" v-if="TicketData.OutTicket"> <view class="detail-info-item" v-if="TicketData.OutTicket">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
出票速度 出票速度
</view> </view>
<view class="item-desc"> <view class="item-desc">
平均2秒出票 {{TicketData.OutTicket}}
</view> </view>
</view> </view>
<view class="detail-info-item" v-if="TicketData.ChangeTickets"> <view class="detail-info-item" v-if="TicketData.ChangeTickets">
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
无需换票 无需换票
</view> </view>
<view class="item-desc"> <view class="item-desc">
无需换票,持【身份证】直接进入 {{TicketData.ChangeTickets}}
</view> </view>
</view> </view>
<!-- 退票政策 --> <!-- 退票政策 -->
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<view class="detail-btn"> <view class="detail-btn">
<view class="price"> <view class="price">
<text class="price-pre"></text> <text class="price-pre"></text>
{{TicketData.HPriceB}} {{$utils.getretailer()==true? TicketData.HPriceB:TicketData.HPriceC}}
</view> </view>
<view class="btn" @click="success"> <view class="btn" @click="success">
立即预订 立即预订
...@@ -175,6 +175,9 @@ ...@@ -175,6 +175,9 @@
} }
} }
}, },
mounted() {
console.log(this.TicketData)
},
methods: { methods: {
goUrl() { goUrl() {
uni.navigateTo({ uni.navigateTo({
...@@ -318,6 +321,7 @@ ...@@ -318,6 +321,7 @@
margin-right: 45rpx; margin-right: 45rpx;
text-align: center; text-align: center;
line-height: 38rpx; line-height: 38rpx;
overflow: hidden;
} }
.item2-name { .item2-name {
width: 120rpx; width: 120rpx;
...@@ -331,6 +335,7 @@ ...@@ -331,6 +335,7 @@
margin-right: 45rpx; margin-right: 45rpx;
text-align: center; text-align: center;
line-height: 38rpx; line-height: 38rpx;
overflow: hidden;
} }
.item-desc { .item-desc {
......
...@@ -129,11 +129,12 @@ ...@@ -129,11 +129,12 @@
data.forEach(x => { data.forEach(x => {
let obj = {} let obj = {}
obj.date = x.Year+'-'+x.Month+'-'+x.Day; obj.date = x.Year+'-'+x.Month+'-'+x.Day;
// if(x.IsHavePrice==1){ if(x.IsHavePrice==1){
obj.price = x.HPriceB; let p=this.$utils.getretailer()==true? x.HPriceB:x.HPriceC
// }else{ obj.price =p ;
// obj.price = ""; }else{
// } obj.price = "";
}
datePrice.push(obj) datePrice.push(obj)
}) })
this.datePrice = datePrice this.datePrice = datePrice
......
...@@ -119,7 +119,8 @@ ...@@ -119,7 +119,8 @@
{{_item.TicketName}} {{_item.TicketName}}
</view> </view>
<view class="price"> <view class="price">
<text class="price-pre"></text>{{_item.HPriceB}}<text <text class="price-pre"></text>{{$utils.getretailer()==true? _item.HPriceB:_item.HPriceC}}
<text
class="price-nex"></text> class="price-nex"></text>
</view> </view>
<view class="tag"> <view class="tag">
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</view> </view>
</view> </view>
<view class="SalesPrice"> <view class="SalesPrice">
<text class="SalesPrice-pre"></text>{{item.SalesPrice}}<text class="SalesPrice-nex"></text> <text class="SalesPrice-pre"></text>{{$utils.getretailer()==true? item.B2BPrice:item.B2CPrice}}<text class="SalesPrice-nex"></text>
</view> </view>
</view> </view>
</view> </view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment