Skip to content

J
jz_Travel
Commit 73cfeaf3 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 58bb0a47
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 25 deletions
pages/restaurant/detail.vue
View file @ 73cfeaf3
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<recommed-restaurant></recommed-restaurant> <recommed-restaurant></recommed-restaurant>
</view> --> </view> -->
</view> </view>
<u-popup v-model="showTimePopup" mode="bottom" border-radius="40" length="70%" <u-popup v-model="showTimePopup" mode="bottom" border-radius="40"
:safe-area-inset-bottom="true"> :safe-area-inset-bottom="true">
<view class="" style="margin-top: 40rpx;"> <view class="" style="margin-top: 40rpx;">
<calendar ref="calendar" :insert="true" :selected="calendar" @change="changeDate"></calendar> <calendar ref="calendar" :insert="true" :selected="calendar" @change="changeDate"></calendar>
......
pages/restaurant/order.vue
View file @ 73cfeaf3
...@@ -219,9 +219,10 @@ ...@@ -219,9 +219,10 @@
title: "支付成功" title: "支付成功"
}) })
setTimeout(()=>{ setTimeout(()=>{
let total=that.orderData.Unit_Price*that.order.BuyNum
uni.redirectTo({ uni.redirectTo({
url: '/pages/jiuzhai/allorderList' url: '/pages/jiuzhai/paysuccess?PreferPrice='+total
}); });
}, 100 ) }, 100 )
}, },
...@@ -231,6 +232,11 @@ ...@@ -231,6 +232,11 @@
title: "支付失败", title: "支付失败",
icon:'none' icon:'none'
}) })
setTimeout(()=>{
uni.redirectTo({
url: '/pages/jiuzhai/allorderList'
});
}, 100 )
} }
}); });
}, },
......
pages/ticketCoupons/components/njzz-calendar/njzz-calendar.vue
View file @ 73cfeaf3
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<text class="font-small">{{nowMonth.year}}年</text> <text class="font-small">{{nowMonth.year}}年</text>
<uni-icons type="arrowdown" size="10"></uni-icons> <uni-icons type="arrowdown" size="10"></uni-icons>
</picker> </picker>
<text class="reset" @tap="reset">重置</text> <!-- <text class="reset" @tap="reset">重置</text> -->
</view> </view>
<scroll-view class="calenHead" scroll-x v-if="mode=='1'"> <scroll-view class="calenHead" scroll-x v-if="mode=='1'">
<view class="headItem" v-for="(date,index) in monthList" v-bind:key="index" :class="[current==index?'active':'']" @tap="headItemTap(index,date.getMonth()+1)"> <view class="headItem" v-for="(date,index) in monthList" v-bind:key="index" :class="[current==index?'active':'']" @tap="headItemTap(index,date.getMonth()+1)">
......
pages/ticketCoupons/components/subscribeTicket.vue
View file @ 73cfeaf3
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
<view class=""> <view class="">
客服 客服
</view> </view>
<button open-type="contact" :send-message-title="TicketName" :send-message-path="msgPath"
:send-message-img="TicketImg" :show-message-card="true"></button>
</view> </view>
<view class="subscribe-btn" @click="nextStep"> <view class="subscribe-btn" @click="nextStep">
...@@ -71,7 +73,11 @@ ...@@ -71,7 +73,11 @@
TicketName: { TicketName: {
type: String, type: String,
default: "" default: ""
} },
TicketImg: {
type: String,
default: ""
},
}, },
data() { data() {
return { return {
...@@ -83,6 +89,8 @@ ...@@ -83,6 +89,8 @@
peopleNum: 1, peopleNum: 1,
showAuth: false, showAuth: false,
u: {}, u: {},
msgPath:"",
} }
}, },
watch: { watch: {
...@@ -105,7 +113,25 @@ ...@@ -105,7 +113,25 @@
} }
} }
}, },
// onShareAppMessage(res) {
// let u = uni.getStorageSync("mall_UserInfo");
// let uid = u.UserId ? u.UserId : 0;
// if(uid==0){
// uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0
// }
// let SmallShopId = u.SmallShopId ? u.SmallShopId : 0;
// if(SmallShopId == 0){//如果微店id为0 去找所属微店id
// SmallShopId = u.UserSmallShopId? u.UserSmallShopId:0
// }
// let Up = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserPageType:0;
// return {
// title:'个人资料',
// path: "/pages/index/index?id=" + this.UserId + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + Up+'&JumpType=13',
// imageUrl:'',
// };
// },
mounted() { mounted() {
this.msgPath="/pages/ticketCoupons/detail?id="+options.id+'&TicketID'+this.TicketID+'&date'+this.defaultSelect
let year = new Date().getFullYear(); //年 let year = new Date().getFullYear(); //年
let month = new Date().getMonth() + 1; //月 let month = new Date().getMonth() + 1; //月
if (month < 10) { if (month < 10) {
...@@ -151,7 +177,8 @@ ...@@ -151,7 +177,8 @@
}, },
changeDate(data) { //选择日期事件 可以将data绑定到此页面以用来提交等操作 changeDate(data) { //选择日期事件 可以将data绑定到此页面以用来提交等操作
this.defaultSelect = data.date; this.defaultSelect = data.date;
this.price = data.price this.price = data.price;
this.msgPath="/pages/ticketCoupons/detail?id="+options.id+'&TicketID'+this.TicketID+'&date'+this.defaultSelect
this.$forceUpdate() this.$forceUpdate()
}, },
...@@ -207,7 +234,7 @@ ...@@ -207,7 +234,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.subscribeTicket { .subscribeTicket {
height: 70vh; // height: 1020rpx;
margin: 45rpx 0; margin: 45rpx 0;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
...@@ -281,15 +308,29 @@ ...@@ -281,15 +308,29 @@
.icon-box { .icon-box {
width: 44rpx; width: 44rpx;
height: 52rpx;
font-size: 22rpx; font-size: 22rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
position: relative;
.kefu-iocn { .kefu-iocn {
width: 44rpx; width: 44rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
}
button {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
opacity: 0
} }
} }
......
pages/ticketCoupons/detail.vue
View file @ 73cfeaf3
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</view> </view>
<view class="ticket-nav" :class="{'check-ticket-nav':checkTicketNavIndex===3}" <view class="ticket-nav" :class="{'check-ticket-nav':checkTicketNavIndex===3}"
@click="changeCheckTicketNavIndex(3)"> @click="changeCheckTicketNavIndex(3)">
其他日期 {{otherDate}}
</view> </view>
<calendar ref="calendar" :insert="false" :selected="calendar" @confirm="confirm"></calendar> <calendar ref="calendar" :insert="false" :selected="calendar" @confirm="confirm"></calendar>
...@@ -185,8 +185,8 @@ ...@@ -185,8 +185,8 @@
</view> </view>
<!-- 填写订单弹出层 --> <!-- 填写订单弹出层 -->
<view> <view>
<u-popup v-model="showSubscribeTicketPop" mode="bottom" border-radius="40" :closeable="true" > <u-popup v-model="showSubscribeTicketPop" mode="bottom" border-radius="40">
<subscribeTicket :dateStr="Date" :TicketID="TicketID" :TitekCounponId="ID" :TicketName="TicketName" @close="showSubscribeTicketPop=false"></subscribeTicket> <subscribeTicket :dateStr="Date" :TicketID="TicketID" :TitekCounponId="ID" :TicketName="TicketName" @close="showSubscribeTicketPop=false" :TicketImg="details.AllPicList[0].TagPicList[0].Path"></subscribeTicket>
</u-popup> </u-popup>
</view> </view>
</view> </view>
...@@ -209,18 +209,7 @@ ...@@ -209,18 +209,7 @@
return { return {
ID: 0, ID: 0,
Date: "", //日期 Date: "", //日期
details: { details: {},
},
typeList: [{
Id: 0,
Name: '视频'
}, {
Id: 1,
Name: '图片'
}],
boxOption: 0,
navsOption: 0,
titleStyle: {}, titleStyle: {},
titleStyleFix: {}, titleStyleFix: {},
active: 0, active: 0,
...@@ -238,6 +227,7 @@ ...@@ -238,6 +227,7 @@
showSubscribeTicketPop: false,//订单弹出层 showSubscribeTicketPop: false,//订单弹出层
TicketID:0,//门票id TicketID:0,//门票id
TicketName:"", TicketName:"",
otherDate:"其他日期"
} }
}, },
onLoad(options) { onLoad(options) {
...@@ -246,6 +236,7 @@ ...@@ -246,6 +236,7 @@
this.ID = options.id this.ID = options.id
this.getDetail() this.getDetail()
} }
uni.getSystemInfo({ uni.getSystemInfo({
success(res) { success(res) {
that.titleStyle = { that.titleStyle = {
...@@ -279,12 +270,19 @@ ...@@ -279,12 +270,19 @@
let today = year+'-'+month+'-'+day let today = year+'-'+month+'-'+day
this.Date = today this.Date = today
this.calendar.date = today this.calendar.date = today
if(options.TicketID&&options.date){
this.TicketID=options.TicketID
this.Date=options.date
this.calendar.date=options.date
this.showSubscribeTicketPop=true
}
}, },
methods: { methods: {
//选择其他日期门票 //选择其他日期门票
confirm(e) { confirm(e) {
this.Date = e.fulldate this.Date = e.fulldate
this.calendar[0].date = e.fulldate this.calendar[0].date = e.fulldate
this.otherDate=e.fulldate
this.getDetailByDate(); this.getDetailByDate();
this.$forceUpdate() this.$forceUpdate()
}, },
...@@ -340,7 +338,6 @@ ...@@ -340,7 +338,6 @@
}, },
scroll(e) { scroll(e) {
this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5);
this.titleStyle.opacity = ((e.detail.scrollTop - 100) < 0 ? 0 : Math.floor(e.detail.scrollTop - 100)) + this.titleStyle.opacity = ((e.detail.scrollTop - 100) < 0 ? 0 : Math.floor(e.detail.scrollTop - 100)) +
"%"; "%";
this.tooltipShow = false this.tooltipShow = false
......
pages/ticketCoupons/policyDetail.vue
View file @ 73cfeaf3
...@@ -100,6 +100,9 @@ ...@@ -100,6 +100,9 @@
this.ID = options.id this.ID = options.id
this.getDetail() this.getDetail()
}, },
onPageScroll(res){
console.log(res.scrollTop);//距离页面顶部距离
},
methods: { methods: {
changeHandler(i) { changeHandler(i) {
this.active = i; this.active = i;
...@@ -112,9 +115,11 @@ ...@@ -112,9 +115,11 @@
toID="#tip" toID="#tip"
} }
uni.pageScrollTo({ uni.pageScrollTo({
// scrollTop: 0,
selector:toID, selector:toID,
duration: 300 duration: 300,
success:res=>{
}
}); });
}, },
//获取详情 //获取详情
......
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