no message
Showing
2 changed files
with
21 additions
and
13 deletions
| ... | @@ -88,12 +88,12 @@ | ... | @@ -88,12 +88,12 @@ |
| 88 | <div>{{ language==0?'在线付':'Online' }}</div> | 88 | <div>{{ language==0?'在线付':'Online' }}</div> |
| 89 | </div> | 89 | </div> |
| 90 | <el-button v-else class="btn-lineG w100" round type="primary" @click="goOrder(r)">Select</el-button> | 90 | <el-button v-else class="btn-lineG w100" round type="primary" @click="goOrder(r)">Select</el-button> |
| 91 | <div class="text-center text-primary mt10 fontsize14 pointer" v-if="language == 0"> | 91 | <!-- <div class="text-center text-primary mt10 fontsize14 pointer" v-if="language == 0">--> |
| 92 | 剩余 {{(r.roomCount - (r.useCount||0)).toFixed()}} 间 | 92 | <!-- 剩余 {{(r.roomCount - (r.useCount||0)).toFixed()}} 间--> |
| 93 | </div> | 93 | <!-- </div>--> |
| 94 | <div class="text-center text-primary mt10 fontsize14" v-else> | 94 | <!-- <div class="text-center text-primary mt10 fontsize14" v-else>--> |
| 95 | {{(r.roomCount - (r.useCount||0)).toFixed()}} Remaining rooms | 95 | <!-- {{(r.roomCount - (r.useCount||0)).toFixed()}} Remaining rooms--> |
| 96 | </div> | 96 | <!-- </div>--> |
| 97 | </el-col> | 97 | </el-col> |
| 98 | </el-row> | 98 | </el-row> |
| 99 | </div> | 99 | </div> | ... | ... |
| ... | @@ -17,32 +17,40 @@ | ... | @@ -17,32 +17,40 @@ |
| 17 | {{ language==0?'订单编号:':'No.' }} {{ b.id }} | 17 | {{ language==0?'订单编号:':'No.' }} {{ b.id }} |
| 18 | </div> | 18 | </div> |
| 19 | <div class="status-po"> | 19 | <div class="status-po"> |
| 20 | <span class="bg-warning" v-if="b.status == '0'&&b.surplus!='0,0'&&b.surplus!='0'" | 20 | <span class="bg-warning" v-if="b.status == '0'&&b.surplus!='0,0'&&b.surplus!='0'"> 待支付 |
| 21 | style="margin-right: 24px;"> 待支付 | ||
| 22 | </span> | 21 | </span> |
| 23 | <span class="bg-warning" v-if="b.status == '0'&&(b.surplus=='0,0'||b.surplus=='0')">已取消</span> | 22 | <span class="bg-warning" v-if="b.status == '0'&&(b.surplus=='0,0'||b.surplus=='0')">已取消</span> |
| 24 | <span class="bg-blue" v-if="b.status == '1'">支付成功</span> | 23 | <span class="bg-blue" v-if="b.status == '1'">支付成功</span> |
| 25 | <span class="bg-warning" v-if="b.status == '2'">已取消</span> | 24 | <span class="bg-warning" v-if="b.status == '2'">已取消</span> |
| 26 | <span class="bg-danger" v-if="b.status == '3'||b.status == '4'">已退订</span> | 25 | <span class="bg-danger" v-if="b.status == '3'||b.status == '4'">已退订</span> |
| 27 | </div> | 26 | </div> |
| 28 | <div class="bbody" v-if="b.orderType == 0"> | 27 | <div class="plr20" v-if="b.orderType == 0"> |
| 29 | <h3 class="name">{{b.name}}</h3> | 28 | <h3 class="name">{{b.name}}</h3> |
| 30 | <p>{{b.messageObj?.roomStayDate}}</p> | 29 | <p>{{b.messageObj?.roomStayDate}}</p> |
| 31 | <p>{{b.messageObj?.roomName}}</p> | 30 | <p>{{b.messageObj?.roomName}}</p> |
| 32 | <p>{{b.messageObj?.roomInfo}}</p> | 31 | <p>{{b.messageObj?.roomInfo}}</p> |
| 33 | 32 | ||
| 34 | </div> | 33 | </div> |
| 35 | <div class="bbody" v-if="b.orderType == 1"> | 34 | <div class="plr20" v-if="b.orderType == 1"> |
| 36 | <h3 class="name">{{b.name}}</h3> | 35 | <h3 class="name">{{b.name}}</h3> |
| 37 | <div v-for="(car,index) in b.messageObj.carsList" :key="index"> | 36 | <div v-for="(car,index) in b.messageObj.carsList" :key="index"> |
| 38 | <div v-if="car.num>0">{{car.name}}:{{car.num}} 辆</div> | 37 | <div v-if="car.num>0">{{car.name}}:{{car.num}} 辆</div> |
| 39 | </div> | 38 | </div> |
| 40 | <div>{{b.handleDate}}</div> | 39 | <div>{{b.handleDate}}</div> |
| 41 | |||
| 42 | </div> | 40 | </div> |
| 43 | <el-row justify="space-between"> | 41 | <div class="plr20" v-if="b.orderType == 2"> |
| 42 | <h3 class="name">{{b.name}}</h3> | ||
| 43 | <div v-for="(n,index) in b.messageObj.foodsList" :key="index"> | ||
| 44 | <div v-if="n.num > 0"> | ||
| 45 | {{n.name}}({{n.categoryName}}) * <span>{{n.num}} 份</span> | ||
| 46 | </div> | ||
| 47 | </div> | ||
| 48 | </div> | ||
| 49 | <el-row class="plr20 mt10" justify="space-between"> | ||
| 44 | <el-col :lg="8"> | 50 | <el-col :lg="8"> |
| 45 | <span class="bigMoney"> {{ language==0?'¥':'€' }} {{b.total}}</span> | 51 | <span class="text-warning"> {{ language==0?'¥':'€' }} |
| 52 | <span class="bigMoney">{{b.total}}</span> | ||
| 53 | </span> | ||
| 46 | </el-col> | 54 | </el-col> |
| 47 | 55 | ||
| 48 | <el-col :lg="8"> | 56 | <el-col :lg="8"> | ... | ... |
-
Please register or sign in to post a comment