diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 5ebe9dda..b5d0a689 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -6,7 +6,7 @@
         <router-link v-else :to="item.redirect||item.path">{{generateTitle(item.meta.title)}}</router-link>
       </el-breadcrumb-item>
     </transition-group>
-    <el-button @click="drawer = true" type="primary" style="margin-left: 16px;"> <i class="el-icon-menu" style="margin-right:5px"></i>全部应用</el-button>
+    <el-button @click="drawer = true" type="primary" round plain style="margin-left: 16px;"> <i class="el-icon-menu" style="margin-right:5px"></i>全部应用</el-button>
     <div class="drawer-box">
         <el-drawer
         :visible.sync="drawer"
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 84eab64b..8e91aef2 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -58,7 +58,9 @@ export default {
     theme: '换肤'
   },
   login: {
-    title: '唛盟云-项目管理平台',
+    mainTitle:'唛盟云',
+    subTitle:'项目管理平台',
+    title: '唛盟项目管理平台',
     logIn: '登录',
     username: '账号',
     password: '密码',
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 53a6e4a2..cf8e2dcd 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -6,16 +6,17 @@
 
     <div class="right-menu">
       <div class="hidden-sm-and-down" style="float:left;display:flex;align-items: center;height:100%;">				
-        <el-tooltip class="item" effect="dark" :content="workShop.branchId+'-'+workShop.shopId+'-'+workShop.locationId" placement="top-start">
-				<el-tag>{{workShop.branchName}}-{{workShop.locationName}}</el-tag>
+        <el-tooltip v-if="workShop.locationName" class="item" effect="dark" :content="workShop.branchId+' '+workShop.shopId+' '+workShop.locationId" placement="top-start">
+				  <el-tag>{{workShop.branchName}} {{workShop.locationName}}</el-tag>
+				</el-tooltip>
+        <el-tooltip v-else class="item" effect="dark" :content="workShop.branchId+' '+workShop.deptid" placement="top-start">
+				  <el-tag>{{workShop.branchName}} {{workShop.deptName}}</el-tag>
 				</el-tooltip>
 				<el-button @click="showSelectShopMethod" type="primary" v-if="workShop.isSuperAdmin||workShop.isPlatFormAdmin">切换商户</el-button>
 			</div>
      <error-log class="errLog-container right-menu-item hidden-sm-and-down"></error-log>
-		
-      <el-tooltip class="hidden-sm-and-down" effect="dark" :content="$t('navbar.screenfull')" placement="bottom">
-        <screenfull class="screenfull right-menu-item"></screenfull>
-      </el-tooltip>
+		 
+        <screenfull class="screenfull right-menu-item"></screenfull> 
 
       <lang-select class="international right-menu-item hidden-sm-and-down"></lang-select>
 
diff --git a/src/views/layout/components/Sidebar/Logo.vue b/src/views/layout/components/Sidebar/Logo.vue
index ac0c8d8f..f2217c2e 100644
--- a/src/views/layout/components/Sidebar/Logo.vue
+++ b/src/views/layout/components/Sidebar/Logo.vue
@@ -3,11 +3,11 @@
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title">{{ title }} </h1>
+        <h1 v-else class="sidebar-title">{{ $t('login.title') }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 class="sidebar-title">{{ title }} </h1>
+        <h1 class="sidebar-title">{{ $t('login.title') }} </h1>
       </router-link>
     </transition>
   </div>
@@ -23,9 +23,8 @@ export default {
     }
   },
   data() {
-    return {
-      title: 'Vue Element Admin',
-      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
+    return { 
+      logo: require('../../../../assets/image/logo1.png')
     }
   }
 }
@@ -46,7 +45,7 @@ export default {
   width: 100%;
   height: 50px;
   line-height: 50px;
-  background: #2b2f3a;
+  background: #3594d3;
   text-align: center;
   overflow: hidden;
 
@@ -55,17 +54,15 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 50px;
+      height: 50px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-left:-2px;
     }
-
     & .sidebar-title {
       display: inline-block;
       margin: 0;
-      color: #fff;
-      font-weight: 600;
+      color: #fff; 
       line-height: 50px;
       font-size: 14px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
@@ -75,7 +72,9 @@ export default {
 
   &.collapse {
     .sidebar-logo {
-      margin-right: 0px;
+      width: 40px;
+      height: 40px; 
+      margin-left: -2px;
     }
   }
 }
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
index f17d6199..3418bf9c 100644
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ b/src/views/layout/components/Sidebar/SidebarItem.vue
@@ -1,20 +1,6 @@
 <template>
-  <div class="menu-wrapper">
-    <template>
-      <router-link to="/">
-        <div class="logo" :class="{'has-logo': isCollapse}">
-          <img v-if="isCollapse" src="../../../../assets/image/logo1.png" alt="" />
-          <div class="logo-text" v-else>
-            <img src="../../../../assets/image/logo1.png" alt="" />
-            <div class="systemName">唛盟云</div>
-            <div class="name">项目管理系统</div>
-          </div>
-
-        </div>
-      </router-link> 
-    </template>
-    <template v-for="item in routes" v-if="!item.hidden&&item.children">
-
+  <div class="menu-wrapper"> 
+    <template v-for="item in routes" v-if="!item.hidden&&item.children"> 
       <router-link v-if="hasOneShowingChildren(item.children) && !item.children[0].children&&!item.alwaysShow" :to="item.path+'/'+item.children[0].path"
         :key="item.children[0].name">
         <el-menu-item :index="item.path+'/'+item.children[0].path" :class="{'submenu-title-noDropdown':!isNest}">
@@ -39,8 +25,7 @@
             </el-menu-item>
           </router-link>
         </template>
-      </el-submenu>
-
+      </el-submenu> 
     </template>
   </div>
 </template>
@@ -80,46 +65,6 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .logo {
-    height: 56px;
-    width: 100%;
-    // padding: 0 20px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    img {
-      width: 100%;
-    }
-    .logo-text {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #fff;
-      img {
-        width: 35%;
-      }
-      .systemName {
-        font-size: 14px;
-        font-weight: bold;
-        font-family:'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-      }
-      .name {
-        font-size: 12px;
-        font-weight: bold;
-        transform: scale(0.8);
-        // transform-origin: (left, center);
-        transform-origin: left center;
-        margin-left: 2px;
-      }
-    }
-  }
-  .has-logo {
-    width: 100%;
-    padding: 0;
-    img {
-      width: 80%;
-    }
-  }
   #app .hideSidebar .submenu-title-noDropdown-logo {
     padding: 0 !important;
   }
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 007e792d..7648f654 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template> 
   <scroll-bar>
     <el-menu
       mode="vertical"
@@ -9,6 +9,7 @@
       text-color="#bfcbd9"
       active-text-color="#409EFF"
     >
+      <logo :collapse="isCollapse"/>
       <sidebar-item :routes="permission_routers"></sidebar-item>
     </el-menu>
   </scroll-bar>
@@ -17,10 +18,11 @@
 <script>
 import { mapGetters } from 'vuex'
 import SidebarItem from './SidebarItem'
+import Logo from './Logo'
 import ScrollBar from '@/components/ScrollBar'
 
 export default {
-  components: { SidebarItem, ScrollBar },
+  components: { SidebarItem, ScrollBar,Logo },
   computed: {
     ...mapGetters([
       'permission_routers',
@@ -32,3 +34,50 @@ export default {
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .logo {
+    height: 56px;
+    width: 100%;
+    // padding: 0 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    img {
+      width: 100%;
+    }
+    .logo-text {
+      display: flex;
+      align-items: center;
+      //justify-content: center;
+      color: #fff;
+      img { 
+        //margin-left: 2px;
+        width: 35%;
+      }
+      .main-title {
+        font-size: 14px;
+        font-weight: bold;
+        font-family:'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+      }
+      .sub-title {
+        font-size: 14px;
+        font-weight: bold;
+        transform: scale(0.8);
+        // transform-origin: (left, center);
+        transform-origin: left center;
+        margin-left: 2px;
+      }
+    }
+  }
+  .has-logo {
+    width: 100%;
+    padding: 0;
+    img {
+      width: 80%;
+    }
+  }
+  #app .hideSidebar .submenu-title-noDropdown-logo {
+    padding: 0 !important;
+  }
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 192627a8..76553099 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -6,7 +6,7 @@
         <div class="logo">
           <img src="../../assets/image/logo1.png" alt="" />  
           <div class="logo-text"> 
-            <div class="systemName">{{$t('login.title')}}</div> 
+            <div class="main-title">{{$t('login.title')}}</div> 
           </div> 
         </div> 
         <lang-select class="set-language"></lang-select>
@@ -437,7 +437,7 @@ $light_gray:#ef1010;
     align-items: center;
     justify-content: center;
     color: $light_gray; 
-    .systemName {
+    .main-title {
       font-size: 35px;
       font-weight: 400;
       color: $light_gray; 
diff --git a/src/views/login/register.vue b/src/views/login/register.vue
index 8c9f4cd1..cb74fa47 100644
--- a/src/views/login/register.vue
+++ b/src/views/login/register.vue
@@ -86,35 +86,35 @@ export default {
   name: 'login',
   data() {
     const validateDisplayUserid = (rule, value, callback) => { 
-        if(value.length<=6){
+        if( !value || value.length<=6){
           callback(new Error('请输入6位以上用户账号'))
         }else{
           callback()
         }  
     }
     const validatePassword = (rule, value, callback) => { 
-        if(value.length<6){
+        if( !value || value.length<6){
           callback(new Error('密码最少为六位'))
         }else{
           callback()
         }  
     }
     const validatePhoneno = (rule, value, callback) => { 
-        if(value.length !=11 ){
+        if( !value || value.length !=11 ){
           callback(new Error('手机号码必须为11位号码'))
         }else{
           callback()
         }  
     }
     const validateSmsCode = (rule, value, callback) => { 
-        if(value.length !=6 ){
+        if( !value || value.length !=6 ){
           callback(new Error('请输入6位短信验证码'))
         }else{
           callback()
         }  
     }
     const validateUsername = (rule, value, callback) => { 
-        if(value.length <2 ){
+        if( !value || value.length <2 ){
           callback(new Error('请输入用户名称'))
         }else{
           callback()
diff --git a/src/views/login/resetPassword.vue b/src/views/login/resetPassword.vue
index 4a2e4700..5478ac47 100644
--- a/src/views/login/resetPassword.vue
+++ b/src/views/login/resetPassword.vue
@@ -76,21 +76,21 @@ export default {
   name: 'login',
   data() { 
     const validatePassword = (rule, value, callback) => { 
-        if(value.length<6){
+        if( !value || value.length<6){
           callback(new Error('密码最少为六位'))
         }else{
           callback()
         }  
     }
     const validatePhoneno = (rule, value, callback) => { 
-        if(value.length !=11 ){
+        if( !value || value.length !=11 ){
           callback(new Error('手机号码必须为11位号码'))
         }else{
           callback()
         }  
     }
     const validateSmsCode = (rule, value, callback) => { 
-        if(value.length !=6 ){
+        if( !value || value.length !=6 ){
           callback(new Error('请输入6位短信验证码'))
         }else{
           callback()
diff --git a/src/views/login/socialsignin.vue b/src/views/login/socialsignin.vue
index 30384da0..12c3c324 100644
--- a/src/views/login/socialsignin.vue
+++ b/src/views/login/socialsignin.vue
@@ -17,8 +17,8 @@ export default {
   methods: {
     wechatHandleClick(thirdpart) {
       this.$store.commit('SET_AUTH_TYPE', thirdpart)
-      const appid = 'wx0c261f0d6052439c'
-      const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/authredirect')
+      const appid = 'wx406faa04557b40c8'
+      const redirect_uri = encodeURIComponent('https://www.qingqinkj.com/api/m1/wxpub/wxpub/msg/notify?redirectUri=' + window.location.origin + '/authredirect&authId=wx_pub_test_001')
       const url = 'https://open.weixin.qq.com/connect/qrconnect?appid=' + appid + '&redirect_uri=' + redirect_uri + '&response_type=code&scope=snsapi_login#wechat_redirect'
       openWindow(url, thirdpart, 540, 540)
     },