From ce9ea228f1987ff4a26d11a6a9aad8652b927f05 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 25 Mar 2025 13:22:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=B0=E9=87=8D=E5=95=86=E5=93=81=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E3=80=81=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E4=BC=98=E6=83=A0=E5=88=B8=E5=95=86=E5=93=81=EF=BC=8C?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=94=AF=E4=BB=98=E6=8C=89=E9=92=AE=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E7=8A=B6=E6=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/carts.ts                               | 2 +-
 src/views/tool/Instead/components/carts/list.vue         | 8 ++++----
 src/views/tool/Instead/components/keyboard.vue           | 2 +-
 src/views/tool/Instead/components/popup-weight-goods.vue | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/store/modules/carts.ts b/src/store/modules/carts.ts
index 8a9ff4f..ab45e73 100644
--- a/src/store/modules/carts.ts
+++ b/src/store/modules/carts.ts
@@ -51,7 +51,7 @@ export const useCartsStore = defineStore("carts", () => {
       status: "on_sale",
       ...query,
     });
-    goods.value = res.records;
+    goods.value = res.records.filter((v: { type: string }) => v.type != 'coupon');
     setGoodsMap(goods.value)
   }
 
diff --git a/src/views/tool/Instead/components/carts/list.vue b/src/views/tool/Instead/components/carts/list.vue
index d259b46..ccc33e7 100644
--- a/src/views/tool/Instead/components/carts/list.vue
+++ b/src/views/tool/Instead/components/carts/list.vue
@@ -102,7 +102,7 @@
         <el-button
           type="primary"
           size="large"
-          :disabled="!carts.isLinkFinshed"
+          :disabled="!carts.isLinkFinshed || carts.isEmpty"
           @click="createOrder('wx-aiplay')"
         >
           微信/支付宝
@@ -110,7 +110,7 @@
         <el-button
           type="primary"
           size="large"
-          :disabled="!carts.isLinkFinshed"
+          :disabled="!carts.isLinkFinshed || carts.isEmpty"
           @click="createOrder('cash')"
         >
           现金
@@ -118,7 +118,7 @@
         <el-button
           type="primary"
           size="large"
-          :disabled="!carts.isLinkFinshed || showOrder"
+          :disabled="!carts.isLinkFinshed || showOrder || carts.isEmpty"
           @click="createOrder('more-pay')"
         >
           更多支付
@@ -273,7 +273,7 @@ defineExpose({
 }
 :deep(.btn-group) {
   display: flex;
-  margin-top: 20px;
+  margin-top: 10px;
   .el-button {
     flex: 1;
   }
diff --git a/src/views/tool/Instead/components/keyboard.vue b/src/views/tool/Instead/components/keyboard.vue
index b9cd614..3d3c052 100644
--- a/src/views/tool/Instead/components/keyboard.vue
+++ b/src/views/tool/Instead/components/keyboard.vue
@@ -319,7 +319,7 @@ function keyboradConfirm() {
 .keybord-box .box_status {
   margin-bottom: 20px;
   width: 370px;
-  height: 58px;
+  min-height: 58px;
   background: #fff;
   border-radius: 4px;
   overflow: hidden;
diff --git a/src/views/tool/Instead/components/popup-weight-goods.vue b/src/views/tool/Instead/components/popup-weight-goods.vue
index 60c4121..9f9d57e 100644
--- a/src/views/tool/Instead/components/popup-weight-goods.vue
+++ b/src/views/tool/Instead/components/popup-weight-goods.vue
@@ -12,7 +12,7 @@
             <div>.</div>
           </template>
           <template #input>
-            <div class="u-font-14 u-row-between u-flex w-full u-text-left">
+            <div class="u-font-14 u-row-between u-flex w-full u-text-left u-p-b-1">
               <div class="">
                 <div>单价</div>
                 <div class="u-m-t-10">