From 4352db77e69535ad829d7ad24efd2d66b4b97d09 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 11:53:22 +0800
Subject: [PATCH] 修改商店优惠劵页面
---
manager/src/views/promotions/coupon/coupon_store_receive.vue | 26 ++++++
manager/src/views/statistics/order.vue | 171 +++++++++++++++++++++---------------------
manager/src/views/promotions/coupon/coupon_store.vue | 8 +-
3 files changed, 116 insertions(+), 89 deletions(-)
diff --git a/manager/src/views/promotions/coupon/coupon_store.vue b/manager/src/views/promotions/coupon/coupon_store.vue
index 8350cb8..84ad9e1 100644
--- a/manager/src/views/promotions/coupon/coupon_store.vue
+++ b/manager/src/views/promotions/coupon/coupon_store.vue
@@ -54,7 +54,7 @@
style="width: 180px"
>
<Option value="ENABLE">鍚敤</Option>
- <Option value="DISABLED">绂佺敤</Option>
+ <Option value="DISABLE">绂佺敤</Option>
</Select>
</FormItem>
</Form>
@@ -93,7 +93,7 @@
<i-switch
v-model="row.status"
true-value="ENABLE"
- false-value="DISABLED"
+ false-value="DISABLE"
@on-change="(status) => handleStatusChange(row, status)"
>
<span slot="open">鍚敤</span>
@@ -474,13 +474,13 @@
// 琛ㄥ崟楠岃瘉瑙勫垯
formRules: {
storeId: [
- { required: true, message: '搴楅摵ID涓嶈兘涓虹┖', trigger: 'blur' }
+ { required: true, message: '搴楅摵涓嶈兘涓虹┖', trigger: 'blur' }
],
storeName: [
{ required: true, message: '搴楅摵鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }
],
couponId: [
- { required: true, message: '浼樻儬鍒窱D涓嶈兘涓虹┖', trigger: 'blur' }
+ { required: true, message: '浼樻儬鍔典笉鑳戒负绌�', trigger: 'blur' }
],
couponName: [
{ required: true, message: '浼樻儬鍒稿悕绉颁笉鑳戒负绌�', trigger: 'blur' }
diff --git a/manager/src/views/promotions/coupon/coupon_store_receive.vue b/manager/src/views/promotions/coupon/coupon_store_receive.vue
index 9f48990..602581f 100644
--- a/manager/src/views/promotions/coupon/coupon_store_receive.vue
+++ b/manager/src/views/promotions/coupon/coupon_store_receive.vue
@@ -197,6 +197,32 @@
},
},
{
+ title: "璁㈠崟鐘舵��",
+ key: "orderStatus",
+ width: 120,
+ render: (h, params) => {
+ if (params.row.orderStatus === "UNPAID") {
+ return h("Tag", { props: { color: "orange" } }, "鏈粯娆�");
+ } else if (params.row.orderStatus === "PAID") {
+ return h("Tag", { props: { color: "green" } }, "宸蹭粯娆�");
+ } else if(params.row.orderStatus === "UNDELIVERED"){
+ return h("Tag", { props: { color: "orange" } }, "寰呭彂璐�");
+ }else if(params.row.orderStatus === "DELIVERED"){
+ return h("Tag", { props: { color: "green" } }, "宸插彂璐�");
+ }else if(params.row.orderStatus === "COMPLETED"){
+ return h("Tag", { props: { color: "green" } }, "宸插畬鎴�");
+ }else if(params.row.orderStatus === "STAY_PICKED_UP"){
+ return h("Tag", { props: { color: "orange" } }, "寰呰嚜鎻�");
+ }else if(params.row.orderStatus === "CANCELLED"){
+ return h("Tag", { props: { color: "purple" } }, "宸插叧闂�");
+ }else if(params.row.orderStatus === "TAKE"){
+ return h("Tag", { props: { color: "orange" } }, "寰呮牳楠�");
+ }else{
+ return h("Tag", { props: { color: "purple" } }, "鏈煡");
+ }
+ },
+ },
+ {
title: "鏈夋晥鏃堕棿",
width: 150,
render: (h, params) => {
diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
index 6e35d0f..a931028 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -5,85 +5,85 @@
<affixTime @selected="clickBreadcrumb" />
</Card>
</Affix>
- <Card class="card">
- <div class="chart-wrapper">
- <div class="chart-header">
- <h2>PV/UV 瓒嬪娍鍥�</h2>
- </div>
- <div ref="chartDom" class="chart-container"></div>
- </div>
- </Card>
- <Card class="card">
- <div class="my-chart-container">
- <div class="chart-wrapper" style="height: 800px">
- <div class="chart-header">
- <h2>鍟嗗搧/瑙嗛娴忚閲忓畬鎾巼 瓒嬪娍鍥�</h2>
- </div>
- <div class="button-group-wrapper">
- <!-- 绗竴缁勶細鍟嗗搧/瑙嗛锛堥潬宸︼級 -->
- <ButtonGroup>
- <Button
- :type="currentType === 'goods' ? 'primary' : 'default'"
- @click="handleTypeChange('goods')"
- >
- 鍟嗗搧
- </Button>
- <Button
- :type="currentType === 'video' ? 'primary' : 'default'"
- @click="handleTypeChange('video')"
- >
- 瑙嗛
- </Button>
- </ButtonGroup>
- <!-- 绗簩缁勶細鍓�10/鍓�20/鍓�30锛堥潬鍙筹級 -->
- <ButtonGroup>
- <Button
- :type="currentLimit === 10 ? 'success' : 'default'"
- @click="handleLimitChange(10)"
- >
- 鍓�10
- </Button>
- <Button
- :type="currentLimit === 20 ? 'success' : 'default'"
- @click="handleLimitChange(20)"
- >
- 鍓�20
- </Button>
- <Button
- :type="currentLimit === 30 ? 'success' : 'default'"
- @click="handleLimitChange(30)"
- >
- 鍓�30
- </Button>
- </ButtonGroup>
- </div>
- <div ref="viewPrintChartDom" class="view-chart-container"></div>
- </div>
- </div>
- </Card>
- <Card class="card">
- <div class="my-chart-container">
- <div class="chart-wrapper">
- <div class="chart-header">
- <h2>璁㈠崟澧為暱 瓒嬪娍鍥�</h2>
- </div>
- <div ref="orderCountChartDom" class="chart-container"></div>
- </div>
- </div>
- </Card>
+<!-- <Card class="card">-->
+<!-- <div class="chart-wrapper">-->
+<!-- <div class="chart-header">-->
+<!-- <h2>PV/UV 瓒嬪娍鍥�</h2>-->
+<!-- </div>-->
+<!-- <div ref="chartDom" class="chart-container"></div>-->
+<!-- </div>-->
+<!-- </Card>-->
+<!-- <Card class="card">-->
+<!-- <div class="my-chart-container">-->
+<!-- <div class="chart-wrapper" style="height: 800px">-->
+<!-- <div class="chart-header">-->
+<!-- <h2>鍟嗗搧/瑙嗛娴忚閲忓畬鎾巼 瓒嬪娍鍥�</h2>-->
+<!-- </div>-->
+<!-- <div class="button-group-wrapper">-->
+<!-- <!– 绗竴缁勶細鍟嗗搧/瑙嗛锛堥潬宸︼級 –>-->
+<!-- <ButtonGroup>-->
+<!-- <Button-->
+<!-- :type="currentType === 'goods' ? 'primary' : 'default'"-->
+<!-- @click="handleTypeChange('goods')"-->
+<!-- >-->
+<!-- 鍟嗗搧-->
+<!-- </Button>-->
+<!-- <Button-->
+<!-- :type="currentType === 'video' ? 'primary' : 'default'"-->
+<!-- @click="handleTypeChange('video')"-->
+<!-- >-->
+<!-- 瑙嗛-->
+<!-- </Button>-->
+<!-- </ButtonGroup>-->
- <Card class="card">
- <div class="my-chart-container">
- <div class="chart-wrapper">
- <div class="chart-header">
- <h2>娴忚鏁版嵁/璁㈠崟鏃堕棿娈� 瓒嬪娍鍥�</h2>
- </div>
- <div ref="orderTimePeriodChartDom" class="chart-container"></div>
- </div>
- </div>
+<!-- <!– 绗簩缁勶細鍓�10/鍓�20/鍓�30锛堥潬鍙筹級 –>-->
+<!-- <ButtonGroup>-->
+<!-- <Button-->
+<!-- :type="currentLimit === 10 ? 'success' : 'default'"-->
+<!-- @click="handleLimitChange(10)"-->
+<!-- >-->
+<!-- 鍓�10-->
+<!-- </Button>-->
+<!-- <Button-->
+<!-- :type="currentLimit === 20 ? 'success' : 'default'"-->
+<!-- @click="handleLimitChange(20)"-->
+<!-- >-->
+<!-- 鍓�20-->
+<!-- </Button>-->
+<!-- <Button-->
+<!-- :type="currentLimit === 30 ? 'success' : 'default'"-->
+<!-- @click="handleLimitChange(30)"-->
+<!-- >-->
+<!-- 鍓�30-->
+<!-- </Button>-->
+<!-- </ButtonGroup>-->
+<!-- </div>-->
+<!-- <div ref="viewPrintChartDom" class="view-chart-container"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </Card>-->
+<!-- <Card class="card">-->
+<!-- <div class="my-chart-container">-->
+<!-- <div class="chart-wrapper">-->
+<!-- <div class="chart-header">-->
+<!-- <h2>璁㈠崟澧為暱 瓒嬪娍鍥�</h2>-->
+<!-- </div>-->
+<!-- <div ref="orderCountChartDom" class="chart-container"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </Card>-->
+<!-- <Card class="card">-->
+<!-- <div class="my-chart-container">-->
+<!-- <div class="chart-wrapper">-->
+<!-- <div class="chart-header">-->
+<!-- <h2>娴忚鏁版嵁/璁㈠崟鏃堕棿娈� 瓒嬪娍鍥�</h2>-->
+<!-- </div>-->
+<!-- <div ref="orderTimePeriodChartDom" class="chart-container"></div>-->
+<!-- </div>-->
+<!-- </div>-->
- </Card>
+<!-- </Card>-->
<Card class="card">
@@ -1310,15 +1310,16 @@
this.refundParams.pageSize = 10
//鏇存柊琛ㄦ牸
- this.updateChartData(this.orderParams)
- this.updateOrderCountChartDate(this.orderParams)
- let form = {...this.orderParams};
- form.currentType = this.currentType;
- form.currentLimit = this.currentLimit;
- this.updateViewAndCompletionRateData(form)
-
- this.updateOrderTimePeriodData(this.orderParams)
+ // this.updateChartData(this.orderParams)
+ // this.updateOrderCountChartDate(this.orderParams)
+ //
+ // let form = {...this.orderParams};
+ // form.currentType = this.currentType;
+ // form.currentLimit = this.currentLimit;
+ // this.updateViewAndCompletionRateData(form)
+ //
+ // this.updateOrderTimePeriodData(this.orderParams)
},
// 瀹炰緥鍖栬鍗曟瑙�
@@ -1377,7 +1378,7 @@
mounted() {
console.log('ECharts 鏄惁瀛樺湪锛�', typeof echarts !== 'undefined'); // 搴旇緭鍑� true
- this.initChart();
+ // this.initChart();
this.initBaseParams();
window.addEventListener('resize', this.handleResize)
},
--
Gitblit v1.8.0