From a9f9262834dfca9d75f9465f46b5d578679e6973 Mon Sep 17 00:00:00 2001 From: masong Date: Fri, 22 Nov 2024 17:20:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E5=AE=BF=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/config.js | 4 + pages.json | 6 +- pages/personcenter/personcenter.vue | 7 +- subPageC/bookHomestay/bookHomestay.vue | 20 ++- subPageC/orderHomestay/order.vue | 26 ---- subPageC/orderHomestay/orderDetail.vue | 190 ++++++++++++++++++++----- subPageC/orderHomestay/orderList.vue | 162 ++++++++++++++------- 7 files changed, 294 insertions(+), 121 deletions(-) delete mode 100644 subPageC/orderHomestay/order.vue diff --git a/common/config.js b/common/config.js index c7c6b9b..49fce69 100644 --- a/common/config.js +++ b/common/config.js @@ -185,4 +185,8 @@ module.exports = { getPhone: PWPATH+"/app-api/wechatshop/auth/getWeChatUserMobile",//获取手机号 weChatLogin: PWPATH+"/app-api/wechatshop/auth/weChatLogin",//登陆获取token refreshToken: PWPATH +"/admin-api/system/auth/refresh-token",//登陆获取token + + // 民宿客栈 + getHomestayOrderDetail: PWPATH +"/admin-api/homestay/HotelOrder/selectUserOrderOne", // 获取民宿订单详情信息 + getHomestayOrderList: PWPATH + "/admin-api/homestay/HotelOrder/selectPageUser", // 获取用户全部民宿订单列表 } diff --git a/pages.json b/pages.json index baf97a9..246543f 100644 --- a/pages.json +++ b/pages.json @@ -500,15 +500,15 @@ } }, { - "path": "orderHomestay/order", + "path": "orderHomestay/orderList", "style": { "navigationBarTitleText": "订单列表" } }, { - "path": "order/orderDetail", + "path": "orderHomestay/orderDetail", "style": { - "navigationBarTitleText": "订单列表" + "navigationBarTitleText": "订单详情" } } ] diff --git a/pages/personcenter/personcenter.vue b/pages/personcenter/personcenter.vue index 3e7962d..a00e745 100644 --- a/pages/personcenter/personcenter.vue +++ b/pages/personcenter/personcenter.vue @@ -45,10 +45,10 @@ - + - 酒店订单 + 住宿订单 @@ -160,6 +160,9 @@ export default { case 'ticketOrder': this.onTokenJump('/subPageC/order/order', 'navigateTo') break; + case 'homestayOrder': + this.onTokenJump('/subPageC/orderHomestay/order', 'navigateTo') + break; case 'yijian': this.onTokenJump('/subPageB/suggest/sug_list?type=2', 'navigateTo') break; diff --git a/subPageC/bookHomestay/bookHomestay.vue b/subPageC/bookHomestay/bookHomestay.vue index 91fcd11..cc2f235 100644 --- a/subPageC/bookHomestay/bookHomestay.vue +++ b/subPageC/bookHomestay/bookHomestay.vue @@ -118,13 +118,23 @@ "idCardNumber": "130682991" }] }; - console.log(data) - uni.navigateTo({ - url: "/subPageC/orderHomestay/order?data=" - }); + this.$Request.post(this.$config.createHotelOrder, data, 'json', null, false, null).then((res) => { console.log("asdf",res) - + if(res.code ==0){ + uni.navigateTo({ + url: "/subPageC/orderHomestay/orderDetail?id="+res.data.id + }); + }else if(res.code == 500){ + uni.showToast({ + title: res.data, + icon: 'none', + duration: 2000 + }) + }else{ + + } + }); diff --git a/subPageC/orderHomestay/order.vue b/subPageC/orderHomestay/order.vue deleted file mode 100644 index 72238cc..0000000 --- a/subPageC/orderHomestay/order.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - \ No newline at end of file diff --git a/subPageC/orderHomestay/orderDetail.vue b/subPageC/orderHomestay/orderDetail.vue index e8a3663..0a715a6 100644 --- a/subPageC/orderHomestay/orderDetail.vue +++ b/subPageC/orderHomestay/orderDetail.vue @@ -3,33 +3,36 @@ - 待付款 - 酒店房间有限,请尽快支付,超时后订单将自动取消 - 25:25 + {{homestayOrderData.status}} + {{promptText(homestayOrderData.orderStatus)}} + + 25:25 - - - 去支付 + + + 去支付 + 再次预订 - + - + + + 退款进度:退款成功 查看详情 - + @@ -37,10 +40,10 @@ 在线支付 - 1520.00 + ¥{{homestayOrderData.orderAmount}} - 详情 + @@ -52,34 +55,40 @@ - + + + - 石家庄西部长青璞祯酒店 - 鹿泉区白鹿乡梁庄村西部长青休博城 + {{homestayOrderData.hotelName}} + {{homestayOrderData.addressInfo}} - 地图导航 - 咨询电话 + 地图导航 + 咨询电话 - - 9月12日 - 1晚 - 09月12日 + + {{item.checkTime}} + {{item.day}}晚 + {{item.checkOutTime}} - 豪华大床房 - 无早餐 1张2米特大床 2人入住 45㎡ + {{homestayOrderData.houseName}} + + + + 最多入住{{homestayOrderData.guest}}人 + {{homestayOrderData.houseArea}}㎡ 入住人 - 张春荣 + {{homestayOrderData.bookerusername}} 联系手机 - 157144552 + {{homestayOrderData.bookerphone}} @@ -89,11 +98,11 @@ 订单号 - 567389478348534 + {{homestayOrderData.orderNumber}} 下单时间 - 2024-08-20 12:00:01 + {{homestayOrderData.orderTime}} @@ -104,21 +113,130 @@ export default { data() { return { - title: 'Hello' + title: '订单详情', + homestayOrderData:{ + 'id': 1734877929, + 'orderNumber': '', + 'hotelId': 0, + 'hotelName': '', + 'addressInfo': '', + 'orderAmount': 0, + 'orderTime': '', + 'payTime': null, + 'price': null, + 'status': '', + 'orderStatus': '0', + 'belongingPayOrderId': '', + 'bedNum': 0, + 'hotelLogo': '', + 'houseName': '', + 'serviceNumber': '', + 'bedWide': 0, + 'houseArea': 0, + 'guest': 0, + 'bedNumTwo': 0, + 'hotelTypeName': '', + 'bookerusername': '', + 'bookerphone': '', + 'cancelReason': null, + 'dateList': [ + { + 'checkTime': '', + 'checkOutTime': '', + 'day': 0 + } + ], + 'no': null + } } }, - onLoad() { - + onLoad(opetion) { + this.getHomestayOrderDetail(opetion.id) }, methods: { - + // 查询订单详情 + getHomestayOrderDetail(orderId){ + let data ={ + 'id':orderId + } + this.$Request.get(this.$config.getHomestayOrderDetail, data, null, null, false, null).then((res) => { + console.log(res) + if(res.code == 0){ + this.homestayOrderData = res.data + }else{ + uni.showToast({ + title: res.data, + icon: 'none', + duration: 2000 + }) + } + }); + + }, + // 拨打咨询电话 + cell(val){ + uni.makePhoneCall({ + phoneNumber: val //仅为示例 + }); + }, + //导航 + navigation(){ + uni.openLocation({ + latitude: Number(this.homestayOrderData.lat), + longitude: Number(this.homestayOrderData.lon), + name: this.homestayOrderData.hotelName, + address: this.homestayOrderData.addressInfo, + complete: function(result) { + console.log(result); + }, + }); + }, + // 根据订单状态反馈提示文字 + promptText: function(val) { + //订单状态 0未支付 1已支付 2已取消 3 预定失败 4预定成功 5 已入住 6已离店 7 退款中 8已退款 + switch (val) { + case "0": + return "酒店房间有限,请尽快支付,超时后订单将自动取消" + break; + case "1": + return "等待商家确认汇总,请及时关注订单状态" + break; + case "2": + return "订单超时未支付,请重新下单" + break; + case "3": + return "商家因满房原因暂时无法接单,建议您稍后重试或选择其他房型" + break; + case "4": + return "请按预订时间办理入住" + break; + case "5": + return "" + break; + case "6": + return "" + break; + case "7": + return "退款进度:发起退款申请" + break; + case "8": + return "退款进度:退款成功" + break; + } + }, + //跳转预订页面 + toHomeStayBookingPage(hotelId){ + uni.navigateTo({ + url: "/subPageB/Homestay/homestaydetail/homestaydetail?guid="+hotelId + }); + } } }