From a7dec0a733ec6a72171cc96f3e25c5b1f5c79280 Mon Sep 17 00:00:00 2001 From: xvv Date: Fri, 6 Sep 2024 13:38:58 +0800 Subject: [PATCH] 9.4 --- .../openCardGift/TimeLimited.vue | 776 +++++++++++++----- .../EventMarketing/openCardGift/separate.vue | 55 +- fuintAdmin/src/views/shopowner.vue | 210 ++++- 3 files changed, 844 insertions(+), 197 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue index 2bc5315ba..9943e0628 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue @@ -1,5 +1,3 @@ - - + + width="48%"> - - + + - - - - - + + + + +
当手动/自动调整商品价格后，若调整后的售价低于规则设置时的会员 - 价，则该规则不生效。
+ 价，则该规则不生效。 + - - + +
折扣请填写0~1的数字。例如输入0.8，表示打8折
 - - + +
减价金额不能小于 0.01
 + + - 取 消 - 确 定 + 确 定 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + width="60%"> + +
+
+ + + + - - -
到
- - - - + + + + - - - - - - + + + + - - -
到
- - - - + + + + + + + +
到
+ + + + + + + + + + + + + + +
到
+ + + + + + + + + + + + - - - - - - - - - - - - - -
- 每周： - - -
-
- 每月： - - - -
-
- 时间段： -
- +
+ + + + + + + + + + + + + + + +
至
+ + + + + + + + + + +
+
+ + + {{ item }} + + + + + + + + +
+
+
+ + + + 至 + + + +
+ + + + +
+
- - 立即创建 - 重置 + + 取消 + 保存 -
@@ -434,32 +810,38 @@ export default { padding: 20px; margin: 0 auto; } -.bai-box{ + +.bai-box { border-radius: 10px; background: #fff; box-sizing: border-box; padding: 15px; } -.d-b{ + +.d-b { width: 100%; display: flex; align-items: center; justify-content: space-between; } -.d-a{ + +.d-a { width: 100%; display: flex; align-items: center; justify-content: space-around; } -.d-s{ + +.d-s { display: flex; align-items: center; } -.top-title{ + +.top-title { } -.hui-text{ + +.hui-text { font-weight: 400; font-size: 16px; color: #999999; @@ -468,30 +850,54 @@ export default { height: 120px; overflow: hidden; } -.bigNum{ + +.bigNum { font-size: 60px; font-weight: bold; color: #333333; margin-right: 15px; } -.smtitle{ + +.smtitle { font-size: 28px; color: #333333; font-weight: bold; } -.gang_{ + +.gang_ { width: 1px; height: 75px; border: 1px solid #FF9655; } -.gang{ + +.gang { width: 2px; height: 13px; background: #FF9655; margin-right: 10px; } -.g-title{ + +.g-title { font-size: 14px; color: #333333; } + +.d-s { + display: flex; + align-items: center; +} + +.icon-type { + display: flex; + align-items: center; + font-weight: 400; + font-size: 14px; + color: #999999; + margin-right: 20px; + cursor: pointer; +} + +.acvtive { + color: #FF770F !important; +} diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue index 6364cc64d..84fd8b082 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue @@ -95,6 +95,13 @@ +
@@ -207,6 +214,13 @@ +
- - -
{ this.ruleList = res.data.records + this.total1 = res.data.total }) }, // 删除 @@ -719,6 +763,7 @@ export default { getList() { getRequestList(this.queryParams).then(res => { this.tableData = res.data.records + this.total = res.data.total }) }, // 新增分时 diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue index 8225e546d..a3f8fe265 100644 --- a/fuintAdmin/src/views/shopowner.vue +++ b/fuintAdmin/src/views/shopowner.vue @@ -137,10 +137,26 @@
-
+
数据展示
-
+
+
员工排行
+
+
排名
+
员工姓名
+
会员充值金额（元)
+
油品销售金额（元)
+
总销售额（元）
+
+
+
{{index}}
+
员工姓名
+
9999
+
6666
+
198888
+
+
数据统计
@@ -307,7 +323,7 @@ export default { const chart1 = echarts.init(document.getElementById('cccc')) const chart2= echarts.init(document.getElementById('ccct')) const chart3= echarts.init(document.getElementById('ctct')) - + const chart4= echarts.init(document.getElementById('cccf')) let dataList = [] let allTotal = 0 if (this.storeAmount.oilNameList) { @@ -455,7 +471,6 @@ export default { } } }, - legend: { data: ['Evaporation','油品交易额','非油品交易额', '会员充值金额','会员消费金额', '会员余额'] }, @@ -601,12 +616,166 @@ export default { containLabel: true } }; - + const option4 = { + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'cross', + crossStyle: { + color: '#999' + } + } + }, + legend: { + data: ['Evaporation','油品交易额','非油品交易额', '会员充值金额','会员消费金额', '会员余额'] + }, + xAxis: [ + { + type: 'category', + // data: ['中建锦绣广场1站', '中建锦绣广场2站', '中建锦绣广场3站', '中建锦绣广场4站', '中建锦绣广场5站', '中建锦绣广场6站', '中建锦绣广场7站'], + data: storeNameList, + axisPointer: { + type: 'shadow' + } + } + ], + yAxis: [ + { + type: 'value', + name: '金额(元)', + // min: 0, + // max: 10000, + // interval: 2000, + axisLabel: { + formatter: '{value}' + } + } + // { + // type: 'value', + // name: '', + // min: 0, + // max: 25, + // interval: 5, + // axisLabel: { + // formatter: '{value} ' + // } + // } + ], + series: [ + { + name: '油品交易额', + color: '#FF9655', + type: 'bar', + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + barWidth: 13, + itemStyle: { + normal: { + barBorderRadius: [50, 50, 0, 0] + } + }, + barGap: '60%', + // data: [ + // 2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3 + // ] + data: oilAmountList + }, + { + name: '非油品交易额', + color: '#55F3FF', + type: 'bar', + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + barWidth: 13, + itemStyle: { + normal: { + barBorderRadius: [50, 50, 0, 0] + } + }, + // data: [ + // 2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3 + // ] + data: noOilAmountList + }, + { + name: '会员充值金额', + color: '#0DC291', + type: 'bar', + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + barWidth: 13, + itemStyle: { + normal: { + barBorderRadius: [50, 50, 0, 0] + } + }, + // data: [ + // 2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3 + // ] + data: rechargeBalanceList + }, + { + name: '会员消费金额', + color: '#409EFF', + type: 'bar', + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + barWidth: 13, + itemStyle: { + normal: { + barBorderRadius: [50, 50, 0, 0] + } + }, + // data: [ + // 2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3 + // ] + data: consumeBalanceList + }, + { + name: '会员余额', + color: '#D55F5F', + type: 'bar', + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + barWidth: 13, + itemStyle: { + normal: { + barBorderRadius: [50, 50, 0, 0] + } + }, + // data: [ + // 2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3 + // ] + data: userBalanceList + } + ], + grid: { + left: '3%', + right: '3%', + bottom: '3%', + containLabel: true + } + }; chart.setOption(option) chart1.setOption(option1) chart2.setOption(option2) chart3.setOption(option3) - + chart4.setOption(option4) } @@ -813,7 +982,7 @@ export default { color: #fff; } .la-left{ - width: 70%; + width: 73%; background: #fff; border-radius: 10px; } @@ -822,4 +991,31 @@ export default { background: #fff; border-radius: 10px; } +.hui-box{ + background: #F4F5F9; + border-radius: 8px; + width: 100%; + box-sizing: border-box; + padding: 10px; + display: flex; + justify-content: space-between; + margin: 10px auto; + div{ + width: 20%; + text-align: center; + } +} +.hang-box{ + border-radius: 8px; + width: 100%; + box-sizing: border-box; + padding: 10px; + display: flex; + justify-content: space-between; + margin: 10px auto; + div{ + width: 20%; + text-align: center; + } +}