caoliancun/PointsMall_Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
xk_chenlianjie
2024-02-04 10:12:21 +08:00
parent ad61e9693b
commit 9682a02cd8
7 changed files with 79 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/order/orderInfo.js
View File

@@ -79,7 +79,7 @@ export default {
exportExcel(page) {
// 导出
return request({
url: `/${service_name}/${group_name}/exportWeb`,
url: `/${service_name}/${group_name}/getByPageExport`,
method: 'post',
data: page,
responseType: 'blob'

9
src/views/dashboard/admin/index.scss
View File

@@ -84,7 +84,10 @@
font-size: 20px;
font-weight: 600;
}
.page{
height:calc(100vh - 144px);
box-sizing: border-box;
.mt{
margin-top: 30px;
}
// .page{
// height:calc(100vh - 144px);
// box-sizing: border-box;
// }

6
src/views/dashboard/admin/index.vue
View File

@@ -104,14 +104,14 @@
<span class="card-title">订单统计</span>
</div>
<div class="orderStatistics-card flex">
<div class="orderStatistics-card-left flex column js">
<div class="orderStatistics-card-left flex column jc">
<div class="orderStatistics-card-left-item">
<div class="orderStatistics-card-left-item-title">本月订单总数</div>
<div class="orderStatistics-card-left-item-number">10000</div>
<div class="orderStatistics-card-left-item-title">10% 同比上周</div>
</div>
<div class="orderStatistics-card-left-item">
<div class="orderStatistics-card-left-item-title">本月订单总数</div>
<div class="orderStatistics-card-left-item mt">
<div class="orderStatistics-card-left-item-title">本周订单数量</div>
<div class="orderStatistics-card-left-item-number">10000</div>
<div class="orderStatistics-card-left-item-title">10% 同比上周</div>
</div>

4
src/views/order/orderList.vue
View File

@@ -60,7 +60,7 @@
</el-table-column>
<el-table-column label="用户账号" min-width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.acctId }}</span>
<span>{{ scope.row.customerPhone }}</span>
</template>
</el-table-column>
<el-table-column label="订单金额" min-width="60" align="center">
@@ -283,7 +283,7 @@ export default {
const searchParam = { ...this.page }
searchParam.pageSize = endIndex
searchParam.currentPage = this.output.startPage
orderInfoApi.getByPage(searchParam).then(res => {
orderInfoApi.exportExcel(searchParam).then(res => {
const link = document.createElement('a')
// 创建Blob对象，设置文件类型
const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型

4
src/views/order/orderListDetail.vue
View File

@@ -6,7 +6,7 @@
</div>
<el-descriptions title="基本信息" class="text" direction="vertical" :column="6" border>
<el-descriptions-item label="订单编号">{{ detailData.orderCode }}</el-descriptions-item>
<el-descriptions-item label="用户账号">{{ detailData.acctId }}</el-descriptions-item>
<el-descriptions-item label="用户账号">{{ detailData.customerPhone }}</el-descriptions-item>
<el-descriptions-item label="支付积分">{{ detailData.integral }}</el-descriptions-item>
<el-descriptions-item label="下单时间">{{ detailData.createTime }}</el-descriptions-item>
<el-descriptions-item label="自提油站">{{ detailData.takeSiteName }}</el-descriptions-item>
@@ -112,7 +112,7 @@ export default {
case '0':
return '待支付'
case '1':
return '已经发'
return '已支付'
case '2':
return '退款申请'
case '3':

8
src/views/product/productList/index.vue
View File

@@ -128,7 +128,7 @@
<el-table-column label="油站" min-width="150" align="center">
<template slot-scope="scope">
<span>
{{ scope.row.siteName }}
{{ scope.row.siteName || '暂无' }}
</span>
</template>
</el-table-column>
@@ -593,10 +593,12 @@ export default {
let selected = this.$refs.table.selection
if (selected && selected.length > 0) {
let selectedIds = selected.map(item => item.id)
productApi.batchShelves({
productApi
.batchShelves({
list: selectedIds,
productStatus: productStatus
}).then(res=>{
})
.then(res => {
if (res.code === 20000) {
this.$message.success(res.msg)
this.getDataList()

44
src/views/statistics/productStatisticsList.vue
View File

@@ -45,7 +45,7 @@
</el-table-column>
<el-table-column label="数量比例" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sellScale }}</span>
<span>{{ scope.row.sellScale }}%</span>
</template>
</el-table-column>
@@ -56,7 +56,7 @@
</el-table-column>
<el-table-column label="金额比例" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sellMoneyScale }}</span>
<span>{{ scope.row.sellMoneyScale }}%</span>
</template>
</el-table-column>
</el-table>
@@ -391,12 +391,22 @@ export default {
})
console.log('tableList', this.tableList)
},
// 表格搜索
productSearchs() {
console.log(this.Time)
console.log('time', this.Time)
if (this.Time !== null && this.Time.length !== 0) {
if (this.isDate(this.Time[0])) {
this.createTime = this.Time[0] + '/' + this.Time[1]
console.log('-----')
} else {
var time1 = this.getSimpleDate(this.Time[0])
var time2 = this.getSimpleDate(this.Time[1])
this.createTime = time1 + '/' + time2
}
console.log('createTime------', this.createTime)
this.getChartList()
} else {
this.$message.error('请选择要查询的时间段！')
@@ -404,15 +414,43 @@ export default {
},
// 表格搜索
userSearchs() {
console.log('createTime2', this.createTime2)
this.page.currentPage = 1
if (this.createTime2 !== null && this.createTime2.length !== 0) {
if (this.isDate(this.createTime2[0])) {
this.page.params.startTime = this.createTime2[0]
this.page.params.endTime = this.createTime2[1]
} else {
var time1 = this.getSimpleDate(this.createTime2[0])
var time2 = this.getSimpleDate(this.createTime2[1])
this.page.params.startTime = time1
this.page.params.endTime = time2
}
this.getList()
} else {
this.$message.error('请选择要查询的时间段！')
}
},
isDate(dateStr) {
var pattern = /^\d{4}-\d{2}-\d{2}$/
return pattern.test(dateStr)
},
getSimpleDate(date) {
var y = date.getFullYear()
var m = date.getMonth() + 1
m = m < 10 ? '0' + m : m
var d = date.getDate()
d = d < 10 ? '0' + d : d
// var h = date.getHours()
// var minute = date.getMinutes()
// minute = minute < 10 ? '0' + minute : minute
// var s = date.getSeconds()
// s = s < 10 ? '0' + s : s
return y + '-' + m + '-' + d
},
// 数据导出；
exportData: function() {},