3ac7df04 by zhangmeng

新功能和bug

1 parent 0491bdfe
......@@ -82,6 +82,8 @@
booking.getHotelList(query.value).then(res=>{
list.value = res.rows
loading.value = false
console.log(list.value)
}).catch(e=>{
loading.value = false
})
......
......@@ -433,11 +433,6 @@ function goMap() {
.oddmb:nth-child(2){margin-bottom: 20px;}
.forbid{
cursor:not-allowed !important;
background-color: rgba(0,0,0,.5) !important;
background: linear-gradient(90deg, #b38ce3, #3d3a79) !important;
color: #aca7a7 !important;
div{
color: #aca7a7 !important;
}
filter:grayscale(1);
}
</style>
......
......@@ -603,7 +603,7 @@ const unsubscribe = () => {
return cancelOrder(orderId.value).then(res=>{
getData()
ElMessage({
message: language.value == 0?'操作成功':'Successful operation!',
message: language.value == 0?'已提交退款,请等待审核!':'Refund has been submitted, please wait for review!',
type: 'success'
})
})
......
......@@ -90,6 +90,8 @@
</div>
<div class="text-right">
<el-button v-if="b.orderType == 0" class="mb10" plain round type="success" @click="Rebook(b)">
{{ language==0?'再次预订':'Rebook' }}</el-button>
<el-button class="mb10" plain round type="primary" @click="goDetail(b)">
{{ language==0?'详情':'Detail' }}</el-button>
<el-button v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" @click="goDetail(b)"
......@@ -153,6 +155,20 @@ function goDetail(b) {
})
}
function Rebook(row){
console.log(row)
router.push({
name:'hotelDetail',
params:{
cptId:row.activeId,
hotelId:row.hotelId
},
query:{
id:row.extId
}
})
}
const cancel = (row) => {
//取消订单
proxy.$modal.confirm(language.value == 0 ? '确定取消订单吗 ?' :`Are you sure to cancel the order?`).then(() => {
......@@ -171,7 +187,7 @@ const unsubscribe = (row) => {
return cancelOrder(row.id).then(res=>{
getList()
ElMessage({
message: language.value == 0?'操作成功':'Successful operation!',
message: language.value == 0?'已提交退款,请等待审核!':'Refund has been submitted, please wait for review!',
type: 'success'
})
})
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!