hookehuyr

fix 订单组件显示调整,新增退款失败,退款中新状态

...@@ -23,23 +23,25 @@ ...@@ -23,23 +23,25 @@
23 <nut-col span="18"> 23 <nut-col span="18">
24 <view class="order-card-price-text"> 24 <view class="order-card-price-text">
25 <view class="left"><nut-price :price="order_price" size="normal" /></view> 25 <view class="left"><nut-price :price="order_price" size="normal" /></view>
26 - <view class="right" style="margin-top: 10rpx" 26 + <!-- <view class="right" style="margin-top: 10rpx"
27 ><nut-price 27 ><nut-price
28 :price="original_total" 28 :price="original_total"
29 size="small" 29 size="small"
30 strike-through 30 strike-through
31 style="color: #7d7c7c" 31 style="color: #7d7c7c"
32 - /></view> 32 + /></view> -->
33 </view> 33 </view>
34 </nut-col> 34 </nut-col>
35 <nut-col span="6" class="order-card-price-num"> 35 <nut-col span="6" class="order-card-price-num">
36 - <IconFont 36 + <!-- <IconFont
37 name="close" 37 name="close"
38 size="7" 38 size="7"
39 color="#000" 39 color="#000"
40 style="margin-right: 5rpx; margin-bottom: 0.5rpx" 40 style="margin-right: 5rpx; margin-bottom: 0.5rpx"
41 - ></IconFont 41 + ></IconFont> -->
42 - ><text>{{ order_num }}</text> 42 + <text>{{ order_num }}&nbsp;</text>
43 + <text v-if="room_type === 'floor'">栋</text>
44 + <text v-else>间</text>
43 </nut-col> 45 </nut-col>
44 </nut-row> 46 </nut-row>
45 </view> 47 </view>
...@@ -93,7 +95,7 @@ ...@@ -93,7 +95,7 @@
93 <nut-col span="18"> 95 <nut-col span="18">
94 <view v-if="showBtn" class="order-control"> 96 <view v-if="showBtn" class="order-control">
95 <nut-button 97 <nut-button
96 - v-if="pay_show || props.data.status === 5" 98 + v-if="pay_show || props.data.status === 5 || props.data.status === 4"
97 @tap="cancelOrder(order_id)" 99 @tap="cancelOrder(order_id)"
98 plain 100 plain
99 color="#6A4925" 101 color="#6A4925"
...@@ -193,7 +195,7 @@ import { IconFont } from "@nutui/icons-vue-taro"; ...@@ -193,7 +195,7 @@ import { IconFont } from "@nutui/icons-vue-taro";
193 import { orderCancelAPI } from "@/api/index"; 195 import { orderCancelAPI } from "@/api/index";
194 196
195 /** 197 /**
196 - * 房间状态(9=已入住,2=已取消,3=未支付,5=已支付) 198 + * 房间状态(9=已入住,2=已取消,3=未支付,5=已支付,4=退款失败,6=退款中
197 * / 199 * /
198 200
199 201
...@@ -259,6 +261,8 @@ const STATUS_COLOR = { ...@@ -259,6 +261,8 @@ const STATUS_COLOR = {
259 3: "#D5842D", 261 3: "#D5842D",
260 5: "#6A4925", 262 5: "#6A4925",
261 9: "#656565", 263 9: "#656565",
264 + 4: "#EB2E2E",
265 + 6: "#F8D9B9",
262 }; 266 };
263 267
264 const STATUS_TEXT = { 268 const STATUS_TEXT = {
...@@ -266,6 +270,8 @@ const STATUS_TEXT = { ...@@ -266,6 +270,8 @@ const STATUS_TEXT = {
266 5: "待入住", 270 5: "待入住",
267 9: "已入住", 271 9: "已入住",
268 3: "待支付", 272 3: "待支付",
273 + 4: "退款失败",
274 + 6: "退款中",
269 }; 275 };
270 276
271 const id = ref(""); // 房间id 277 const id = ref(""); // 房间id
...@@ -309,7 +315,7 @@ const calcBgColor = computed(() => { ...@@ -309,7 +315,7 @@ const calcBgColor = computed(() => {
309 315
310 // 显示操作按钮的条件判断 316 // 显示操作按钮的条件判断
311 const showBtn = computed(() => { 317 const showBtn = computed(() => {
312 - return props.data.status === 5 || props.data.status === 3; 318 + return props.data.status === 5 || props.data.status === 3 || props.data.status === 4;
313 }); 319 });
314 320
315 /** 321 /**
......