Skip to content

U
uni-pdtravel
Commit 15bec41e authored by 潘永坪's avatar 潘永坪
Browse files
Options

支付页面跳转优化

parent 47b5abb5
Show whitespace changes
Inline Side-by-side
Showing with 693 additions and 178 deletions
pages.json
View file @ 15bec41e
......@@ -157,8 +157,7 @@
//分包加载配置，此配置为小程序的分包加载机制。
"subPackages": [{
"root": "pages/my", //个人中心分包
"pages": [
{
"pages": [{
"path": "order/electronicTicket/electronicTicket",
"style": {
"navigationBarTitleText": "电子门票",
......@@ -255,6 +254,27 @@
"enablePullDownRefresh": false
}
}, {
"path": "takeNumber/numberChoose/numberChoose",
"style": {
"navigationBarTitleText": "选择出发站点",
"enablePullDownRefresh": false
}
}, {
"path": "takeNumber/numberIndex/numberIndex",
"style": {
"navigationBarTitleText": "取号",
"enablePullDownRefresh": false
}
}, {
"path": "takeNumber/rowNumber/rowNumber",
"style": {
"navigationBarTitleText": "取号",
"enablePullDownRefresh": false
}
}
]
},
......@@ -495,9 +515,6 @@
"selectedColor": "#007AFF", //选中时字体颜色
"borderStyle": "black", //底部的上边框线条
"backgroundColor": "#F8F8F8", //底部背景色
"fontSize": "18px", //字体大小
"spacing": "10px", //字体到图标的距离
"iconWidth": "16px",
"list": [{
"pagePath": "pages/indexs/index/index",
"iconPath": "static/img/index/home.png",
......
pages/indexs/index/index - 副本.vue
View file @ 15bec41e
<template>
<view >
<!-- <view class="top">
<view class="top-search">
<view class="wrap">
<view class="search">
<text>重庆</text>
<view class="search-right">
<u-icon name="search" style="margin-right: 10rpx;"></u-icon>
<input placeholder="商品/用户/关键词搜索" disabled/>
</view>
<view class="top-content">
<view>
<navigator url="../scenic/scenic">
<image src="../../static/img/index/classify1.png"></image>
<view>景区门票</view>
</navigator>
</view>
<view class="middle">
<view class="tabbar">
<view @click="goScenic()">
<image src="@/static/img/index/classify1.png"></image>
<view>
<navigator url="../hotel/hotel">
<image src="../../static/img/index/classify2.png"></image>
<view>酒店民宿</view>
</navigator>
景区门票
</view>
</view>
<view @click="goHotel()">
<image src="@/static/img/index/classify2.png" ></image>
<view>
<navigator url="../restaurant/restaurant">
<image src="../../static/img/index/classify3.png"></image>
<view>特色美食</view>
</navigator>
酒店民宿
</view>
</view>
<view @click="goScenic()">
<image src="@/static/img/index/classify4.png"></image>
<view>
<navigator url="../nearby/nearby">
<image src="../../static/img/index/classify4.png"></image>
<view>周边游</view>
</navigator>
周边游
</view>
</view>
<view @click="goScenic()">
<image src="@/static/img/index/classify5.png"></image>
<view>
跟团游
</view>
</view>
<view @click="goScenic()">
<image src="@/static/img/index/classify6.png"></image>
<view>
亲子游
</view>
</view>
<view @click="goTravelList()">
<image src="@/static/img/index/classify7.png"></image>
<view>
<navigator url="../travelOne/travelOne">
<image src="../../static/img/index/classify5.png"></image>
<view>跟团游</view>
</navigator>
行程订制
</view>
</view>
<!-- #ifdef MP-WEIXIN -->
<view @click="goAlbum()">
<image src="@/static/img/index/album.png"></image>
<view>
摄影/旅拍
</view>
</view>
<view @click="goVlog()">
<image src="@/static/img/index/video.png"></image>
<view>
vlog
</view>
</view>
<!-- #endif -->
</view>
<view class="banner">
<u-swiper :list="list" mode="number" height="300" indicator-pos="bottomRight" @click="swiperClick">
</u-swiper>
</view>
</view>
<view class="list">
<view class="list-wrap" @click="goSuodao()">
<view class="list-head">
<image src="http://wx.pangdly.com/static/img/sodao.1cdf287.jpg" mode="widthFix">
</image>
<view class="address">
<u-icon name="map"></u-icon>
重庆
</view>
</view>
<view class="list-bottom">
<view style="font-size: 32rpx;">
长江索道
</view>
<view class="bottom-price">
<view class="price-left">
<text>
¥
</text>
<text>
20
</text>
<text>
起
</text>
</view>
<view>
<navigator url="../travelTwo/travelTwo">
<image src="../../static/img/index/classify6.png"></image>
<view>亲子游</view>
</navigator>
5分
</view>
</view>
</view>
</view>
<view class="list-wrap" @click="goGuoji()">
<view class="list-head">
<image src="http://wx.pangdly.com/static/img/yunduan.331a774.jpg" mode="widthFix">
</image>
<view class="address">
<u-icon name="map"></u-icon>
重庆
</view>
</view>
<view class="list-bottom">
<view style="font-size: 32rpx;">
云端之眼
</view>
<view class="bottom-price">
<view class="price-left">
<text>
¥
</text>
<text>
68
</text>
<text>
起
</text>
</view>
<view>
<navigator url="../dingzhi/dingzhi">
<image src="../../static/img/index/classify7.png"></image>
<view>行程订制</view>
</navigator>
5分
</view>
</view>
</view>
</view>
<view class="list-wrap" @click="goLiangjiang()">
<view class="list-head">
<image src="http://wx.pangdly.com/static/img/liangjiang.097258e.jpg" mode="widthFix">
</image>
<view class="address">
<u-icon name="map"></u-icon>
重庆
</view>
</view>
<view class="list-bottom">
<view style="font-size: 32rpx;">
两江游金碧系列
</view>
<view class="bottom-price">
<view class="price-left">
<text>
¥
</text>
<text>
138
</text>
<text>
起
</text>
</view>
<view>
<navigator url="../special/special">
<image src="../../static/img/index/classify8.png"></image>
<view>特产好礼</view>
</navigator>
5分
</view>
</view>
</view>
</view>
<view class="top-img">
<view class="list-wrap" @click="goHuiguan()">
<view class="list-head">
<image src="http://wx.pangdly.com/static/img/huiguan.c00da69.jpg" mode="widthFix">
</image>
<view class="address">
<u-icon name="map"></u-icon>
重庆
</view>
</view>
</view> -->
<!-- <text @click="getUserInfo()"> 授权获取头像昵称 </text> -->
<view class="bottom">
<web-view :src="outUrl"></web-view>
<view class="list-bottom">
<view style="font-size: 32rpx;">
重庆湖广会馆
</view>
<view class="bottom-price">
<view class="price-left">
<text>
¥
</text>
<text>
23
</text>
<text>
起
</text>
</view>
<view>
5分
</view>
</view>
</view>
</view>
</view>
</view>
</template>
......@@ -76,53 +214,107 @@
export default {
data() {
return {
outUrl:'',//跳出地址
companyId:'',//公司Id
list: [
{
image: 'http://wx.pangdly.com/static/img/home1.69efcf8.jpg'
},
{
image: 'http://wx.pangdly.com/static/img/home2.2ec1a04.jpg'
},
{
image: 'http://wx.pangdly.com/static/img/home3.df60ec3.jpg'
}
],
}
},
onLoad(option){
this.companyId=option.companyId||''
if(!this.companyId){
let companyId=this.$commonjs.getCompanyId(option)
if(!companyId){
this.getCompanyId()
}else{
let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
let pdToken=uni.getStorageSync('token')
let pdCreateUserId=uni.getStorageSync('createUserId')
let pdUserId=uni.getStorageSync('userId')
this.outUrl='https://wx.pangdly.com/#/home?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&companyId='+this.companyId
}
},
methods: {
getUserInfo() { // 获取用户信息
uni.getUserProfile({
lang:'zh_CN',
desc:'登录',
success:(res)=>{
console.log(res)
},
fail:(res)=>{
//---获取公司Id
getCompanyId(){
let openid=uni.getStorageSync('openid')||''
let data={openid}
this.$request('wechatUser/wxUser/getLastRecord',data).then((res) => {
if (res.code == '00'){
//公司Id,用于入口判断，跳入公众号页面时需要传入到公众号
let companyId=res.data.companyId||''
uni.setStorageSync('companyId',companyId)
}
})
},
getCompanyId(){//获取公司Id
let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
let pdToken=uni.getStorageSync('token')
let pdCreateUserId=uni.getStorageSync('createUserId')
let pdUserId=uni.getStorageSync('userId')
let data={
openid:pdOpenid
//---轮播图点击
swiperClick(index){
//长江索道
if(index==0){
this.goSuodao()
}
this.$request('wechatUser/wxUser/getLastRecord',data).then((res) => {
if (res.code == '00'){
this.companyId=res.data.companyId||''
this.outUrl='https://wx.pangdly.com/#/home?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&companyId='+this.companyId
}else{
this.outUrl='https://wx.pangdly.com/#/home?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&companyId='+this.companyId
//湖广会馆
if(index==1){
this.goHuiguan()
}
//联合国际
if(index==2){
this.goGuoji()
}
}).catch(()=>{
this.outUrl='https://wx.pangdly.com/#/home?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&companyId='+this.companyId
},
//---跳转景区首页
goScenic(){
uni.navigateTo({
url:'/pages/scenic/scenicIndex/scenicIndex'
})
},
//---跳转酒店首页
goHotel(){
uni.navigateTo({
url:'/pages/hotel/hotelIndex/hotelIndex'
})
},
//跳转影集首页
goAlbum(){
uni.navigateTo({
url:'/pages/album/albumIndex?index=1'
})
},
//---跳转vlog
goVlog(){
uni.navigateTo({
url:'/pages/vlog/vlogIndex/vlogIndex'
})
},
//---跳转行程订制
goTravelList(){
uni.navigateTo({
url:'/pages/my/travelList/travelList/travelList'
})
},
//---跳转索道
goSuodao(){
uni.navigateTo({
url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId=1&merchantId=z0015605022691a5945bbe463141668c'+
'&groupId=z0016038113016708b8ad38c637b2f26&groupChannelId=z00160423712018998e6260ffcaf3369'
})
},
//---跳转联合国际
goGuoji(){
uni.navigateTo({
url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z00160128940329482da6bd94d443a91&channelType=1'
})
},
//---跳转两江游
goLiangjiang(){
uni.navigateTo({
url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z001578652229233acd0134cf825fdbe'
})
},
//---跳转湖广会馆
goHuiguan(){
uni.navigateTo({
url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=cdd4da5d154a4512bd5f3bec2797557b'
})
}
......@@ -130,9 +322,100 @@ export default {
}
</script>
<style>
.top{padding: 0 24rpx;}
.top-content{display: flex;flex-wrap: wrap;background: #FFFFFF;border-radius:24rpx;padding-bottom:32rpx;}
.top-content>view{width: 25%;text-align: center;margin-top:40rpx;}
.top-content view image{width:64rpx;height:64rpx;}
<style lang="scss" scoped>
.search{
position: fixed;
width: 100%;
height:100rpx;
top: 0;
display: flex;
align-items: center;
padding:24rpx;
background: #f5f5f5;
z-index: 10;
}
.search-right{
flex: 1;
display: flex;
margin-left: 20rpx;
background: #fff;
padding:12rpx 24rpx;
border-radius:48rpx;
}
.middle{
padding: 0 24rpx;
margin-top: 110rpx;
}
.tabbar{
padding: 10rpx 0;
display: flex;
flex-wrap: wrap;
background: #fff;
border-radius:16rpx;
box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.12);
justify-content: space-between;
>view{
width: 25%;
text-align: center;
margin: 24rpx 0;
}
image{
width: 64rpx;
height: 64rpx;
}
}
.banner{
margin-top: 20rpx;
}
.list{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
padding: 0 20rpx;
border-radius: 24rpx 24rpx 0 0;
}
.list-wrap{
width: 49%;
margin-top: 30rpx;
}
.list-head{
position: relative;
image{
width: 100%;
border-radius: 16rpx 16rpx 0 0;
}
}
.address{
position: absolute;
left: 20rpx;
bottom: 20rpx;
display: inline-block;
background: rgba(0,0,0,0.5);
padding: 8rpx 20rpx 12rpx 10rpx;
border-radius: 24rpx;
color: #FFFFFF;
font-size: 22rpx;
}
.list-bottom{
padding:16rpx 20rpx;
background: #fff;
}
.bottom-price{
display: flex;
justify-content: space-between;
margin-top: 10rpx;
}
.price-left{
color:$red;
font-size: 24rpx;
}
.price-left text:nth-child(2){
color: $red;
font-size: 36rpx;
font-weight: bold;
margin: 0 6rpx;
}
.price-left text:nth-child(3){
color: $grey;
}
</style>
pages/indexs/index/index.vue
View file @ 15bec41e
......@@ -11,52 +11,10 @@
<view class="middle">
<view class="tabbar">
<view @click="goScenic()">
<image src="@/static/img/index/classify1.png"></image>
<view @click="jumpPage(item.projectLinkUrl)" v-for="(item,index) in iconList" :key='index'>
<image :src="item.projectImgUrl"></image>
<view>
景区门票
</view>
</view>
<view @click="goHotel()">
<image src="@/static/img/index/classify2.png" ></image>
<view>
酒店民宿
</view>
</view>
<view @click="goScenic()">
<image src="@/static/img/index/classify4.png"></image>
<view>
周边游
</view>
</view>
<view @click="goScenic()">
<image src="@/static/img/index/classify5.png"></image>
<view>
跟团游
</view>
</view>
<view @click="goScenic()">
<image src="@/static/img/index/classify6.png"></image>
<view>
亲子游
</view>
</view>
<view @click="goTravelList()">
<image src="@/static/img/index/classify7.png"></image>
<view>
行程订制
</view>
</view>
<view @click="goAlbum()">
<image src="@/static/img/index/album.png"></image>
<view>
摄影/旅拍
</view>
</view>
<view @click="goVlog()">
<image src="@/static/img/index/video.png"></image>
<view>
欢乐影集
{{item.merchantExtendProjectName}}
</view>
</view>
</view>
......@@ -223,6 +181,7 @@ export default {
image: 'http://wx.pangdly.com/static/img/home3.df60ec3.jpg'
}
],
iconList:[],//图标列表
}
},
onLoad(option){
......@@ -230,6 +189,7 @@ export default {
if(!companyId){
this.getCompanyId()
}
this.loadIcon()
},
methods: {
//---获取公司Id
......@@ -259,34 +219,21 @@ export default {
this.goGuoji()
}
},
//---跳转景区首页
goScenic(){
uni.navigateTo({
url:'/pages/scenic/scenicIndex/scenicIndex'
})
},
//---跳转酒店首页
goHotel(){
uni.navigateTo({
url:'/pages/hotel/hotelIndex/hotelIndex'
})
},
//跳转影集首页
goAlbum(){
uni.navigateTo({
url:'/pages/album/albumIndex?index=1'
})
},
//---跳转vlog
goVlog(){
uni.navigateTo({
url:'/pages/vlog/vlogIndex/vlogIndex'
//---加载图标
loadIcon(){
let data={
merchantType:0,//商户类型，其他
}
this.$request('scenic/merchantExtendProject/loadList',data).then((res)=>{
if(res.code=='00'){
this.iconList=res.data||[]
}
})
},
//---跳转行程订制
goTravelList(){
//---图片页面跳转
jumpPage(url){
uni.navigateTo({
url:'/pages/my/travelList/travelList/travelList'
url
})
},
//---跳转索道
......
pages/my/takeNumber/numberChoose/numberChoose.vue 0 → 100644
View file @ 15bec41e
<template>
<view class="wrap">
<view class="top">
<view class="name">
长江索道
</view>
<view class="tip">
请确认出行方向，选择对应的出发站点，确定后，无法更改，请谨慎选择！
</view>
<view class="map">
<image src="@/pages/my/static/takeNumber/sdMap.jpg" mode="widthFix"></image>
</view>
<view class="choose">
<view class="choose-content">
<view class="choose-name">
北站
</view>
<view class="choose-add">
解放碑.新华路
</view>
</view>
<view class="choose-content">
<view class="choose-name">
南站
</view>
<view class="choose-add">
南岸区.上新街
</view>
</view>
</view>
</view>
<view class="bottom">
<text class="btn" style="background: #fff;color: #999;margin-right: 80rpx;">
取消
</text>
<text class="btn">
确定
</text>
</view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.wrap{
height: 100%;
background: #ECF3FE;
padding: 24rpx;
}
.top{
background: #ffffff;
box-shadow: 0px 0px 16rpx 2rpx rgba(54,136,255,0.16);
border-radius: 16rpx;
padding: 48rpx 24rpx;
text-align: center;
}
.name{
font-size: 40rpx;
font-weight: bold;
color: #191919;
}
.tip{
font-size: 32rpx;
color: #FC771D;
line-height: 48rpx;
margin-top: 24rpx;
}
.map{
margin-top: 48rpx;
image{
width: 100%;
}
}
.choose{
margin-top: 48rpx;
display: flex;
justify-content: space-between;
}
.choose-content{
baackground: rgba(54,136,255,0);
border-radius: 8rpx;
border: 1px solid #BFD9FF;
padding:24rpx 0;
width: 280rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.choose-name{
font-size: 36rpx;
font-weight: bold;
}
.choose-add{
color:#999999;
font-size: 26rpx;
margin-top: 16rpx;
}
.bottom{
margin-top:48rpx;
display: flex;
justify-content: center;
}
.btn{
display: inline-block;
line-height: 60rpx;
width: 212rpx;
height: 80rpx;
background: #3688FF;
border-radius: 40rpx
}
</style>
pages/my/takeNumber/numberIndex/numberIndex.vue 0 → 100644
View file @ 15bec41e
<template>
<view class="wrap">
<view>
<view class="first">
<input placeholder="请输入购票预留手机号/身份证号" />
</view>
<view class="query">
<text class="button">查询订单</text>
</view>
</view>
<view class="mark-box">
<view style="width: 100%;">
<view class="mark-content">
<view class="mark-title"> 获取失败 </view>
<view class="mark-tip"> 查无该订单，请咨询购票渠道！ </view>
<view class="mark-btn">
<text class="btn">重试</text>
</view>
</view>
<!-- <view class="mark-content"> </view> -->
<view class="mark-close">
<u-icon name="close-circle" size='60' color='#ffffff'></u-icon>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
showMark: true //是否显示遮罩层
}
},
methods: {}
}
</script>
<style lang="scss" scoped>
.wrap {
height: 100%;
display: flex;
align-items: center;
justify-content: center;
background: linear-gradient(180deg, #3688ff 0%, #2abbd7 100%);
}
.first input {
width: 600rpx;
height: 88rpx;
background: #fff;
border-radius: 8rpx;
padding: 0 24rpx;
}
.query {
margin-top: 48rpx;
display: flex;
justify-content: center;
}
.button {
display: inline-block;
width: 440rpx;
height: 80rpx;
line-height: 80rpx;
background: #3688ff;
border-radius: 40rpx;
text-align: center;
color: #fff;
font-size: 32rpx;
font-weight: bold;
}
// 遮罩层
.mark-box {
position: fixed;
z-index: 100;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.6);
display: flex;
align-items: center;
justify-content: center;
}
.mark-content{
background: #ffffff;
margin: 0 48rpx;
border-radius: 16rpx;
padding: 64rpx 0;
text-align: center;
}
.mark-title{
font-size: 40rpx;
font-weight: bold;
color: #191919;
}
.mark-tip{
font-size: 32rpx;
margin-top: 24rpx;
}
.mark-btn{
margin-top: 48rpx;
.btn{
width: 212rpx;
height: 80rpx;
line-height: 60rpx;
font-size: 32rpx;
background: #3688FF;
border-radius: 40rpx;
}
}
.mark-close{
margin-top: 60rpx;
text-align: center;
}
</style>
pages/my/takeNumber/rowNumber/rowNumber.vue 0 → 100644
View file @ 15bec41e
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>
pages/payment/orderPayment/orderPayment.vue
View file @ 15bec41e
......@@ -71,7 +71,7 @@ export default {
background: '', //去支付的背景颜色
orderId: '', //订单Id
openid: '', //用户Id
afterBuyUrl: '', //支付成功后地址跳转
afterBuyUrl:'/pages/my/order/electronicTicket/electronicTicket', //支付成功后地址跳转,默认单票跳详情
ifyukuaiCode: '' ,//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
albumOrderdetail:'',//是否跳影集订单详情
}
......@@ -160,9 +160,6 @@ export default {
if(res.data.orderType=='10'){
//组合票和联票跳订单列表
this.afterBuyUrl='/pages/my/order/orderList/orderList'
}else{
//单票跳详情
this.afterBuyUrl='/pages/my/order/electronicTicket/electronicTicket'
}
}
......@@ -177,8 +174,7 @@ export default {
this.orderInfo = res.data.payInfo || ''
//支付参数结束
this.pdOrderMoney = res.data.pdOrderMoney
if (this.pdOrderMoney == 0 && res.data.subOrderType == -1) {
this.afterBuyUrl='/pages/my/order/electronicTicket/electronicTicket'
if (this.pdOrderMoney == 0 && res.data.subOrderType == -1){
uni.navigateTo({
url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl + '&ifyukuaiCode=' + this.ifyukuaiCode
})
......
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