修复优化

src/utils/index.js

@@ -164,9 +164,10 @@ export function commOrderPrintData(orderInfo) {
     carts: [],
     amount: formatDecimal(orderInfo.payAmount),
     originAmount: formatDecimal(orderInfo.originAmount),
-    discountAmount: formatDecimal(
-      orderInfo.originAmount - orderInfo.orderAmount
-    ),
+    discountAmount:
+      orderInfo.status == "unpaid"
+        ? "0.00"
+        : formatDecimal(orderInfo.originAmount - orderInfo.orderAmount),
     discount: orderInfo.discountRatio,
     remark: orderInfo.remark,
     orderInfo: orderInfo,

src/views/home/components/cartOperation.vue

@@ -499,8 +499,8 @@ const noteList = ref([
 // 显示
 function showDiscountModalHandle() {
     let item = goodsStore.cartList[goodsStore.cartActiveIndex]
-    if ((item && item.id) && (!item.is_temporary || !item.is_gift)) {
-        // 存在商品并且不能为临时菜
+    if ((item && item.id) && (!item.is_temporary && !item.is_gift)) {
+        // 存在商品并且不能为临时菜或者赠送
         showDiscountModal.value = true
     }
 }

src/views/order/components/printDrawer.vue

@@ -60,8 +60,9 @@
         </div>
         <div class="row between">
           <span>折扣</span>
-          <span>
-            {{ formatDecimal(orderInfo.originAmount - orderInfo.orderAmount) }}
+          <span>-{{ orderInfo.status == "unpaid"
+            ? "0.00"
+            : formatDecimal(orderInfo.originAmount - orderInfo.orderAmount) }}
           </span>
         </div>
         <div class="line"></div>