Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev

This commit is contained in:
gyq 2024-10-25 09:38:25 +08:00
commit 82cc068206
3 changed files with 9 additions and 8 deletions

View File

@ -114,17 +114,17 @@
<el-table-column label="单价" prop="price"></el-table-column> -->
<el-table-column label="商品名称" prop="name"></el-table-column>
<el-table-column label="销量" prop="salesNum"></el-table-column>
<el-table-column label="销售金额" prop="salesAmount">
<template v-slot="scope">
{{ scope.row.salesAmount }}
</template>
</el-table-column>
<el-table-column label="退单量" prop="refNum"></el-table-column>
<el-table-column label="退款金额" prop="refAmount">
<template v-slot="scope">
{{ scope.row.refAmount }}
</template>
</el-table-column>
<el-table-column label="销售金额" prop="salesAmount">
<template v-slot="scope">
{{ scope.row.salesAmount }}
</template>
</el-table-column>
</el-table>
</div>
<div class="head-container">

View File

@ -194,9 +194,9 @@
<el-radio-button label="30">30</el-radio-button>
</el-radio-group>
</div>
<div class="chart" ref="saleChart" v-loading="saleLoading" style="height: 400px;" v-show="lineChartType == 0">
<div class="chart" ref="saleChart" v-loading="saleLoading" style="height: 500px;" v-show="lineChartType == 0">
</div>
<div class="chart" ref="payChart" v-loading="payChartLoading" style="height: 400px;"
<div class="chart" ref="payChart" v-loading="payChartLoading" style="height: 500px;"
v-show="lineChartType == 1">
</div>
</div>

View File

@ -43,7 +43,7 @@
showUpload = true;
uploadIndex = 3;
"></el-image>
<el-button plain v-if="form.shopQrcode" @click="downloadImgHandle(form.shopQrcode)">下载</el-button>
<!-- <el-button plain v-if="form.shopQrcode" @click="downloadImgHandle(form.shopQrcode)">下载</el-button> -->
</div>
</el-form-item>
<el-form-item label="店铺小程序码">
@ -441,6 +441,7 @@ export default {
display: flex;
align-items: flex-end;
gap: 20px;
padding-bottom: 20px;
}
.map_box {