dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11.19

Browse Source
This commit is contained in:
sw 2024-11-20 16:34:18 +08:00
parent ad0adc0c08
commit 2f3117165f
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuintAdmin_zt/src/views/components/Service/allOrder.vue
View File

@ -16,12 +16,11 @@
<el-select <el-select
v-model="queryParams.payChannel" v-model="queryParams.payChannel"
clearable clearable
placeholder="请选择订单状态" placeholder="请选择订单类型"
> >
<el-option label="小程序" value="applet"/> <el-option label="小程序" value="applet"/>
<el-option label="收银台" value="cashier"/> <el-option label="收银台" value="cashier"/>
<el-option label="POS端" value="POS"/> <el-option label="POS端" value="POS"/>
<el-option label="平台" value="PC"/>
</el-select> </el-select>
@ -30,7 +29,7 @@
<el-select <el-select
v-model="queryParams.paymentChannel" v-model="queryParams.paymentChannel"
clearable clearable
placeholder="请选择订单类型" placeholder="支付通道"
> >
<el-option label="全部" value=""/> <el-option label="全部" value=""/>
<el-option label="拉卡拉" value="cashier"/> <el-option label="拉卡拉" value="cashier"/>
@ -42,7 +41,7 @@
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
clearable clearable
placeholder="支付通道" placeholder="请选择订单状态"
> >
<el-option label="已支付" value="paid"/> <el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/> <el-option label="未支付" value="unpaid"/>

6
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -449,7 +449,8 @@
ref="getFocus" ref="getFocus"
autofocus autofocus
@keydown.enter.native="collection1" @keydown.enter.native="collection1"
placeholder="扫描或输入付款码、支持微信、支付宝、云闪付"> placeholder="扫描或输入付款码、支持微信、支付宝、云闪付"
>
<i <i
slot="suffix"> slot="suffix">
<svg t="1697791915471" class="icon" viewBox="0 0 1024 1024" version="1.1" <svg t="1697791915471" class="icon" viewBox="0 0 1024 1024" version="1.1"
@ -472,7 +473,7 @@
</div> </div>
<div v-else> <div v-else>
<div> <div>
<el-input v-model.number="payForm.authCode" <el-input v-model="payForm.authCode"
oninput="value=value.replace(/[^0-9]/g, '').slice(0, 10)" oninput="value=value.replace(/[^0-9]/g, '').slice(0, 10)"
type="number" type="number"
ref="getFocus" ref="getFocus"
@ -1597,7 +1598,6 @@ export default {
else { else {
this.payForm.consumeAmount = 0 this.payForm.consumeAmount = 0
} }
//会员id //会员id
this.payForm.userId = this.chooseVipUser.id this.payForm.userId = this.chooseVipUser.id
//终端 默认传PC //终端 默认传PC