From afc417a4279fac75893ebe4376a0991aa4088540 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 24 二月 2025 16:37:08 +0800
Subject: [PATCH] ll
---
admin/src/views/combo/components/Refund.vue | 3 +
admin/src/views/combo/record.vue | 4 +-
admin/src/views/combo/components/Edit.vue | 6 +-
admin/src/views/combo/components/OrderDetail.vue | 4 +-
admin/src/views/combo/index.vue | 20 ++++++++-
admin/src/views/combo/order.vue | 17 +++++---
admin/package-lock.json | 5 ++
admin/package.json | 1
admin/src/api/business/combo.js | 9 ++++
admin/src/views/combo/components/ComboDetail.vue | 12 +++---
10 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/admin/package-lock.json b/admin/package-lock.json
index dcbeba0..92bcd97 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -5266,6 +5266,11 @@
"integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
"dev": true
},
+ "dayjs": {
+ "version": "1.11.13",
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+ },
"de-indent": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
diff --git a/admin/package.json b/admin/package.json
index 228ca86..56f3575 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -21,6 +21,7 @@
"@wangeditor/editor-for-vue": "^1.0.2",
"axios": "^0.21.1",
"core-js": "^3.6.5",
+ "dayjs": "^1.11.13",
"echarts": "^5.4.2",
"ele-calendar": "^2.0.0",
"element-ui": "^2.15.13",
diff --git a/admin/src/api/business/combo.js b/admin/src/api/business/combo.js
index ed20247..d63366d 100644
--- a/admin/src/api/business/combo.js
+++ b/admin/src/api/business/combo.js
@@ -10,6 +10,15 @@
trim: true
})
}
+export function comboUpdatePost(data) {
+ return request.post('/business/discount/updStatus', data, {
+ trim: true
+ })
+}
+
+export function comboDelPost(id) {
+ return request.get(`/business/discount/delete/${id}`)
+}
export function comboListPost(data) {
return request.post('/business/discount/page', data, {
trim: true
diff --git a/admin/src/views/combo/components/ComboDetail.vue b/admin/src/views/combo/components/ComboDetail.vue
index 6ab44db..d2af7fb 100644
--- a/admin/src/views/combo/components/ComboDetail.vue
+++ b/admin/src/views/combo/components/ComboDetail.vue
@@ -31,9 +31,9 @@
</div>
<div class="createTime_wrap">
<span class="item">鍒涘缓鏃堕棿锛歿{ detail.createDate }}</span>
- <span class="item">鍒涘缓浜猴細{{ detail.creator }}</span>
- <span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.editDate }}</span>
- <span class="item">鏇存柊浜猴細{{ detail.editor }}</span>
+ <span class="item">鍒涘缓浜猴細{{ detail.creatorName }}</span>
+ <span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.endDate }}</span>
+ <span class="item">鏇存柊浜猴細{{ detail.editorName }}</span>
</div>
</div>
<div class="separate" />
@@ -55,7 +55,7 @@
<div class="line">
<div class="key">濂楅绠�浠嬶細</div>
<div class="value">
- <div>{{ detail.desc }}</div>
+ <div>{{ detail.descs }}</div>
</div>
</div>
@@ -72,11 +72,11 @@
</div>
<div class="line">
<div class="key">閫傜敤鑼冨洿锛�</div>
- <div class="value">{{ detail.useWorkday == 1 && '宸ヤ綔鏃�' }} {{ detail.useWorkday && detail.useHoliday && '|' }} {{ detail.useHoliday == 1 && '鑺傚亣鏃�' }}</div>
+ <div class="value">{{ detail.useWorkday == 1 ? '宸ヤ綔鏃�' : ''}} {{ detail.useWorkday && detail.useHoliday ? '|' : '' }} {{ detail.useHoliday == 1 ? '鑺傚亣鏃�' : '' }}</div>
</div>
<div class="line">
<div class="key">閫傜敤椤圭洰锛�</div>
- <div class="value">{{ detail.isbike == 1 && '鑷杞�' }} {{ detail.isbike && detail.iselecbike && '|' }} {{ detail.iselecbike == 1 && '鐢靛姩杞�' }}</div>
+ <div class="value">{{ detail.isbike == 1 ? '鑷杞�' : '' }} {{ detail.isbike && detail.iselecbike ? '|' : '' }} {{ detail.iselecbike == 1 ? '鐢靛姩杞�' :'' }}</div>
</div>
<div class="line">
diff --git a/admin/src/views/combo/components/Edit.vue b/admin/src/views/combo/components/Edit.vue
index 51b16fd..584457d 100644
--- a/admin/src/views/combo/components/Edit.vue
+++ b/admin/src/views/combo/components/Edit.vue
@@ -100,13 +100,13 @@
</div>
</el-form-item>
<el-form-item label="鎬婚檺棰�">
- <el-input class="w400" v-model="param.saleLimit" oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 12)"
+ <el-input class="w400" v-model="param.saleLimit" oninput="value=value.replace(/^(-1+)|[^\d]+/g, '').slice(0, 12)"
placeholder="璇疯緭鍏ユ�诲彂鍞暟閲�" v-trim />
<div class="placeholder9">璇疯緭鍏ユ�诲彂鍞暟閲忥紝閿�閲忓ぇ浜庤鏁伴噺鍚庯紝涓嶅啀鏀寔閿�鍞紱涓虹┖琛ㄧず涓嶉檺鍒�</div>
</el-form-item>
<el-form-item label="鏃ラ檺棰�">
<el-input class="w400" v-model="param.saleDayLimit"
- oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 12)" placeholder="璇疯緭鍏ュ崟鏃ュ彂鍞暟閲�" v-trim />
+ oninput="value=value.replace(/^(-1+)|[^\d]+/g, '').slice(0, 12)" placeholder="璇疯緭鍏ュ崟鏃ュ彂鍞暟閲�" v-trim />
<div class="placeholder9">璇疯緭鍏ユ棩鍙戝敭鏁伴噺锛屽綋鏃ラ攢閲忓ぇ浜庤鏁伴噺鍚庯紝涓嶅啀鏀寔閿�鍞紱涓虹┖琛ㄧず涓嶉檺鍒�</div>
</el-form-item>
@@ -230,7 +230,7 @@
if (res.useStartDate && res.useEndDate) {
this.$set(this.param, 'useDate', [res.useStartDate, res.useEndDate])
}
- this.$set(this.param, id, type == 'copy' ? null : this.param.id)
+ this.$set(this.param, 'id', type == 'copy' ? null : this.param.id)
})
},
}
diff --git a/admin/src/views/combo/components/OrderDetail.vue b/admin/src/views/combo/components/OrderDetail.vue
index 075ca64..4da44b6 100644
--- a/admin/src/views/combo/components/OrderDetail.vue
+++ b/admin/src/views/combo/components/OrderDetail.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow :title="title" width="1000px" :visible.sync="visible" :confirm-working="isWorking">
+ <GlobalWindow :title="title" width="1100px" :visible.sync="visible" :confirm-working="isWorking">
<div class="title">璁㈠崟淇℃伅</div>
<div class="info_warp">
<div class="item">
@@ -32,7 +32,7 @@
</div>
<div class="item">
<div class="la">瀹屾垚鏃堕棿锛�</div>
- <div class="val">{{ info.closeDate }}</div>
+ <div class="val">{{ info.payDate }}</div>
</div>
<div class="item">
<div class="la">澶囨敞锛�</div>
diff --git a/admin/src/views/combo/components/Refund.vue b/admin/src/views/combo/components/Refund.vue
index 776030f..c619c90 100644
--- a/admin/src/views/combo/components/Refund.vue
+++ b/admin/src/views/combo/components/Refund.vue
@@ -72,7 +72,8 @@
comboReDetailPost({ orderId: id }).then(res => {
if (res) {
this.form = res
- this.form.backType = 0
+ // this.form.backType = 0
+ this.$set(this.form, 'backType', 0)
this.form.orderId = id
}
})
diff --git a/admin/src/views/combo/index.vue b/admin/src/views/combo/index.vue
index d32263e..5951710 100644
--- a/admin/src/views/combo/index.vue
+++ b/admin/src/views/combo/index.vue
@@ -49,7 +49,7 @@
<div>
<span v-if="row.status == 0" @click="handleEdit(row, 'copy')" class="primaryColor pointer">澶嶅埗</span>
<span v-if="row.status == 1" @click="handleEdit(row)" class="primaryColor pointer mr10">缂栬緫</span>
- <span v-if="row.status == 1" @click="handleDetail(row)" class="red pointer">鍒犻櫎</span>
+ <span v-if="row.status == 1" @click="handleDel(row)" class="red pointer">鍒犻櫎</span>
</div>
</template>
</el-table-column>
@@ -68,7 +68,7 @@
import TableLayout from '@/layouts/TableLayout'
import Edit from './components/Edit'
import ComboDetail from './components/ComboDetail.vue'
-import { comboListPost, comboEditPost } from '@/api/business/combo.js'
+import { comboListPost, comboUpdatePost, comboDelPost } from '@/api/business/combo.js'
import { Message } from 'element-ui'
export default {
extends: BasePageTemp,
@@ -130,12 +130,26 @@
})
},
changeStatus(row) {
- comboEditPost({ ...row }).then(res => {
+ comboUpdatePost({ ...row }).then(res => {
if (res.code == 200) {
return Message.success('鏇存柊鎴愬姛')
}
})
},
+ handleDel(row) {
+ this.$confirm('鎮ㄧ‘璁よ鍒犻櫎褰撳墠濂楅鍚楋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ comboDelPost(row.id).then(res => {
+ if (res) {
+ Message.success('鍒犻櫎鎴愬姛')
+ this.getList()
+ }
+ })
+ })
+ },
handleEdit(row, type = 'edit') {
this.isShowEdit = true
this.$nextTick(() => {
diff --git a/admin/src/views/combo/order.vue b/admin/src/views/combo/order.vue
index e123a37..ddd8d1b 100644
--- a/admin/src/views/combo/order.vue
+++ b/admin/src/views/combo/order.vue
@@ -15,7 +15,7 @@
<el-table-column prop="money" align="center" label="鍚堣(鍏�)" min-width="80" show-overflow-tooltip />
<el-table-column prop="money" align="center" label="瀹炰粯(鍏�)" min-width="80" show-overflow-tooltip />
<el-table-column prop="refundMoney" align="center" label="宸查��閲戦(鍏�)" min-width="100" show-overflow-tooltip />
- <el-table-column prop="memberId" align="center" label="鐢ㄦ埛淇℃伅" min-width="200" show-overflow-tooltip />
+ <el-table-column prop="openid" align="center" label="鐢ㄦ埛淇℃伅" min-width="200" show-overflow-tooltip />
<el-table-column prop="payWay" align="center" label="鏀粯鏂瑰紡" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
<span v-if="row.payWay == 0">寰俊鏀粯</span>
@@ -62,6 +62,7 @@
comboListOrderEx,
comboOrderDetailPost
} from '@/api/business/combo.js'
+import dayjs from 'dayjs'
export default {
extends: BasePageTemp,
components: {
@@ -105,7 +106,7 @@
},
{
filed: 'selDate',
- type: 'date',
+ type: 'daterange',
label: '鏀粯鏃堕棿',
},
{
@@ -119,6 +120,8 @@
}
},
created() {
+ let date = dayjs().format('YYYY-MM-DD')
+ this.$set(this.filters, 'selDate', [date,date])
this.getList()
// this.initData()
},
@@ -144,8 +147,8 @@
.then(() => {
this.loading = true
if (filters.selDate && filters.selDate.length > 0) {
- filters.startDate = filters.selDate[0]
- filters.endDate = filters.selDate[1]
+ filters.startDate = filters.selDate[0] + ' 00:00:00'
+ filters.endDate = filters.selDate[1] + ' 00:00:00'
} else {
filters.startDate = null
filters.endDate = null
@@ -175,14 +178,14 @@
getList(page) {
const { pagination, filters } = this
this.loading = true
- if (page) { pagination.page = page }
if (filters.selDate && filters.selDate.length > 0) {
- filters.startDate = filters.selDate[0]
- filters.endDate = filters.selDate[1]
+ filters.startDate = filters.selDate[0] + ' 00:00:00'
+ filters.endDate = filters.selDate[1] + ' 00:00:00'
} else {
filters.startDate = null
filters.endDate = null
}
+ if (page) { pagination.page = page }
comboOrderPost({
model: {
...filters,
diff --git a/admin/src/views/combo/record.vue b/admin/src/views/combo/record.vue
index 8d8b0c7..4333ac9 100644
--- a/admin/src/views/combo/record.vue
+++ b/admin/src/views/combo/record.vue
@@ -1,7 +1,7 @@
<template>
<div class="main_app">
<Breadcrumb />
- <QueryForm v-model="querys" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clearQueryForm">
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clearQueryForm">
</QueryForm>
<div class="table_btns">
<el-button plain type="primary" @click="handleEx">瀵煎嚭</el-button>
@@ -249,7 +249,7 @@
},
clearQueryForm() {
// eslint-disable-next-line no-unused-vars
- this.querys = {}
+ this.filters = {}
this.getList(1)
},
// 鎵撳紑modal 鍐荤粨 瑙ｅ喕 浣滃簾
--
Gitblit v1.9.3