+
![]()
+ {{ user.nickName }}
个人中心
-
+
退出登录
@@ -56,6 +43,7 @@ import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
+import { getUserProfile } from "@/api/system/user";
export default {
components: {
@@ -91,7 +79,20 @@ export default {
}
}
},
+ data() {
+ return {
+ user: {},
+ };
+ },
+ created() {
+ this.getUser();
+ },
methods: {
+ getUser() {
+ getUserProfile().then(response => {
+ this.user = response.data;
+ });
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
@@ -111,13 +112,17 @@ export default {
diff --git a/src/router/index.js b/src/router/index.js
index 71907b6..4f29763 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -68,7 +68,7 @@ export const constantRoutes = [
children: [
{
path: 'index',
- component: () => import('@/views/index'),
+ component: () => import('@/views/index_v1'),
name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true }
}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ab0a6fe..c06d1aa 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -51,7 +51,10 @@ const user = {
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
- const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+ const avatar = (user.avatar == "" || user.avatar == null) ? require("../../assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+ console.log(user.avatar,1111)
+ console.log(process.env.VUE_APP_BASE_API,1111)
+
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 04cffac..a3ad032 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -71,46 +71,14 @@ export function addDateRange(params, dateRange, propName) {
// 添加日期范围
export function addSESDateRange(params, dateRange, propName) {
- var search = params
+ var search = params;
search.beginTime = null
- search.endTime = null
- search.updateBeginTime = null
- search.updateEndTime = null
- if (propName) {
- if (dateRange[0]) {
- if (dateRange[0][0] && dateRange[0][1]) {
- search.beginTime = dateRange[0][0]
- search.endTime = dateRange[0][1]
- } else if (!dateRange[0][0]) {
- search.beginTime = undefined
- search.endTime = undefined
- }
- }
- if (dateRange[1]) {
- if (dateRange[1][0] && dateRange[1][1]) {
- search.updateBeginTime = dateRange[1][0]
- search.updateEndTime = dateRange[1][1]
- } else if (!dateRange[1][0]) {
- search.updateBeginTime = undefined
- search.updateEndTime = undefined
- }
- }
+ search.endTime = null;
+ if (null != dateRange && '' != dateRange) {
+ search.beginTime = dateRange[0];
+ search.endTime = dateRange[1];
}
- if (!propName) {
- if (null != dateRange && '' != dateRange) {
- // search.beginTime = dateRange[0];
- // search.endTime = dateRange[1];
- if (dateRange[0] && dateRange[1]) {
- search.beginTime = dateRange[0]
- search.endTime = dateRange[1]
- } else if (!dateRange[0]) {
- search.beginTime = undefined
- search.endTime = undefined
- }
- }
- }
-
- return search
+ return search;
}
// 通用下载方法
diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue
index 1a1081f..f16e7da 100644
--- a/src/views/dashboard/PanelGroup.vue
+++ b/src/views/dashboard/PanelGroup.vue
@@ -1,54 +1,43 @@
-
+
-
-
-
- 访客
+
+
成交订单
+ {{chartData.beginTime}}~{{chartData.endTime}}
+
+ 
+
-
-
-
-
-
-
- 消息
+
+
成交金额
+ {{chartData.beginTime}}~{{chartData.endTime}}
+
+ 
+
-
-
-
-
-
-
- 金额
-
-
-
-
-
- 订单
+
@@ -62,6 +51,12 @@ export default {
components: {
CountTo
},
+ props: {
+ chartData: {
+ type: Object,
+ required: true,
+ },
+ },
methods: {
handleSetLineChartData(type) {
this.$emit('handleSetLineChartData', type)
@@ -71,23 +66,39 @@ export default {
\ No newline at end of file
diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
index d2d2ec6..3501ecc 100644
--- a/src/views/index_v1.vue
+++ b/src/views/index_v1.vue
@@ -1,31 +1,32 @@
获取收益
+ {{chartData.beginTime}}~{{chartData.endTime}}
+
+ 
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -34,7 +35,9 @@ import PanelGroup from './dashboard/PanelGroup'
import LineChart from './dashboard/LineChart'
import RaddarChart from './dashboard/RaddarChart'
import PieChart from './dashboard/PieChart'
+import PieChartCreate from './dashboard/PieChartCreate'
import BarChart from './dashboard/BarChart'
+import { payGetMerchantTotalInfo } from "@/api/form";
const lineChartData = {
newVisitis: {
@@ -62,14 +65,48 @@ export default {
LineChart,
RaddarChart,
PieChart,
- BarChart
+ BarChart,
+ PieChartCreate
},
data() {
return {
- lineChartData: lineChartData.newVisitis
+ lineChartData: lineChartData.newVisitis,
+ dateRange: [],
+ queryParams: {},
+ info: {},
}
},
+ created() {
+ this.addDate()
+ this.getData()
+ },
methods: {
+ addDate() {
+ let nowDate = new Date();
+ let date = {
+ year: nowDate.getFullYear(),
+ month: nowDate.getMonth() + 1,
+ date: nowDate.getDate(),
+ }
+ if (date.date <= 9) {
+ this.dateRange[0] = date.year + '-' + 0 + date.month + '-' + 0 + date.date + ' ' + '00:00:00';
+ this.dateRange[1] = date.year + '-' + 0 + date.month + '-' + 0 + date.date + ' ' + '23:59:59';
+
+ } else {
+ this.dateRange[0] = date.year + '-' + 0 + date.month + '-' + date.date + ' ' + '00:00:00';
+ this.dateRange[1] = date.year + '-' + 0 + date.month + '-' + date.date + ' ' + '23:59:59';
+ }
+ },
+ getData() {
+ payGetMerchantTotalInfo.getMerchantTotalInfo(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => {
+ this.info = response.data
+ this.info.beginTime=this.dateRange[0]
+ this.info.endTime=this.dateRange[1]
+ });
+ },
+ /** 搜索按钮操作 */
+ handleQuery() {
+ },
handleSetLineChartData(type) {
this.lineChartData = lineChartData[type]
}
@@ -78,9 +115,14 @@ export default {
+
+
+
+
+ OTC当日数据统计
+
+
+ 时间
+ 搜索
+
+
+
+
+
+
+ Payment当日数据统计
+
+
-
-
-
-
-
-