Skip to content

J
jz_Travel
Commit 95d3bf45 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 66a52476 b0a54f95
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 453 additions and 120 deletions
pages/card/index/index.vue
View file @ 95d3bf45
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
:current="current" :current="current"
@change="change" @change="change"
:active-color="mainColor" :active-color="mainColor"
bar-height='4'
height="100"
></u-tabs> ></u-tabs>
<u-empty v-if="g.length == 0" text="暂无相关卡券" mode="order"></u-empty> <u-empty v-if="g.length == 0" text="暂无相关卡券" mode="order"></u-empty>
......
pages/coupon/index/index.vue
View file @ 95d3bf45
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
:current="msg.UseState" :current="msg.UseState"
@change="change" @change="change"
:active-color="mainColor" :active-color="mainColor"
height="100"
></u-tabs> ></u-tabs>
<u-empty v-if="g.length == 0" text="暂无相关优惠券" mode="coupon"></u-empty> <u-empty v-if="g.length == 0" text="暂无相关优惠券" mode="coupon"></u-empty>
......
pages/guidecar/bookaCarList.vue
View file @ 95d3bf45
...@@ -571,8 +571,9 @@ ...@@ -571,8 +571,9 @@
StartDate:'', StartDate:'',
EndDate:'', EndDate:'',
}, },
scrollleft:0 scrollleft:0,
carMsgobj:'',
Up:0
} }
...@@ -582,15 +583,27 @@ ...@@ -582,15 +583,27 @@
if (options && options.carMsg) { if (options && options.carMsg) {
//对象解码 //对象解码
this.carMsg = JSON.parse(decodeURIComponent(options.carMsg)) this.carMsg = JSON.parse(decodeURIComponent(options.carMsg))
this.carMsgobj = options.carMsg;//保存原始的用于分享
console.log(this.carMsg)
this.msg.StartCityId = this.carMsg.StartCityId; this.msg.StartCityId = this.carMsg.StartCityId;
this.msg.StartCityType = this.carMsg.StartCityType; this.msg.StartCityType = this.carMsg.StartCityType;
this.msg.ArriveCityId = this.carMsg.ArriveCityId; this.msg.ArriveCityId = this.carMsg.ArriveCityId;
this.msg.ArriveCityType = this.carMsg.ArriveCityType; this.msg.ArriveCityType = this.carMsg.ArriveCityType;
this.msg.Q_Date = this.carMsg.Q_Date; if(new Date()>new Date(this.carMsg.Q_Date)){//判断分享的时间是否过期过期了 就给与今天的日期
var date1 = new Date();
let carMonth = (date1.getMonth() + 1)<10?'0'+(date1.getMonth() + 1):(date1.getMonth() + 1);
let carDays = (date1.getDate() )<10?'0'+(date1.getDate() ):(date1.getDate());
let nowtime = date1.getFullYear() + "-" + carMonth + "-" + carDays;
this.msg.Q_Date = nowtime
}else{
this.msg.Q_Date = this.carMsg.Q_Date;
}
} }
this.$nextTick(function() { this.$nextTick(function() {
this.scrollleft = 0 this.scrollleft = 0
}); });
console.log(options)
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.gettimeList() this.gettimeList()
this.init(); this.init();
...@@ -598,8 +611,47 @@ ...@@ -598,8 +611,47 @@
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
this.Up = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserPageType:0;
}, },
onShareTimeline() {//朋友圈
let uid = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserId
: 0;
if(uid==0){
uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0
}
let SmallShopId = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").SmallShopId
: 0;
if(SmallShopId == 0){//如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserSmallShopId
: 0;
}
return {
title: this.carMsg.StartCityName +'-' + this.carMsg.ArriveCityName,
query: "user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&carMsg='+this.carMsgobj,
imageUrl: '',
};
},
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
}
return {
title:this.carMsg.StartCityName +'-' + this.carMsg.ArriveCityName,
path: "/pages/index/index?user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&carMsg='+this.carMsgobj+'&JumpType=17',
imageUrl:'',
};
},
methods: { methods: {
getscroll(e){ getscroll(e){
// console.log(e.detail.scrollLeft) // console.log(e.detail.scrollLeft)
......
pages/hotel/detail.vue
View file @ 95d3bf45
...@@ -63,7 +63,10 @@ ...@@ -63,7 +63,10 @@
</view> </view>
<!-- 关注 --> <!-- 关注 -->
<view class="op-box"> <view class="op-box">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_709.png" style="margin-right: 17rpx;"></image> <view style="position: relative;margin-right: 17rpx;width:32px;height:32px;display:inline-block;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_709.png"></image>
<button class="detail_ShareBtn" open-type="share"></button>
</view>
<image v-if="!islike" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_61.png" <image v-if="!islike" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_61.png"
@click="changeLike"></image> @click="changeLike"></image>
<image v-if="islike" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_953.png" <image v-if="islike" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_953.png"
...@@ -268,7 +271,8 @@ ...@@ -268,7 +271,8 @@
dayObj:{}, dayObj:{},
hotelData:{} ,//传递到房间预订组件 hotelData:{} ,//传递到房间预订组件
startDay:'', startDay:'',
endDay:'' endDay:'',
Up:0
} }
}, },
components: { components: {
...@@ -278,7 +282,7 @@ ...@@ -278,7 +282,7 @@
canlendar canlendar
}, },
created() { created() {
this.Up = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserPageType:0;
}, },
onLoad(options) { onLoad(options) {
this.id = options.id; this.id = options.id;
...@@ -550,7 +554,52 @@ ...@@ -550,7 +554,52 @@
} }
} }
); );
} },
//分享朋友圈
onShareTimeline() {
let uid = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserId
: 0;
if(uid==0){
uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0
}
let SmallShopId = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").SmallShopId
: 0;
if(SmallShopId == 0){//如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserSmallShopId
: 0;
}
let title =this.dataList.HotelName?this.dataList.HotelName:'帖子';
let imageUrl =this.dataList.HotelImg && this.dataList.HotelImg.length>0?this.dataList.HotelImg[0]:'';
let id = this.id;
return {
title: title,
query: "id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up +
'&JumpType=18' + '&dayObj=' + JSON.stringify(this.dayObj) + '&searchObj=' + JSON.stringify(this.searchObj),
imageUrl: imageUrl,
};
},
//分享给朋友
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
}
return {
title:this.dataList.HotelName?this.dataList.HotelName:'帖子',
path: "/pages/index/index?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+
"&Up=" + this.Up+'&JumpType=18' + '&dayObj=' + JSON.stringify(this.dayObj) + '&searchObj=' + JSON.stringify(this.searchObj),
imageUrl:this.dataList.HotelImg && this.dataList.HotelImg.length>0?this.dataList.HotelImg[0]:'',
};
},
}, },
} }
</script> </script>
...@@ -988,4 +1037,12 @@ ...@@ -988,4 +1037,12 @@
.hotel-detail .media .media-info .mi-left { .hotel-detail .media .media-info .mi-left {
flex: 1; flex: 1;
} }
.detail_ShareBtn{
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
opacity: 0
}
</style> </style>
pages/hotel/order.vue
View file @ 95d3bf45
...@@ -253,9 +253,13 @@ ...@@ -253,9 +253,13 @@
return; return;
} }
var tempObj = uni.getStorageSync('basedata').mall.wechatmessage; var tempObj = uni.getStorageSync('basedata').mall.wechatmessage;
var tmplIds = ''; var tmplIds = [];
if(tempObj&&tempObj.length>0){ if(tempObj&&tempObj.length>0){
tmplIds = tempObj[0].MessageId; tempObj.forEach(x=>{
if(x.Name=='下单成功提醒'||x.Name=='订单取消提醒'||x.Name=='订单确认通知'){
tmplIds.push(x.MessageId)
}
})
} }
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
tmplIds: tmplIds, tmplIds: tmplIds,
......
pages/hotel/picture.vue
View file @ 95d3bf45
...@@ -3,14 +3,28 @@ ...@@ -3,14 +3,28 @@
<scroll-view scroll-y="true" class="hotel-pic"> <scroll-view scroll-y="true" class="hotel-pic">
<view class="content"> <view class="content">
<view class="left"> <view class="left">
<view v-for="(x,i) in jiList" :key="i" class="image-box" @click="previewImage(x.Path)"> <template v-if="isLine==0">
<image :src="x.Path" mode="widthFix"></image> <view v-for="(x,i) in jiList" :key="i" class="image-box" @click="previewImage(x.Path)">
</view> <image :src="x.Path" mode="widthFix"></image>
</view>
</template>
<template v-else>
<view v-for="(x,i) in jiList" :key="i" class="image-box" @click="previewImage(x.Url)">
<image :src="x.Url" mode="widthFix"></image>
</view>
</template>
</view> </view>
<view class="right"> <view class="right">
<view v-for="(x,i) in ouList" :key="i" class="image-box" @click="previewImage(x.Path)"> <template v-if="isLine==0">
<image :src="x.Path" mode="widthFix"></image> <view v-for="(x,i) in ouList" :key="i" class="image-box" @click="previewImage(x.Path)">
</view> <image :src="x.Path" mode="widthFix"></image>
</view>
</template>
<template v-else>
<view v-for="(x,i) in ouList" :key="i" class="image-box" @click="previewImage(x.Url)">
<image :src="x.Url" mode="widthFix"></image>
</view>
</template>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
...@@ -24,19 +38,29 @@ ...@@ -24,19 +38,29 @@
imageList:[], imageList:[],
jiList:[], jiList:[],
ouList:[], ouList:[],
allImageSrc:[] allImageSrc:[],
isLine:0
} }
}, },
onLoad(options) { onLoad(options) {
if(options.imgObj){ if(options.imgObj&&options.isLine==1){
this.imageList=JSON.parse(decodeURIComponent(options.imgObj))
this.isLine=1;
this.getSeperate();
uni.setNavigationBarTitle({
title: "线路图片",
});
}else{
this.imageList=JSON.parse(options.imgObj); this.imageList=JSON.parse(options.imgObj);
this.isLine=0;
this.getSeperate(); this.getSeperate();
} uni.setNavigationBarTitle({
title: "酒店图片",
});
}
}, },
created() { created() {
uni.setNavigationBarTitle({
title: "酒店图片",
});
}, },
mounted () { mounted () {
...@@ -44,7 +68,11 @@ ...@@ -44,7 +68,11 @@
methods: { methods: {
getSeperate(){ getSeperate(){
this.imageList.forEach((x,i)=>{ this.imageList.forEach((x,i)=>{
this.allImageSrc.push(x.Path) if(this.isLine==1){
this.allImageSrc.push(x.Url)
}else{
this.allImageSrc.push(x.Path)
}
if(i%2==0){ if(i%2==0){
this.jiList.push(x) this.jiList.push(x)
}else{ }else{
......
pages/index/index.vue
View file @ 95d3bf45
...@@ -168,6 +168,10 @@ ...@@ -168,6 +168,10 @@
cardsmoney:0,//储值卡带过来的金额 cardsmoney:0,//储值卡带过来的金额
orderPopupdata:{},//离线收益的弹窗 orderPopupdata:{},//离线收益的弹窗
showorder:false,//显示弹出 showorder:false,//显示弹出
carMsg:'',//景点专车分享带过来的字段
id:0, //酒店带过来字段
dayObj:'', //酒店带过来字段
searchObj:'' //酒店带过来字段
}; };
}, },
components: { components: {
...@@ -284,6 +288,7 @@ ...@@ -284,6 +288,7 @@
CounponPassword: options.CounponPassword CounponPassword: options.CounponPassword
}); });
} }
if (options && options.KeyWord) {//口令 if (options && options.KeyWord) {//口令
uni.setStorageSync("KeyWord", { uni.setStorageSync("KeyWord", {
KeyWord: options.KeyWord KeyWord: options.KeyWord
...@@ -302,6 +307,9 @@ ...@@ -302,6 +307,9 @@
if (options && options.storeId) { if (options && options.storeId) {
this.fxstoreId = options.storeId; this.fxstoreId = options.storeId;
} }
if (options && options.carMsg) {
this.carMsg = options.carMsg;
}
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
wx.showShareMenu({ wx.showShareMenu({
withShareTicket: true, withShareTicket: true,
...@@ -349,9 +357,19 @@ ...@@ -349,9 +357,19 @@
if (options && options.money) { //储值卡 if (options && options.money) { //储值卡
this.cardsmoney = options.money; this.cardsmoney = options.money;
} }
if(options && options.id){
this.id = options.id
}
if(options && options.dayObj){
this.dayObj = options.dayObj
}
if(options && options.searchObj){
this.searchObj = options.searchObj
}
if (options && options.OrderId) { //代付订单id if (options && options.OrderId) { //代付订单id
this.OrderId = options.OrderId; this.OrderId = options.OrderId;
} }
that.u = uni.getStorageSync("mall_UserInfo"); that.u = uni.getStorageSync("mall_UserInfo");
if (!that.u) { if (!that.u) {
that.u = { that.u = {
...@@ -796,8 +814,16 @@ ...@@ -796,8 +814,16 @@
uni.navigateTo({ url: "/pages/blindDate/persondetails?UserId=" + that.GoodsId }); uni.navigateTo({ url: "/pages/blindDate/persondetails?UserId=" + that.GoodsId });
}else if(that.JumpType == 14){//用户资料填写 }else if(that.JumpType == 14){//用户资料填写
uni.navigateTo({ url: "/pages/blindDate/editData"}); uni.navigateTo({ url: "/pages/blindDate/editData"});
}else if(that.JumpType == 15){//门票详情
console.log(that.GoodsId)
uni.navigateTo({ url: "/pages/ticketCoupons/details?id"+that.GoodsId});
}else if(that.JumpType == 16){//餐食详情
uni.navigateTo({ url: "/pages/restaurant/details?id"+that.GoodsId});
}else if(that.JumpType == 17){//景点专车
uni.navigateTo({ url: '/pages/guidecar/bookaCarList?carMsg='+that.carMsg})
}else if(that.JumpType == 18){ //酒店详情
uni.navigateTo({ url: '/pages/hotel/detail?id=' + that.id + '&dayObj=' + that.dayObj+'&searchObj='+that.searchObj})
} }
}, 500); }, 500);
}, },
updateuserinfo(msg) { updateuserinfo(msg) {
......
pages/jiuzhai/allorderList.vue
View file @ 95d3bf45
...@@ -534,11 +534,11 @@ ...@@ -534,11 +534,11 @@
}) })
}else if(data.OrderType==2){//餐厅 }else if(data.OrderType==2){//餐厅
uni.navigateTo({ uni.navigateTo({
url: '/pages/restaurant/list?Name='+data.DiningList[0].MealName, url: '/pages/restaurant/list?Name='+data.DiningList[0].DiningName,
}) })
}else if(data.OrderType==3){//门票 }else if(data.OrderType==3){//门票
uni.navigateTo({ uni.navigateTo({
url: '/pages/ticketCoupons/list?Name='+data.TicketList[0].TicketName, url: '/pages/ticketCoupons/list?Name='+data.TicketList[0].TitekCounponName,
}) })
}else if(data.OrderType==4){//车 }else if(data.OrderType==4){//车
let obj = { let obj = {
......
pages/jiuzhai/allorderdetails.vue
View file @ 95d3bf45
...@@ -575,11 +575,11 @@ ...@@ -575,11 +575,11 @@
}) })
}else if(data.OrderType==2){//餐厅 }else if(data.OrderType==2){//餐厅
uni.navigateTo({ uni.navigateTo({
url: '/pages/restaurant/list?Name='+data.DiningList[0].MealName, url: '/pages/restaurant/list?Name='+data.DiningList[0].DiningName,
}) })
}else if(data.OrderType==3){//门票 }else if(data.OrderType==3){//门票
uni.navigateTo({ uni.navigateTo({
url: '/pages/ticketCoupons/list?Name='+data.TicketList[0].TicketName, url: '/pages/ticketCoupons/list?Name='+data.TicketList[0].TitekCounponName,
}) })
}else if(data.OrderType==4){//车 }else if(data.OrderType==4){//车
let obj = { let obj = {
......
pages/jiuzhai/jz_LineDetail.vue
View file @ 95d3bf45
...@@ -453,9 +453,9 @@ ...@@ -453,9 +453,9 @@
this.yeCount=e.value; this.yeCount=e.value;
}, },
openPicture() { openPicture() {
let imgObj = JSON.stringify(this.dataList.HotelImg); let imgObj = this.dataList.imgCover;
uni.navigateTo({ uni.navigateTo({
url: "/pages/hotel/picture?imgObj=" + imgObj url: "/pages/hotel/picture?imgObj=" + encodeURIComponent(imgObj) + '&isLine=1'
}) })
}, },
goback() { goback() {
......
pages/restaurant/detail.vue
View file @ 95d3bf45
...@@ -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>
...@@ -200,7 +200,8 @@ ...@@ -200,7 +200,8 @@
date: "", date: "",
info: '' info: ''
}], }],
Date: "" Date: "",
up:""
} }
}, },
components: { components: {
...@@ -228,6 +229,52 @@ ...@@ -228,6 +229,52 @@
this.Date = tomorrow this.Date = tomorrow
console.log(this.calendar,this.Date) console.log(this.calendar,this.Date)
}, },
onShareTimeline() {
// setTimeout(() => {
// console.log("分享朋友圈调用");
// }, 2500);
let uid = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserId
: 0;
if(uid==0){
uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0
}
let SmallShopId = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").SmallShopId
: 0;
if(SmallShopId == 0){//如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserSmallShopId
: 0;
}
let title =this.details.Name?this.details.Name:'美食';
let imageUrl =this.details.AllPicList[0].TagPicList[0].Path?this.details.AllPicList[0].TagPicList[0].Path:'';
let id = this.ID;
return {
title: title,
query: "id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up,
imageUrl: imageUrl,
};
},
onShareAppMessage(res) {
// setTimeout(() => {
// console.log("分享好友调用");
// }, 2500);
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
}
return {
title:this.details.Name?this.details.Name:'美食',
path: "/pages/index/index?id=" + this.ID + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&JumpType=16',
imageUrl:this.details.AllPicList[0].TagPicList[0].Path?this.details.AllPicList[0].TagPicList[0].Path:''
};
},
onLoad(options) { onLoad(options) {
if (options && options.id) { if (options && options.id) {
this.ID = options.id this.ID = options.id
...@@ -319,6 +366,9 @@ ...@@ -319,6 +366,9 @@
}, },
//获取详情 //获取详情
getDetail() { getDetail() {
uni.showLoading({
title: '加载中...'
});
this.request2({ this.request2({
url: '/api/AppletDining/GetDiningDetails', url: '/api/AppletDining/GetDiningDetails',
data: { data: {
...@@ -326,6 +376,7 @@ ...@@ -326,6 +376,7 @@
} }
}, },
res => { res => {
uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1) {
res.data.FoodTag = res.data.FoodTag.split(',') res.data.FoodTag = res.data.FoodTag.split(',')
res.data.GeographicTag = res.data.GeographicTag.split(',') res.data.GeographicTag = res.data.GeographicTag.split(',')
...@@ -339,6 +390,9 @@ ...@@ -339,6 +390,9 @@
this.imgsList.push(obj) this.imgsList.push(obj)
}) })
} }
},
err=>{
uni.hideLoading();
} }
); );
}, },
......
pages/restaurant/order.vue
View file @ 95d3bf45
...@@ -175,6 +175,12 @@ ...@@ -175,6 +175,12 @@
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
tmplIds: res.data.template_message_list, tmplIds: res.data.template_message_list,
complete(_res) { complete(_res) {
if(data.Final_Price===0){
uni.redirectTo({
url: '/pages/jiuzhai/allorderList'
});
return
}
that.queren(res.data.OrderId) that.queren(res.data.OrderId)
} }
}); });
...@@ -219,9 +225,10 @@ ...@@ -219,9 +225,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 +238,11 @@ ...@@ -231,6 +238,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 @ 95d3bf45
...@@ -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 @ 95d3bf45
...@@ -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,15 @@ ...@@ -71,7 +73,15 @@
TicketName: { TicketName: {
type: String, type: String,
default: "" default: ""
} },
TicketImg: {
type: String,
default: ""
},
msgPath: {
type: String,
default: ""
},
}, },
data() { data() {
return { return {
...@@ -169,7 +179,7 @@ ...@@ -169,7 +179,7 @@
this.showAuth = true; this.showAuth = true;
} else { } else {
if (!this.price) { if (!this.price&&this.price!==0){
uni.showToast({ uni.showToast({
title: "请选择日期", title: "请选择日期",
icon: "none", icon: "none",
...@@ -207,7 +217,7 @@ ...@@ -207,7 +217,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.subscribeTicket { .subscribeTicket {
height: 70vh; // height: 70vh;
margin: 45rpx 0; margin: 45rpx 0;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
...@@ -281,15 +291,29 @@ ...@@ -281,15 +291,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 @ 95d3bf45
This diff is collapsed.
pages/ticketCoupons/fillOrder.vue
View file @ 95d3bf45
...@@ -87,7 +87,6 @@ ...@@ -87,7 +87,6 @@
onLoad(options) { onLoad(options) {
let obj=JSON.parse(decodeURIComponent(options.data)) let obj=JSON.parse(decodeURIComponent(options.data))
this.ticketdData=obj this.ticketdData=obj
console.log(this.ticketdData)
this.Final_Price=this.ticketdData.PeopleNumber*this.ticketdData.Unit_Price this.Final_Price=this.ticketdData.PeopleNumber*this.ticketdData.Unit_Price
}, },
...@@ -151,6 +150,12 @@ ...@@ -151,6 +150,12 @@
console.log('订阅失败',err) console.log('订阅失败',err)
}, },
complete(_res) { complete(_res) {
if(that.Final_Price===0){
uni.redirectTo({
url: '/pages/jiuzhai/allorderList'
});
return
}
that.queren(res.data.OrderId) that.queren(res.data.OrderId)
} }
}); });
......
pages/ticketCoupons/list.vue
View file @ 95d3bf45
...@@ -163,9 +163,6 @@ ...@@ -163,9 +163,6 @@
}); });
this.getScenicType();// 获取景点类型 this.getScenicType();// 获取景点类型
this.getList();// 获取景点门票类型 this.getList();// 获取景点门票类型
},
created() {
}, },
methods: { methods: {
searchList(){ searchList(){
......
pages/ticketCoupons/policyDetail.vue
View file @ 95d3bf45
...@@ -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=>{
}
}); });
}, },
//获取详情 //获取详情
......
pages/user-center/integral-detail/integral-detail.vue
View file @ 95d3bf45
<template> <template>
<view class="integralDStyle" :style="{ height: contentHeight }"> <view class="integralDStyle" :style="{ height: contentHeight }">
<u-tabs :list="list" :is-scroll="false" :current="current" @change="change" :active-color="mainColor"></u-tabs> <u-tabs :list="list" :is-scroll="false" :current="current" @change="change" :active-color="mainColor" height="100"></u-tabs>
<u-empty v-if="g.length == 0" text="暂无积分明细" mode="list"></u-empty> <u-empty v-if="g.length == 0" text="暂无积分明细" mode="list"></u-empty>
<view v-if="g.length > 0" style="height: calc(100vh - 50px);width: calc(100vw);overflow: hidden; "> <view v-if="g.length > 0" style="height: calc(100vh - 50px);width: calc(100vw);overflow: hidden; ">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }"> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
......
pages/user-center/user-center.vue
View file @ 95d3bf45
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
this.u = wx.getStorageSync('basedata').user_info; this.u = wx.getStorageSync('basedata').user_info;
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo"); this.mall_UserInfo = uni.getStorageSync("mall_UserInfo");
this.nav = uni.getMenuButtonBoundingClientRect().top + 'px'; this.nav = uni.getMenuButtonBoundingClientRect().top + 'px';
this.headStyle.background = `linear-gradient(to right, '#6E75EA',80%, '#B984EC')`; this.headStyle.background = `linear-gradient(to right, '#e6b865',80%, '#ebb45e')`;
this.headStyle.paddingTop = this.nav; this.headStyle.paddingTop = this.nav;
if (!this.mall_UserInfo) { if (!this.mall_UserInfo) {
this.showAuth = true; this.showAuth = true;
...@@ -800,8 +800,8 @@ ...@@ -800,8 +800,8 @@
top: 0; top: 0;
display: flex; display: flex;
background-image: linear-gradient(to right, background-image: linear-gradient(to right,
#6E75EA, #e6b865,
#B984EC); #ebb45e);
} }
......
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