From e7435aa8589ca00669db60ec29ad4f75d11cc93b Mon Sep 17 00:00:00 2001
From: Linzm <1015157648@qq.com>
Date: Sat, 7 Jun 2025 10:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=A4=B1=E6=95=88=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.ts        |  5 +++--
 src/views/badge/index.vue   | 13 +++++++++----
 src/views/badge/myOrder.vue | 38 +++++++++++++++++++++++++------------
 src/views/badge/preview.vue | 25 ++++++++++++++++++------
 src/views/badge/record.vue  | 17 +++++++++++++++--
 5 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index f15a0c3..e0735cf 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -35,10 +35,11 @@ const errorHandler = (error: RequestError): Promise<any> => {
       })
     }
     // 401 未登录/未授权
-    if (status === 401 && data.result && data.result.isLogin) {
+    if (status === 401) {
       showNotify({
         type: 'danger',
-        message: 'Authorization verification failed',
+        message: (data && data.message) || '链接已失效，请联系平台客服',
+        duration: 0
       })
       // 如果你需要直接跳转登录页面
       // location.replace(loginRoutePath)
diff --git a/src/views/badge/index.vue b/src/views/badge/index.vue
index 5a21a29..97c3b03 100644
--- a/src/views/badge/index.vue
+++ b/src/views/badge/index.vue
@@ -139,6 +139,11 @@ const getPid = async () => {
     }
   } catch (err) {
     isLoading.value = false
+    closeToast()
+    showToast({
+      message: '链接已失效，请联系平台客服',
+      duration: 2000,
+    })
     console.log(err)
   } finally {
     isLoading.value = false
@@ -294,7 +299,7 @@ onMounted(() => {
             {{ item.size }}
           </div>
           <div class="size-count">
-            （剩余兑换：{{ item.count }}）
+            （剩余兑换：{{ item.remaining }}）
           </div>
         </div>
         <!-- <div class="size-item">
@@ -313,7 +318,7 @@ onMounted(() => {
           设计图集
         </div>
         <div class="badge-count">
-          {{ orderStat.create_count }}张
+          {{ orderStat.create_count || 0 }}张
         </div>
       </div>
       <div class="badge-item" @click="goToMyOrder">
@@ -321,7 +326,7 @@ onMounted(() => {
           我的订单
         </div>
         <div class="badge-count">
-          {{ orderStat.order_count }}笔
+          {{ orderStat.order_count || 0 }}笔
         </div>
       </div>
     </div>
@@ -452,7 +457,7 @@ onMounted(() => {
     <div class="design-action-bar">
       <div class="design-left">
         <img class="design-leaf-icon" width="18" height="18" src="@/assets/badge/leaf.png" alt="">
-        <span class="design-remaining">剩余{{ orderStat.remain_count }}次</span>
+        <span class="design-remaining">剩余{{ orderStat.remain_count || 0 }}次</span>
       </div>
       <button class="design-btn" @click="goToPreview">
         <span>开始设计</span>
diff --git a/src/views/badge/myOrder.vue b/src/views/badge/myOrder.vue
index 3cbb59b..0d1c051 100644
--- a/src/views/badge/myOrder.vue
+++ b/src/views/badge/myOrder.vue
@@ -3,12 +3,15 @@
     <div class="header" @click="goBack">
       <span class="back-icon"><van-icon name="arrow-left" size="16px" color="#333" /> 我的订单</span>
     </div>
-    <div class="order-list">
+    <div class="order-list" v-if="orders.length > 0">
       <div class="order-item" @click="OrderDetail(item.id)" v-for="item in orders" :key="item.id">
         <img class="order-img" :src="item.path" alt="order1" />
-        <span class="order-status status-processing">{{ getStatus(item.status) }}</span>
+        <span class="order-status status-finished">{{ getStatus(item.status) }}</span>
       </div>
     </div>
+    <div v-else class="record-image-item-null">
+      <img src="@/assets/badge/null-data.png" alt="暂无数据">
+    </div>
   </div>
 </template>
 <script setup lang="ts">
@@ -31,11 +34,11 @@ function getOrder() {
     status: 0,
   }).then(res => {
     if(page.value === 1) {
-      orders.value = res.data.list
+      orders.value = res.list
     } else {
-      orders.value.push(...res.data.list)
+      orders.value.push(...res.list)
     }
-    if(res.data.list.length < 10) {
+    if(res.list.length < 10) {
       finished.value = true
     } else {
       page.value++
@@ -87,20 +90,20 @@ function getStatus(status: number) {
   }
   .order-list {
     display: flex;
+    flex-wrap: wrap;
     gap: 8px;
-    justify-content: space-between;
     padding: 24px 16px;
   }
 
   .order-item {
     position: relative;
-    width: 43vw;
+    width: calc(50% - 4px);
     height: 43vw;
-    /* border-radius: 50%; */
     box-shadow: 0 2px 8px rgba(0,0,0,0.08);
     display: flex;
     align-items: center;
     justify-content: center;
+    flex-direction: column;
   }
 
   .order-img {
@@ -112,11 +115,11 @@ function getStatus(status: number) {
 
   .order-status {
     position: absolute;
-    bottom: 10px;
-    right: 10px;
-    padding: 2px 14px;
+    bottom: 5px;
+    right: 5px;
+    padding: 2px 12px;
     border-radius: 12px;
-    font-size: 14px;
+    font-size: 12px;
     color: #fff;
     background: #bdbdbd;
     opacity: 0.9;
@@ -130,4 +133,15 @@ function getStatus(status: number) {
   .status-finished {
     background: #8bc34a;
   }
+  
+  .record-image-item-null {
+    height: 50vh;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .record-image-item-null img {
+    width: 80vw;
+    height: 200px;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/badge/preview.vue b/src/views/badge/preview.vue
index 9e8c46c..9e5f5a6 100644
--- a/src/views/badge/preview.vue
+++ b/src/views/badge/preview.vue
@@ -36,7 +36,7 @@
     </div>
     <div class="info-section">
       <div class="info-item">
-        <div class="info-title">芯比风格</div>
+        <div class="info-title">{{ compareList.kind_name }}</div>
         <div class="info-content">风格</div>
       </div>
       <div class="info-item">
@@ -59,9 +59,9 @@
       <div class="order-title">订购数量</div>
       <div class="order-item" v-for="item in sizeList" :key="item.id">
         <span class="order-size">{{ item.size }}</span>
-        <span class="order-free">(剩余兑换：{{ item.count }})</span>
+        <span class="order-free">(剩余兑换：{{ item.remaining }})</span>
         <div class="order-ctrl">
-          <van-stepper v-model="value" :min="0" :max="item.count" @change="changeValue" />
+          <van-stepper v-model="item.count" :min="0" :max="item.remaining" @change="changeValue" />
         </div>
       </div>
       <!-- <div class="order-item">
@@ -72,6 +72,7 @@
         </div>
       </div> -->
     </div>
+    <div style="height: 110px;"></div>
     <div class="confirm-box">
       <div class="action-section">
         <button @click="reload" :disabled="flag < 2" class="action-btn"><img class="action-img" src="@/assets/badge/reload.png" alt=""> 再次生成</button>
@@ -162,7 +163,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import { useRoutimporter } from 'vue-router';
-import { showSuccessToast } from 'vant';
+import { showSuccessToast, showToast, showNotify } from 'vant';
 import * as badgeApi from '@/api/badge'
 const router = useRouter();
 const value = ref(0);
@@ -172,7 +173,7 @@ const showBgCompare = ref(false)
 const currentIndex = ref(0)
 const imageList = ref([])
 function compare() {
-  if (extend_value == -1) {
+  if (extend_value.value == -1) {
     showCompare.value = true
   } else {
     showBgCompare.value = true
@@ -211,6 +212,10 @@ function sureReload() {
   }).catch((err) => {
     console.log('putModeling', err)
     showReload.value = false
+    showToast({
+      message: '链接已失效，请联系平台客服',
+      duration: 2000,
+    })
   }).finally(() => {
     showReload.value = false
   })
@@ -284,13 +289,17 @@ const getSizeList = () => {
 
 const payAmount = ref(0)
 const changeValue = (value: number) => {
-  console.log(value)
+  console.log(value) 
   payAmount.value = value
 }
 
 const key = ref(0)
 const confirm = () => {
   console.log('confirm')
+  if (payAmount.value <= 0) {
+    showToast('请先选择下单数量')
+    return
+  }
   const parms = {
     pid: pid.value,
     key: key.value,
@@ -308,6 +317,10 @@ const confirm = () => {
     })
   }).catch((err) => {
     console.log('creatOrder', err)
+    showToast({
+      message: '链接已失效，请联系平台客服',
+      duration: 2000,
+    })
   }).finally((err) => {
     
   })
diff --git a/src/views/badge/record.vue b/src/views/badge/record.vue
index feee30e..d4eedd6 100644
--- a/src/views/badge/record.vue
+++ b/src/views/badge/record.vue
@@ -5,17 +5,20 @@
     </div>
     <div class="record-container">
       <div class="record-note">注：可点击效果图进行下单打印</div>
-      <div class="record-images">
+      <div class="record-images" v-if="images.length > 0">
         <div class="record-image-item" v-for="item in images" :key="item.id">
           <block v-if="item.status == 1" @click="goPreview(item)">
             <img :src="item.path" :alt="item.name" style="width: 100%; height: 100%; object-fit: cover; border-radius: 50%;">
             <div class="record-image-item-shadow"></div>
           </block>
-          <div v-else class="record-image-item-loading" stop-click>
+          <div v-else class="record-image-item-loading">
             设计失败
           </div>
         </div>
       </div>
+      <div v-else class="record-image-item-null">
+        <img src="@/assets/badge/null-data.png" alt="暂无数据">
+      </div>
     </div>
   </div>
 </template>
@@ -142,4 +145,14 @@ function goBack() {
     font-size: 16px;
     color: #999;
   }
+  .record-image-item-null {
+    height: 50vh;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .record-image-item-null img {
+    width: 80vw;
+    height: 200px;
+  }
 </style>
\ No newline at end of file