diff --git a/fuintAdmin_zt/src/api/setting/message.js b/fuintAdmin_zt/src/api/setting/message.js
new file mode 100644
index 000000000..1f74cd23f
--- /dev/null
+++ b/fuintAdmin_zt/src/api/setting/message.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 分页查询所有的订单信息
+export function getListApi(query) {
+ return request({
+ url: 'messageTemplate',
+ method: 'get',
+ params: query
+ })
+}
+
+//
+export function deleteApi(ids) {
+ return request({
+ url: 'messageTemplate?idList=' + ids,
+ method: 'delete'
+ })
+}
+//
+export function saveApi(data) {
+ return request({
+ url: 'messageTemplate',
+ method: 'post',
+ data: data
+ })
+}
+
+// 保存修改信息
+export function updateApi(data) {
+ return request({
+ url: 'messageTemplate',
+ method: 'put',
+ data: data
+ })
+}
+
+
diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue
index 5a6088ce4..1fab8e120 100644
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@@ -37,8 +37,8 @@
-
- 布局设置
+
+ 修改密码
退出登录
@@ -59,6 +59,7 @@ import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
import FuintDoc from '@/components/Fuint/Doc'
+import confirmLog from "@/views/coupon/confirmLog/index.vue";
export default {
components: {
@@ -95,6 +96,9 @@ export default {
}
},
methods: {
+ prsswrod(){
+ console.log('方法')
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index b91db9cbe..2a94ea2fe 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -758,7 +758,7 @@
-
+
diff --git a/fuintAdmin_zt/src/views/homeComponents/manage.vue b/fuintAdmin_zt/src/views/homeComponents/manage.vue
index 48707f738..f24b4af01 100644
--- a/fuintAdmin_zt/src/views/homeComponents/manage.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/manage.vue
@@ -593,8 +593,8 @@ export default {
}
],
grid: {
- left: '1%',
- right: '1%',
+ left: '3%',
+ right: '3%',
bottom: '3%',
containLabel: true
}
diff --git a/fuintAdmin_zt/src/views/homeComponents/shopowner.vue b/fuintAdmin_zt/src/views/homeComponents/shopowner.vue
index 3e53a405c..beb6ea717 100644
--- a/fuintAdmin_zt/src/views/homeComponents/shopowner.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/shopowner.vue
@@ -387,7 +387,6 @@ export default {
};
const option3 = {
- color: ['#FF9655', '#0DC291', '#409EFF'],
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -399,25 +398,13 @@ export default {
},
legend: {
- data: ['交易金额', '交易笔数', '活跃油站数']
+ data: ['Evaporation','油品交易额','非油品交易额', '会员充值金额','会员消费金额', '会员余额']
},
xAxis: [
{
type: 'category',
- data: [
- '00:00',
- '02:00',
- '04:00',
- '06:00',
- '08:00',
- '10:00',
- '12:00',
- '14:00',
- '16:00',
- '18:00',
- '20:00',
- '22:00'
- ],
+ // data: ['中建锦绣广场1站', '中建锦绣广场2站', '中建锦绣广场3站', '中建锦绣广场4站', '中建锦绣广场5站', '中建锦绣广场6站', '中建锦绣广场7站'],
+ data: storeNameList,
axisPointer: {
type: 'shadow'
}
@@ -427,76 +414,133 @@ export default {
{
type: 'value',
name: '金额(元)',
-
- min: 0,
- max: 250,
- interval: 50,
- axisLabel: {
- formatter: '{value} '
- }
- },
- {
- type: 'value',
- name: '笔数',
- min: 0,
- max: 25,
- interval: 5,
+ // min: 0,
+ // max: 10000,
+ // interval: 2000,
axisLabel: {
formatter: '{value}'
}
}
+ // {
+ // type: 'value',
+ // name: '',
+ // min: 0,
+ // max: 25,
+ // interval: 5,
+ // axisLabel: {
+ // formatter: '{value} '
+ // }
+ // }
],
series: [
{
- name: '活跃油站数',
+ name: '油品交易额',
+ color: '#FF9655',
type: 'bar',
tooltip: {
valueFormatter: function (value) {
- return value + ' ml';
+ return value;
}
},
barWidth: 13,
itemStyle: {
normal: {
- //这里设置柱形图圆角 5左上角，右上角，右下角，左下角]
barBorderRadius: [50, 50, 0, 0]
}
},
- data: [
- 30.0, 31.9, 71.0, 23.2, 41.6, 31.7, 21.6, 30.0, 31.9, 71.0, 23.2, 41.6
- ]
- },
-
- {
- name: '交易金额',
- type: 'line',
- yAxisIndex: 1,
- tooltip: {
- valueFormatter: function (value) {
- return value + ' °C';
- }
- },
- data: [3.0, 3.9, 7.0, 2.2, 4.6, 3.7, 2.6, 3.0, 3.9, 7.0, 3.2, 4.6]
+ 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: '交易笔数',
- type: 'line',
- yAxisIndex: 1,
+ name: '非油品交易额',
+ color: '#55F3FF',
+ type: 'bar',
tooltip: {
valueFormatter: function (value) {
- return value + ' °C';
+ return value;
}
},
- data: [2.0, 3.9, 4.0, 5.2, 4.6, 6.7, 7.6, 6.0, 5.9, 4.0, 4.2, 2.6]
+ 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: '1%',
- right: '1%',
+ left: '3%',
+ right: '3%',
bottom: '3%',
containLabel: true
}
-
};
chart.setOption(option)
diff --git a/fuintAdmin_zt/src/views/index.vue b/fuintAdmin_zt/src/views/index.vue
index 69cda14a8..570491289 100644
--- a/fuintAdmin_zt/src/views/index.vue
+++ b/fuintAdmin_zt/src/views/index.vue
@@ -16,7 +16,7 @@ import shopowner from "@/views/homeComponents/shopowner.vue"
export default {
data(){
return{
- power:3
+ power:2
}
},
created() {
diff --git a/fuintAdmin_zt/src/views/setting/message.vue b/fuintAdmin_zt/src/views/setting/message.vue
index 3bbda30bc..9f8d04624 100644
--- a/fuintAdmin_zt/src/views/setting/message.vue
+++ b/fuintAdmin_zt/src/views/setting/message.vue
@@ -1,7 +1,7 @@
-
+
新增商品
+ >新增短信模板
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- 未上架
+ 停用
- 已上架
+ 启用
@@ -95,31 +97,42 @@
-
-
+
+
-
+
+
+
+
-
-
+
+
+ v-for="item in deptListSelect"
+ :key="item.deptId"
+ :label="item.deptName"
+ :value="item.deptId"
+ >
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
提交
@@ -133,18 +146,18 @@