新功能和bug
Showing
4 changed files
with
21 additions
and
8 deletions
| ... | @@ -82,6 +82,8 @@ | ... | @@ -82,6 +82,8 @@ |
| 82 | booking.getHotelList(query.value).then(res=>{ | 82 | booking.getHotelList(query.value).then(res=>{ |
| 83 | list.value = res.rows | 83 | list.value = res.rows |
| 84 | loading.value = false | 84 | loading.value = false |
| 85 | console.log(list.value) | ||
| 86 | |||
| 85 | }).catch(e=>{ | 87 | }).catch(e=>{ |
| 86 | loading.value = false | 88 | loading.value = false |
| 87 | }) | 89 | }) | ... | ... |
| ... | @@ -433,11 +433,6 @@ function goMap() { | ... | @@ -433,11 +433,6 @@ function goMap() { |
| 433 | .oddmb:nth-child(2){margin-bottom: 20px;} | 433 | .oddmb:nth-child(2){margin-bottom: 20px;} |
| 434 | .forbid{ | 434 | .forbid{ |
| 435 | cursor:not-allowed !important; | 435 | cursor:not-allowed !important; |
| 436 | background-color: rgba(0,0,0,.5) !important; | 436 | filter:grayscale(1); |
| 437 | background: linear-gradient(90deg, #b38ce3, #3d3a79) !important; | ||
| 438 | color: #aca7a7 !important; | ||
| 439 | div{ | ||
| 440 | color: #aca7a7 !important; | ||
| 441 | } | ||
| 442 | } | 437 | } |
| 443 | </style> | 438 | </style> | ... | ... |
| ... | @@ -603,7 +603,7 @@ const unsubscribe = () => { | ... | @@ -603,7 +603,7 @@ const unsubscribe = () => { |
| 603 | return cancelOrder(orderId.value).then(res=>{ | 603 | return cancelOrder(orderId.value).then(res=>{ |
| 604 | getData() | 604 | getData() |
| 605 | ElMessage({ | 605 | ElMessage({ |
| 606 | message: language.value == 0?'操作成功':'Successful operation!', | 606 | message: language.value == 0?'已提交退款,请等待审核!':'Refund has been submitted, please wait for review!', |
| 607 | type: 'success' | 607 | type: 'success' |
| 608 | }) | 608 | }) |
| 609 | }) | 609 | }) | ... | ... |
| ... | @@ -90,6 +90,8 @@ | ... | @@ -90,6 +90,8 @@ |
| 90 | </div> | 90 | </div> |
| 91 | 91 | ||
| 92 | <div class="text-right"> | 92 | <div class="text-right"> |
| 93 | <el-button v-if="b.orderType == 0" class="mb10" plain round type="success" @click="Rebook(b)"> | ||
| 94 | {{ language==0?'再次预订':'Rebook' }}</el-button> | ||
| 93 | <el-button class="mb10" plain round type="primary" @click="goDetail(b)"> | 95 | <el-button class="mb10" plain round type="primary" @click="goDetail(b)"> |
| 94 | {{ language==0?'详情':'Detail' }}</el-button> | 96 | {{ language==0?'详情':'Detail' }}</el-button> |
| 95 | <el-button v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" @click="goDetail(b)" | 97 | <el-button v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" @click="goDetail(b)" |
| ... | @@ -153,6 +155,20 @@ function goDetail(b) { | ... | @@ -153,6 +155,20 @@ function goDetail(b) { |
| 153 | }) | 155 | }) |
| 154 | } | 156 | } |
| 155 | 157 | ||
| 158 | function Rebook(row){ | ||
| 159 | console.log(row) | ||
| 160 | router.push({ | ||
| 161 | name:'hotelDetail', | ||
| 162 | params:{ | ||
| 163 | cptId:row.activeId, | ||
| 164 | hotelId:row.hotelId | ||
| 165 | }, | ||
| 166 | query:{ | ||
| 167 | id:row.extId | ||
| 168 | } | ||
| 169 | }) | ||
| 170 | } | ||
| 171 | |||
| 156 | const cancel = (row) => { | 172 | const cancel = (row) => { |
| 157 | //取消订单 | 173 | //取消订单 |
| 158 | proxy.$modal.confirm(language.value == 0 ? '确定取消订单吗 ?' :`Are you sure to cancel the order?`).then(() => { | 174 | proxy.$modal.confirm(language.value == 0 ? '确定取消订单吗 ?' :`Are you sure to cancel the order?`).then(() => { |
| ... | @@ -171,7 +187,7 @@ const unsubscribe = (row) => { | ... | @@ -171,7 +187,7 @@ const unsubscribe = (row) => { |
| 171 | return cancelOrder(row.id).then(res=>{ | 187 | return cancelOrder(row.id).then(res=>{ |
| 172 | getList() | 188 | getList() |
| 173 | ElMessage({ | 189 | ElMessage({ |
| 174 | message: language.value == 0?'操作成功':'Successful operation!', | 190 | message: language.value == 0?'已提交退款,请等待审核!':'Refund has been submitted, please wait for review!', |
| 175 | type: 'success' | 191 | type: 'success' |
| 176 | }) | 192 | }) |
| 177 | }) | 193 | }) | ... | ... |
-
Please register or sign in to post a comment