优化
Showing
2 changed files
with
26 additions
and
20 deletions
| ... | @@ -241,9 +241,12 @@ function initMap() { | ... | @@ -241,9 +241,12 @@ function initMap() { |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | function goOrder(room) { | 243 | function goOrder(room) { |
| 244 | checkRoomPayByUserId(room.hotelId).then(res=>{ | 244 | ElMessageBox.confirm(language.value == 0 ? '你当前选择的入住时间为'+hotTime.value[0]+'至'+hotTime.value[1]+',是否确定?':'Your current check-in time is'+hotTime.value[0]+'~'+hotTime.value[1]+'Are you sure?',{type:'warning'}).then({ |
| 245 | if(res.data == -100){ | 245 | |
| 246 | ElMessageBox.confirm( | 246 | }).then(()=>{ |
| 247 | checkRoomPayByUserId(room.hotelId).then(res=>{ | ||
| 248 | if(res.data == -100){ | ||
| 249 | ElMessageBox.confirm( | ||
| 247 | language.value == 0 ?'你有未支付的酒店订单,是否前往个人中心查看':'You already have an unpaid hotel order, do you want to go to the personal center to check it?', | 250 | language.value == 0 ?'你有未支付的酒店订单,是否前往个人中心查看':'You already have an unpaid hotel order, do you want to go to the personal center to check it?', |
| 248 | language.value==0?'提示':'Warning', | 251 | language.value==0?'提示':'Warning', |
| 249 | { | 252 | { |
| ... | @@ -251,21 +254,24 @@ function goOrder(room) { | ... | @@ -251,21 +254,24 @@ function goOrder(room) { |
| 251 | // cancelButtonText: language.value==1?'Continue to book':'继续预订', | 254 | // cancelButtonText: language.value==1?'Continue to book':'继续预订', |
| 252 | type: 'warning', | 255 | type: 'warning', |
| 253 | } | 256 | } |
| 254 | ).then((res) => { | 257 | ).then((res) => { |
| 255 | console.log(res) | 258 | console.log(res) |
| 256 | router.push({ | 259 | router.push({ |
| 257 | name:'myReservation', | 260 | name:'myReservation', |
| 261 | }) | ||
| 258 | }) | 262 | }) |
| 259 | }) | 263 | // .catch((res) => { |
| 260 | // .catch((res) => { | 264 | // console.log(res) |
| 261 | // console.log(res) | 265 | // goNext(room) |
| 262 | // goNext(room) | 266 | // }) |
| 263 | // }) | 267 | return |
| 264 | return | 268 | } |
| 265 | } | 269 | goNext(room) |
| 266 | goNext(room) | 270 | }) |
| 267 | }) | 271 | }) |
| 268 | 272 | ||
| 273 | |||
| 274 | |||
| 269 | } | 275 | } |
| 270 | function goNext(room) { | 276 | function goNext(room) { |
| 271 | router.push({ | 277 | router.push({ | ... | ... |
| ... | @@ -90,16 +90,16 @@ | ... | @@ -90,16 +90,16 @@ |
| 90 | </div> | 90 | </div> |
| 91 | 91 | ||
| 92 | <div class="text-right"> | 92 | <div class="text-right"> |
| 93 | <el-button v-if="b.orderType == 0&&b.viewStatus!=0" class="mb10" plain round type="success" @click="Rebook(b)"> | 93 | <el-button v-if="b.orderType == 0&&b.viewStatus!=0" class="mb10" plain round type="success" size="small" @click="Rebook(b)"> |
| 94 | {{ language==0?'再次预订':'Rebook' }}</el-button> | 94 | {{ language==0?'再次预订':'Rebook' }}</el-button> |
| 95 | <el-button class="mb10" plain round type="primary" @click="goDetail(b)"> | 95 | <el-button class="mb10" plain round type="primary" size="small" @click="goDetail(b)"> |
| 96 | {{ language==0?'详情':'Detail' }}</el-button> | 96 | {{ language==0?'详情':'Detail' }}</el-button> |
| 97 | <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)" |
| 98 | class="mb10" plain round type="primary" > | 98 | class="mb10" plain round type="primary" size="small" > |
| 99 | {{ language==0?'支付':'Pay' }}</el-button> | 99 | {{ language==0?'支付':'Pay' }}</el-button> |
| 100 | <el-button v-if="b.viewStatus==0" @click="cancel(b)" class="mb10" plain round type="warning" > | 100 | <el-button v-if="b.viewStatus==0" @click="cancel(b)" class="mb10" plain round type="warning" size="small" > |
| 101 | {{ language==0?'取消订单':'Cancel Order' }}</el-button> | 101 | {{ language==0?'取消订单':'Cancel Order' }}</el-button> |
| 102 | <el-button v-if="b.viewStatus==5" @click="unsubscribe(b)" class="mb10" plain round type="" > | 102 | <el-button v-if="b.viewStatus==5" @click="unsubscribe(b)" class="mb10" plain round type="" size="small" > |
| 103 | {{ language==0?'退订':'Unsubscribe' }}</el-button> | 103 | {{ language==0?'退订':'Unsubscribe' }}</el-button> |
| 104 | </div> | 104 | </div> |
| 105 | </el-col> | 105 | </el-col> | ... | ... |
-
Please register or sign in to post a comment