Skip to content

J
jz_Travel
Commit 7a8d3734 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

parents f2b1a864 d67153af
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1156 additions and 732 deletions
pages/guidecar/bookaCarList.vue
View file @ 7a8d3734
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
</view> </view>
<view class="s-c-r prices"> <view class="s-c-r prices">
<span style='margin-top: 3px;font-size: 11px;'>￥</span> <span style='margin-top: 3px;font-size: 11px;'>￥</span>
<span style='font-weight: bold;'>{{isdistributor==true? x.Price:x.B2CPrice}}</span> <span style='font-weight: bold;'>{{$utils.getretailer()==true? x.Price:x.B2CPrice}}</span>
<span style='margin-top: 3px;font-size: 11px;'>起</span> <span style='margin-top: 3px;font-size: 11px;'>起</span>
</view> </view>
</view> </view>
...@@ -404,7 +404,7 @@ ...@@ -404,7 +404,7 @@
</view> </view>
<view class="s-c-r prices" v-if="index==0"> <view class="s-c-r prices" v-if="index==0">
<span style='margin-top: 3px;font-size: 11px;'>￥</span> <span style='margin-top: 3px;font-size: 11px;'>￥</span>
<span style='font-weight: bold;'>{{isdistributor==true? x.Price:x.B2CPrice}}</span> <span style='font-weight: bold;'>{{$utils.getretailer()==true? x.Price:x.B2CPrice}}</span>
<span style='margin-top: 3px;font-size: 11px;'>起</span> <span style='margin-top: 3px;font-size: 11px;'>起</span>
</view> </view>
<view class="s-c-r sold" v-if="index==x.SiteList.length-1"> <view class="s-c-r sold" v-if="index==x.SiteList.length-1">
...@@ -501,25 +501,30 @@ ...@@ -501,25 +501,30 @@
</u-popup> </u-popup>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
</view> </view>
</template> </template>
<script> <script>
import auth from "@/components/auth/index.vue";
import Calendar from './components/Calendar.vue' import Calendar from './components/Calendar.vue'
export default { export default {
components: { components: {
Calendar, Calendar,
auth
}, },
data(options) { data(options) {
return { return {
showAuth:false,
screenshow: false, screenshow: false,
startDate: '', startDate: '',
pageTitle: "去订车", pageTitle: "去订车",
showcalendar: false, showcalendar: false,
mainColor: '', mainColor: '',
u:{},
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
...@@ -560,7 +565,7 @@ ...@@ -560,7 +565,7 @@
StartDate:'', StartDate:'',
EndDate:'', EndDate:'',
}, },
isdistributor:false,
} }
...@@ -576,7 +581,6 @@ ...@@ -576,7 +581,6 @@
this.msg.ArriveCityType = this.carMsg.ArriveCityType; this.msg.ArriveCityType = this.carMsg.ArriveCityType;
this.msg.Q_Date = this.carMsg.Q_Date; this.msg.Q_Date = this.carMsg.Q_Date;
} }
this.isdistributor = this.$utils.getretailer()
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.gettimeList() this.gettimeList()
...@@ -588,11 +592,21 @@ ...@@ -588,11 +592,21 @@
}, },
methods: { methods: {
yuding(x){ yuding(x){
uni.navigateTo({ this.u = uni.getStorageSync("mall_UserInfo");
url: '/pages/guidecar/specialCarReserve?Id='+x.Id +'&Date='+this.msg.Q_Date if (!this.u) {
this.u = {
}) nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else{
uni.navigateTo({
url: '/pages/guidecar/specialCarReserve?Id='+x.Id +'&Date='+this.msg.Q_Date
})
}
}, },
popupchange(e) { //tab事件 popupchange(e) { //tab事件
this.popupcurrent = e; this.popupcurrent = e;
...@@ -832,6 +846,16 @@ ...@@ -832,6 +846,16 @@
} }
}, },
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false;
this.init();
},
//关闭登录窗口
gbAuth(){
this.showAuth = false;
},
} }
} }
......
pages/guidecar/guidecarList.vue
View file @ 7a8d3734
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</view> </view>
<view class="g_Second" style="position: relative;background: #fff;width: 100%;"> <view class="g_Second" style="position: relative;background: #fff;width: 100%;">
<view style=" border-bottom: 1px solid rgba(0, 0, 0, 0.03);"> <view style=" border-bottom: 1px solid rgba(0, 0, 0, 0.03);">
<u-tabs :list="list" :is-scroll="false" :current="current" @change="change" bar-height='4' active-color="#FF8585"></u-tabs> <u-tabs :list="list" :is-scroll="false" :show-bar="false" duration="0" font-size="28" :activeFontSize="34" :bold="true" :current="current" @change="change" bar-height='4' active-color="#FF8585"></u-tabs>
</view> </view>
<view v-if="screenshow==true" class="tanchu"> <view v-if="screenshow==true" class="tanchu">
<scroll-view :scroll-y="true" :enable-back-to-top="true" style="max-height: 321px;"> <scroll-view :scroll-y="true" :enable-back-to-top="true" style="max-height: 321px;">
......
pages/guidecar/map.vue
View file @ 7a8d3734
...@@ -64,9 +64,16 @@ ...@@ -64,9 +64,16 @@
}) })
this.markers = []; this.markers = [];
if(this.details.type == 1){ if(this.details.type == 1){
// this.src_latitude = ((Number((this.upcar[0].Lonlat.split(',')[1])) + Number(this.upcar[this.upcar.length-1].Lonlat.split(',')[1]) )/2).toString();
// this.src_longitude = ((Number((this.upcar[0].Lonlat.split(',')[0])) + Number(this.upcar[this.upcar.length-1].Lonlat.split(',')[0]) )/2).toString();;
this.src_latitude = this.upcar[0].Lonlat.split(',')[1]; this.src_latitude = this.upcar[0].Lonlat.split(',')[1];
this.src_longitude = this.upcar[0].Lonlat.split(',')[0]; this.src_longitude = this.upcar[0].Lonlat.split(',')[0];
this.upcar.map(x=>{ this.upcar.map(x=>{
if(this.details.SelectID == x.Id){
this.src_latitude = x.Lonlat.split(',')[1];
this.src_longitude = x.Lonlat.split(',')[0];
}
let obj = { let obj = {
id: x.Id, id: x.Id,
iconPath: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dcdtbiaoji.png', iconPath: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dcdtbiaoji.png',
...@@ -82,6 +89,10 @@ ...@@ -82,6 +89,10 @@
this.src_latitude = this.downcar[0].Lonlat.split(',')[1]; this.src_latitude = this.downcar[0].Lonlat.split(',')[1];
this.src_longitude = this.downcar[0].Lonlat.split(',')[0]; this.src_longitude = this.downcar[0].Lonlat.split(',')[0];
this.downcar.map(x=>{ this.downcar.map(x=>{
if(this.details.SelectID == x.Id){
this.src_latitude = x.Lonlat.split(',')[1];
this.src_longitude = x.Lonlat.split(',')[0];
}
let obj = { let obj = {
id: x.Id, id: x.Id,
iconPath: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dcdtbiaoji.png', iconPath: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dcdtbiaoji.png',
...@@ -124,6 +135,7 @@ ...@@ -124,6 +135,7 @@
background: #FFF; background: #FFF;
border-radius: 10px 10px 0px 0px; border-radius: 10px 10px 0px 0px;
padding: 10px 15px; padding: 10px 15px;
overflow-y: auto;
} }
.liststyle-item{ .liststyle-item{
padding: 5px 0; padding: 5px 0;
......
pages/guidecar/pickcarcity2.vue
View file @ 7a8d3734
...@@ -58,10 +58,11 @@ ...@@ -58,10 +58,11 @@
searchList:[],//搜索出来的 searchList:[],//搜索出来的
searchKey: "", searchKey: "",
show:false, show:false,
indexList: [{ti:"A"}, {ti:"B"}, {ti:"C"}, {ti:"D"}, {ti:"E"}, {ti:"F"}, {ti:"G"},{ ti:"H"}, {ti:"I"}, {ti:"J"}, {ti:"K"}, {ti:"L"}, indexList:[],
{ti:"M"}, {ti:"N"}, {ti:"O"}, {ti:"P"},{ ti:"Q"}, {ti:"R"}, {ti:"S"}, {ti:"T"}, {ti:"U"}, // indexList: [{ti:"A"}, {ti:"B"}, {ti:"C"}, {ti:"D"}, {ti:"E"}, {ti:"F"}, {ti:"G"},{ ti:"H"}, {ti:"I"}, {ti:"J"}, {ti:"K"}, {ti:"L"},
{ti:"V"}, {ti:"W"}, {ti:"X"}, {ti:"Y"}, {ti:"Z"} // {ti:"M"}, {ti:"N"}, {ti:"O"}, {ti:"P"},{ ti:"Q"}, {ti:"R"}, {ti:"S"}, {ti:"T"}, {ti:"U"},
], // {ti:"V"}, {ti:"W"}, {ti:"X"}, {ti:"Y"}, {ti:"Z"}
// ],
dztype:1, dztype:1,
ArriveMsg:{ ArriveMsg:{
StartCityId:0, StartCityId:0,
......
pages/guidecar/specialCarReserve.vue
View file @ 7a8d3734
...@@ -375,20 +375,28 @@ ...@@ -375,20 +375,28 @@
uni.showLoading({ uni.showLoading({
title: '下单中...' title: '下单中...'
}) })
this.request2({ let that= this
url: '/api/AppletCar/SetAppletCarOrderInfo', uni.requestSubscribeMessage({
data: this.addMsg tmplIds: that.details.template_message_list,
}, complete(_res) {
res => { console.log(_res)
uni.hideLoading() that.request2({
if (res.resultCode == 1) { url: '/api/AppletCar/SetAppletCarOrderInfo',
this.queren(res.data) data: that.addMsg
} },
}, res => {
err => { uni.hideLoading()
uni.hideLoading() if (res.resultCode == 1) {
that.queren(res.data)
}
},
err => {
uni.hideLoading()
}
);
} }
); });
}, },
queren(OrderId){ queren(OrderId){
let url='/api/WeChatPay/GetDmcPayInfo' let url='/api/WeChatPay/GetDmcPayInfo'
...@@ -425,12 +433,22 @@ ...@@ -425,12 +433,22 @@
uni.showToast({ uni.showToast({
title: "支付成功" title: "支付成功"
}) })
setTimeout(()=>{
uni.redirectTo({
url: '/pages/jiuzhai/allorderList'
});
}, 100 )
}, },
fail: function(err) { fail: function(err) {
console.log('fail:', err); console.log('fail:', err);
uni.showToast({ uni.showToast({
title: "支付失败" title: "支付失败"
}) })
setTimeout(()=>{
uni.redirectTo({
url: '/pages/jiuzhai/allorderList'
});
}, 100 )
} }
}); });
}, },
...@@ -447,7 +465,7 @@ ...@@ -447,7 +465,7 @@
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.details = res.data this.details = res.data
this.addMsg.DepartureTime = this.details.StartDate; this.addMsg.DepartureTime = this.details.StartDate;
this.addMsg.Unit_Price = this.details.Price; this.addMsg.Unit_Price = (this.$utils.getretailer()==true ? this.details.Price :this.details.B2CPrice) ;
this.upcar = []; this.upcar = [];
this.downcar = [] this.downcar = []
......
pages/hotel/description.vue
View file @ 7a8d3734
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<u-tabs :is-scroll="false" name="Name" :list="navs" active-color="#DFBE6E" :current="active" @change="changeHandler" <u-tabs :is-scroll="false" name="Name" :list="navs" active-color="#DFBE6E" :current="active" @change="changeHandler"
:show-bar="true" :activeFontSize="32" inactive-color="#111111" :bold="true" height="100" duration="0" font-size="28"></u-tabs> :show-bar="true" :activeFontSize="32" inactive-color="#111111" :bold="true" height="100" duration="0" font-size="28"></u-tabs>
</view> </view>
<scroll-view scroll-y="true" class="hotel-descr" @scroll="scroll"> <scroll-view scroll-y="true" class="hotel-descr" @scroll="scroll" :scroll-top="scrollTop">
<view class="content"> <view class="content">
<view class="flex"> <view class="flex">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622085515000_731.png" mode="widthFix" <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622085515000_731.png" mode="widthFix"
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
this.scrollTop = posi; this.scrollTop = posi;
this.$nextTick(function() { this.$nextTick(function() {
this.scrollTop = posi; this.scrollTop = posi;
}); });
}, },
changeActive() { changeActive() {
let t = 0 let t = 0
......
pages/hotel/detail.vue
View file @ 7a8d3734
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
</view> </view>
<view class="mi-right"> <view class="mi-right">
<view style="font-size: 40rpx;font-weight: 600;text-align: right;margin-bottom: 6rpx;" class="king">{{dataList.StarName}}</view> <view style="font-size: 40rpx;font-weight: 600;text-align: right;margin-bottom: 6rpx;" class="king">{{dataList.StarName}}</view>
<view style="font-weight: 500;color:#dfbe6e99;text-align: right;" class="f12">658人下单入住</view>
<!-- <view class="flex"> <!-- <view class="flex">
<text style="color:white;margin-right: 14rpx;" class="f12">星级</text> <text style="color:white;margin-right: 14rpx;" class="f12">星级</text>
<u-rate active-color="#DFBE6E" inactive-color="#f1f1f1" current="4" active-icon="star" inactive-icon="star" disabled></u-rate> <u-rate active-color="#DFBE6E" inactive-color="#f1f1f1" current="4" active-icon="star" inactive-icon="star" disabled></u-rate>
...@@ -75,7 +74,7 @@ ...@@ -75,7 +74,7 @@
<view class="sb-left"> <view class="sb-left">
<view class="sb-item" v-for="(subItem,sIndex) in dataList.PublicFacilities">{{subItem}}</view> <view class="sb-item" v-for="(subItem,sIndex) in dataList.PublicFacilities">{{subItem}}</view>
</view> </view>
<view class="sb-right"> <view class="sb-right" @click="openDescription">
<text style="margin-right: 20rpx;">设施/详情</text> <text style="margin-right: 20rpx;">设施/详情</text>
<u-icon name="arrow" size="20" /> <u-icon name="arrow" size="20" />
</view> </view>
...@@ -833,8 +832,11 @@ ...@@ -833,8 +832,11 @@
.hotel-detail .hotel-content .hotel-base .shebei .sb-left { .hotel-detail .hotel-content .hotel-base .shebei .sb-left {
width: 1px; width: 1px;
flex: 1; flex: 1;
display: flex; /* display: flex; */
align-items: center; align-items: center;
display: -webkit-box;
overflow: auto;
margin-right:20rpx;
} }
.hotel-detail .hotel-content .hotel-base .shebei .sb-left .sb-item { .hotel-detail .hotel-content .hotel-base .shebei .sb-left .sb-item {
......
pages/jiuzhai/allorderList.vue
View file @ 7a8d3734
...@@ -254,6 +254,7 @@ ...@@ -254,6 +254,7 @@
} }
}, },
onLoad(options){ onLoad(options){
this.current = options.status || 0;
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") ? let pages = wx.getStorageSync("basedata") ?
...@@ -454,7 +455,6 @@ ...@@ -454,7 +455,6 @@
}, },
queren(data,index){ queren(data,index){
this.payindex = index this.payindex = index
console.log(data,222,index)
let url='/api/WeChatPay/GetDmcPayInfo' let url='/api/WeChatPay/GetDmcPayInfo'
let GoodsName = '' let GoodsName = ''
if(data.OrderType==1){ if(data.OrderType==1){
......
pages/jiuzhai/jz_Line.vue
View file @ 7a8d3734
This diff is collapsed.
pages/jiuzhai/jz_MyOrder.vue
View file @ 7a8d3734
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
} }
/* .jz_MyOrderMain{
background-color: #ECF1F4;
}
*/
.jz_OrderList { .jz_OrderList {
width: 100%; width: 100%;
min-height: 334rpx; min-height: 334rpx;
...@@ -71,7 +67,7 @@ ...@@ -71,7 +67,7 @@
.jz_Zailai { .jz_Zailai {
position: absolute; position: absolute;
right: 40rpx; right: 40rpx;
bottom: 40rpx; bottom: 20rpx;
background-color: #111111; background-color: #111111;
border-radius: 16px; border-radius: 16px;
width: 150rpx; width: 150rpx;
...@@ -115,7 +111,8 @@ ...@@ -115,7 +111,8 @@
<view style="margin-top:22rpx;">付款总额：¥{{item.preferPrice}}</view> <view style="margin-top:22rpx;">付款总额：¥{{item.preferPrice}}</view>
</view> </view>
</view> </view>
<view class="jz_Zailai" @click="gojz_List">再来一单</view> <view class="jz_Zailai" style="right:90px;" @click="gojz_List">再来一单</view>
<view class="jz_Zailai" style="width:60px;" @click="goCancel(item)">取消</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
...@@ -133,15 +130,19 @@ ...@@ -133,15 +130,19 @@
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
MiniAppUserId: 0 MiniAppUserId: 0,
orderState:-1
}, },
mainColor: "", mainColor: "",
list: [{ list: [{
name: '全部' name: '全部',
Id:-1
}, { }, {
name: '待付款' name: '待付款',
Id:2
}, { }, {
name: '未使用' name: '已付款',
Id:1
}], }],
current: 0, current: 0,
dataList: [], dataList: [],
...@@ -158,12 +159,15 @@ ...@@ -158,12 +159,15 @@
this.getOrderInfo(); this.getOrderInfo();
}, },
onLoad(option) { onLoad(option) {
this.current = option.status || 0;
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
methods: { methods: {
change(val) { change(i) {
this.current = i;
this.msg.orderState = this.list[i].Id;
this.research();
}, },
//获取第一张图 //获取第一张图
getFirstImg(obj) { getFirstImg(obj) {
...@@ -191,14 +195,28 @@ ...@@ -191,14 +195,28 @@
this.status = "nomore"; this.status = "nomore";
} }
}, },
getOrderInfo() { research()
{
this.msg.pageIndex=1;
this.getOrderInfo(1);
},
getOrderInfo(type) {
if(type==1){
this.dataList=[];
}
this.userInfo = uni.getStorageSync('mall_UserInfo'); this.userInfo = uni.getStorageSync('mall_UserInfo');
this.msg.MiniAppUserId = this.userInfo.UserId this.msg.MiniAppUserId = this.userInfo.UserId
this.apipost("sellorder_post_GetMiniAppTravelOrderList", this.msg, this.apipost("sellorder_post_GetMiniAppTravelOrderList", this.msg,
res => { res => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res, '数据'); console.log(res, '数据');
this.dataList = this.dataList.concat(res.data.pageData); if(type==1){
this.dataList = res.data.pageData;
}
else{
this.dataList = this.dataList.concat(res.data.pageData);
}
this.dataList.forEach(x => { this.dataList.forEach(x => {
x.isShowHalf = true; x.isShowHalf = true;
}) })
...@@ -209,6 +227,51 @@ ...@@ -209,6 +227,51 @@
}, },
null null
); );
},
//取消订单
goCancel(item) {
console.log(item, 'item');
//未付款-调用后台取消
if ((item.paymentTime == null||item.paymentTime=='')&&item.orderState==2) {
this.apipost(
"sellorder_post_B2BRemoveOrder", {
ID: item.orderId
},
res => {
if (res.data.resultCode == 1) {
uni.showToast({
title: '操作成功',
icon: 'success',
})
this.research();
}
},
err => {}
);
}
else{
let msg={
OrderId:item.orderId,
UserId:uni.getStorageSync('mall_UserInfo').UserId
}
//已付款取消申请
this.apipost("sellorder_post_AppletUserCancelOrder", msg ,
res => {
if (res.resultCode == 1) {
console.log(res, '数据');
uni.showToast({
title: '操作成功',
icon: 'success',
})
this.research();
} else {
}
},
null
);
}
} }
} }
......
pages/restaurant/components/buyNotice.vue 0 → 100644
View file @ 7a8d3734
<template>
<view class="buy-notice-restaurant">
<view class="meal-info">
<image :src="mealData.MealPic" mode="aspectFit" class="MealPic"></image>
<view class="right">
<view class="name">{{mealData.MealName}}</view>
<view class="sale">已售 {{mealData.SaleCount}}</view>
</view>
</view>
<view class="ticket-title">
套餐内容
<text class="ticket-title-bg"></text>
</view>
<view class="meal-con">
{{mealData.MealDesc}}
</view>
<view class="ticket-title">
购买须知
<text class="ticket-title-bg"></text>
</view>
<view class="buy-notice-con">
<rich-text :nodes="mealData.OtherTag"></rich-text>
</view>
<view class="btn-box">
<view class="price">
<text class="price-pre">￥</text>
{{$utils.getretailer()==true? mealData.LPriceB:mealData.LPriceC}}
</view>
<view class="btn" @click="subscribe">
立即预订
</view>
</view>
</view>
</template>
<script>
export default{
props:{
mealData:{
type:Object,
default:{}
}
},
data(){
return{
}
},
methods:{
subscribe(){
this.$emit("success")
}
}
}
</script>
<style lang="scss" scoped>
.buy-notice-restaurant{
height: 70vh;
padding: 45rpx 45rpx 120rpx 45rpx;
overflow-y: scroll;
overflow-x: hidden;
.meal-info{
display: flex;
padding-bottom: 50rpx;
border-bottom: 1rpx solid #E7E7E7;
.MealPic{
width: 129rpx;
height: 129rpx;
background-color: #DFBE6E;
border-radius: 20rpx;
}
.right{
flex-grow: 5;
margin-left: 35rpx;
.name{
font-size: 34rpx;
font-family: PingFang SC;
font-weight: bold;
color: #1B1D1E;
}
.sale{
width: 120rpx;
height: 40rpx;
background-color: #ECF1F4;
border-radius: 4rpx;
font-size: 22rpx;
font-family: PingFang SC;
font-weight: 500;
color: #111111;
text-align: center;
line-height: 38rpx;
margin-top: 20rpx;
}
}
}
.ticket-title {
// width: 70rpx;
height: 50rpx;
font-size: 34rpx;
font-family: PingFang SC;
font-weight: bold;
color: #1F1F1F;
background-color: transparent;
// line-height: 44rpx;
position: relative;
margin: 40rpx 0;
.ticket-title-bg {
width: 70rpx;
height: 10rpx;
background-color: #DFBE6E;
border-radius: 4px;
position: absolute;
left: 0;
bottom: 6rpx;
z-index: 1;
opacity: 0.6;
}
}
.meal-con{
white-space: pre-wrap;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 500;
color: #111111;
}
.buy-notice-con{
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 600;
color: #111111;
}
.btn-box{
position: fixed;
right: 55rpx;
bottom:100rpx;
display: flex;
justify-content: flex-end;
align-items: center;
.price{
font-size: 40rpx;
font-family: PingFang SC;
font-weight: 500;
color: #D91818;
// line-height: 38rpx;
.price-pre{
font-size: 22rpx;
}
}
.btn{
width: 300rpx;
height: 80rpx;
background-color: #111111;
border-radius: 20rpx;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: bold;
color: #FFFFFF;
text-align: center;
line-height: 78rpx;
margin-left: 45rpx;
}
}
}
</style>
pages/restaurant/components/package-good.vue
View file @ 7a8d3734
...@@ -8,58 +8,94 @@ ...@@ -8,58 +8,94 @@
<view class="package-name">{{data.MealName}}</view> <view class="package-name">{{data.MealName}}</view>
<view class="f11"> <view class="f11">
<text class="king" style="margin-right: 14rpx;" v-if="data.MinBuyNum>0">{{data.MinBuyNum}}人起订</text> <text class="king" style="margin-right: 14rpx;" v-if="data.MinBuyNum>0">{{data.MinBuyNum}}人起订</text>
<text><text v-for="(item,index) in data.UsageTimeList" :key="index"> <text>
{{item.Name}} <text v-if="index!=data.UsageTimeList.length-1">、</text> <text v-for="(item,index) in data.UsageTimeList" :key="index" v-if="data.UsageTimeList[0].ID!==0">
</text>可用,</text> {{item.Name}}
<text v-if="index!=data.UsageTimeList.length-1">、</text>
</text>
<text v-if="data.UsageTimeList[0].ID!==0">可用,</text>
<text v-if="data.UsageTimeList[0].ID===0">
使用时间不限
</text>
</text>
<text v-if="data.IsHoliday===1">节假日可用</text> <text v-if="data.IsHoliday===1">节假日可用</text>
</view> </view>
<viwe class="give f11"> <viwe class="give f11">
<text v-if="data.MakeDay===0">可预约当天</text> <text v-if="data.MakeDay===0">可预约当天</text>
<text v-if="data.MakeDay>0">提前{{data.MakeDay}}天预约</text> <text v-if="data.MakeDay>0">提前{{data.MakeDay}}天预约</text>
</viwe> </viwe>
<view class="price" style="margin-top:30rpx;"> <view class="buy-know" @click="seeBuyNotice">
购买须知
</view>
<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">
<view class="buy" @click="previewOrder"> <view class="buy" @click="previewOrder" v-if="data.RemainingInventory>0">
<view class="buy-content">抢</view> <view class="buy-content">抢</view>
<view class="buy-tips">在线订</view> <view class="buy-tips">在线订</view>
</view> </view>
<!-- <view class="buy disabled"> <view class="buy disabled" v-if="data.RemainingInventory===0">
<view class="buy-content">抢</view> <view class="buy-content">抢</view>
<view class="buy-tips">已售罄</view> <view class="buy-tips">已售罄</view>
</view> --> </view>
</view> </view>
<u-popup v-model="showBuyNotice" mode="bottom" border-radius="40" :safe-area-inset-bottom="true">
<buyNotice :mealData="data" @success="buyNoticeSuccess"></buyNotice>
</u-popup>
</view> </view>
</template> </template>
<script> <script>
import buyNotice from "./buyNotice.vue"
export default { export default {
props:{ components: {
data:{ buyNotice
type:Object, },
dafault:{} props: {
data: {
type: Object,
dafault: {}
}
},
data() {
return {
showBuyNotice: false
} }
}, },
mounted() { mounted() {
console.log(this.data) console.log(this.data)
}, },
methods: { methods: {
previewOrder(){ previewOrder() {
uni.navigateTo({ this.$emit("success")
url:"/pages/restaurant/order" },
}) buyNoticeSuccess(){
this.showBuyNotice = false
if(this.data.RemainingInventory>0){
this.previewOrder()
}else{
uni.showToast({
title:"该套餐已售罄",
icon:"none"
})
}
}, },
seeBuyNotice() {
this.showBuyNotice = true
}
}, },
} }
</script> </script>
<style> <style scoped>
.package-good { .package-good {
margin-bottom: 30rpx; margin-bottom: 30rpx;
display: flex; display: flex;
...@@ -79,7 +115,8 @@ ...@@ -79,7 +115,8 @@
width: 1px; width: 1px;
flex: 1; flex: 1;
} }
.package-good .rm-opera{
.package-good .rm-opera {
margin-left: 10rpx; margin-left: 10rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -87,14 +124,16 @@ ...@@ -87,14 +124,16 @@
justify-items: center; justify-items: center;
align-items: center; align-items: center;
} }
.package-good .rm-opera .warm-count{
.package-good .rm-opera .warm-count {
text-align: center; text-align: center;
font-size: 18rpx; font-size: 18rpx;
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
.package-good .rm-opera .buy{
.package-good .rm-opera .buy {
width: 70rpx; width: 70rpx;
height: 81rpx; height: 81rpx;
background: #FFFFFF; background: #FFFFFF;
...@@ -103,26 +142,31 @@ ...@@ -103,26 +142,31 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.package-good .rm-opera .buy.disabled{
.package-good .rm-opera .buy.disabled {
background: #EBEBEB; background: #EBEBEB;
border: 2rpx solid #DCDCDC; border: 2rpx solid #DCDCDC;
} }
.package-good .rm-opera .buy.disabled .buy-tips{
.package-good .rm-opera .buy.disabled .buy-tips {
background: #A09E9E; background: #A09E9E;
color: #fff; color: #fff;
} }
.package-good .rm-opera .buy.disabled .buy-content{
.package-good .rm-opera .buy.disabled .buy-content {
color: #A09E9E; color: #A09E9E;
} }
.package-good .rm-opera .buy .buy-tips{
.package-good .rm-opera .buy .buy-tips {
height: 27rpx; height: 27rpx;
background: #000000; background: #000000;
text-align: center; text-align: center;
color:#DFBE6E; color: #DFBE6E;
font-size: 18rpx; font-size: 18rpx;
line-height: 27rpx; line-height: 27rpx;
} }
.package-good .rm-opera .buy .buy-content{
.package-good .rm-opera .buy .buy-content {
height: 1px; height: 1px;
flex: 1; flex: 1;
text-align: center; text-align: center;
...@@ -133,6 +177,7 @@ ...@@ -133,6 +177,7 @@
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
} }
.package-good .rm-right .package-name { .package-good .rm-right .package-name {
font-size: 30rpx; font-size: 30rpx;
font-weight: 800; font-weight: 800;
...@@ -143,27 +188,28 @@ ...@@ -143,27 +188,28 @@
} }
.package-good .rm-right .give { .package-good .rm-right .give {
background: #ECF1F4; background: #ECF1F4;
border-radius: 4rpx; border-radius: 4rpx;
padding: 10rpx; padding: 10rpx;
margin-top:15rpx; margin-top: 15rpx;
display: inline-block; display: inline-block;
} }
.package-good .rm-right .price{ .package-good .rm-right .price {
font-weight: 800; font-weight: 800;
font-size: 40rpx; font-size: 40rpx;
color:#111; color: #111;
} }
.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 {
...@@ -182,4 +228,12 @@ ...@@ -182,4 +228,12 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
} }
.buy-know {
margin-top: 10rpx;
font-size: 22rpx;
font-family: PingFang SC;
font-weight: 800;
color: #111111;
}
</style> </style>
pages/restaurant/components/restaurant-good.vue
View file @ 7a8d3734
...@@ -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>
...@@ -42,9 +44,6 @@ ...@@ -42,9 +44,6 @@
default:{} default:{}
} }
}, },
created() {
console.log(this.data)
},
data() { data() {
return { return {
// key: value // key: value
...@@ -64,7 +63,7 @@ ...@@ -64,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;
...@@ -72,6 +71,7 @@ ...@@ -72,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%;
...@@ -80,6 +80,7 @@ ...@@ -80,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;
...@@ -143,4 +144,17 @@ ...@@ -143,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>
pages/restaurant/detail.vue
View file @ 7a8d3734
This diff is collapsed.
pages/restaurant/list.vue
View file @ 7a8d3734
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<view class="search-box"> <view class="search-box">
<view style="width: 1px; flex: 1;"> <view style="width: 1px; flex: 1;">
<u-search placeholder="美食名称" v-model="msg.Name" input-align="left" <u-search placeholder="美食名称" v-model="msg.Name" input-align="left"
text-color="#111" bg-color="rgba(0,0,0,0)" :show-action="false"></u-search> text-color="#111" bg-color="rgba(0,0,0,0)" :show-action="false" clearabled @search="searchList" @clear="searchList"></u-search>
</view> </view>
</view> </view>
<view> <view>
<u-dropdown ref="uDropdown" @open="open" @close="close" active-color="#000" inactive-color="#444"> <u-dropdown ref="uDropdown" @open="open" @close="close" active-color="#000" inactive-color="#444">
<u-dropdown-item v-model="msg.OrderBy" :title="optionsTitle[0]" :options="options1" @change="change"> <u-dropdown-item v-model="msg.OrderBy" :title="optionsTitle[0]" :options="options1" @change="getFoodList">
</u-dropdown-item> </u-dropdown-item>
<u-dropdown-item v-model="msg.FoodTypeIds" :title="optionsTitle[1]" :options="classOptions"> <u-dropdown-item v-model="msg.FoodTypeIds" :title="optionsTitle[1]" :options="classOptions" @change="getFoodList">
</u-dropdown-item> </u-dropdown-item>
<u-dropdown-item :title="optionsTitle[2]"> <u-dropdown-item :title="optionsTitle[2]">
<view class="slot-content" style="padding: 30rpx;background-color: #FFF;"> <view class="slot-content" style="padding: 30rpx;background-color: #FFF;">
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
<text style="font-size: 28rpx;color:#111;font-weight: 800;">价格</text> <text style="font-size: 28rpx;color:#111;font-weight: 800;">价格</text>
</view> </view>
<view class="hotel-rate-box"> <view class="hotel-rate-box">
<view v-for="(x,i) in rates" class="hotel-rate" :class="{'active':tempRateAndPrice.rate.indexOf(x.ID)!=-1}" @click="setRestaurantPrice(x.ID)">{{x.Name}}</view> <!-- <view v-for="(x,i) in rates" class="hotel-rate" :class="{'active':tempRateAndPrice.rate.indexOf(x.ID)!=-1}" @click="setRestaurantPrice(x.ID)">{{x.Name}}</view> -->
<view v-for="(x,i) in rates" class="hotel-rate" :class="{'active':msg.DiningPriceType===x.ID}" @click="setRestaurantPrice(x.ID)">{{x.Name}}</view>
</view> </view>
<view style="box-shadow: 0px -10px 30px 0px rgba(36, 36, 36, 0.06);margin-top:40rpx;display: flex;"> <view style="box-shadow: 0px -10px 30px 0px rgba(36, 36, 36, 0.06);margin-top:40rpx;display: flex;">
<view style="flex:1;margin-right: 30rpx;"> <view style="flex:1;margin-right: 30rpx;">
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
Name:"", Name:"",
OrderBy:0, OrderBy:0,
FoodTypeIds:0, FoodTypeIds:0,
DiningPriceType:-1, DiningPriceType:0,
}, },
page_count:1, page_count:1,
status: "loadmore", status: "loadmore",
...@@ -187,9 +188,6 @@ ...@@ -187,9 +188,6 @@
restaurantType restaurantType
}, },
created() { created() {
// uni.navigateTo({
// url:"/pages/hotel/detail"
// })
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "美食", title: "美食",
}); });
...@@ -213,7 +211,10 @@ ...@@ -213,7 +211,10 @@
this.getFoodList(); this.getFoodList();
}, },
methods: { methods: {
searchList(){
this.msg.pageIndex=1
this.getFoodList();
},
scroll: function(e) { scroll: function(e) {
this.old.scrollTop = e.detail.scrollTop; this.old.scrollTop = e.detail.scrollTop;
}, },
...@@ -233,89 +234,93 @@ ...@@ -233,89 +234,93 @@
} }
}, },
setRestaurantPrice(rateId){ setRestaurantPrice(rateId){
if(rateId==-1){ this.msg.DiningPriceType=rateId
this.tempRateAndPrice.rate=[-1] // if(rateId==-1){
}else{ // this.tempRateAndPrice.rate=[-1]
if(this.tempRateAndPrice.rate.indexOf(-1)!=-1){ // }else{
this.tempRateAndPrice.rate.splice(this.tempRateAndPrice.rate.indexOf(-1),1) // if(this.tempRateAndPrice.rate.indexOf(-1)!=-1){
} // this.tempRateAndPrice.rate.splice(this.tempRateAndPrice.rate.indexOf(-1),1)
let temp=this.tempRateAndPrice.rate.indexOf(rateId) // }
if(temp==-1){ // let temp=this.tempRateAndPrice.rate.indexOf(rateId)
this.tempRateAndPrice.rate.push(rateId) // if(temp==-1){
}else{ // this.tempRateAndPrice.rate.push(rateId)
this.tempRateAndPrice.rate.splice(temp,1) // }else{
} // this.tempRateAndPrice.rate.splice(temp,1)
} // }
console.log(this.tempRateAndPrice.rate) // }
},
setRestaurant(typeId){
if(typeId==-1){
this.tempRateAndPrice.types=[-1]
}else{
if(this.tempRateAndPrice.types.indexOf(-1)!=-1){
this.tempRateAndPrice.types.splice(this.tempRateAndPrice.types.indexOf(-1),1)
}
let temp=this.tempRateAndPrice.types.indexOf(typeId)
if(temp==-1){
this.tempRateAndPrice.types.push(typeId)
}else{
this.tempRateAndPrice.types.splice(temp,1)
}
}
}, },
// setRestaurant(typeId){
// if(typeId==-1){
// this.tempRateAndPrice.types=[-1]
// }else{
// if(this.tempRateAndPrice.types.indexOf(-1)!=-1){
// this.tempRateAndPrice.types.splice(this.tempRateAndPrice.types.indexOf(-1),1)
// }
// let temp=this.tempRateAndPrice.types.indexOf(typeId)
// if(temp==-1){
// this.tempRateAndPrice.types.push(typeId)
// }else{
// this.tempRateAndPrice.types.splice(temp,1)
// }
// }
// },
resetPrice(){ resetPrice(){
this.optionsTitle[2]="筛选" // this.optionsTitle[2]="筛选"
this.searchObj.rateAndPrice={ // this.searchObj.rateAndPrice={
types:[-1], // types:[-1],
priceText:"不限", // priceText:"不限",
rate:[-1] // rate:[-1]
} // }
this.msg.DiningPriceType=0
this.getFoodList();
this.closeDropdown(); this.closeDropdown();
}, },
surePrice(){ surePrice(){
let result="" // let result=""
if(this.tempRateAndPrice.types.length>0){ // if(this.tempRateAndPrice.types.length>0){
this.options2.forEach(x=>{ // this.options2.forEach(x=>{
if(this.tempRateAndPrice.types.indexOf(x.value)!=-1){ // if(this.tempRateAndPrice.types.indexOf(x.value)!=-1){
result+=x.label+"," // result+=x.label+","
} // }
}) // })
} // }
if(this.tempRateAndPrice.rate.length>0){ // if(this.tempRateAndPrice.rate.length>0){
this.rates.forEach(x=>{ // this.rates.forEach(x=>{
if(this.tempRateAndPrice.rate.indexOf(x.value)!=-1){ // if(this.tempRateAndPrice.rate.indexOf(x.value)!=-1){
result+=x.label+"," // result+=x.label+","
} // }
}) // })
} // }
result=result==""?"筛选":result // result=result==""?"筛选":result
console.log(result) // console.log(296,result)
this.optionsTitle[2]=result // this.optionsTitle[2]=result
this.$forceUpdate() // this.$forceUpdate()
this.searchObj.rateAndPrice=this.tempRateAndPrice // this.searchObj.rateAndPrice=this.tempRateAndPrice
this.closeDropdown(); // this.msg.DiningPriceType=this.tempRateAndPrice.rate.toString();
}, this.getFoodList();
sureType(item){
this.searchObj.rtype=item.Id
this.optionsTitle[1]=item.Id==-1?'菜系':item.Name
this.closeDropdown(); this.closeDropdown();
item.newTimespan=this.rand(1000,9999)
this.currentTypeObj=item
},
rangechange4(e){
if(e.minValue==0){
if(e.maxValue==1000){
this.tempRateAndPrice.priceText="不限"
}else{
this.tempRateAndPrice.priceText=`￥${e.maxValue}以下`
}
}else if(e.maxValue==1000){
this.tempRateAndPrice.priceText=`￥${e.minValue}以上`
}else{
this.tempRateAndPrice.priceText=`￥${e.minValue} - ￥${e.maxValue}之间`
}
}, },
// sureType(item){
// this.searchObj.rtype=item.Id
// this.optionsTitle[1]=item.Id==-1?'菜系':item.Name
// this.closeDropdown();
// item.newTimespan=this.rand(1000,9999)
// this.currentTypeObj=item
// },
// rangechange4(e){
// if(e.minValue==0){
// if(e.maxValue==1000){
// this.tempRateAndPrice.priceText="不限"
// }else{
// this.tempRateAndPrice.priceText=`￥${e.maxValue}以下`
// }
// }else if(e.maxValue==1000){
// this.tempRateAndPrice.priceText=`￥${e.minValue}以上`
// }else{
// this.tempRateAndPrice.priceText=`￥${e.minValue} - ￥${e.maxValue}之间`
// }
// },
closeDropdown() { closeDropdown() {
this.$refs.uDropdown.close(); this.$refs.uDropdown.close();
}, },
......
pages/restaurant/order.vue
View file @ 7a8d3734
This diff is collapsed.
pages/ticketCoupons/components/buyNotice.vue
View file @ 7a8d3734
...@@ -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 {
......
pages/ticketCoupons/components/subscribeTicket.vue
View file @ 7a8d3734
...@@ -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
......
pages/ticketCoupons/detail.vue
View file @ 7a8d3734
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
style="position: fixed;top: 0;left: 0;z-index: 9; padding-left: 6rpx;"> style="position: fixed;top: 0;left: 0;z-index: 9; padding-left: 6rpx;">
<u-icon name="arrow-left" size="44" color="#000" style="margin-top: 22rpx;"></u-icon> <u-icon name="arrow-left" size="44" color="#000" style="margin-top: 22rpx;"></u-icon>
</view> </view>
<image class="banner-img" :src="imgBaseUrl+details.AllPicList[0].TagPicList[0].Path" mode="aspectFit" <image class="banner-img" :src="details.AllPicList[0].TagPicList[0].Path" mode="aspectFit"
@click="goUrl('/pages/ticketCoupons/imgList')"></image> @click="goUrl('/pages/ticketCoupons/imgList')"></image>
</view> </view>
<view class="ticket-title" :style="[titleStyleFix]"> <view class="ticket-title" :style="[titleStyleFix]">
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</view> </view>
<view> <view>
<view class="no-data" v-if="details.mealList.length==0"> <view class="no-data" v-if="details.mealList.length===0">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/no-data.png" mode="aspectFit" class="no-data-img"></image> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/no-data.png" mode="aspectFit" class="no-data-img"></image>
<view class="zhanwu"> <view class="zhanwu">
暂无数据 暂无数据
...@@ -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">
......
pages/ticketCoupons/imgList.vue
View file @ 7a8d3734
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="img-list-box"> <view class="img-list-box">
<view v-for="(item,index) in dataList.TagPicList" :key="item.ID" class="img-list-item" @click=""> <view v-for="(item,index) in dataList.TagPicList" :key="item.ID" class="img-list-item" @click="">
<view class="img-box" @click="previewImage(index,item.Path)" v-if="item.type==='image'"> <view class="img-box" @click="previewImage(index,item.Path)" v-if="item.type==='image'">
<image :src="imgBaseUrl+item.Path" mode="aspectFit"></image> <image :src="imgBaseUrl+item.Path" mode="aspectFit" :style="{'margin-right':index%2 ==0?'20rpx':0}"></image>
</view> </view>
<view class="img-box" style="position: relative" v-if="item.type==='video'"> <view class="img-box" style="position: relative" v-if="item.type==='video'">
<video id="myVideo" :src="imgBaseUrl+item.Path" <video id="myVideo" :src="imgBaseUrl+item.Path"
...@@ -167,9 +167,13 @@ ...@@ -167,9 +167,13 @@
background-color: #E7E7E7; background-color: #E7E7E7;
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
display: flex;
justify-content: space-between;
image{ image{
width: 100%; width: 100%;
height: 100%; height: 100%;
// margin-right: 20rpx;
margin-bottom: 20rpx;
} }
#myVideo{ #myVideo{
width: 100%; width: 100%;
......
pages/ticketCoupons/list.vue
View file @ 7a8d3734
...@@ -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