Skip to content

Commit

Permalink
Merge pull request #469 from hiwuyi/develop
Browse files Browse the repository at this point in the history
Hide onchain
  • Loading branch information
PlutoNbai authored Jun 2, 2023
2 parents 6a58013 + 077f5f5 commit dc41923
Show file tree
Hide file tree
Showing 8 changed files with 252 additions and 251 deletions.
2 changes: 1 addition & 1 deletion commit_timestamp.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Commit timestamp: 2023-05-30 16:51:24
Commit timestamp: 2023-06-02 16:48:06
6 changes: 3 additions & 3 deletions web/src/components/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ export default {
// 防止登录后需要跳转到指定页面
that.$router.push({ path: that.$route.query.redirect })
} else {
that.$router.push({ path: '/my_files' })
that.$router.push({ path: '/my_buckets' })
}
window.location.reload()
that.$emit('getMetamaskLogin', false)
Expand All @@ -473,7 +473,7 @@ export default {
// 防止登录后需要跳转到指定页面
that.$router.push({ path: that.$route.query.redirect })
} else {
that.$router.push({ path: '/my_files' })
that.$router.push({ path: '/my_buckets' })
}
window.location.reload()
that.$emit('getMetamaskLogin', false)
Expand All @@ -495,7 +495,7 @@ export default {
// 防止登录后需要跳转到指定页面
that.$router.push({ path: that.$route.query.redirect })
} else {
that.$router.push({ path: '/my_files' })
that.$router.push({ path: '/my_buckets' })
}
window.location.reload()
that.$emit('getMetamaskLogin', false)
Expand Down
14 changes: 7 additions & 7 deletions web/src/components/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ export default {
name: 'Space',
type: ''
},
{
icon: 'el-icon-s-deal',
index: '1',
title: this.$t('route.Deal'),
name: 'my_files',
type: ''
},
// {
// icon: 'el-icon-s-deal',
// index: '1',
// title: this.$t('route.Deal'),
// name: 'my_files',
// type: ''
// },
{
icon: 'el-icon-s-billing',
index: '5',
Expand Down
2 changes: 1 addition & 1 deletion web/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Vue.prototype.baseAPIURL = netData === 80001 ? process.env.BASE_PAYMENT_GATEWAY_
Vue.prototype.baseAddressURL = netData === 80001 ? process.env.BASE_MUMBAI_ADDRESS : process.env.BASE_POLYGON_ADDRESS
Vue.prototype.Web3 = Web3
Vue.prototype.baseNetwork = process.env.BASE_ENV === true
console.log('update time: 2023-5-30', 'env:', process.env.BASE_ENV === true ? 'Main' : 'Cali', process.env.BASE_ENV)
console.log('update time: 2023-6-2', 'env:', process.env.BASE_ENV === true ? 'Main' : 'Cali', process.env.BASE_ENV)
router.beforeEach((to, from, next) => {
if (to.matched.some(record => record.meta.requiresAuth)) {
if (!sessionStorage.getItem('metaAddress')) {
Expand Down
Loading

0 comments on commit dc41923

Please sign in to comment.