diff --git a/app.json b/app.json
index f4b03de..980412d 100644
--- a/app.json
+++ b/app.json
@@ -8,6 +8,7 @@
"pages/order/comment/index",
"pages/order/coupon/index",
"pages/order/pay/index",
+ "pages/order/payresult/index",
"pages/order/showSeat/index",
"pages/order/show/index",
"pages/order/road/index",
diff --git a/pages/list/mayday/index.js b/pages/list/mayday/index.js
index b405eb3..991725b 100644
--- a/pages/list/mayday/index.js
+++ b/pages/list/mayday/index.js
@@ -15,8 +15,7 @@ Page({
list3:[],
list4:[],
list5:[],
- list6:[],
- maydayurl:null
+ list6:[]
},
/**
@@ -85,8 +84,8 @@ Page({
list4:res.data.list
})
})
- commonApi._post('product/get_product_by_tag',{
- tag_id:51,
+ commonApi._post('scene/get_scene_by_tag',{
+ tag_id:29,
offset:0,
limit:100
}).then(res=>{
@@ -111,14 +110,6 @@ Page({
list6:res.data.list
})
})
- commonApi._post("pbservice/Other/getClientConfig",{
- unique_key:"wechatxcx"
- }).then(res=>{
- let data = JSON.parse(res.data);
- this.setData({
- maydayurl:data.maydayurl
- })
- })
},
gotoDetail:function(e){
let item = e.currentTarget.dataset.item;
@@ -131,12 +122,10 @@ Page({
})
},
clickBanner:function(){
- if(this.data.maydayurl){
- app.globalData.weburl=this.data.maydayurl
- wx.navigateTo({
- url: '/pages/pbService/web/index'
- })
- }
+ wx.navigateToMiniProgram({
+ appId: 'wx336dcaf6a1ecf632',
+ page:'page/home/webview/webview?hideShare=0&src=https%3A%2F%2Fopen.weixin.qq.com%2Fconnect%2Foauth2%2Fauthorize%3Fappid%3Dwx3827070276e49e30%26redirect_uri%3Dhttps%3A%2F%2Fwx.17u.cn%2Fflight%2Fgetopenid.html%3Furl%3Dhttps%25253A%25252F%25252Fwx.17u.cn%25252Finternalcarrebornwechat%25252Fview%25252Fmain.html%252523%25252FspecialCarIndex%25252FinstantCar%25253Frefid%25253D1563845199%26showwxpaytitle%3D1%26response_type%3Dcode%26scope%3Dsnsapi_base%26state%3D123%26connect_redirect%3D1%23wechat_redirect'
+ })
},
scrollPage:function(e){
let index = e.currentTarget.dataset.index-1;
diff --git a/pages/list/mayday/index.wxss b/pages/list/mayday/index.wxss
index 5f6b25e..f96d0fa 100644
--- a/pages/list/mayday/index.wxss
+++ b/pages/list/mayday/index.wxss
@@ -76,6 +76,7 @@ page {
font-size: 15rpx;
color: #fff;
margin: 0 10rpx;
+ height: 23rpx;
}
.tag {
background-color: #a1c443;
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index 0bf6552..6b3fc73 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -108,8 +108,8 @@ Page({
icon:'success'
})
setTimeout(()=>{
- wx.reLaunch({
- url: '/pages/user/order/list',
+ wx.redirectTo({
+ url: '../payresult/index?tid='+_this.data.id
})
},1000)
},
diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js
new file mode 100644
index 0000000..b39042a
--- /dev/null
+++ b/pages/order/payresult/index.js
@@ -0,0 +1,84 @@
+// pages/order/payresult/index.js
+import util from "../../../utils/util"
+import commonApi from "../../../utils/https/common"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ tid:null,
+ info:null
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ this.setData({
+ tid:options.tid,
+ type:options.type
+ })
+ commonApi.user_post("order/query",{
+ order_id:options.tid
+ }).then(res=>{
+ this.setData({
+ info:res.data
+ })
+ console.log(res)
+ })
+ },
+ gotoOrderList:function(){
+ if(!this.data.info) return;
+ util.gotoOrder(this.data.info)
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/order/payresult/index.json b/pages/order/payresult/index.json
new file mode 100644
index 0000000..35cf02f
--- /dev/null
+++ b/pages/order/payresult/index.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "title":"/pages/component/TitleHeader"
+ }
+}
\ No newline at end of file
diff --git a/pages/order/payresult/index.wxml b/pages/order/payresult/index.wxml
new file mode 100644
index 0000000..cd55a1e
--- /dev/null
+++ b/pages/order/payresult/index.wxml
@@ -0,0 +1,7 @@
+
+
+
+订单正在处理中
+具体出票/发货状态
+将会通过短信/订单状态进行通知
+查看订单
\ No newline at end of file
diff --git a/pages/order/payresult/index.wxss b/pages/order/payresult/index.wxss
new file mode 100644
index 0000000..90fb22e
--- /dev/null
+++ b/pages/order/payresult/index.wxss
@@ -0,0 +1,29 @@
+/* pages/order/payresult/index.wxss */
+.icon-gou1 {
+ color: #009944;
+ font-size: 230rpx;
+ margin-top: 100rpx;
+}
+.btn {
+ width: 280rpx;
+ line-height: 80rpx;
+ background: #F8B551;
+ border-radius: 40rpx;
+ color: #fff;
+ margin: 0 auto;
+ font-size: 36rpx;
+ font-weight: 500;
+ margin-top: 200rpx;
+}
+page {
+ text-align: center;
+ color: #999;
+ font-size: 32rpx;
+}
+.order-tip {
+ color: #009944;
+ font-size: 48rpx;
+ font-weight: 500;
+ margin-top: 30rpx;
+ margin-bottom: 50rpx;
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index ed3da28..8b46003 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -13,9 +13,9 @@
"miniprogram": {
"list": [
{
- "name": "pages/list/techan/index",
- "pathName": "pages/list/techan/index",
- "query": "id=0000000000LINELINEINFO18082257199008",
+ "name": "支付成页面",
+ "pathName": "pages/order/payresult/index",
+ "query": "tid=59532104301613182765&type=ticket",
"scene": null
},
{
diff --git a/utils/https.js b/utils/https.js
index 8ab4c80..dd5a38b 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -157,7 +157,7 @@ function user_post(url,data={}){
if(res.data.data.pay_status==1){
// 0元直接付款成功
wx.navigateTo({
- url:"/pages/user/order/list"
+ url:"/pages/order/payresult/index?tid="+res.data.data.order_id
})
// util.gotoOrder(res.data.data)
// // wx.navigateTo({
diff --git a/utils/util.js b/utils/util.js
index c3098b4..17518e3 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -262,55 +262,55 @@ const orderMoreTime = function(item){
const gotoOrder = function(item){
if(item.order_product_list[0].product_model=='ticket'){
wx.navigateTo({
- url: 'sceneOrderInfo/index?id='+item.order_id,
+ url: '/pages/user/order/sceneOrderInfo/index?id='+item.order_id,
})
return;
}
if(item.order_product_list[0].product_model=='food'){
wx.navigateTo({
- url: 'foodOrderInfo/index?id='+item.order_id,
+ url: '/pages/user/order/foodOrderInfo/index?id='+item.order_id,
})
return;
}
if(item.order_product_list[0].product_model=='activity'){
wx.navigateTo({
- url: 'activityOrderInfo/index?id='+item.order_id,
+ url: '/pages/user/order/activityOrderInfo/index?id='+item.order_id,
})
return;
}
if(item.order_product_list[0].product_model=='venue'){
wx.navigateTo({
- url: 'museumOrderInfo/index?id='+item.order_id,
+ url: '/pages/user/order/museumOrderInfo/index?id='+item.order_id,
})
return;
}
if(item.order_product_list[0].product_model=='hotel'){
wx.navigateTo({
- url: 'hotelOrderInfo/index?id='+item.order_id,
+ url: '/pages/user/order/hotelOrderInfo/index?id='+item.order_id,
})
return;
}
if(item.order_product_list[0].product_model=='line'){
wx.navigateTo({
- url: 'lineOrderInfo/index?id='+item.order_id,
+ url: '/pages/user/order/lineOrderInfo/index?id='+item.order_id,
})
return;
}
if(item.order_product_list[0].product_model=='movie' || item.order_product_list[0].product_model=='show'){
wx.navigateTo({
- url: 'movieOrderInfo/index?id='+item.order_id,
+ url: '/pages/user/order/movieOrderInfo/index?id='+item.order_id,
})
return;
}
if(item.order_product_list[0].product_model=='post'){
wx.navigateTo({
- url: 'postOrderInfo/index?id='+item.order_id,
+ url: '/pages/user/order/postOrderInfo/index?id='+item.order_id,
})
return;
}
if(item.order_product_list[0].product_model=='coupon'){
wx.navigateTo({
- url: 'couponOrderInfo/index?id='+item.order_id,
+ url: '/pages/user/order/couponOrderInfo/index?id='+item.order_id,
})
return;
}