From fa4a71f860cf12866798d3a330034ddc93a3d82a Mon Sep 17 00:00:00 2001
From: Linzm <1015157648@qq.com>
Date: Mon, 9 Jun 2025 16:55:03 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/badge/index.vue       | 6 ++++--
 src/views/badge/orderDetail.vue | 2 +-
 src/views/badge/preview.vue     | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/badge/index.vue b/src/views/badge/index.vue
index 8c1acaf..d7350e4 100644
--- a/src/views/badge/index.vue
+++ b/src/views/badge/index.vue
@@ -97,6 +97,8 @@ const getPid = async () => {
   showLoadingToast({
     message: '上传中...',
     forbidClick: true,
+    loadingType: 'spinner',
+    duration: 0,
   })
   // kindId.value = checkId.value == 0 ? getRandomNumber() : checkId.value
   const params = {
@@ -176,7 +178,7 @@ const sendToOss = async (src: string, url: string) => {
     if (--pendingUploads.value === 0 && !isAnotherAPICalled.value) {
       const params = {
         pid: pid.value,
-        kind_id: kindId.value,
+        kind_id: checkId.value,
         extend_value: isBgShow.value ? -1 : 0,
         group: 1,
       }
@@ -204,7 +206,7 @@ const createLog = () => {
   const params = {
     pid: pid.value,
     group: 1,
-    kind_id: kindId.value,
+    kind_id: checkId.value,
   }
   badgeApi.createLog(params).then((res: any) => {
     console.log('createLog', res)
diff --git a/src/views/badge/orderDetail.vue b/src/views/badge/orderDetail.vue
index a92f0ef..fdbd7a8 100644
--- a/src/views/badge/orderDetail.vue
+++ b/src/views/badge/orderDetail.vue
@@ -12,7 +12,7 @@
     <div class="status-info">
       <div class="status-title">{{ getStatus(order.status) }}</div>
       <div class="status-desc">
-        下单后预计需要7天完成生产发货。如对产品有疑问，可以联系客服咨询。
+        下单后预计需要10天完成生产发货。如对产品有疑问，可以联系客服咨询。
       </div>
     </div>
     <div style="padding: 0 16px;">
diff --git a/src/views/badge/preview.vue b/src/views/badge/preview.vue
index 965523a..29cf7b8 100644
--- a/src/views/badge/preview.vue
+++ b/src/views/badge/preview.vue
@@ -190,10 +190,6 @@ function compare() {
 const kindList = ref([])
 const checkId = ref(0)
 function reload() {
-  if (checkId.value == 0) {
-    showToast('请选择风格样式')
-    return
-  }
   badgeApi.getKindList({
     page: 1,
     size: 20,
@@ -216,6 +212,10 @@ function reload() {
 // }
 function sureReload() {
   console.log('sureReload')
+  if (checkId.value == 0) {
+    showToast('请选择风格样式')
+    return
+  }
   imageUrl.value = '';
   group.value = newGroup.value
   const params = {