From 0211c1d57cdb0a0bed367cfc955bc4c7153dd9e3 Mon Sep 17 00:00:00 2001
From: lihaoyuan <18278596806@163.com>
Date: Thu, 23 Oct 2025 14:45:43 +0800
Subject: [PATCH] =?UTF-8?q?update:=E5=85=A8=E9=83=A8=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/onlineOrder/index.vue                 | 11 +++++++++++
 .../product/productList/components/addProductEdit.vue |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

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 @@
           <el-button v-if="row.order_state_id === 2010" plain size="mini">{{ formatStateId(row) }}</el-button>
           <el-button v-else-if="row.order_state_id === 2011" plain size="mini">{{  formatStateId(row) }}</el-button>
           <el-button v-else-if="row.order_state_id === 2013" plain size="mini">{{  formatStateId(row) }}</el-button>
+          <el-button v-else-if="row.order_state_id === 2016" plain size="mini">{{  formatStateId(row) }}</el-button>
           <el-button v-else-if="row.order_state_id === 2020" plain size="mini" type="warning">{{  formatStateId(row) }}</el-button>
           <el-button v-else-if="row.order_state_id === 2030" plain size="mini" type="danger">{{  formatStateId(row) }}</el-button>
           <el-button v-else-if="row.order_state_id === 2040" plain size="mini" type="info">{{  formatStateId(row) }}</el-button>
+          <el-button v-else-if="row.order_state_id === 2050" plain size="mini" type="info">{{  formatStateId(row) }}</el-button>
+          <el-button v-else-if="row.order_state_id === 2050" plain size="mini" type="info">{{  formatStateId(row) }}</el-button>
           <el-button v-else-if="row.order_state_id === 2060" plain size="mini" type="success">{{  formatStateId(row) }}</el-button>
           <el-button v-else-if="row.order_state_id === 2070" plain size="mini" type="plain">{{  formatStateId(row) }}</el-button>
           <el-button v-else>
@@ -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(',')