更新

src/components/pay.vue

@@ -26,9 +26,10 @@ const open = () => {
 
 const changeActive = (e) => {
   active.value = e;
-  if (active.value == 2) {  // 添加键盘事件监听器
+  if (active.value == 2) {
-    document.addEventListener('keydown', keyboard);
+    // 添加键盘事件监听器
-  }else document.removeEventListener('keydown', keyboard);
+    document.addEventListener("keydown", keyboard);
+  } else document.removeEventListener("keydown", keyboard);
 };
 
 const form = ref({});
@@ -191,6 +192,8 @@ const beforeClose = () => {
   reLoad.value = false;
   loading.value = false;
   input.value = "";
+  collection.value = "";
+  collectionArray.value = [];
   codeRef.value?.blur();
   emit("paySuccess");
   drawer.value = false;
@@ -206,12 +209,13 @@ defineExpose({
 
 const collectionArray = ref([]);
 const collection = ref(""); //输入的金额
-const changePrice = computed(()=>{ // 找零
+const changePrice = computed(() => {
-  if(+collection.value>0){
+  // 找零
+  if (+collection.value > 0) {
     return (collection.value - form.value.order_price).toFixed(2);
   }
   return -1;
-})
+});
 const defaultcalc = ref(false);
 
 //清除计算机输入的数字
@@ -246,8 +250,7 @@ const numTap = (item) => {
 };
 // 现金结算
 const cashBnt = () => {
-  console.log("结算");
+  if(changePrice.value!=''&&changePrice.value>=0) orderCreateApi({
-  orderCreateApi({
     address_id: "",
     key: form.value.key,
     cart_id: cart_id.value,
@@ -266,6 +269,8 @@ const cashBnt = () => {
       } else {
         if (!res.data.group_order_sn) {
           order_id.value = res.data.result.order_id;
+          collection.value = "";
+          collectionArray.value = [];
           loading.value = false;
           return ElMessage({
             message: res.message,
@@ -281,9 +286,6 @@ const cashBnt = () => {
     })
     .catch((err) => {
       loading.value = false;
-        nextTick(() => {
-          codeRef.value?.focus();
-        });
     });
 };
 
@@ -345,6 +347,9 @@ const keyboard = (event) => {
     case 8:
       delNum();
       break;
+    case 13:
+      cashBnt();
+      break;
   }
 };
 </script>
@@ -403,9 +408,11 @@ const keyboard = (event) => {
             <div class="counter">
               <div class="received">
                 <span v-if="collection">{{ collection }}</span>
-                <span v-else style="font-size: 1rem;color: #999;">按下键盘输入客户支付金额</span>
+                <span v-else style="font-size: 1rem; color: #999"
+                  >按下键盘输入客户支付金额</span
+                >
               </div>
-              <div class="balance" v-if="changePrice>=0">
+              <div class="balance" v-if="changePrice >= 0">
                 需找零(元)：<span class="money">￥{{ changePrice }}</span>
               </div>
               <div class="balance" v-else>不够找零, 请支付更多金额</div>
@@ -433,9 +440,7 @@ const keyboard = (event) => {
     </template>
     <template #footer>
       <div style="width: 100%; display: flex; justify-content: center">
-        <el-button class="cancel-btn" @click="cancelClick"
+        <el-button class="cancel-btn" @click="cancelClick">取消收款</el-button>
-          >取消收款</el-button
-        >
       </div>
     </template>
   </el-drawer>