Merge branch 'pre' of http://git.bjzxtw.org.cn:3000/zxt/admin_home into pre

src/layout/components/Navbar.vue

@@ -29,10 +29,10 @@
         </div>
 
         <el-dropdown-menu slot="dropdown" style="width: 200px;">
-          <router-link to="/examine">
+          <router-link to="/examine" v-if="msg.apply_articale.length > 0">
             <div class="userMenuDownItem">
               <el-dropdown-item>
-                <span style="display:block;">审核列表</span>
+                <span style="display:block; text-align: center; width: 100%; color: #409EFF;">审核列表</span>
               </el-dropdown-item>
             </div>
           </router-link>
@@ -46,6 +46,46 @@
             </div>
           </router-link>
 
+          <router-link to="/hall" v-if="msg.chat.length > 0">
+            <div class="userMenuDownItem">
+              <el-dropdown-item>
+                <span style="display:block;  color: #409EFF;">未读单聊</span>
+              </el-dropdown-item>
+            </div>
+          </router-link>
+
+          <router-link to="/hall" v-for="item in msg.chat" :key="item.id">
+            <div class="userMenuDownItem" style="width: 200px;">
+              <el-dropdown-item divided style="width: 200px;">
+                <el-tooltip :content="item.content" effect="dark" placement="top">
+                  <span style="display:block;width: 150px;" :alt="item.content">{{ item.content.substring(0, 10)
+                  }}</span>
+                </el-tooltip>
+              </el-dropdown-item>
+            </div>
+          </router-link>
+
+
+
+          <router-link to="/hall" v-if="msg.chat_group.length > 0">
+            <div class="userMenuDownItem">
+              <el-dropdown-item>
+                <span style="display:block; color: #409EFF;">未读群聊</span>
+              </el-dropdown-item>
+            </div>
+          </router-link>
+
+
+          <router-link to="/hall" v-for="item in msg.chat_group" :key="item.id">
+            <div class="userMenuDownItem" style="width: 200px;">
+              <el-dropdown-item divided style="width: 200px;">
+                <el-tooltip :content="item.content" effect="dark" placement="top">
+                  <span style="display:block;width: 150px;" :alt="item.content">{{ item.content.substring(0, 10)
+                  }}</span>
+                </el-tooltip>
+              </el-dropdown-item>
+            </div>
+          </router-link>
 
         </el-dropdown-menu>
       </el-dropdown>

src/store/modules/user.js

@@ -89,34 +89,37 @@ const actions = {
     return new Promise((resolve, reject) => {
       login({ username: username.trim(), password: password, type: type, captcha: captcha.trim(), code: code}).then(response => {
         const { data } = response;
-        console.log(889900)
-        //会员登录跳转 但不储存
-        if(userInfo.backurl){
-          console.log("不储存用户的userurl!")
-          //设置用户url
-          setUserUrl(userInfo.backurl,data.exp)
-          commit('SET_URL',userInfo.backurl)
-          //只设置token 不储存url
-          setToken(data.token,data.exp)
-          commit('SET_TOKEN',data.token)
-          //储存过期时间
-          setExp(data.exp,data.exp)
-          commit('SET_EXP',data.exp)
-        }
+        if(data.token==undefined){
+          console.log("登录失败！userurl非法！")
+        }else{
+          //会员登录跳转 但不储存
+          if(userInfo.backurl){
+            console.log("不储存用户的userurl!")
+            //设置用户url
+            setUserUrl(userInfo.backurl,data.exp)
+            commit('SET_URL',userInfo.backurl)
+            //只设置token 不储存url
+            setToken(data.token,data.exp)
+            commit('SET_TOKEN',data.token)
+            //储存过期时间
+            setExp(data.exp,data.exp)
+            commit('SET_EXP',data.exp)
+          }
 
-        //会员登录进入系统，储存所属url
-        if(userInfo.userurl){
-          console.log("储存用户的userurl!")
-          setUserUrl(userInfo.userurl,data.exp)
-          commit('SET_URL',userInfo.userurl)
-          //设置token
-          setToken(data.token,data.exp)
-          commit('SET_TOKEN',data.token)
-          //储存过期时间
-          setExp(data.exp,data.exp)
-          commit('SET_EXP',data.exp)
+          //会员登录进入系统，储存所属url
+          if(userInfo.userurl){
+            console.log("储存用户的userurl!")
+            setUserUrl(userInfo.userurl,data.exp)
+            commit('SET_URL',userInfo.userurl)
+            //设置token
+            setToken(data.token,data.exp)
+            commit('SET_TOKEN',data.token)
+            //储存过期时间
+            setExp(data.exp,data.exp)
+            commit('SET_EXP',data.exp)
+          }
         }
-        
+
         resolve(response)
       }).catch(error => {
         reject(error)

src/views/login/index.vue

@@ -427,7 +427,7 @@ export default {
             this.$store.dispatch('user/login', this.loginForm).then( res => {
               this.loading = false
               console.log(res)
-              if(res.code==0){
+              if(res.code==0||res.code==-1){
                 this.$message({
                   type:'error',
                   message:res.message