diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航1-1.png b/src/assets/images/btn07.png
similarity index 100%
rename from src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航1-1.png
rename to src/assets/images/btn07.png
diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航2-1.png b/src/assets/images/btn08.png
similarity index 100%
rename from src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航2-1.png
rename to src/assets/images/btn08.png
diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航3-1.png b/src/assets/images/btn09.png
similarity index 100%
rename from src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航3-1.png
rename to src/assets/images/btn09.png
diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航4-1.png b/src/assets/images/btn10.png
similarity index 100%
rename from src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航4-1.png
rename to src/assets/images/btn10.png
diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航5-1.png b/src/assets/images/btn11.png
similarity index 100%
rename from src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航5-1.png
rename to src/assets/images/btn11.png
diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航1-2.png b/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航1-2.png
deleted file mode 100644
index afa9826..0000000
Binary files a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航1-2.png and /dev/null differ
diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航2-2.png b/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航2-2.png
deleted file mode 100644
index 3e4350f..0000000
Binary files a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航2-2.png and /dev/null differ
diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航3-2.png b/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航3-2.png
deleted file mode 100644
index 2f0b327..0000000
Binary files a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航3-2.png and /dev/null differ
diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航4-2.png b/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航4-2.png
deleted file mode 100644
index b7961a7..0000000
Binary files a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航4-2.png and /dev/null differ
diff --git a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航5-2.png b/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航5-2.png
deleted file mode 100644
index 6fcc28e..0000000
Binary files a/src/assets/images/央行可视化监控中心-切图/央行可视化监控中心/导航5-2.png and /dev/null differ
diff --git a/src/permission.js b/src/permission.js
index 739b202..c2b9362 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -15,25 +15,25 @@ const whiteList = ['/login', '/register'];
router.beforeEach((to, from, next) => {
NProgress.start()
- if (getToken()) {
- to.meta.title && useSettingsStore().setTitle(to.meta.title)
- /* has token*/
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done()
- } else {
- next()
- }
- } else {
- // 没有token
- if (whiteList.indexOf(to.path) !== -1) {
- // 在免登录白名单,直接进入
- next()
- } else {
- next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
- NProgress.done()
- }
- }
+ // if (getToken()) {
+ // to.meta.title && useSettingsStore().setTitle(to.meta.title)
+ // /* has token*/
+ // if (to.path === '/login') {
+ // next({ path: '/' })
+ // NProgress.done()
+ // } else {
+ // next()
+ // }
+ // } else {
+ // // 没有token
+ // if (whiteList.indexOf(to.path) !== -1) {
+ // // 在免登录白名单,直接进入
+ // next()
+ // } else {
+ // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+ // NProgress.done()
+ // }
+ // }
next()
})
diff --git a/src/router/index.js b/src/router/index.js
index a8a930c..42d87a0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -270,7 +270,7 @@ export const dynamicRoutes = [
{
path: 'transaction',
hidden: true,
- component: () => import('@/views/visual/transaction/transaction.vue'),
+ component: () => import('@/views/visual/components/transaction.vue'),
name: 'transaction',
meta: { title: '交易总览',activeMenu: '/visual/index' }
},
@@ -278,7 +278,7 @@ export const dynamicRoutes = [
{
path: 'transaction-node',
hidden: true,
- component: () => import('@/views/visual/transaction-node/transaction-node.vue'),
+ component: () => import('@/views/visual/components/transaction-node.vue'),
name: 'transaction-node',
meta: { title: '交易节点',activeMenu: '/visual/index' }
},
@@ -286,7 +286,7 @@ export const dynamicRoutes = [
{
path: 'transaction-block',
hidden: true,
- component: () => import('@/views/visual/transaction-block/transaction-block.vue'),
+ component: () => import('@/views/visual/components/transaction-block.vue'),
name: 'transaction-block',
meta: { title: '交易区块',activeMenu: '/visual/index' }
},
@@ -294,7 +294,7 @@ export const dynamicRoutes = [
{
path: 'transaction-broadcast',
hidden: true,
- component: () => import('@/views/visual/transaction-broadcast/transaction-broadcast.vue'),
+ component: () => import('@/views/visual/components/transaction-broadcast.vue'),
name: 'transaction-broadcast',
meta: { title: '交易广播',activeMenu: '/visual/index' }
},
@@ -302,7 +302,7 @@ export const dynamicRoutes = [
{
path: 'merkle',
hidden: true,
- component: () => import('@/views/visual/merkle/merkle.vue'),
+ component: () => import('@/views/visual/components/merkle.vue'),
name: 'merkle',
meta: { title: 'Merkle',activeMenu: '/visual/index' }
},
diff --git a/src/utils/request.js b/src/utils/request.js
index e9c71f1..01e1007 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -14,7 +14,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
const service = axios.create({
// axios中请求配置有baseURL选项,表示请求URL公共部分
// baseURL: import.meta.env.VITE_APP_BASE_API,
- baseURL: 'http://192.168.2.15:8800/',
+ baseURL: 'http://118.31.7.2:8800/',
// 超时
timeout: 10000
})
@@ -114,9 +114,9 @@ service.interceptors.response.use(res => {
message = "系统接口请求超时";
} else if (message.includes("Request failed with status code")) {
if(message.includes("code 401")){
- useUserStore().fedLogOut().then(() => {
- location.href = '/login';
- })
+ // useUserStore().fedLogOut().then(() => {
+ // location.href = '/login';
+ // })
}else if(message.includes("code 400")){
// ElNotification.error({ title: error.response.data })
ElMessage({ message: error.response.data.msg, type: 'error' })
diff --git a/src/views/individual/consumermall/consumermall.vue b/src/views/individual/consumermall/consumermall.vue
index 53ffbd4..e8aa04d 100644
--- a/src/views/individual/consumermall/consumermall.vue
+++ b/src/views/individual/consumermall/consumermall.vue
@@ -102,6 +102,8 @@ getRedPacket()
v-model:limit="params.size"
@pagination="getRedPacket"
/>
+
+
@@ -133,6 +135,7 @@ getRedPacket()
v-model:limit="params1.size"
@pagination="getDigital"
/>
+
\ No newline at end of file
diff --git a/src/views/visual/components/merkle.vue b/src/views/visual/components/merkle.vue
index e69de29..a4436da 100644
--- a/src/views/visual/components/merkle.vue
+++ b/src/views/visual/components/merkle.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/visual/components/transaction-block.vue b/src/views/visual/components/transaction-block.vue
index e69de29..406a690 100644
--- a/src/views/visual/components/transaction-block.vue
+++ b/src/views/visual/components/transaction-block.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/visual/components/transaction-broadcast.vue b/src/views/visual/components/transaction-broadcast.vue
index e69de29..71f68ff 100644
--- a/src/views/visual/components/transaction-broadcast.vue
+++ b/src/views/visual/components/transaction-broadcast.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/visual/components/transaction-node.vue b/src/views/visual/components/transaction-node.vue
index e69de29..b5c8c32 100644
--- a/src/views/visual/components/transaction-node.vue
+++ b/src/views/visual/components/transaction-node.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/visual/components/transaction.vue b/src/views/visual/components/transaction.vue
index e6a86fa..4c9551e 100644
--- a/src/views/visual/components/transaction.vue
+++ b/src/views/visual/components/transaction.vue
@@ -16,13 +16,15 @@