Skip to content

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

1

parent 0de81e41
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 49 deletions
pages/jiuzhai/jz_MyOrder.vue
View file @ ec2c756b
...@@ -207,6 +207,9 @@ ...@@ -207,6 +207,9 @@
</scroll-view> </scroll-view>
</view> </view>
</template> </template>
<!-- #ifdef MP-ALIPAY -->
<subscribe-msg />
<!-- #endif -->
</view> </view>
</template> </template>
<script> <script>
...@@ -250,10 +253,11 @@ export default { ...@@ -250,10 +253,11 @@ export default {
}, },
status: "加载中", status: "加载中",
price: 0, price: 0,
showBar: true showBar: true,
}; };
}, },
created() { created() {
console.log(260, uni.getStorageSync("mall_UserInfo").OpenId);
// #ifdef MP-ALIPAY // #ifdef MP-ALIPAY
this.showBar = false; this.showBar = false;
// #endif // #endif
...@@ -418,10 +422,29 @@ export default { ...@@ -418,10 +422,29 @@ export default {
}, },
(res) => { (res) => {
let orderInfo = JSON.parse(res.data); let orderInfo = JSON.parse(res.data);
this.goPay(orderInfo); // this.goPay(orderInfo);
this.subscribeMsg(orderInfo);
} }
); );
}, },
subscribeMsg(orderInfo) {
const that = this;
let tempObj = uni.getStorageSync("basedata")?.mall?.wechatmessage ?? [];
let tmplIds = [];
if (tempObj && tempObj.length > 0) {
tempObj.forEach((x) => {
if (x.Name == "下单成功提醒" || x.Name == "订单取消提醒") {
tmplIds.push(x.MessageId);
}
});
}
uni.requestSubscribeMessage({
tmplIds: tmplIds,
complete(res) {
that.goPay(orderInfo);
},
});
},
goPay(orderInfo) { goPay(orderInfo) {
let that = this; let that = this;
uni.requestPayment({ uni.requestPayment({
...@@ -455,6 +478,7 @@ export default { ...@@ -455,6 +478,7 @@ export default {
// #endif // #endif
// #ifdef MP-ALIPAY // #ifdef MP-ALIPAY
goZhifuAli(item) { goZhifuAli(item) {
let that = this;
uni.showLoading({ uni.showLoading({
title: "支付中", title: "支付中",
}); });
...@@ -473,7 +497,10 @@ export default { ...@@ -473,7 +497,10 @@ export default {
}, },
(res) => { (res) => {
if (res.data) { if (res.data) {
this.goPayAli(res.data, item); this.$utils.SubscribeMsgAli(() => {
console.log(477, that.goPayAli);
that.goPayAli(res.data, item);
});
} else { } else {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
......
pages/jiuzhai/jz_Reserve.vue
View file @ ec2c756b
...@@ -834,19 +834,29 @@ export default { ...@@ -834,19 +834,29 @@ export default {
}, },
(res) => { (res) => {
this.orderInfo = JSON.parse(res.data); this.orderInfo = JSON.parse(res.data);
console.log(718, res.data); // this.Pay(OrderId);
// let idsArr = uni.getStorageSync("basedata")?.mall?.alimessage ?? []; this.subscribeMsg(OrderId);
// let ids=[]
// if(idsArr.length>0){
// }
// uni.requestSubscribeMessage({
// tmplIds: ids,
// success(res) {},
// });
this.Pay(OrderId);
} }
); );
}, },
subscribeMsg(OrderId) {
const that = this;
let tempObj = uni.getStorageSync("basedata")?.mall?.wechatmessage ?? [];
let tmplIds = [];
if (tempObj && tempObj.length > 0) {
tempObj.forEach((x) => {
if (x.Name == "下单成功提醒" || x.Name == "订单取消提醒") {
tmplIds.push(x.MessageId);
}
});
}
uni.requestSubscribeMessage({
tmplIds: tmplIds,
complete(res) {
that.Pay(OrderId);
},
});
},
Pay(OrderId) { Pay(OrderId) {
let that = this; let that = this;
uni.requestPayment({ uni.requestPayment({
......
pages/jiuzhai/jz_SureOrder.vue
View file @ ec2c756b
...@@ -321,11 +321,11 @@ ...@@ -321,11 +321,11 @@
font-weight: 500; font-weight: 500;
width: 100%; width: 100%;
} }
.jz_MyGuestList .label{ .jz_MyGuestList .label {
width:115rpx; width: 115rpx;
} }
.jz_MyGuestList { .jz_MyGuestList {
margin-top:40rpx; margin-top: 40rpx;
} }
</style> </style>
<template> <template>
...@@ -447,36 +447,40 @@ ...@@ -447,36 +447,40 @@
</view> </view>
</view> </view>
</view> </view>
<view class="empty-block"></view>
<view class="jz_form jz_MyGuestList" v-for="(subItem, subIndex) in orderData.model.GuestList":key="subIndex">
<view style="margin: 10rpx 0 20rpx 0"> 游客{{ subIndex + 1 }} </view>
<view class="form-items">
<view class="label">游客姓名</view>
<view class="jz_SureVal">{{subItem.SurName}}{{subItem.Name}}</view>
</view>
<view class="form-items">
<view class="label">联系电话</view>
<view class="jz_SureVal">{{subItem.MobilePhone}}</view>
</view>
<view class="form-items">
<view class="label">身份证</view>
<view class="jz_SureVal">{{subItem.IdCard}}</view>
</view>
<view class="form-items">
<view class="label">学生</view>
<view class="jz_SureVal">
{{subItem.IsHightSchool==1?'是':'否'}}
</view>
</view>
</view>
<view class="empty-block"></view> <view class="empty-block"></view>
<view class="jz_form" v-if="orderData.model.Remarks"> <view
<view class="form-items" style="border-bottom: 0;"> class="jz_form jz_MyGuestList"
<view class="label">备注</view> v-for="(subItem, subIndex) in orderData.model.GuestList"
<view class="jz_SureVal">{{orderData.model.Remarks}}</view> :key="subIndex"
</view> >
</view> <view style="margin: 10rpx 0 20rpx 0"> 游客{{ subIndex + 1 }} </view>
<view class="empty-block"></view> <view class="form-items">
<view class="label">游客姓名</view>
<view class="jz_SureVal">{{ subItem.SurName }}{{ subItem.Name }}</view>
</view>
<view class="form-items">
<view class="label">联系电话</view>
<view class="jz_SureVal">{{ subItem.MobilePhone }}</view>
</view>
<view class="form-items">
<view class="label">身份证</view>
<view class="jz_SureVal">{{ subItem.IdCard }}</view>
</view>
<view class="form-items">
<view class="label">学生</view>
<view class="jz_SureVal">
{{ subItem.IsHightSchool == 1 ? "是" : "否" }}
</view>
</view>
</view>
<view class="empty-block"></view>
<view class="jz_form" v-if="orderData.model.Remarks">
<view class="form-items" style="border-bottom: 0">
<view class="label">备注</view>
<view class="jz_SureVal">{{ orderData.model.Remarks }}</view>
</view>
</view>
<view class="empty-block"></view>
<view style="padding: 50rpx 40rpx"> <view style="padding: 50rpx 40rpx">
<view class="big-title"> <view class="big-title">
<text>费用明细</text> <text>费用明细</text>
...@@ -642,6 +646,9 @@ ...@@ -642,6 +646,9 @@
<!-- #endif --> <!-- #endif -->
</view> </view>
</view> </view>
<!-- #ifdef MP-ALIPAY -->
<subscribe-msg />
<!-- #endif -->
</view> </view>
</template> </template>
...@@ -741,7 +748,7 @@ export default { ...@@ -741,7 +748,7 @@ export default {
initOrderInfo(orderId) { initOrderInfo(orderId) {
let msg = { let msg = {
ID: orderId, ID: orderId,
IsGetGuest:1, IsGetGuest: 1,
}; };
this.apipost( this.apipost(
"sellorder_post_GetOrderEntity", "sellorder_post_GetOrderEntity",
...@@ -789,7 +796,7 @@ export default { ...@@ -789,7 +796,7 @@ export default {
goFukuan() { goFukuan() {
if (this.submit || this.submitCancel) return; if (this.submit || this.submitCancel) return;
var that = this; var that = this;
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) {
tempObj.forEach((x) => { tempObj.forEach((x) => {
...@@ -862,6 +869,7 @@ export default { ...@@ -862,6 +869,7 @@ export default {
//支付宝支付 //支付宝支付
goZhifuAli() { goZhifuAli() {
this.submit = true; this.submit = true;
let that = this;
uni.showLoading({ uni.showLoading({
title: "支付中", title: "支付中",
}); });
...@@ -879,7 +887,9 @@ export default { ...@@ -879,7 +887,9 @@ export default {
}, },
(res) => { (res) => {
if (res.data) { if (res.data) {
this.goPayAli(res.data); this.$utils.SubscribeMsgAli(() => {
that.goPayAli(res.data);
});
} else { } else {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
...@@ -896,7 +906,8 @@ export default { ...@@ -896,7 +906,8 @@ export default {
tradeNO: tradeNO, tradeNO: tradeNO,
success: function (res) { success: function (res) {
console.log("success", res); console.log("success", res);
if (res.resultCode == "9000") { const list = ["8000", "9000"];
if (list.includes(res.resultCode)) {
let obj = { let obj = {
TradeNo: tradeNO, TradeNo: tradeNO,
OrderNo: that.orderData.model.orderNo, OrderNo: that.orderData.model.orderNo,
......
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