合并

src/App.vue

@@ -23,7 +23,7 @@ import VHeader from './views/layout/header.vue'
 import VSlidebar from './views/layout/slidebar.vue'
 import VFooter from './views/layout/footer.vue'
 import { base64decode, isNotEmptyUtils, getUrlParamsMap } from "./utils/utils.js"
-import { mapActions } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 import { getLoginUrl } from './utils/index.js'
 let vm = null
 export default {
@@ -41,6 +41,11 @@ export default {
 			authList: {}
 		}
 	},
+	computed:{
+		...mapGetters([
+			'_token'
+		])
+	},
 	created() {
 		vm = this
 		vm.getToken()
@@ -59,13 +64,19 @@ export default {
 				let paramStr = href.substring(offset + 1, href.length)
 				let pars = base64decode(paramStr)
 				let paramMap = getUrlParamsMap(pars, "&")
-				if (isNotEmptyUtils(paramMap["token"])) {
+				if (isNotEmptyUtils(paramMap["token"]) || localStorage.getItem('storageToken')) {
 					vm.token = paramMap["token"]
 				} else {
 					window.location.href = getLoginUrl()  // 没有token返回登录页面
 				}
 			}else {
+<<<<<<< HEAD
 				window.location.href = getLoginUrl()  // 没有token返回登录页面
+=======
+				if(!localStorage.getItem('storageToken')) {
+					window.location.href = getLoginUrl()  // 没有token返回登录页面
+				}
+>>>>>>> 1049ca21c55130831c3d4ab2d015aa8ce21707bf
 			}
 			vm.changeToken(vm.token)
 			vm.getUserAuth(vm.token)

src/style/common.scss

@@ -210,4 +210,12 @@ html,body{
 }
 .el-radio__input.is-checked+.el-radio__label, .el-tabs__item.is-active {
     color: #449284 !important;
+}
+
+// 面包屑导航
+.el-breadcrumb__inner a, .el-breadcrumb__inner.is-link {
+    font-weight: 300 !important;
+}
+.el-breadcrumb__inner.is-link:hover {
+    color: #449284 !important;
 }
\ No newline at end of file

src/views/education/create-component.vue

@@ -1032,7 +1032,7 @@ export default {
         .el-steps--simple {
             float: left;
             padding: 20px 0 0 5%;
-            width: 25%;
+            width: 350px;
             background: #fff;
             .el-step__icon {
                 display: none;
@@ -1048,7 +1048,7 @@ export default {
                 font-size: 12px;
                 border: 1px solid #ccc;
                 border-radius: 50%;
-                width: 25px;
+                width: 22px;
                 height: 16px;
                 line-height: 13px;
                 padding-left: 3px;