From 2f3117165f27e2138d3968b7d18a2fd2b52bbe9e Mon Sep 17 00:00:00 2001
From: sw <17615834396@163.com>
Date: Wed, 20 Nov 2024 16:34:18 +0800
Subject: [PATCH] 11.19

---
 .../src/views/components/Service/allOrder.vue |  7 +++----
 .../views/cashier/NewComponents/newHome.vue   | 20 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
index ed0362826..3a56308ab 100644
--- a/fuintAdmin_zt/src/views/components/Service/allOrder.vue
+++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
@@ -16,12 +16,11 @@
           <el-select
             v-model="queryParams.payChannel"
             clearable
-            placeholder="请选择订单状态"
+            placeholder="请选择订单类型"
           >
             <el-option label="小程序" value="applet"/>
             <el-option label="收银台" value="cashier"/>
             <el-option label="POS端" value="POS"/>
-            <el-option label="平台" value="PC"/>
           </el-select>
 
 
@@ -30,7 +29,7 @@
           <el-select
             v-model="queryParams.paymentChannel"
             clearable
-            placeholder="请选择订单类型"
+            placeholder="支付通道"
           >
             <el-option label="全部" value=""/>
             <el-option label="拉卡拉" value="cashier"/>
@@ -42,7 +41,7 @@
           <el-select
             v-model="queryParams.status"
             clearable
-            placeholder="支付通道"
+            placeholder="请选择订单状态"
           >
             <el-option label="已支付" value="paid"/>
             <el-option label="未支付" value="unpaid"/>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index b3d7d3465..7d9ef6fdc 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -449,7 +449,8 @@
                       ref="getFocus"
                       autofocus
                       @keydown.enter.native="collection1"
-                      placeholder="扫描或输入付款码、支持微信、支付宝、云闪付">
+                      placeholder="扫描或输入付款码、支持微信、支付宝、云闪付"
+                      >
               <i
                 slot="suffix">
                 <svg t="1697791915471" class="icon" viewBox="0 0 1024 1024" version="1.1"
@@ -472,14 +473,14 @@
         </div>
         <div v-else>
           <div>
-            <el-input v-model.number="payForm.authCode"
-                      oninput="value=value.replace(/[^0-9]/g, '').slice(0, 10)"
-                      type="number"
-                      ref="getFocus"
-                      autofocus maxlength="10"
-                      @keydown.enter.native="collection1"
-                      placeholder="请输入收款金额">
-            </el-input>
+              <el-input v-model="payForm.authCode"
+                        oninput="value=value.replace(/[^0-9]/g, '').slice(0, 10)"
+                        type="number"
+                        ref="getFocus"
+                        autofocus maxlength="10"
+                        @keydown.enter.native="collection1"
+                        placeholder="请输入收款金额">
+              </el-input>
           </div>
           <div style="text-align: right;margin: 10px 0">
             <span>应找零</span>
@@ -1597,7 +1598,6 @@ export default {
       else {
         this.payForm.consumeAmount = 0
       }
-
       //会员id
       this.payForm.userId = this.chooseVipUser.id
       //终端  默认传PC