hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-26 08:45:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

Browse Source
This commit is contained in:
YunaiV
2024-07-07 17:10:18 +08:00
parent 8a73fbe775 f341ba4d3c
commit 4acd379d50
18 changed files with 98 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/mall/home/components/TradeTrendCard.vue
View File

@ -186,7 +186,7 @@ const getOrderCountTrendComparison = async (
dates.push(item.value.date)
if (series.length === 2) {
series[0].data.push(fenToYuan(item?.value?.orderPayPrice || 0)) // 当前金额
series[1].data.push(fenToYuan(item?.value?.orderPayCount || 0)) // 当前数量
series[1].data.push(item?.value?.orderPayCount || 0) // 当前数量
} else {
series[0].data.push(fenToYuan(item?.reference?.orderPayPrice || 0)) // 对照金额
series[1].data.push(fenToYuan(item?.value?.orderPayPrice || 0)) // 当前金额

1
src/views/mall/product/spu/form/ProductPropertyAddForm.vue
View File

@ -7,6 +7,7 @@
:model="formData"
:rules="formRules"
label-width="80px"
@keydown.enter.prevent="submitForm"
>
<el-form-item label="属性名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入名称" />