asd26269546 2 жил өмнө
parent
commit
2ec691ec1e

+ 2 - 1
src/components/header-bar.vue

@@ -125,7 +125,7 @@
 
 				<el-dropdown class="dropdown-box">
 					<span class="el-dropdown-link">
-						leehom<i class="el-icon-arrow-down el-icon--right"></i>
+						{{ userData.role_name }}<i class="el-icon-arrow-down el-icon--right"></i>
 					</span>
 					<el-dropdown-menu slot="dropdown">
 						<el-dropdown-item>个人中心</el-dropdown-item>
@@ -152,6 +152,7 @@ export default {
 			isChildMenu: false,
 			menuData: [],
 			barData: [],
+			userData:JSON.parse(window.localStorage.getItem('token'))
 		}
 	},
 	computed: {

+ 1 - 0
src/libs/micros.js

@@ -19,6 +19,7 @@ actions.onGlobalStateChange((state, prev) => {
 	console.log(state, prev, '123123123');
 });
 const setToken = ((token) => {
+	console.log(token)
 	actions.setGlobalState({ ...state, token: token })
 })
 const setTheme = ((theme) => {

+ 1 - 0
src/views/login.vue

@@ -111,6 +111,7 @@ export default {
 				if(res.status == 200 && res.data){
 					window.localStorage.setItem("token",JSON.stringify(res.data))
 					setToken(res.data)
+					console.log(v.checked)
 					if(v.checked){
 						window.localStorage.setItem('username',v.loginForm.username)
 						window.localStorage.setItem('passwordCopy',v.loginForm.passwordCopy)

+ 2 - 2
src/views/main.vue

@@ -100,7 +100,6 @@ const state = getAll()
 state.router = router
 const isTest = window.location.host == '36.134.91.96:10003'
 const isServe = process.env.NODE_ENV === "development"
-console.log(isTest,isServe)
 registerMicroApps([
 	{
 		name: 'app-vue-hash',
@@ -113,7 +112,8 @@ registerMicroApps([
 	},
 	{
 		name: 'fjhxCloudVue',
-		entry: isServe ? 'http://localhost:8082' :  'http://36.134.91.96:10002',
+		entry: isServe ?  
+			'http://192.168.1.198:1777' :  'http://36.134.91.96:10002',
 		//entry: (process.env.NODE_ENV === "development") ?  'https://wdly.bytesail.cn:10002' : 'https://wdly.bytesail.cn:10002',
 		container: '#appContainer',
 		activeRule: '/main/fjhxCloudVue',