Skip to content

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

洞舰首页和湖广会馆首页增加，支付成功逻辑修改

parent 44987af4
Hide whitespace changes
Inline Side-by-side
Showing with 478 additions and 362 deletions
pages.json
View file @ f0db232b
{
"pages": [ //pages数组中第一项表示应用启动页
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页"
}
}
,{
"pages" : [
//pages数组中第一项表示应用启动页
{
"path" : "pages/indexs/index/index",
"style" : {
"navigationBarTitleText" : "首页"
}
},
{
"path" : "pages/payment/orderPayment/orderPayment",
"style" :
{
"navigationBarTitleText": "订单支付",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/vlog/orderPay/orderPay",
"style" :
{
"navigationBarTitleText": "确认订单",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#ffffff",
"navigationBarTextStyle": "black"
}
},
{
"path" : "pages/vlog/shippingAddress/shippingAddress",
"style" :
{
"navigationBarTitleText": "填写收货地址",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#ffffff",
"navigationBarTextStyle": "black"
}
}
,{
"style" : {
"navigationBarTitleText" : "订单支付",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/vlog/orderPay/orderPay",
"style" : {
"navigationBarTitleText" : "确认订单",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#ffffff",
"navigationBarTextStyle" : "black"
}
},
{
"path" : "pages/vlog/shippingAddress/shippingAddress",
"style" : {
"navigationBarTitleText" : "填写收货地址",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#ffffff",
"navigationBarTextStyle" : "black"
}
},
{
"path" : "pages/login/login",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/payment/paySuccess/paySuccess",
"style" :
{
"navigationBarTitleText": "支付成功",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "支付成功",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/payment/ourPayment/ourPayment",
"style" :
{
"navigationBarTitleText": "订单支付",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/combination/combiChoose/combiChoose",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/my/order/electronicTicket/electronicTicket",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/combination/sourceCombiChoose/sourceCombiChoose",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},{
"path" : "pages/combination/distributionCombiChoose/distributionCombiChoose",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/vlog/vlogIndex/vlogIndex",
"style" : {
"navigationBarTitleText": "欢乐影集",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#ffffff",
"navigationBarTextStyle": "black"
}
}
,{
"style" : {
"navigationBarTitleText" : "订单支付",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/combination/combiChoose/combiChoose",
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/my/order/electronicTicket/electronicTicket",
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/combination/sourceCombiChoose/sourceCombiChoose",
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/combination/distributionCombiChoose/distributionCombiChoose",
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/vlog/vlogIndex/vlogIndex",
"style" : {
"navigationBarTitleText" : "欢乐影集",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#ffffff",
"navigationBarTextStyle" : "black"
}
},
{
"path" : "pages/vlog/vlogface/vlogface",
"style" : {
"navigationBarTitleText": "扫脸获取视频",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#ffffff",
"navigationBarTextStyle": "black"
}
}
,{
"navigationBarTitleText" : "扫脸获取视频",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#ffffff",
"navigationBarTextStyle" : "black"
}
},
{
"path" : "pages/vlog/scenicList/scenicList",
"style" : {
"enablePullDownRefresh": false,
"backgroundColor":"#192033"
}
}
,{
"enablePullDownRefresh" : false,
"backgroundColor" : "#192033"
}
},
{
"path" : "pages/vlog/vlogList/vlogList",
"style" : {
"navigationBarTitleText": "我的Vlog集",
"enablePullDownRefresh": false,
"backgroundColor":"#192033"
}
}
,{
"navigationBarTitleText" : "我的Vlog集",
"enablePullDownRefresh" : false,
"backgroundColor" : "#192033"
}
},
{
"path" : "pages/vlog/share/share",
"style" : {
"navigationBarTitleText": "Vlog",
"enablePullDownRefresh": false
}
}
,{
"navigationBarTitleText" : "Vlog",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/vlog/myVlog/myVlog",
"style" : {
"navigationBarTitleText": "我的Vlog集",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
}
}
,{
"navigationBarTitleText" : "我的Vlog集",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#fff",
"navigationBarTextStyle" : "black"
}
},
{
"path" : "pages/vlog/product/product",
"style" : {
"navigationBarTitleText": "产品列表",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
}
}
,{
"navigationBarTitleText" : "产品列表",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#fff",
"navigationBarTextStyle" : "black"
}
},
{
"path" : "pages/vlog/productDetails/productDetails",
"style" : {
"navigationBarTitleText": "产品详情",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
}
}
,{
"navigationBarTitleText" : "产品详情",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#fff",
"navigationBarTextStyle" : "black"
}
},
{
"path" : "pages/vlog/uploadPictures/uploadPictures",
"style" : {
"navigationBarTitleText": "上传照片",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
}
}
,{
"path": "pages/vlog/u-avatar-cropper/u-avatar-cropper",
"style": {
"navigationBarTitleText": "照片裁剪",
"navigationBarBackgroundColor": "#000000"
}
},
{
"path" : "pages/vlog/pictureFormat/pictureFormat",
"style" :
{
"navigationBarTitleText": "照片调整",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#ffffff",
"navigationBarTextStyle": "black"
}
}
,{
"navigationBarTitleText" : "上传照片",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#fff",
"navigationBarTextStyle" : "black"
}
},
{
"path" : "pages/vlog/u-avatar-cropper/u-avatar-cropper",
"style" : {
"navigationBarTitleText" : "照片裁剪",
"navigationBarBackgroundColor" : "#000000"
}
},
{
"path" : "pages/vlog/pictureFormat/pictureFormat",
"style" : {
"navigationBarTitleText" : "照片调整",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#ffffff",
"navigationBarTextStyle" : "black"
}
},
{
"path" : "pages/vlog/myVlogPhotos/myVlogPhotos",
"style" :
{
"navigationBarTitleText": "我的vlog照片",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#ffffff",
"navigationBarTextStyle": "black"
"style" : {
"navigationBarTitleText" : "我的vlog照片",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor" : "#ffffff",
"navigationBarTextStyle" : "black"
}
}
,{
},
{
"path" : "pages/scenic/scenicSingleOrder/scenicSingleOrder",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/my/order/intelTicket/intelTicket",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/combination/combiOrder/combiOrder",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/scenic/scenicJointOrder/scenicJointOrder",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/configure/backMiniProgram/backMiniProgram",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/my/order/orderList/orderList",
"style" :
{
"navigationBarTitleText": "订单列表",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "订单列表",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/common/coupon/coupon",
"style" :
{
"navigationBarTitleText": "领劵中心",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "领劵中心",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/common/getTicket/getTicket",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/common/questionConsultation/questionConsultation",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/scenic/scenicProduct/scenicProduct",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/my/order/electronicTicketold/electronicTicketold",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
,{
"path" : "pages/dongjianIndex/dongjianIndex",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
},
{
"path" : "pages/indexs/dongjianIndex/dongjianIndex",
"style" : {
"navigationBarTitleText" : "洞舰",
"enablePullDownRefresh" : false
}
}
,{
},
{
"path" : "pages/my/order/applyAfterSales/applyAfterSales",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/indexs/hghgIndex/hghgIndex",
"style" : {
"navigationBarTitleText" : "湖广会馆",
"enablePullDownRefresh" : false
}
}
],
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#192033",
"backgroundColor": "#F8F8F8"
},
"condition" : { //模式配置，仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项)
"list": [
{
"name": "", //模式名称
"path": "", //启动页面，必选
"query": "" //启动参数，在页面的onLoad函数里面得到
}
]
},
"easycom": {
// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
// 下载安装方式
"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
// npm安装方式
// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
}
}
\ No newline at end of file
"globalStyle" : {
"navigationBarTextStyle" : "white",
"navigationBarTitleText" : "",
"navigationBarBackgroundColor" : "#192033",
"backgroundColor" : "#F8F8F8"
},
"condition" : {
//模式配置，仅开发期间生效
"current" : 0, //当前激活的模式(list 的索引项)
"list" : [
{
"name" : "", //模式名称
"path" : "", //启动页面，必选
"query" : "" //启动参数，在页面的onLoad函数里面得到
}
]
},
"easycom" : {
// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
// 下载安装方式
"^u-(.*)" : "@/uview-ui/components/u-$1/u-$1.vue"
}
}
// npm安装方式
// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
pages/indexs/hghgIndex/hghgIndex.vue 0 → 100644
View file @ f0db232b
<template>
<view class="wrap">
<view>
<view>
<text class="button" @click="goKnow()">购票须知</text>
</view>
<view style="margin-top: 100rpx;">
<text class="button" @click="goBuy()">立即购票</text>
</view>
</view>
<!-- 购票须知 -->
<view class="buy-know" v-if="showKnow" @click="showKnow=false">
<view class="box">
<view class="title">
告游客书
</view>
<view>
尊敬的游客、广大市民：
</view>
<view>
<text>
开放时间：
</text>
09:00 - 18:00，闭馆前1小时（17:00）停止售票
</view>
<view style="color: #D9A874;">
每周一“湖广镇四川”移民博物馆、临展馆闭馆维护。
</view>
<view>
<text>
博物馆开放日多功能设备运行时间：
</text>
09:30 - 12:30；14:30 - 17:30，（根据景区当天实际情况为准）
</view>
<view>
<text>
免费人群：
</text>
需出示身份证及有效证件原件前往检票处登记入园。
</view>
<view>
<text>
退票须知：
</text>
游客所购门票在选定游玩日期当天19:00前如未使用，可在电子门票‘我的订单’中申请退票，逾期不可退。
</view>
<view style="margin-top: 48rpx;display: flex;justify-content: center;">
<text class="button" @click.stop="goBuy()">立即购票</text>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
urlQuery:'',
showKnow:false
}
},
onLoad(option) {
let channelId=option.channelId||''
let companyId=option.companyId||''
let merchantId=option.merchantId||''
let groupId=option.groupId||''
let groupChannelId=option.groupChannelId||''
this.urlQuery=channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId
},
methods: {
//---购票
goBuy(){
uni.navigateTo({
url:"/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId="+this.urlQuery
})
},
//---购票须知
goKnow(){
this.showKnow=true
}
}
}
</script>
<style scoped>
.wrap{
height: 100%;
background:#fffae8;
font-size: 40rpx;
display: flex;
align-items: center;
justify-content:center;
}
.button{
width: 520rpx;
height: 112rpx;
display:flex;
align-items: center;
justify-content: center;
background: url('../../../static/img/hghg/bigBtn.png') no-repeat;
background-size: 100% 100%;
}
.buy-know{
padding: 0 48rpx;
display: flex;
align-items: center;
justify-content: center;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.3);
}
.box{
padding: 60rpx 40rpx;
background: url('../../../static/img/hghg/dialog.png') no-repeat;
background-size: 100% 100%;
color: #000000;
font-size: 28rpx;
}
.box>view{
margin-top: 10rpx;
}
.box view text{
font-weight: bold;
}
.title{
font-weight: bold;
font-size: 40rpx;
text-align: center;
}
.button{
display: flex;
width: 244rpx;
height: 96rpx;
background: url('../../../static/img/hghg/smallBtn.png') no-repeat;
background-size: 100% 100%;
align-items: center;
justify-content: center;
font-size: 32rpx;
}
</style>
pages/my/order/electronicTicketold/electronicTicketold.vue deleted 100644 → 0
View file @ 44987af4
<template>
<view>
<web-view :src="outUrl"></web-view>
</view>
</template>
<script>
export default {
data() {
return {
outUrl:'',//跳出地址
Brightness:'',//屏幕亮度
}
},
onShow() {
let _this=this
uni.getScreenBrightness({
success: function(res){
// 这里是把获取到的手机屏幕亮度，存储到data里面，方便给到页面生命周期隐藏和卸载方法里面用
_this.Brightness = res.value
if(res.value != 1){
uni.setScreenBrightness({
value: 1
})
}
}
})
},
onHide: function () {
uni.setScreenBrightness({// 恢复之前屏幕亮度
value: this.Brightness
})
},
onLoad(option) {
let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
let pdToken=uni.getStorageSync('token')
let pdCreateUserId=uni.getStorageSync('createUserId')
let pdUserId=uni.getStorageSync('userId')
let ifyukuaiCode=option.ifyukuaiCode||''//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
this.outUrl='https://wx.pangdly.com/#/unusedDetail?id='+option.orderId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&ifyukuaiCode='+ifyukuaiCode
},
methods: {
}
}
</script>
<style>
</style>
pages/payment/orderPayment/orderPayment.vue
View file @ f0db232b
......@@ -194,9 +194,9 @@ export default {
//支付参数结束
this.pdOrderMoney = res.data.pdOrderMoney
if (this.pdOrderMoney == 0 && res.data.subOrderType == -1) {
//0元购直接跳电子门票页面
this.afterBuyUrl='/pages/my/order/electronicTicket/electronicTicket'
uni.navigateTo({
url: '/pages/my/order/electronicTicket/electronicTicket?orderId=' + this.orderId + '&ifyukuaiCode=' + this.ifyukuaiCode
url: '/pages/payment/paySuccess/paySuccess?orderId=' + _this.orderId+'&afterBuyUrl=' + _this.afterBuyUrl + '&ifyukuaiCode=' + _this.ifyukuaiCode
})
}
this.errorMessage = res.data.errorMessage
......@@ -245,7 +245,7 @@ export default {
paySign: this.paySign,
success: function(res) {
uni.navigateTo({
url: _this.afterBuyUrl + '?orderId=' + _this.orderId + '&ifyukuaiCode=' + _this.ifyukuaiCode
url: '/pages/payment/paySuccess/paySuccess?orderId=' + _this.orderId+'&afterBuyUrl=' + _this.afterBuyUrl + '&ifyukuaiCode=' + _this.ifyukuaiCode
})
},
fail: function(err) {
......@@ -263,7 +263,7 @@ export default {
orderInfo: this.orderInfo, // 支付宝订单号
success: function(res) {
uni.navigateTo({
url: _this.afterBuyUrl + '?orderId=' + _this.orderId + '&ifyukuaiCode=' + _this.ifyukuaiCode
url: '/pages/payment/paySuccess/paySuccess?orderId=' + _this.orderId+'&afterBuyUrl=' + _this.afterBuyUrl + '&ifyukuaiCode=' + _this.ifyukuaiCode
})
},
fail: function(err) {
......
pages/payment/paySuccess/paySuccess.vue
View file @ f0db232b
<template>
<view>
<web-view :src="outUrl"></web-view>
</view>
<view class="wrap">
<text style="margin-right: 20rpx;">
{{title}}
</text>
<image src="../../../static/img/common/loading.gif" v-if="loadImg" style="width: 32rpx;height: 32rpx;">
</image>
</view>
</template>
<script>
export default {
data() {
return {
outUrl:"",//跳出页面路径
title: "正在出票中", //标题
orderId: "", //订单Id
status: "", //出票状态
timer: "", //计时器
loadImg: true, //控制加载图片显示隐藏
afterBuyUrl:'',//页面跳转地址
ifyukuaiCode: '' //是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
}
},
onLoad(option) {
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/#/paySuccess?orderId="+option.orderId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
this.orderId = option.orderId||''
this.afterBuyUrl = option.afterBuyUrl||''
this.ifyukuaiCode=option.ifyukuaiCode||''
let sum = 0
let intFun=()=>{ //页面初始化
this.timer = setTimeout(()=>{
sum += 300
if (sum > 300) {
sum += 700
}
if (this.status == "2" || this.status == "4" || this.status == "5") {
uni.redirectTo({
url:this.afterBuyUrl+'?orderId=' + this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode
})
return
}
if (this.status == "3") {
this.title = "出票失败..."
this.loadImg = false
return
}
if (sum > 10000) {
this.title = "出票失败..."
this.loadImg = false
return
}
this.ticketStatus()
intFun()
}, sum)
}
intFun()
},
beforeDestroy() {
if (this.timer) {
//清除定时器
clearInterval(this.timer)
}
},
methods: {
//---出票状态
ticketStatus() {
let data = {
orderId: this.orderId
}
this.$request("order/order/getStatusById", data).then((res) => {
if (res.code == "00") {
this.status = res.data
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
}
})
}
}
}
</script>
<style>
<style scoped="scoped">
.wrap {
padding-top: 150rpx;
text-align: center;
font-size: 36rpx;
color: #ffbc00;
display: flex;
align-items: center;
justify-content: center;
}
</style>
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