udxcms 1.0.41 → 1.0.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/basicComponents/UserMenu.vue +23 -9
- package/dist/components/basicComponents/WalletConnected.vue +8 -4
- package/dist/components/businessComponents/NetworkSelect.vue +1 -0
- package/dist/components/h5Components/walletconnectBottom.vue +4 -6
- package/dist/components/pageComponents/header/header_morse.vue +1 -1
- package/package.json +1 -1
|
@@ -64,6 +64,20 @@ import conf from "../../config/index";
|
|
|
64
64
|
|
|
65
65
|
export default {
|
|
66
66
|
name: "UserMenu",
|
|
67
|
+
props: {
|
|
68
|
+
isLocked: {
|
|
69
|
+
type: Boolean,
|
|
70
|
+
default: false,
|
|
71
|
+
},
|
|
72
|
+
accountIsCustody: {
|
|
73
|
+
type: Boolean,
|
|
74
|
+
default: false,
|
|
75
|
+
},
|
|
76
|
+
account: {
|
|
77
|
+
type: String,
|
|
78
|
+
default: "",
|
|
79
|
+
},
|
|
80
|
+
},
|
|
67
81
|
data() {
|
|
68
82
|
return {
|
|
69
83
|
logOutModalVisible: false,
|
|
@@ -74,17 +88,17 @@ export default {
|
|
|
74
88
|
};
|
|
75
89
|
},
|
|
76
90
|
computed: {
|
|
77
|
-
account() {
|
|
78
|
-
|
|
79
|
-
},
|
|
91
|
+
// account() {
|
|
92
|
+
// return this.$store.getters["wallet/account"] || "";
|
|
93
|
+
// },
|
|
80
94
|
token() {
|
|
81
95
|
return (
|
|
82
96
|
localStorage.getItem("TOKEN") || this.$store.state.user.token
|
|
83
97
|
);
|
|
84
98
|
},
|
|
85
|
-
accountIsCustody() {
|
|
86
|
-
|
|
87
|
-
},
|
|
99
|
+
// accountIsCustody() {
|
|
100
|
+
// return this.$store.getters["wallet/accountIsCustody"];
|
|
101
|
+
// },
|
|
88
102
|
userMenus() {
|
|
89
103
|
return this.$store.state.navigation.user.filter(
|
|
90
104
|
(v) => v.client == "WEB"
|
|
@@ -114,9 +128,9 @@ export default {
|
|
|
114
128
|
let ethWallet = this.$store.state.wallet.ethWallet || {};
|
|
115
129
|
return Object.keys(ethWallet).length > 0;
|
|
116
130
|
},
|
|
117
|
-
isLocked() {
|
|
118
|
-
|
|
119
|
-
},
|
|
131
|
+
// isLocked() {
|
|
132
|
+
// return this.$store.getters["wallet/isLocked"];
|
|
133
|
+
// },
|
|
120
134
|
walletLocked() {
|
|
121
135
|
if (this.accountIsCustody) {
|
|
122
136
|
return false;
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
|
|
55
55
|
<!-- wallet 菜单 -->
|
|
56
56
|
<div class="menu-dropdown">
|
|
57
|
-
<UserMenu v-if="userMenus.length > 0 || walletType == 'L1' && !l1Login" />
|
|
57
|
+
<UserMenu v-if="userMenus.length > 0 || walletType == 'L1' && !l1Login" :isLocked="isLocked" :accountIsCustody="accountIsCustody" :account="account" />
|
|
58
58
|
<userPanel
|
|
59
59
|
v-else
|
|
60
60
|
v-model="walletMenuVisible"
|
|
@@ -74,6 +74,10 @@ export default {
|
|
|
74
74
|
type: Boolean,
|
|
75
75
|
default: false,
|
|
76
76
|
},
|
|
77
|
+
isLocked: {
|
|
78
|
+
type: Boolean,
|
|
79
|
+
default: false,
|
|
80
|
+
},
|
|
77
81
|
},
|
|
78
82
|
computed: {
|
|
79
83
|
btcWallet() {
|
|
@@ -85,9 +89,9 @@ export default {
|
|
|
85
89
|
accountIsCustody() {
|
|
86
90
|
return this.$store.getters["wallet/accountIsCustody"];
|
|
87
91
|
},
|
|
88
|
-
isLocked() {
|
|
89
|
-
|
|
90
|
-
},
|
|
92
|
+
// isLocked() {
|
|
93
|
+
// return this.$store.getters["wallet/isLocked"];
|
|
94
|
+
// },
|
|
91
95
|
|
|
92
96
|
walletIcon() {
|
|
93
97
|
return window.localStorage.getItem("selectedIcon") || "";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<!--
|
|
2
2
|
* @Author: Sneed
|
|
3
3
|
* @Date: 2021-03-03 17:28:40
|
|
4
|
-
* @LastEditTime: 2025-
|
|
4
|
+
* @LastEditTime: 2025-11-13 14:54:47
|
|
5
5
|
* @LastEditors: lewis lewis@everylink.ai
|
|
6
6
|
* @Description:
|
|
7
7
|
-->
|
|
@@ -188,11 +188,9 @@ export default {
|
|
|
188
188
|
}
|
|
189
189
|
},
|
|
190
190
|
watch: {
|
|
191
|
-
|
|
192
|
-
handler: function(
|
|
193
|
-
|
|
194
|
-
this.initActiveUser()
|
|
195
|
-
}
|
|
191
|
+
ethWallet: {
|
|
192
|
+
handler: function(val, oldVal) {
|
|
193
|
+
console.log("ethWallet-wallet-connect-bootom", val, oldVal)
|
|
196
194
|
},
|
|
197
195
|
deep: true
|
|
198
196
|
},
|