Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/layout/personal/navBar.vue

@@ -105,7 +105,7 @@ defineProps({
 const localeStore = useLocaleStore()
 
 const list = ref([
-  { text: '首页', path: '' },
+  { text: '首页', path: '/home' },
   { text: '职位', path: '/recruit/position' },
   { text: '公司', path: '' }
 ])

src/styles/index.css

@@ -1,6 +1,6 @@
 :root {
   --zIndex-dialog: 9999;
-  --default-bgc: #eaf4fe;
+  --default-bgc: #f2f4f7;
   --v-primary-base: #00897B;
   --v-primary-lighten1: #26A69A;
   --v-primary-lighten2: #4DB6AC;

src/styles/index.min.css

@@ -1 +1 @@
-:root{--zIndex-dialog:9999;--default-bgc:#eaf4fe;--v-primary-base:#00897B;--v-primary-lighten1:#26A69A;--v-primary-lighten2:#4DB6AC;--v-primary-lighten3:#80CBC4;--v-primary-lighten4:#B2DFDB;--default-text:#666}.buttons{height:36px;width:224px}.half-button{height:36px;width:88px}.default-width{width:1184px;min-width:1184px;max-width:1184px;margin:0 auto;align-items:center}.default-active{color:var(--v-primary-base) !important}
+:root{--zIndex-dialog:9999;--default-bgc:#f2f4f7;--v-primary-base:#00897B;--v-primary-lighten1:#26A69A;--v-primary-lighten2:#4DB6AC;--v-primary-lighten3:#80CBC4;--v-primary-lighten4:#B2DFDB;--default-text:#666}.buttons{height:36px;width:224px}.half-button{height:36px;width:88px}.default-width{width:1184px;min-width:1184px;max-width:1184px;margin:0 auto;align-items:center}.default-active{color:var(--v-primary-base) !important}

src/styles/index.scss

@@ -1,6 +1,6 @@
 :root {
   --zIndex-dialog: 9999;
-  --default-bgc: #eaf4fe;
+  --default-bgc: #f2f4f7;
   --v-primary-base: #00897B;
   --v-primary-lighten1: #26A69A;
   --v-primary-lighten2: #4DB6AC;

src/styles/personal/navBar.css

@@ -21,7 +21,7 @@
   height: 50px;
   z-index: var(--zIndex-nav) !important;
   color: #fff;
-  background-color: var(--default-bgc);
+  background-color: #d5e6e8;
   padding-left: 0px;
   height: 50px;
   font-size: 14px;
@@ -106,11 +106,7 @@
 }
 
 .user-nav {
-  position: absolute;
-  right: 0;
   color: var(--v-primary-base);
-  height: 49px;
-  line-height: 49px;
 }
 
 .user-nav .btns .btn-outline {

src/styles/personal/navBar.min.css

@@ -1 +1 @@
-.user-nav .nav-resume-tools{display:inline-block;vertical-align:middle}.user-nav .nav-resume-tools>a{display:inline-block;font-weight:500;color:var(--v-primary-base);line-height:20px;height:auto;padding:3px 7px;vertical-align:middle;border-radius:4px;margin-right:8px;border:1px solid transparent}.banner{width:100%;height:50px;z-index:var(--zIndex-nav) !important;color:#fff;background-color:var(--default-bgc);padding-left:0px;height:50px;font-size:14px}.banner .left{height:100%;display:flex;align-items:center;font-size:20px;cursor:pointer}.hover:hover{cursor:pointer;background:rgba(0,0,0,0.03)}.innerBox{position:relative;width:1184px;max-width:1184px;margin:0 auto;align-items:center}.nav-logo{float:left}.nav-city{float:left;position:relative;cursor:pointer;height:49px;line-height:49px;color:var(--v-primary-base);margin-left:50px}.nav-city-selected{display:inline-block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:84px;vertical-align:middle}.switchover-city{color:var(--v-primary-base);margin-left:10px}.nav{font-size:0;float:left;margin-left:50px;height:49px;line-height:49px}.nav ul{display:flex;white-space:nowrap;vertical-align:top}.nav ul li{text-align:center;font-size:14px;margin:0 5px;list-style:none}.nav li a{display:block;padding:0 5px;position:relative;text-decoration:none;color:var(--v-primary-base)}.user-nav{position:absolute;right:0;color:var(--v-primary-base);height:49px;line-height:49px}.user-nav .btns .btn-outline{border-radius:8px;text-align:center;font-size:14px;height:26px;line-height:26px;min-width:0;padding:0 11px;margin-left:14px;background-color:transparent}.user-nav .btn{display:inline-block;box-sizing:content-box;border:1px solid var(--v-primary-base);letter-spacing:1px;cursor:pointer}.user-nav a{text-decoration:none}
+.user-nav .nav-resume-tools{display:inline-block;vertical-align:middle}.user-nav .nav-resume-tools>a{display:inline-block;font-weight:500;color:var(--v-primary-base);line-height:20px;height:auto;padding:3px 7px;vertical-align:middle;border-radius:4px;margin-right:8px;border:1px solid transparent}.banner{width:100%;height:50px;z-index:var(--zIndex-nav) !important;color:#fff;background-color:#d5e6e8;padding-left:0px;height:50px;font-size:14px}.banner .left{height:100%;display:flex;align-items:center;font-size:20px;cursor:pointer}.hover:hover{cursor:pointer;background:rgba(0,0,0,0.03)}.innerBox{position:relative;width:1184px;max-width:1184px;margin:0 auto;align-items:center}.nav-logo{float:left}.nav-city{float:left;position:relative;cursor:pointer;height:49px;line-height:49px;color:var(--v-primary-base);margin-left:50px}.nav-city-selected{display:inline-block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:84px;vertical-align:middle}.switchover-city{color:var(--v-primary-base);margin-left:10px}.nav{font-size:0;float:left;margin-left:50px;height:49px;line-height:49px}.nav ul{display:flex;white-space:nowrap;vertical-align:top}.nav ul li{text-align:center;font-size:14px;margin:0 5px;list-style:none}.nav li a{display:block;padding:0 5px;position:relative;text-decoration:none;color:var(--v-primary-base)}.user-nav{color:var(--v-primary-base)}.user-nav .btns .btn-outline{border-radius:8px;text-align:center;font-size:14px;height:26px;line-height:26px;min-width:0;padding:0 11px;margin-left:14px;background-color:transparent}.user-nav .btn{display:inline-block;box-sizing:content-box;border:1px solid var(--v-primary-base);letter-spacing:1px;cursor:pointer}.user-nav a{text-decoration:none}

src/styles/personal/navBar.scss

@@ -19,7 +19,7 @@
   height: 50px;
   z-index: var(--zIndex-nav) !important;
   color: #fff;
-  background-color: var(--default-bgc);
+  background-color: #d5e6e8;
   padding-left: 0px;
   height: 50px;
   font-size: 14px;