fix: 代客下单修复先打折后选会员导致结算价格为负数问题。订单退款增加安全密码校验,代客下单修复选择用户手机号未展示问题
This commit is contained in:
@@ -22,7 +22,10 @@
|
||||
<el-table-column label="用户" prop="headImg" width="200px">
|
||||
<template v-slot="scope">
|
||||
<div class="user_info">
|
||||
<el-image :src="scope.row.headImg" style="width: 40px; height: 40px; flex-shrink: 0">
|
||||
<el-image
|
||||
:src="scope.row.headImg"
|
||||
style="width: 40px; height: 40px; flex-shrink: 0"
|
||||
>
|
||||
<template #error>
|
||||
<div class="image-slot">
|
||||
<i class="el-icon-user"></i>
|
||||
@@ -33,7 +36,7 @@
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="手机号" prop="telephone" width="160"></el-table-column>
|
||||
<el-table-column label="手机号" prop="phone" width="160"></el-table-column>
|
||||
|
||||
<el-table-column label="会员" prop="isVip">
|
||||
<template v-slot="scope">
|
||||
@@ -52,9 +55,14 @@
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="head-container">
|
||||
<el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
|
||||
@size-change="sizeChange" @current-change="paginationChange"
|
||||
layout="total, sizes, prev, pager, next, jumper"></el-pagination>
|
||||
<el-pagination
|
||||
:total="tableData.total"
|
||||
:current-page="tableData.page"
|
||||
:page-size="tableData.size"
|
||||
@size-change="sizeChange"
|
||||
@current-change="paginationChange"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
></el-pagination>
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
@@ -119,7 +127,7 @@ function toPage(type) {
|
||||
}
|
||||
|
||||
function sizeChange() {
|
||||
tableData.value.page = 0;
|
||||
tableData.value.page = 1;
|
||||
getTableData();
|
||||
}
|
||||
// 切换状态
|
||||
@@ -142,7 +150,7 @@ function resetHandle() {
|
||||
}
|
||||
// 分页回调
|
||||
function paginationChange(e) {
|
||||
tableData.value.page = e - 1;
|
||||
tableData.value.page = e;
|
||||
getTableData();
|
||||
}
|
||||
async function getTableData() {
|
||||
@@ -151,7 +159,7 @@ async function getTableData() {
|
||||
const res = await shopUserApi.getList({
|
||||
...query.value,
|
||||
size: tableData.value.size,
|
||||
page: tableData.value.page + 1,
|
||||
page: tableData.value.page,
|
||||
});
|
||||
tableData.value.loading = false;
|
||||
tableData.value.data = res.records;
|
||||
|
||||
@@ -92,6 +92,10 @@ const props = defineProps({
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
maxLength: {
|
||||
type: Number,
|
||||
default: 14,
|
||||
},
|
||||
});
|
||||
|
||||
const number = defineModel({
|
||||
@@ -109,6 +113,9 @@ function clearFunction() {
|
||||
const regex = /^\d+(\.\d{1,2})?$/;
|
||||
|
||||
function keyboradAdd(n) {
|
||||
if (`${number.value}`.length >= props.maxLength) {
|
||||
return;
|
||||
}
|
||||
if (n == "." && `${number.value}`.includes(".")) {
|
||||
return;
|
||||
}
|
||||
@@ -315,7 +322,7 @@ function keyboradConfirm() {
|
||||
height: 58px;
|
||||
background: #fff;
|
||||
border-radius: 4px;
|
||||
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
|
||||
justify-content: center;
|
||||
|
||||
@@ -347,6 +347,10 @@ watch(
|
||||
() => props.user.id,
|
||||
(newval) => {
|
||||
quansSelArr.value = [];
|
||||
checkOrderPay.discountAmount = 0;
|
||||
checkOrderPay.discount = 0;
|
||||
score.sel = -1;
|
||||
usePointsNumber.value = 0;
|
||||
if (newval !== "") {
|
||||
pointsInit();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user