From cb40ce643fa33af63a94cb94cb629f9cee87cc87 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Thu, 16 May 2024 16:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=A2=9C=E8=89=B2=E5=B0=BA=E7=A0=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/sku-dialog.vue                       | 4 ++--
 src/pages/mall/subs/order/order-confirm.vue         | 4 ++--
 src/pages/mall/subs/shoppingcart/index.vue          | 2 +-
 src/pages/mine/subs/order/components/order-item.vue | 2 +-
 src/pages/mine/subs/order/detail.vue                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/sku-dialog.vue b/src/components/sku-dialog.vue
index 0fe8141..dcd7149 100644
--- a/src/components/sku-dialog.vue
+++ b/src/components/sku-dialog.vue
@@ -19,7 +19,7 @@
                 :class='{"sku-item-active":currentColorIndex==index}'
                 v-for='(item, index) in skuColorList' :key='index'
                 @click='colorChange(index)'>
-            <text>{{ item }}</text>
+            <text>{{ item||'均色' }}</text>
           </view>
         </view>
 
@@ -30,7 +30,7 @@
                 :class='{"sku-item-active":currentSizeIndex==index,"sku-item-disabled":item.existingNumber<=0}'
                 v-for='(item, index) in skuSizeList' :key='index'
                 @click='sizeChange(index)'>
-            <text>{{ item.sizeName }}</text>
+            <text>{{ item.sizeName||'均码' }}</text>
           </view>
           <text v-else style='color: #999999;font-size: 30rpx'>暂无库存</text>
         </view>
diff --git a/src/pages/mall/subs/order/order-confirm.vue b/src/pages/mall/subs/order/order-confirm.vue
index d1b7450..76997d2 100644
--- a/src/pages/mall/subs/order/order-confirm.vue
+++ b/src/pages/mall/subs/order/order-confirm.vue
@@ -49,7 +49,7 @@
             </text>
             <view class='bottom-sku-view c-flex-row'>
               <text>
-                {{ item.checkedStock.colorName }}，{{ item.checkedStock.sizeName }} x{{ item.checkedStock.count }}
+                {{ item.checkedStock.colorName||'均色' }}，{{ item.checkedStock.sizeName||'均码' }} x{{ item.checkedStock.count }}
               </text>
               <text>¥{{ item.price }}</text>
             </view>
@@ -161,7 +161,7 @@ const buildSqbParams = computed(() => {
     return_url: '/pages/common/payresult/index',
     total_amount: Number(((totalPrice.value || 0) * 100).toFixed(2)),
     terminal_sn: terminalInfo.value.terminalSn,
-    subject: orderBean?.value?.orderGoods[0].name,
+    subject: orderBean?.value?.orderGoods[0].name||'未知',
     subject_img: orderBean?.value?.orderGoods[0].images || '',
     merchant_name: terminalInfo.value.companyName,
     notify_url: 'https://www.baidu.com'
diff --git a/src/pages/mall/subs/shoppingcart/index.vue b/src/pages/mall/subs/shoppingcart/index.vue
index 461012d..7162c6b 100644
--- a/src/pages/mall/subs/shoppingcart/index.vue
+++ b/src/pages/mall/subs/shoppingcart/index.vue
@@ -18,7 +18,7 @@
               <text>{{ item.name }}</text>
               <view class='c-flex-row'>
                 <view class='sku-view' @click.stop='showSkuDialog(index)'>
-                  <text>{{ item?.checkedStock?.colorName }}，{{ item?.checkedStock?.sizeName }}
+                  <text>{{ item?.checkedStock?.colorName||'均色' }}，{{ item?.checkedStock?.sizeName||'均码' }}
                     x{{ item?.checkedStock?.count }}
                   </text>
                   <image :src='assetsUrl("ic_arrow_down_gray.png")' />
diff --git a/src/pages/mine/subs/order/components/order-item.vue b/src/pages/mine/subs/order/components/order-item.vue
index 1f5647e..7addf9a 100644
--- a/src/pages/mine/subs/order/components/order-item.vue
+++ b/src/pages/mine/subs/order/components/order-item.vue
@@ -13,7 +13,7 @@
         </view>
         <view class='bottom-view c-flex-row'>
           <text>
-            {{ item?.orderGoods[0].stockStock.colorName }}，{{ item?.orderGoods[0].stockStock.sizeName }}
+            {{ item?.orderGoods[0].stockStock.colorName||'均色' }}，{{ item?.orderGoods[0].stockStock.sizeName||'均码' }}
           </text>
           <text>
             共{{ item?.itemNum }}件
diff --git a/src/pages/mine/subs/order/detail.vue b/src/pages/mine/subs/order/detail.vue
index 38ed4ef..14730ca 100644
--- a/src/pages/mine/subs/order/detail.vue
+++ b/src/pages/mine/subs/order/detail.vue
@@ -48,7 +48,7 @@
             </text>
             <view class='bottom-view c-flex-row'>
               <text>
-                {{ item.stockStock.colorName }}，{{ item.stockStock.sizeName }} x{{ item.goodsNum }}
+                {{ item.stockStock.colorName||'均色' }}，{{ item.stockStock.sizeName||'均码' }} x{{ item.goodsNum }}
               </text>
               <text>{{ item.consumePrice }}</text>
             </view>