Commit 9ca37953 by lijinqi

1.上传发票文案修改,由上传jpg/png改为pdf

2.sku 分页bug修改+列表布局属性值为空的时候也正常展示
parent 478e1698
......@@ -4,7 +4,7 @@
<UploadImg v-model="formData.invoiceUrl" />
<p class="upload-tips">
请上传 大小不超过 <span class="red-text">5MB</span> 格式为
<span class="red-text">png/jpg/jpeg</span>
<span class="red-text">pdf</span>
的文件
</p>
</el-form-item>
......
......@@ -42,13 +42,13 @@
<el-table-column label="费用描述" prop="feeInfo" align="center" min-width="60">
<el-table-column label="费用描述" prop="feeInfo" align="center" min-width="100">
<template #default="{ row }">
<el-input v-model="row.feeInfo" class="w-100%" />
</template>
</el-table-column>
</template>
<el-table-column label="鉴权信息" prop="auth" align="center" min-width="260">
<el-table-column label="鉴权信息" prop="auth" align="center" min-width="200">
<template #default="{ row }">
<el-input
v-model="row.auth"
......@@ -96,11 +96,11 @@
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="库存" min-width="168">-->
<!-- <template #default="{ row }">-->
<!-- <el-input-number v-model="row.stock" :min="0" class="w-100%" controls-position="right" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="库存" min-width="168">
<template #default="{ row }">
<el-input-number v-model="row.stock" :min="0" class="w-100%" controls-position="right" />
</template>
</el-table-column>
<template v-if="formData!.subCommissionType">
<el-table-column align="center" label="一级返佣(元)" min-width="168">
<template #default="{ row }">
......
......@@ -79,16 +79,16 @@ const ruleConfig: RuleConfig[] = [
rule: (arg) => arg >= 0.01,
message: '商品销售价格必须大于等于 0.01 元!!!'
},
{
name: 'marketPrice',
rule: (arg) => arg >= 0.01,
message: '商品市场价格必须大于等于 0.01 元!!!'
},
{
name: 'costPrice',
rule: (arg) => arg >= 0.01,
message: '商品成本价格必须大于等于 0.00 元!!!'
}
// {
// name: 'marketPrice',
// rule: (arg) => arg >= 0.01,
// message: '商品市场价格必须大于等于 0.01 元!!!'
// },
// {
// name: 'costPrice',
// rule: (arg) => arg >= 0.01,
// message: '商品成本价格必须大于等于 0.00 元!!!'
// }
]
const message = useMessage() // 消息弹窗
......
......@@ -4,7 +4,7 @@
<UploadImg v-model="formData.invoiceUrl" />
<p class="upload-tips">
请上传 大小不超过 <span class="red-text">5MB</span> 格式为
<span class="red-text">png/jpg/jpeg</span>
<span class="red-text">pdf</span>
的文件
</p>
</el-form-item>
......
......@@ -93,7 +93,17 @@
<el-table-column type="selection" width="55" />
<el-table-column label="用户手机" align="center" prop="mobile" />
<el-table-column label="订单编号" align="center" prop="tradeOrderNo" />
<el-table-column label="属性" align="center" prop="properties" />
<!-- 动态展示前四个属性 -->
<el-table-column
v-for="(p, index) in [0, 1, 2, 3]"
:key="index"
:label="list[0]?.properties?.[index]?.propertyName || `属性${index+1}`"
align="center"
>
<template #default="scope">
{{ scope.row.properties?.[index]?.valueName || '-' }}
</template>
</el-table-column>
<el-table-column
label="过期时间"
align="center"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment