diff --git a/src/views/order/onlineOrder/index.vue b/src/views/order/onlineOrder/index.vue index 051a59e..ab8470e 100644 --- a/src/views/order/onlineOrder/index.vue +++ b/src/views/order/onlineOrder/index.vue @@ -258,9 +258,12 @@ {{ formatStateId(row) }} {{ formatStateId(row) }} {{ formatStateId(row) }} + {{ formatStateId(row) }} {{ formatStateId(row) }} {{ formatStateId(row) }} {{ formatStateId(row) }} + {{ formatStateId(row) }} + {{ formatStateId(row) }} {{ formatStateId(row) }} {{ formatStateId(row) }} @@ -768,14 +771,22 @@ ? this.__('待审核') : row.order_state_id === 2013 ? this.__('待财务审核') + : row.order_state_id === 2016 + ? this.__('已经付款') : row.order_state_id === 2020 ? this.__('待配货') : row.order_state_id === 2030 ? this.__('待发货') : row.order_state_id === 2040 ? this.__('待签收') + : row.order_state_id === 2050 + ? this.__('已签收') : row.order_state_id === 2060 ? this.__('已完成') + : row.order_state_id === 2070 + ? this.__('已取消') + : row.order_state_id === 2080 + ? this.__('自提') : row.order_state_id === 2010 ? this.__('待付款') : this.__('已关闭') diff --git a/src/views/product/productList/components/addProductEdit.vue b/src/views/product/productList/components/addProductEdit.vue index c9cc2d2..b44ddee 100644 --- a/src/views/product/productList/components/addProductEdit.vue +++ b/src/views/product/productList/components/addProductEdit.vue @@ -2077,7 +2077,7 @@ export default { } else { if (shop_product_image.length) { let image = shop_product_image?.[0] - obj.main_color_img = image.item_image_default + obj.main_color_img = image.item_image_default || '' let other = image.item_image_other if (other) { obj.color_img = other.split(',')