From 73a67360750e9a7e662c98749afa9fc6f20cf3d8 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 10 Dec 2024 18:30:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8C=82=E8=B4=A6=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E7=A6=81=E6=AD=A2=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/components/keyboard.vue      |  6 +++++-
 .../Instead/components/popup-choose-guazhang.vue    | 13 +++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/tool/Instead/components/keyboard.vue b/src/views/tool/Instead/components/keyboard.vue
index ce6d99d..1a2c624 100644
--- a/src/views/tool/Instead/components/keyboard.vue
+++ b/src/views/tool/Instead/components/keyboard.vue
@@ -7,7 +7,7 @@
         </slot>
       </div>
       <slot name="tips"></slot>
-      <div class="number_list_box">
+      <div class="number_list_box" v-if="!disabled">
         <div class="yd-keyboard">
           <div class="mini-number-box1">
             <div class="mini-number">
@@ -65,6 +65,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    disabled:{
+      type:Boolean,
+      default:false
+    },
     max: {
       type: [Number, String],
       default: Infinity,
diff --git a/src/views/tool/Instead/components/popup-choose-guazhang.vue b/src/views/tool/Instead/components/popup-choose-guazhang.vue
index 6f9c351..2c4e7c4 100644
--- a/src/views/tool/Instead/components/popup-choose-guazhang.vue
+++ b/src/views/tool/Instead/components/popup-choose-guazhang.vue
@@ -25,6 +25,7 @@
           v-model="number"
           isFloat
           @clear="clear"
+          :disabled="true"
           :max="payMoney"
           :maxTips="'超出未结账金额'"
         >
@@ -36,7 +37,7 @@
           >
             {{ tips }}
           </div>
-          <div slot="input" class="u-p-l-20 u-p-r-20 u-flex w-full">
+          <div slot="input" class="u-p-l-20 u-p-r-20 u-flex w-full u-relative">
             <div class="font-bold u-font-32">¥</div>
             <el-input
               placeholder="请输入挂账金额"
@@ -48,6 +49,7 @@
               :type="focus ? 'number' : 'text'"
             >
             </el-input>
+            <div class="zhezhao"></div>
           </div>
         </key-board>
         <div class="confirm_btns">
@@ -267,7 +269,14 @@ export default {
   font-size: 20px;
   position: relative;
 }
-
+.zhezhao{
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 1;
+}
 .select_desk .select_desk_dialog .inputs .close {
   color: #aaa;
   position: absolute;

From d85c6db3f67fd0b140addada8a6ce63fff5f70b1 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Wed, 18 Dec 2024 09:42:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/add_shop.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index bcc8112..aaf2af5 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -666,8 +666,8 @@ export default {
         singlePeopleLimit: 0,
         weight: '',
         days: couponEnum.cycle.map(item => item.value),
-        startTime: '',
-        endTime: ''
+        startTime: '00:00',
+        endTime: '23:59'
       },
       useTime: ['00:00', '23:59'],
       imgList: [],