修改 bug

This commit is contained in:
zhaohengkun 2024-10-10 19:49:45 +08:00
parent 3bc9fcf7ae
commit 1926125bc2
2 changed files with 298 additions and 198 deletions

View File

@ -16,17 +16,16 @@
<!-- <el-form-item label="" style="width: 180px">--> <!-- <el-form-item label="" style="width: 180px">-->
<!-- <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>--> <!-- <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="" prop="payChannel" style="width: 180px">--> <el-form-item label="" prop="payChannel" style="width: 180px">
<!-- <el-select--> <el-select
<!-- v-model="queryParams.payChannel"--> v-model="queryParams.orderType"
<!-- clearable--> clearable
<!-- placeholder="订单类型"--> placeholder="订单类型"
<!-- >--> >
<!-- <el-option label="小程序" value="applet"/>--> <el-option label="商城兑换" value="0"/>
<!-- <el-option label="收银台" value="cashier"/>--> <el-option label="收银台兑换" value="1"/>
<!-- <el-option label="POS端" value="POS"/>--> </el-select>
<!-- </el-select>--> </el-form-item>
<!-- </el-form-item>-->
<el-form-item label="" prop="payType" style="width: 180px"> <el-form-item label="" prop="payType" style="width: 180px">
<el-select <el-select
v-model="queryParams.paymentType" v-model="queryParams.paymentType"
@ -83,7 +82,7 @@
<el-table-column type="index" width="50" align="center" label="序号"/> <el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column> <el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNumber" align="center" label="订单号" > </el-table-column> <el-table-column prop="orderNumber" align="center" label="订单号" > </el-table-column>
<el-table-column prop="amount" align="center" label="订单金额(元)"> <el-table-column prop="amount" align="center" label="订单金额(元)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.amount">{{scope.row.amount}}</span> <span v-if="scope.row.amount">{{scope.row.amount}}</span>
<span v-else>--</span> <span v-else>--</span>
@ -91,11 +90,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="payChannel" align="center" label="订单类型"> <el-table-column prop="payChannel" align="center" label="订单类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span> <span v-if="scope.row.orderType=='1'">收银台兑换</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span> <span v-else-if="scope.row.orderType=='0'">商城兑换</span>
<span v-else-if="scope.row.payChannel=='PC'">收银台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="paymentType" align="center" label="支付方式"> <el-table-column prop="paymentType" align="center" label="支付方式">
@ -238,7 +234,7 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan
this.total = response.data.total; this.total = response.data.total;
this.isSysDate = false this.isSysDate = false
}) })
this.getOrderStatistics()
}, },
// //

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="card-change" > <div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="name"> <el-form-item label="" prop="name">
<el-input <el-input
@ -12,106 +12,111 @@
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item style="float: right">--> <!-- <el-form-item style="float: right">-->
<!-- <el-form-item label="" prop="bannerName">--> <!-- <el-form-item label="" prop="bannerName">-->
<!-- <el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">--> <!-- <el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in systemPositionList"--> <!-- v-for="item in systemPositionList"-->
<!-- :key="item.value"--> <!-- :key="item.value"-->
<!-- :label="item.label"--> <!-- :label="item.label"-->
<!-- :value="item.value">--> <!-- :value="item.value">-->
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="" prop="bannerName"> <el-form-item label="" prop="bannerName">
<el-select v-model="queryParams.bannerStatus" placeholder="请选择banner图状态"> <el-select v-model="queryParams.bannerStatus" placeholder="请选择banner图状态">
<el-option label="停用" value="0" ></el-option> <el-option label="停用" value="0"></el-option>
<el-option label="启用" value="1" ></el-option> <el-option label="启用" value="1"></el-option>
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in systemPositionList"--> <!-- v-for="item in systemPositionList"-->
<!-- :key="item.value"--> <!-- :key="item.value"-->
<!-- :label="item.label"--> <!-- :label="item.label"-->
<!-- :value="item.value">--> <!-- :value="item.value">-->
<!-- </el-option>--> <!-- </el-option>-->
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['setting:banner:add']" v-hasPermi="['setting:banner:add']"
>新增banner图</el-button> >新增banner图
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- </el-card>--> <!-- </el-card>-->
<!-- &lt;!&ndash; 列表信息&ndash;&gt;--> <!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >--> <!-- <el-card style="margin-top: 20px" >-->
<div style="height: 70vh;overflow: auto"> <div style="height: 70vh;overflow: auto">
<el-table :data="tableData" style="width: 100%;" border> <el-table :data="tableData" style="width: 100%;" border>
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="bannerName" label="banner名称"></el-table-column> <el-table-column prop="bannerName" label="banner名称"></el-table-column>
<el-table-column prop="productImage" label="图片"> <el-table-column prop="productImage" label="图片">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-image
style="width: 50px; height: 50px" v-if="scope.row.productImage"
:src="imagePath+scope.row.productImage" style="width: 50px; height: 50px"
:preview-src-list="[imagePath + scope.row.productImage]" :src="imagePath+scope.row.productImage"
fit="cover"> :preview-src-list="[imagePath + scope.row.productImage]"
</el-image> fit="cover"
</template> >
</el-table-column> </el-image>
<el-table-column prop="systemPosition" label="系统位置"></el-table-column> </template>
<el-table-column prop="sortOrder" label="排序号"></el-table-column> </el-table-column>
<el-table-column prop="bannerLink" label="banner图链接"></el-table-column> <el-table-column prop="systemPosition" label="系统位置"></el-table-column>
<el-table-column prop="note" label="备注"></el-table-column> <el-table-column prop="sortOrder" label="排序号"></el-table-column>
<el-table-column prop="bannerStatus" label="banner图状态"> <el-table-column prop="bannerLink" label="banner图链接"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="note" label="备注"></el-table-column>
<el-switch <el-table-column prop="bannerStatus" label="banner图状态">
v-model="scope.row.bannerStatus" <template slot-scope="scope">
active-color="#13ce66" <el-switch
inactive-color="#ff4949" v-model="scope.row.bannerStatus"
@change="changeStatus(scope.row)" active-color="#13ce66"
> inactive-color="#ff4949"
</el-switch> @change="changeStatus(scope.row)"
</template> >
</el-table-column> </el-switch>
<el-table-column prop="createByName" label="创建人"></el-table-column> </template>
<el-table-column prop="createTime" label="创建时间"></el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column prop="createByName" label="创建人"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="createTime" label="创建时间"></el-table-column>
<el-button <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
size="mini" <template slot-scope="scope">
type="text" <el-button
icon="el-icon-view" size="mini"
@click="edit(scope.row)" type="text"
v-hasPermi="['setting:banner:edit']" icon="el-icon-view"
>编辑</el-button> @click="edit(scope.row)"
<el-button v-hasPermi="['setting:banner:edit']"
size="mini" >编辑
type="text" </el-button>
icon="el-icon-edit" <el-button
@click="del(scope.row)" size="mini"
v-hasPermi="['setting:banner:delete']" type="text"
>删除</el-button> icon="el-icon-edit"
</template> @click="del(scope.row)"
</el-table-column> v-hasPermi="['setting:banner:delete']"
</el-table> >删除
</el-button>
</template>
</el-table-column>
</el-table>
</div> </div>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.page" :page.sync="queryParams.page"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</div> </div>
@ -122,23 +127,69 @@
<el-input v-model="deviceInfo.bannerName" style="width: 300px"></el-input> <el-input v-model="deviceInfo.bannerName" style="width: 300px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="图片" prop="uploadAction"> <el-form-item label="图片" prop="uploadAction">
<el-upload <el-upload
:action="uploadAction" ref="uploadRef"
list-type="picture-card" accept=".jpg, .jpeg, .png, .gif"
:class="{hide:hideUpload}" :class="{hide:hideUpload}"
:file-list="uploadFiles"
:auto-upload="true"
:show-file-list="false"
:headers="uploadHeader" :headers="uploadHeader"
:on-success="handleUploadSuccessCover"> :action="uploadAction"
<img :on-success="handleSuccess"
v-if="this.deviceInfo.productImage" :on-error="handleError"
:src="imagePath + this.deviceInfo.productImage" :file-list="uploadFiles"
class="list-img" list-type="picture-card"
style="width: 750px; height: 100%" :disable-transition="true"
/> >
<i v-if="!this.deviceInfo.productImage" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
:src="file.url" alt=""
>
<!-- 按钮容器 -->
<span class="el-upload-list__item-actions">
<!-- 放大 -->
<span
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<!-- 删除-->
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
<i class="el-icon-delete"></i>
</span>
</span>
</div>
</el-upload> </el-upload>
<el-dialog :visible.sync="dialogVisible" :append-to-body="true">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<!-- <el-upload-->
<!-- :action="uploadAction"-->
<!-- list-type="picture-card"-->
<!-- :class="{hide:hideUpload}"-->
<!-- :file-list="uploadFiles"-->
<!-- :auto-upload="true"-->
<!-- :show-file-list="false"-->
<!-- :headers="uploadHeader"-->
<!-- :on-success="handleUploadSuccessCover">-->
<!-- <img-->
<!-- v-if="this.deviceInfo.productImage"-->
<!-- :src="imagePath + this.deviceInfo.productImage"-->
<!-- class="list-img"-->
<!-- style="width: 750px; height: 100%"-->
<!-- />-->
<!-- <i v-if="!this.deviceInfo.productImage" class="el-icon-plus"></i>-->
<!-- </el-upload>-->
</el-form-item> </el-form-item>
<el-form-item label="系统位置" prop="systemPosition"> <el-form-item label="系统位置" prop="systemPosition">
<el-select v-model="deviceInfo.systemPosition" placeholder="系统位置" style="width: 300px"> <el-select v-model="deviceInfo.systemPosition" placeholder="系统位置" style="width: 300px">
@ -146,7 +197,8 @@
v-for="item in systemPositionList" v-for="item in systemPositionList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -160,11 +212,12 @@
<el-switch <el-switch
v-model="deviceInfo.bannerStatus" v-model="deviceInfo.bannerStatus"
active-color="#13ce66" active-color="#13ce66"
inactive-color="#ff4949"> inactive-color="#ff4949"
>
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="note"> <el-form-item label="备注" prop="note">
<el-input v-model="deviceInfo.note" style="width: 300px" ></el-input> <el-input v-model="deviceInfo.note" style="width: 300px"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button> <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
@ -178,14 +231,17 @@
<script> <script>
import {deleteBannerApi, getBannerListApi, saveBannerApi, updateBannerApi} from "@/api/sys/banner"; import { deleteBannerApi, getBannerListApi, saveBannerApi, updateBannerApi } from '@/api/sys/banner'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
export default { export default {
name: "printIndex", name: 'printIndex',
data() { data() {
return { return {
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
tableData: [], tableData: [],
deviceInfo: { deviceInfo: {
id: null, // id id: null, // id
@ -196,63 +252,92 @@ export default {
bannerLink: '', // Banner bannerLink: '', // Banner
bannerStatus: false, // Banner bannerStatus: false, // Banner
note: '', // note: '', //
createByName: '', // createByName: '' //
}, },
systemPositionList:[ { systemPositionList: [{
value: '系统首页', value: '系统首页',
label: '系统首页' label: '系统首页'
},], }],
// //
open: false, open: false,
title:"", title: '',
total:0, total: 0,
// //
queryParams: { queryParams: {
page: 1, page: 1,
pageSize: 10, pageSize: 10,
bannerName:'', bannerName: '',
systemPosition:'系统首页', systemPosition: '系统首页',
bannerStatus:'', bannerStatus: ''
}, },
rules: { rules: {
bannerName:[ bannerName: [
{required: true, message: '请填写banner名称', trigger: 'blur'}, { required: true, message: '请填写banner名称', trigger: 'blur' }
], ],
systemPosition:[ systemPosition: [
{required: true, message: '请填写系统位置', trigger: ''}, { required: true, message: '请填写系统位置', trigger: '' }
], ],
sortOrder:[ sortOrder: [
{required: true, message: '请填写排序号', trigger: 'blur'}, { required: true, message: '请填写排序号', trigger: 'blur' }
], ],
bannerLink:[ bannerLink: [
{required: true, message: '请填写链接', trigger: 'blur'}, { required: true, message: '请填写链接', trigger: 'blur' }
],
note:[
{required: true, message: '请选择备注', trigger: 'blur'},
], ],
note: [
{ required: true, message: '请选择备注', trigger: 'blur' }
]
}, },
// //
uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload', uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
uploadHeader: { 'Access-Token' : getToken() }, // uploadHeader: { 'Access-Token': getToken() }, //
uploadFiles: [ uploadFiles: [],
{name:"nihao",
url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
],
// //
imagePath: process.env.VUE_APP_BASE_API, imagePath: process.env.VUE_APP_BASE_API,
// //
hideUpload: false, hideUpload: false
}; }
}, },
created() { created() {
this.getList() this.getList()
}, },
watch: {
//
uploadFiles(newValue) {
//
if (newValue.length >= 1) {
//
this.hideUpload = true
} else {
//
this.hideUpload = false
}
}
},
methods: { methods: {
getList(){ handleRemove(file) {
getBannerListApi(this.queryParams).then(res=>{ console.log('删除文件', file)
this.tableData = res.data.records; console.log('删除文件', this.uploadFiles)
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url
this.dialogVisible = true
},
handleSuccess(response, file, fileList) {
//Element UI el-upload fileList
console.log('上传成功', response, file)
this.uploadFiles = fileList
//
this.deviceInfo.productImage = response.data.title
},
handleError(error, file, fileList) {
console.error('上传失败', error, file, fileList)
},
getList() {
getBannerListApi(this.queryParams).then(res => {
this.tableData = res.data.records
this.total = res.data.total this.total = res.data.total
}) })
}, },
@ -260,72 +345,80 @@ export default {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
if (valid) { if (valid) {
// //
this.submitDeviceInfo(); this.submitDeviceInfo()
} else { } else {
// //
return false; return false
} }
}); })
}, },
submitDeviceInfo() { submitDeviceInfo() {
// //
console.log('提交设备信息数据:', this.deviceInfo); console.log('提交设备信息数据:', this.deviceInfo)
if (this.deviceInfo.id) { if (this.deviceInfo.id) {
updateBannerApi(this.deviceInfo).then(res=>{ updateBannerApi(this.deviceInfo).then(res => {
if(res.code === 200) { if (res.code === 200) {
this.getList() this.getList()
this.open = false this.open = false
} }
}) })
}else { } else {
saveBannerApi(this.deviceInfo).then(res=>{ saveBannerApi(this.deviceInfo).then(res => {
if(res.code === 200) { if (res.code === 200) {
this.getList() this.getList()
this.open = false this.open = false
} }
}) })
} }
}, },
changeStatus(data){ changeStatus(data) {
updateBannerApi(data).then(res=>{ updateBannerApi(data).then(res => {
if(res.code === 200) { if (res.code === 200) {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '修改状态成功!' message: '修改状态成功!'
}); })
this.getList() this.getList()
} }
}) })
}, },
// handleQuery() {
handleUploadSuccessCover(file) {
this.deviceInfo.productImage = file.data.fileName;
this.deviceInfo.productImage = file.data.fileName;
},
handleQuery(){
this.getList() this.getList()
}, },
resetQuery(){ resetQuery() {
this.queryParams = { this.queryParams = {
page: 1, page: 1,
pageSize: 10, pageSize: 10,
deviceName:'', deviceName: '',
systemPosition:'系统首页', systemPosition: '系统首页'
}, },
this.getList() this.getList()
}, },
handleAdd(e) { handleAdd(e) {
this.clean() this.clean()
this.open = true; this.open = true
this.title = "新增banner图" this.title = '新增banner图'
}, },
edit(e) { edit(e) {
this.clean() this.clean()
this.open = true; this.open = true
this.title = "修改banner图" this.title = '修改banner图'
this.deviceInfo = e //
this.deviceInfo = JSON.parse(JSON.stringify(e));
console.log('编辑',e)
//
if (e.productImage && e.productImage != ''){
this.uploadFiles=[
{
url: this.imagePath + e.productImage,
name: e.productImage
}
]
console.log('图片回显',this.uploadFiles)
}
}, },
del(e) { del(e) {
this.$confirm('此操作将永久删除该banner图, 是否继续?', '提示', { this.$confirm('此操作将永久删除该banner图, 是否继续?', '提示', {
@ -333,12 +426,12 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteBannerApi(e.id).then(res=>{ deleteBannerApi(e.id).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!' message: '删除成功!'
}); })
this.getList() this.getList()
} }
}) })
@ -347,11 +440,11 @@ export default {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消删除' message: '已取消删除'
}); })
}); })
}, },
clean() { clean() {
this.deviceInfo= { this.deviceInfo = {
id: null, // id id: null, // id
bannerName: '', // Banner bannerName: '', // Banner
productImage: '', // productImage: '', //
@ -360,33 +453,44 @@ export default {
bannerLink: '', // Banner bannerLink: '', // Banner
bannerStatus: false, // Banner bannerStatus: false, // Banner
note: '', // note: '', //
createByName: '', // createByName: '' //
} }
},
this.uploadFiles = []
}
} }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.common-dialog >>> .el-upload--picture-card {
.common-dialog > > > .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;
line-height: 60px; line-height: 60px;
} }
.d-dialog >>> .el-upload--picture-card {
::v-deep.hide .el-upload--picture-card {
display: none;
}
.d-dialog > > > .el-upload--picture-card {
width: 100px; width: 100px;
height: 100px; height: 100px;
line-height: 100px; line-height: 100px;
} }
.d-dialog >>> .avatar-uploader .el-upload { .d-dialog > > > .avatar-uploader .el-upload {
width: 100px; width: 100px;
height: 100px; height: 100px;
} }
.d-dialog >>> .el-upload-list--picture-card .el-upload-list__item {
.d-dialog > > > .el-upload-list--picture-card .el-upload-list__item {
width: 100px; width: 100px;
height: 100px; height: 100px;
} }
.list-img{
.list-img {
width: 98px; width: 98px;
height: 98px; height: 98px;
} }