yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jh_web' of https://gitee.com/jianghewangluo/specialty-ui-admin-vue3 into jh_web

pull/551/head
痴货 2024-09-11 16:14:29 +08:00
parent 467184a8ab 5f4a5324b4
commit 5f06396f8c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/mall/product/spu/components/SkuList.vue
View File

@ -180,17 +180,17 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="销售价(元)" min-width="80"> <el-table-column align="center" label="销售价(元)" min-width="80">
<template #default="{ row }"> <template #default="{ row }">
{{ formatToFraction(row.price) }} {{ row.price }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="市场价(元)" min-width="80"> <el-table-column align="center" label="市场价(元)" min-width="80">
<template #default="{ row }"> <template #default="{ row }">
{{ formatToFraction(row.marketPrice) }} {{ row.marketPrice }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="成本价(元)" min-width="80"> <el-table-column align="center" label="成本价(元)" min-width="80">
<template #default="{ row }"> <template #default="{ row }">
{{ formatToFraction(row.costPrice) }} {{ row.costPrice }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="库存" min-width="80"> <el-table-column align="center" label="库存" min-width="80">

3
src/views/mall/promotion/coupon/components/CouponSelect.vue
View File

@ -173,7 +173,8 @@ const queryParams = reactive({
status: null, status: null,
discountType: null, discountType: null,
type: null, type: null,
createTime: [] createTime: [],
canTakeTypes:[1]//只获得直接领取的券
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
const selectedCouponList = ref<CouponTemplateApi.CouponTemplateVO[]>([]) // 选择的数据 const selectedCouponList = ref<CouponTemplateApi.CouponTemplateVO[]>([]) // 选择的数据