Skip to content

J
jz_Travel
Commit 7973f272 authored by 罗超's avatar 罗超
Browse files
Options

1

parent e2f3bc0c
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 127 deletions
pages/restaurant/components/buyNotice.vue
View file @ 7973f272
......@@ -12,14 +12,16 @@
<text class="ticket-title-bg"></text>
</view>
<view class="meal-con">
{{mealData.MealDesc}}
<text v-if="mealData.MealDesc">{{mealData.MealDesc}}</text>
<text v-else class="zanwu">暂无</text>
</view>
<view class="ticket-title">
购买须知
<text class="ticket-title-bg"></text>
</view>
<view class="buy-notice-con">
<rich-text :nodes="mealData.OtherTag"></rich-text>
<rich-text :nodes="mealData.OtherTag" v-if="mealData.OtherTag"></rich-text>
<text v-else class="zanwu">暂无</text>
</view>
<view class="btn-box">
<view class="price">
......@@ -163,4 +165,10 @@
}
}
}
.zanwu{
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #999999;
}
</style>
pages/restaurant/components/package-good.vue
View file @ 7973f272
<template>
<view class="package-good">
<view class="rm-left">
<image :src="data.MealPic" mode="aspectFit">
<image :src="data.MealPic" mode="aspectFill">
</image>
</view>
<view class="rm-right">
......
pages/restaurant/components/restaurant-type.vue
View file @ 7973f272
......@@ -145,11 +145,11 @@
changeHandler(i) {
this.tid = i;
this.sd = this.d[this.tid].ChildrenList;
this.currentObj=this.d[i]
},
clickHandler(item) {
this.currentObj=item
this.currentObj.active=this.active
console.log(this.currentObj)
// let Id1 = this.d[this.tid].ID;
// let Id2 = item.ID;
// let CategoryIds = Id2;
......
pages/restaurant/components/uni-calendar/uni-calendar.vue
View file @ 7973f272
......@@ -268,6 +268,20 @@
*/
choiceDate(weeks) {
if (weeks.disable) return
let resDay=Date.parse(weeks.fullDate);
let now=new Date();
now.setHours(0);//设置小时
now.setMinutes(0);//设置分钟
now.setSeconds(0);//设置秒
now.setMilliseconds(0);//设置毫妙
let today= now.getTime();
if(resDay<today){
uni.showToast({
title: "不能选择今天以前的日期",
icon: "none",
});
return
}
this.calendar = weeks
// 设置多选
this.cale.setMultiple(this.calendar.fullDate)
......
pages/restaurant/detail.vue
View file @ 7973f272
......@@ -84,7 +84,7 @@
</view>
<ul class="title-style-one hr">
<ul class="title-style-one hr" v-if="details.FoodRecommendList.length>0">
<li v-for="(item,index) in details.FoodRecommendList" :key="index">
<view class="item-title regular">{{item.FoodName}}</view>
</li>
......@@ -397,7 +397,7 @@
.chooseDate {
width: 275rpx;
margin-top: 20rpx;
margin: 20rpx 0;
/* display: inline-block; */
/* height: 60rpx; */
background-color: #ECF1F4;
......
pages/restaurant/list.vue
View file @ 7973f272
......@@ -172,7 +172,7 @@
showLoading: false,
status: "loadmore",
currentTypeObj: {
Id: -1,
ID: -1,
active: 0
},
foodType: [],
......@@ -184,9 +184,6 @@
restaurantType
},
onLoad(options) {
if(options && options.Name){
this.msg.Name = options.Name
}
uni.setNavigationBarTitle({
title: "美食",
});
......@@ -306,6 +303,7 @@
},
sureType(item) {
this.msg.FoodTypeIds = item.ID;
console.log(this.msg,item)
this.getFoodList();
this.closeDropdown();
},
......
pages/ticketCoupons/components/buyNotice.vue
View file @ 7973f272
......@@ -71,17 +71,20 @@
</view>
</view>
<!-- 使用说明 -->
<view class="use-desc" v-if="TicketData.UseInstructionsList.length>0">
<view class="use-desc">
<view class="ticket-title">
使用说明
<text class="ticket-title-bg"></text>
</view>
<view v-for="(item,index) in TicketData.UseInstructionsList" :key="index">
<view class="zanwu" v-if="TicketData.UseInstructionsList.length===0||(TicketData.UseInstructionsList[0].title==''&&TicketData.UseInstructionsList[0].Dec=='')">
暂无
</view>
<view v-for="(item,index) in TicketData.UseInstructionsList" :key="index" v-if="TicketData.UseInstructionsList.length>0">
<view class="detail-info-item">
<view class="item2-name">
<view class="item2-name" v-if="item.title">
{{item.title}}
</view>
<view class="item-desc">
<view class="item-desc" v-if="item.Dec">
{{item.Dec}}
</view>
</view>
......@@ -93,12 +96,15 @@
费用说明
<text class="ticket-title-bg"></text>
</view>
<view v-for="(item,index) in TicketData.PriceInstructionsList" :key="index">
<view class="zanwu" v-if="TicketData.PriceInstructionsList.length===0||(TicketData.PriceInstructionsList[0].title==''&&TicketData.PriceInstructionsList[0].Dec=='')">
暂无
</view>
<view v-for="(item,index) in TicketData.PriceInstructionsList" :key="index" v-if="TicketData.PriceInstructionsList.length>0">
<view class="detail-info-item">
<view class="item2-name">
<view class="item2-name" v-if="item.title">
{{item.title}}
</view>
<view class="item-desc">
<view class="item-desc" v-if="item.Dec">
{{item.Dec}}
</view>
</view>
......@@ -106,17 +112,20 @@
</view>
<!-- 其他信息 -->
<view class="other-desc">
<view class="other-desc" v-if="TicketData.OtherDescList.length>0">
<view class="ticket-title">
其他信息
<text class="ticket-title-bg"></text>
</view>
<view v-for="(item,index) in TicketData.OtherDescList" :key="index">
<view class="zanwu" v-if="TicketData.OtherDescList.length===0||(TicketData.OtherDescList[0].title==''&&TicketData.OtherDescList[0].Dec=='')">
暂无
</view>
<view v-for="(item,index) in TicketData.OtherDescList" :key="index" v-if="TicketData.OtherDescList.length>0">
<view class="detail-info-item">
<view class="item2-name">
<view class="item2-name" v-if="item.title">
{{item.title}}
</view>
<view class="item-desc">
<view class="item-desc" v-if="item.Dec">
{{item.Dec}}
</view>
</view>
......@@ -307,11 +316,14 @@
.detail-info-item {
display: flex;
margin-bottom: 30rpx;
flex-wrap: wrap;
align-items: center;
margin-bottom: 20rpx;
.item-name {
width: 120rpx;
height: 40rpx;
// width: 120rpx;
// height: 40rpx;
padding: 8rpx;
background-color: #111111;
border-radius: 4rpx;
font-size: 24rpx;
......@@ -324,8 +336,9 @@
overflow: hidden;
}
.item2-name {
width: 120rpx;
height: 40rpx;
// width: 120rpx;
// height: 40rpx;
padding: 8rpx;
background-color: #ECF1F4;
border-radius: 4rpx;
font-size: 24rpx;
......@@ -333,28 +346,34 @@
font-weight: bold;
color: #111111;
margin-right: 45rpx;
margin-bottom: 20rpx;
text-align: center;
line-height: 38rpx;
overflow: hidden;
}
.item-desc {
width: 500rpx;
// width: 500rpx;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 800;
color: #111111;
line-height: 28rpx;
// white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
}
}
.method {
// width: 660rpx;
height: 225rpx;
// height: 225rpx;
background-color: #FCF8F0;
border-radius: 4rpx;
position: relative;
margin-top: 40rpx;
padding: 60rpx 0 0 25rpx;
padding: 60rpx 25rpx 25rpx 25rpx;
margin-bottom: 50rpx;
.method-title {
......@@ -397,7 +416,7 @@
padding-left: 25rpx;
margin-bottom: 25rpx;
.tuipiao-name {
height: 40rpx;
// height: 40rpx;
background-color: #FFFFFF;
border: 1rpx solid #DFBE6E;
border-radius: 4rpx;
......@@ -407,12 +426,13 @@
color: #DFBE6E;
text-align: center;
margin-right: 25rpx;
margin-bottom: 25rpx;
padding: 0 10rpx;
line-height: 38rpx;
}
.tuipiao-desc {
height: 40rpx;
// height: 40rpx;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: bold;
......@@ -455,4 +475,10 @@
}
.zanwu{
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #999999;
}
</style>
pages/ticketCoupons/components/njzz-calendar/njzz-calendar.vue
View file @ 7973f272
......@@ -23,7 +23,7 @@
</view>
<view class="dayBox">
<view class="day" v-for="(item,index) in space" v-bind:key="index"></view>
<view class="day" :class="[getDateStr(item.date)==getDateStr(dayActive.date)?'active':'']" v-for="(item,index) in dayList" v-bind:key="index" @tap="selectDate(item)">
<view class="day" :class="[getDateStr(item.date)==defaultSelect?'active':'']" v-for="(item,index) in dayList" v-bind:key="index" @tap="selectDate(item)">
<view :class="[isToday(item.date)?'today':'']">{{isToday(item.date) ? "今天" : item.date.getDate()}}</view>
<view class="calen-text-orange">{{item.price||item.price===0?'&yen;'+item.price:''}}</view>
</view>
......@@ -33,7 +33,6 @@
<script>
import uniIcons from "./uni-icons/uni-icons.vue"
/* import {uniIcons} from "../../components/uni-icons" */
export default{
components:{uniIcons},
name:"Zcalendar",
......@@ -72,8 +71,7 @@
},
watch:{
defaultSelect(val){
console.log(75,val)
this.getDefaultData(val)
// this.getDefaultData(val)
}
},
mounted() {
......@@ -84,11 +82,11 @@
}
this.setMonthList()
},
updated() {
if(this.defaultSelect != "" && !this.dayActive){
this.dayActive = this.getDefaultData(this.defaultSelect)
}
},
// updated() {
// if(this.defaultSelect != "" && !this.dayActive){
// this.dayActive = this.getDefaultData(this.defaultSelect)
// }
// },
computed: {
monthDatePrice: function () {
//过滤出 每个月份的团期价格list 并且按照对象内的价格排序 以用来显示当前月份xxxx金额起,用于mode1
......@@ -141,20 +139,20 @@
this.current = index
this.$emit('changeMonth',momth)
},
getDefaultData(d){ //设置初始值
let list = this.datePrice.filter(item=>item.date==d);
let obj={};
if(list.length>0){ //逻辑依旧是保证没有团期（价格）的不能选中
obj = {
date:new Date(list[0].date),
price:list[0].price
}
}else{
obj = false
}
// getDefaultData(d){ //设置初始值
// let list = this.datePrice.filter(item=>item.date==d);
// let obj={};
// if(list.length>0){ //逻辑依旧是保证没有团期（价格）的不能选中
// obj = {
// date:new Date(list[0].date),
// price:list[0].price
// }
// }else{
// obj = false
// }
return obj;
},
// return obj;
// },
isToday(date){
return date.getFullYear()==this.today.getFullYear() && date.getMonth()==this.today.getMonth() && date.getDate() == this.today.getDate()
},
......@@ -216,7 +214,6 @@
selectDate(data){ //选择日期
//多选模式请在这改造
/* this.$set(this.dayActive,"date",date) */
console.log(data)
let resDay=Date.parse(data.date);
let now=new Date();
now.setHours(0);//设置小时
......
pages/ticketCoupons/components/subscribeTicket.vue
View file @ 7973f272
......@@ -20,23 +20,23 @@
</view>
<view class="chooseBtn-box">
<view class="btn-TicketName-box">
{{defaultSelect}}
{{defaultSelect}}
<text class="btn-TicketName">
{{TicketName}}
</text>
</view>
<view class="btn-box">
<view class="icon-box">
<view class="kefu-iocn">
<u-icon name="service-o" color="#111111" size="24rpx"></u-icon>
<u-icon name="service-o" color="#111111" size="24rpx"></u-icon>
</view>
<view class="">
客服
</view>
</view>
<view class="subscribe-btn" @click="nextStep">
立即预订
</view>
......@@ -64,11 +64,11 @@
type: Number,
default: 0
},
TitekCounponId:{
TitekCounponId: {
type: Number,
default: 0
},
TicketName:{
TicketName: {
type: String,
default: ""
}
......@@ -77,12 +77,12 @@
return {
curryear: 0,
currmonth: 0,
defaultSelect:"",
defaultSelect: "",
datePrice: [],
price:"",
peopleNum:1,
showAuth:false,
u:{},
price: "",
peopleNum: 1,
showAuth: false,
u: {},
}
},
watch: {
......@@ -90,13 +90,17 @@
this.defaultSelect = val;
let newMonth = val.split('-')[1]
let oldMonth = oldVal.split('-')[1]
if(newMonth!=oldMonth&&oldMonth!=undefined){
if (newMonth != oldMonth && oldMonth != undefined) {
this.getGoodsDateList(val)
}
let list = this.datePrice.filter(item => item.date == this.dateStr);
if (list.length > 0) {
this.price = list[0].price
}
},
TicketID(val){
if(val){
TicketID(val) {
if (val) {
this.getGoodsDateList(this.dateStr)
}
}
......@@ -104,16 +108,15 @@
mounted() {
let year = new Date().getFullYear(); //年
let month = new Date().getMonth() + 1; //月
if(month<10){
if (month < 10) {
month = ('0' + month)
}
this.curryear= year
this.currmonth= month
this.curryear = year
this.currmonth = month
},
methods: {
valChange(e) {
this.peopleNum=e.value
this.peopleNum = e.value
},
getGoodsDateList(date) {
this.request2({
......@@ -128,34 +131,35 @@
let data = res.data;
let datePrice = [];
data.forEach(x => {
let obj = {}
obj.date = x.Year+'-'+x.Month+'-'+x.Day;
if(x.IsHavePrice==1){
let p=this.$utils.getretailer()==true? x.HPriceB:x.HPriceC
obj.price =p ;
}else{
obj.price = "";
}
datePrice.push(obj)
let obj = {}
obj.date = x.Year + '-' + x.Month + '-' + x.Day;
if (x.IsHavePrice == 1) {
let p = this.$utils.getretailer() == true ? x.HPriceB : x.HPriceC
obj.price = p;
} else {
obj.price = "";
}
datePrice.push(obj)
})
this.datePrice = datePrice
let list = this.datePrice.filter(item=>item.date==this.dateStr);
this.price=list[0].price
console.log(144,list)
let list = this.datePrice.filter(item => item.date == this.dateStr);
if (list.length > 0) {
this.price = list[0].price
}
}
);
},
changeDate(data){ //选择日期事件 可以将data绑定到此页面以用来提交等操作
changeDate(data) { //选择日期事件 可以将data绑定到此页面以用来提交等操作
this.defaultSelect = data.date;
this.price=data.price
this.price = data.price
this.$forceUpdate()
},
changeMonth(nowMonth){
let Month = nowMonth.year+'-'+nowMonth.month+'-01';
changeMonth(nowMonth) {
let Month = nowMonth.year + '-' + nowMonth.month + '-01';
this.getGoodsDateList(Month)
},
nextStep(){
nextStep() {
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
......@@ -163,28 +167,28 @@
avatarUrl: ""
};
this.showAuth = true;
} else {
if(!this.price){
if (!this.price) {
uni.showToast({
title: "请选择日期",
icon: "none",
});
return
}
let data={
TicketId:this.TicketID,
TitekCounponId:this.TitekCounponId,
Unit_Price:this.price,
Date:this.defaultSelect,
TicketName:this.TicketName,
PeopleNumber:this.peopleNum,
let data = {
TicketId: this.TicketID,
TitekCounponId: this.TitekCounponId,
Unit_Price: this.price,
Date: this.defaultSelect,
TicketName: this.TicketName,
PeopleNumber: this.peopleNum,
}
uni.navigateTo({
url: "/pages/ticketCoupons/fillOrder?data="+encodeURIComponent(JSON.stringify(data)),
url: "/pages/ticketCoupons/fillOrder?data=" + encodeURIComponent(JSON.stringify(data)),
});
}
},
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
......@@ -193,7 +197,7 @@
goback() {
uni.navigateBack()
},
close(){
close() {
this.$emit("close")
}
}
......@@ -203,11 +207,12 @@
<style lang="scss" scoped>
.subscribeTicket {
height: 80vh;
padding-top: 45rpx;
height: 70vh;
margin: 45rpx 0;
overflow-y: scroll;
overflow-x: hidden;
.title{
.title {
text-align: center;
font-size: 32rpx;
font-family: PingFang SC;
......@@ -215,21 +220,25 @@
color: #111111;
margin-bottom: 10rpx;
position: relative;
.close-icon{
.close-icon {
position: absolute;
right: 30rpx;
top: 0;
}
}
.chooseTicketAndNum{
.chooseTicketAndNum {
height: 335rpx;
padding: 30rpx;
.chooseTicket{
.chooseTicket {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 100rpx;
.TicketName{
.TicketName {
width: auto;
height: 60rpx;
padding: 0rpx 30rpx;
......@@ -242,7 +251,8 @@
color: #FFFFFF;
}
}
.chooseBtn-box{
.chooseBtn-box {
// width: 670px;
height: 100rpx;
background-color: #FFFFFF;
......@@ -252,33 +262,38 @@
display: flex;
justify-content: space-between;
align-items: center;
.btn-TicketName-box{
.btn-TicketName-box {
font-size: 24rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111;
.btn-TicketName{
.btn-TicketName {
margin-left: 10rpx;
}
}
.btn-box{
.btn-box {
display: flex;
justify-content: space-between;
align-items: center;
.icon-box{
.icon-box {
width: 44rpx;
font-size: 22rpx;
font-family: PingFang SC;
font-weight: 500;
color: #111111;
.kefu-iocn{
.kefu-iocn {
width: 44rpx;
display: flex;
justify-content: center;
}
}
.subscribe-btn{
.subscribe-btn {
width: 190rpx;
height: 80rpx;
margin-left: 20rpx;
......
pages/ticketCoupons/components/uni-calendar/uni-calendar.vue
View file @ 7973f272
......@@ -216,6 +216,7 @@
* 确认按钮
*/
confirm() {
this.setEmit('confirm')
this.close()
},
......@@ -268,6 +269,20 @@
*/
choiceDate(weeks) {
if (weeks.disable) return
let resDay=Date.parse(weeks.fullDate);
let now=new Date();
now.setHours(0);//设置小时
now.setMinutes(0);//设置分钟
now.setSeconds(0);//设置秒
now.setMilliseconds(0);//设置毫妙
let today= now.getTime();
if(resDay<today){
uni.showToast({
title: "不能选择今天以前的日期",
icon: "none",
});
return
}
this.calendar = weeks
// 设置多选
this.cale.setMultiple(this.calendar.fullDate)
......
pages/ticketCoupons/detail.vue
View file @ 7973f272
......@@ -128,8 +128,8 @@
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/likeruyuan.png"
mode="aspectFit" v-if="_item.IsSameDayBuy==1"></image>
<view class="tag-item" v-if="_item.SubscribeTime||_item.ChangeTickets">
<text>{{_item.SubscribeTime}}</text>
<text class="gap">{{_item.ChangeTickets}}</text>
<text v-if="_item.SubscribeTime">随时可买</text>
<text class="gap" v-if="_item.ChangeTickets">无需换票</text>
</view>
</view>
<!-- 无忧退款 -->
......@@ -807,7 +807,7 @@
.tag {
display: flex;
max-width: 70%;
// height: 32rpx;
height: 32rpx;
margin-bottom: 20rpx;
.tag-img {
......
pages/ticketCoupons/policyDetail.vue
View file @ 7973f272
......@@ -2,7 +2,7 @@
<!-- 政策详情 -->
<view class="policyDetail">
<u-tabs :list="typeList" :current="active" name="Name" :is-scroll="false" @change="changeHandler"
:active-color="mainColor" bg-color="#FFF" bar-height='4' height="100"></u-tabs>
:active-color="mainColor" bg-color="#FFF" :bar-style="barStyle" height="140"></u-tabs>
<view class="officialNotice">
<view class="title">
官方公告信息
......@@ -72,10 +72,10 @@
active: 0,
mainColor: "#DFBE6E",
barStyle: {
width: '30rrpx',
height: '6rpx',
width: '10rpx',
height: '2rpx',
background: '#DFBE6E',
borderRadius: '3rpx'
borderRadius: '1rpx'
},
typeList: [{
Id: 0,
......
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