Compare commits

..

No commits in common. "bdf5a93298ff7db13687f8c2e9b5f73198e8c979" and "5a9d64c35932f35df3af2cf7c28d2f452ba8b40a" have entirely different histories.

2 changed files with 14 additions and 13 deletions

View File

@ -16,11 +16,12 @@
<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>
@ -29,7 +30,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"/>
@ -41,7 +42,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"/>

View File

@ -449,8 +449,7 @@
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"
@ -473,14 +472,14 @@
</div> </div>
<div v-else> <div v-else>
<div> <div>
<el-input v-model="payForm.authCode" <el-input v-model.number="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"
autofocus maxlength="10" autofocus maxlength="10"
@keydown.enter.native="collection1" @keydown.enter.native="collection1"
placeholder="请输入收款金额"> placeholder="请输入收款金额">
</el-input> </el-input>
</div> </div>
<div style="text-align: right;margin: 10px 0"> <div style="text-align: right;margin: 10px 0">
<span>应找零</span> <span>应找零</span>
@ -1598,6 +1597,7 @@ 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