|
|
|
|
@ -2,9 +2,9 @@ |
|
|
|
|
<view class="v-order-list"> |
|
|
|
|
<mescroll-uni :up="upOption" @down="downCallback" @up="upCallback" :fixed="false"> |
|
|
|
|
<view class="list_item container-fluid m-b-24" v-for="(item,index) in orderList" |
|
|
|
|
@click="toHomeStayDetailPage(item.id)"> |
|
|
|
|
> |
|
|
|
|
<view class="item_title">{{item.hotelName}}</view> |
|
|
|
|
<view class="row"> |
|
|
|
|
<view class="row" @click="toHomeStayDetailPage(item.id)"> |
|
|
|
|
<view class="item_image"> |
|
|
|
|
<image class="img" :src="item.hotelLogo" mode="widthFix"></image> |
|
|
|
|
</view> |
|
|
|
|
@ -17,12 +17,14 @@ |
|
|
|
|
{{item.checkOutTime}} |
|
|
|
|
</view> |
|
|
|
|
<view class="content-price">总价：¥{{item.orderAmount}}</view> |
|
|
|
|
<view class="content-bottom"> |
|
|
|
|
<view class="btn" v-if="item.orderStatus=='0'" @click="payOrder(item)">去支付</view> |
|
|
|
|
<view class="btn" v-if="item.orderStatus !='0' && item.orderStatus !='1'" |
|
|
|
|
@click="toHomeStayBookingPage(item.hotelId)">再次预定</view> |
|
|
|
|
<view class="btn" v-if="item.refundDisplay =='1'" @click="toRefundPage(item.id)">退款进度</view> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="item_content"> |
|
|
|
|
<view class="content-bottom"> |
|
|
|
|
<view class="btn" v-if="item.orderStatus=='0'" @click="payOrder(item)">去支付</view> |
|
|
|
|
<view class="btn" v-if="item.orderStatus !='0' && item.orderStatus !='1'" |
|
|
|
|
@click="toHomeStayBookingPage(item.hotelId)">再次预定</view> |
|
|
|
|
<view class="btn" v-if="item.refundDisplay =='1'" @click="toRefundPage(item.id)">退款进度</view> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="tip-bage"></view> |
|
|
|
|
@ -30,7 +32,7 @@ |
|
|
|
|
<view class="state" :class="'type'+item.orderStatus">{{stateMessage(item.orderStatus)}}</view> |
|
|
|
|
</view> |
|
|
|
|
</mescroll-uni> |
|
|
|
|
<u-popup :show="isPayPopup" mode="bottom" @close="isPayPopup = false" round="10"> |
|
|
|
|
<u-popup :show="isPayPopup" mode="bottom" @close="closePay" round="10"> |
|
|
|
|
<f-pay :show-title="false" :show="isPayPopup" :order="orderInfo" :payMoney="orderInfo.orderAmount" |
|
|
|
|
:tradeNo="orderInfo.orderNumber" @payResult="payResult"></f-pay> |
|
|
|
|
</u-popup> |
|
|
|
|
@ -80,10 +82,9 @@ |
|
|
|
|
//TODO: |
|
|
|
|
this.judgeLogin() |
|
|
|
|
}, |
|
|
|
|
onUnload: function() { |
|
|
|
|
uni.navigateTo({ |
|
|
|
|
url: '/pages/personcenter/personcenter' |
|
|
|
|
}); |
|
|
|
|
onShow() { |
|
|
|
|
this.param.pageNo = 1 |
|
|
|
|
this.loadData() |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
stateMessage: function(val) { |
|
|
|
|
@ -121,8 +122,8 @@ |
|
|
|
|
/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */ |
|
|
|
|
/*下拉刷新的回调 */ |
|
|
|
|
downCallback(mescroll) { |
|
|
|
|
this.param.pageNo = 1 |
|
|
|
|
this.loadData(); |
|
|
|
|
this.param.pageNo = 1 |
|
|
|
|
this.loadData(); |
|
|
|
|
// #ifdef H5 |
|
|
|
|
this.top = uni.upx2px(100 + 88) + 'px'; // H5的高度需加上 88的标题栏 |
|
|
|
|
// #endif |
|
|
|
|
@ -146,17 +147,17 @@ |
|
|
|
|
title: '支付成功', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.isPayPopup = false |
|
|
|
|
setTimeout(() => { |
|
|
|
|
uni.navigateTo({ |
|
|
|
|
url: "/subPageC/orderHomestay/orderList" |
|
|
|
|
}); |
|
|
|
|
this.isPayPopup = false |
|
|
|
|
this.param.pageNo = 1 |
|
|
|
|
this.loadData() |
|
|
|
|
}, 1000) |
|
|
|
|
} else { |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: '支付失败', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.isPayPopup = false |
|
|
|
|
} |
|
|
|
|
//uni.showToast({title: data.detail.errMsg,icon:'none'}); |
|
|
|
|
}, |
|
|
|
|
@ -165,14 +166,12 @@ |
|
|
|
|
// TODO: 需从缓存获取appId openId |
|
|
|
|
const userInfo = uni.getStorageSync("userInfo"); |
|
|
|
|
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {}; |
|
|
|
|
console.log(uni.getExtConfigSync(), 'extConfigextConfigextConfig') |
|
|
|
|
let appId = extConfig.app_id |
|
|
|
|
|
|
|
|
|
this.param.openid = userInfo.openid |
|
|
|
|
this.param.appid = appId |
|
|
|
|
|
|
|
|
|
this.$Request.get(this.$config.getHomestayOrderList, this.param, null, null, false, true).then((res) => { |
|
|
|
|
console.log("bbbbb") |
|
|
|
|
const curPageData = res.data.list || [] // 当前页数据 |
|
|
|
|
if (this.mescroll.num == 1) this.orderList = []; // 第一页需手动制空列表 |
|
|
|
|
curPageData.forEach((item, index) => { |
|
|
|
|
@ -192,6 +191,23 @@ |
|
|
|
|
console.log("订单==========", this.orderInfo) |
|
|
|
|
this.isPayPopup = true |
|
|
|
|
}, |
|
|
|
|
closePay() { |
|
|
|
|
let that = this |
|
|
|
|
uni.showModal({ |
|
|
|
|
title: '提示', |
|
|
|
|
content: '确定取消支付？', |
|
|
|
|
cancelText: '再想想', |
|
|
|
|
showCancel: true, |
|
|
|
|
success: function(res) { |
|
|
|
|
if (res.confirm) { |
|
|
|
|
that.isPayPopup = false |
|
|
|
|
} else if (res.cancel) { |
|
|
|
|
console.log('用户点击取消'); |
|
|
|
|
this.isPayPopup=false |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
// 跳转民宿订单详情页 |
|
|
|
|
toHomeStayDetailPage(id) { |
|
|
|
|
uni.navigateTo({ |
|
|
|
|
@ -241,7 +257,7 @@ |
|
|
|
|
|
|
|
|
|
.item_image { |
|
|
|
|
width: 180rpx; |
|
|
|
|
height: 200rpx; |
|
|
|
|
height: 150rpx; |
|
|
|
|
margin-right: 20rpx; |
|
|
|
|
overflow: hidden; |
|
|
|
|
|
|
|
|
|
|
