aiya mei xianshi qi

src/components/message/message.vue

@@ -45,6 +45,7 @@
 import moment from 'moment'
 import { panelStatus } from '@/utils/common'
 import { mapGetters, mapState, mapActions } from 'vuex'
+import {  emojis} from '@/utils/auth'
 import Load from '../load/moreDot'
 export default {
     data(){
@@ -127,15 +128,21 @@ export default {
         ]),
         //  在发送信息之后，将输入的内容中属于表情的部分替换成emoji图片标签
         //  再经过v-html 渲染成真正的图片
-        replaceFace (con) {
-            if(con&&con.includes('/:')) {
-                var emojis=this.user.emojis;
-                for(var i=0;i<emojis.length;i++){
-                    con = con.replace(emojis[i].reg, '<img src="static/emoji/' + emojis[i].file +'"  alt="" style="vertical-align: middle; width: 24px; height: 24px" />');
-                }   
-                return con;
-            }
-            return con;
+        replaceFace (content) {
+            let html = String(content).replace(/\n/g, "<br>")
+             for(let item of emojis){
+                let regex = new RegExp(`\\[${item.title}\\]`, 'g')
+                html = html.replace(regex, `<img class='wx-emoji' width="30px" height="30px" src='static/emoji/${item.file}'/>`)
+             }
+              return html
+            // if(con&&con.includes('/:')) {
+            //     var emojis=this.user.emojis;
+            //     for(var i=0;i<emojis.length;i++){
+            //         con = con.replace(emojis[i].title, '<img src="static/emoji/' + emojis[i].file +'"  alt="" style="vertical-align: middle; width: 24px; height: 24px" />');
+            //     }   
+            //     return con;
+            // }
+            // return con;
         }
     },
     filters: {

src/components/mycard/mycard.vue

@@ -4,16 +4,16 @@
 	    <header>
 	    	<img :src="user.img" class="avatar">
 	    	<span v-if="user.onLineStatus==10" class="paopao" @click="chageFlag=!chageFlag" style="background:#00dc41"></span>
-	    	<span v-if="user.onLineStatus==20" class="paopao" @click="chageFlag=!chageFlag" style="background:#d8bf0c"></span>
-	    	<span v-if="user.onLineStatus==30" class="paopao" @click="chageFlag=!chageFlag" style="background:#b70277"></span>
-	    	<span v-if="user.onLineStatus==90" class="paopao" @click="chageFlag=!chageFlag" style="background:#737273"></span>
+	    	<span v-if="user.onLineStatus==30" class="paopao" @click="chageFlag=!chageFlag" style="background:#d8bf0c"></span>
+	    	<span v-if="user.onLineStatus==20" class="paopao" @click="chageFlag=!chageFlag" style="background:#b70277"></span>
+	    	<span v-if="user.onLineStatus==40" class="paopao" @click="chageFlag=!chageFlag" style="background:#737273"></span>
 	    </header>
 
-	    <div class="status-panel" style="    position: absolute;z-index: 100;top: 0px;left: -100px;" v-if="chageFlag">
+	    <div class="status-panel" style="    position: absolute;z-index: 100;top: 0px;left: 60px;" v-if="chageFlag">
         	<div @click="chengeStatus(10)"><span class="paopaod" style="background:#00dc41"></span><span class="sdsd">在线</span></div>
-        	<div @click="chengeStatus(20)"><span class="paopaod" style="background:#d8bf0c"></span><span class="sdsd">休息</span></div>
-        	<div @click="chengeStatus(30)"><span class="paopaod" style="background:#b70277"></span><span class="sdsd">忙碌</span></div>
-        	<div @click="chengeStatus(90)"><span class="paopaod" style="background:#737273"></span><span class="sdsd">离线</span></div>
+        	<div @click="chengeStatus(30)"><span class="paopaod" style="background:#d8bf0c"></span><span class="sdsd">休息</span></div>
+        	<div @click="chengeStatus(20)"><span class="paopaod" style="background:#b70277"></span><span class="sdsd">忙碌</span></div>
+        	<div @click="chengeStatus(40)"><span class="paopaod" style="background:#737273"></span><span class="sdsd">离线</span></div>
         </div>
         <div v-if="chageFlag" style="width: 100%;height: 100%;position: fixed;top: 0;right: 0;" @click="chageFlag=!chageFlag"></div>
 	    <div class="navbar" @click="clearSearch">
@@ -25,12 +25,12 @@
 	         <!-- <router-link to="/main/my" class="icon iconfont icon-collection"></router-link> -->
 	    </div>
 	    <footer>
+	    	<div v-if="accountFlag" style="width: 100%;height: 100%;position: fixed; top: 0;right: 0;" @click="accountFlag=!accountFlag"></div>
+		    <div class="tool-panel" style="position:relative;z-index: 99;top: 30px;" v-if="accountFlag">
+	        	<div @click="logout"><span class="sdsd">切换账号</span></div>
+	        	<div @click="logout"><span class="sdsd">退出登录</span></div>
+	        </div>
 	        <i class="icon iconfont icon-more" @click="accountFlag=!accountFlag"></i>
-	        <div v-if="accountFlag" style="width: 100%;height: 100%;position: fixed; top: 0;right: 0;" @click="accountFlag=!accountFlag"></div>
-	    <div class="tool-panel" style="position:relative;" v-if="accountFlag">
-        	<div @click="logout"><span class="sdsd">切换账号</span></div>
-        	<div @click="logout"><span class="sdsd">退出登录</span></div>
-        </div>
 	    </footer>
 	    
 	</div>
@@ -71,6 +71,8 @@ export default {
               cancelButtonText: '取消',
               type: 'warning'
             }).then(() => {
+            	console.log('333333333333')
+              window.localStorage.clear();
               this.$message({
                 type: 'success',
                 message: '已退出!'

src/components/text/text.vue

@@ -29,7 +29,7 @@
           <transition name="showbox">
              <div class="emojiBox" v-show="showEmoji">
                  <li v-for="(item, index) in user.emojis">
-                    <img :src="'static/emoji/'+item.file" :data="item.code"   @click="chiosebiafg(item.code)">
+                    <img :src="'static/emoji/'+item.file" :data="item.title" width="30px" height="30px" @click="chiosebiafg(item.title)">
                  </li>
              </div>
           </transition>
@@ -106,7 +106,7 @@ export default {
     },
     methods: {
       chiosebiafg(code){
-        this.content +=code
+        this.content +=`[${code}]`
         this.clonese()
       },
         clonese(){
@@ -294,9 +294,7 @@ export default {
             }
         },
         sendContent(val){
-          console.log(7777777777777777777)
           this.content = val
-
         }
     }
 }
@@ -332,7 +330,7 @@ export default {
             flex-wrap: wrap
             top: -210px
             left: -100px
-            width: 300px
+            width: 600px
             height: 200px
             padding: 5px
             background-color: #fff
@@ -343,6 +341,8 @@ export default {
                 transition: all .5s
             &.showbox-enter,&.showbox-leave-active
                 opacity: 0
+            li
+              height:30px    
     textarea
         box-sizing: border-box
         padding: 0 30px

src/page/login/index.vue

@@ -25,8 +25,10 @@ export default {
   data(){
   	return {
       isLoging: false,
-  		account: 'liyinghao',
-  		password: 'baozheng0618'
+  		// account: 'liyinghao',
+  		// password: 'baozheng0618'
+      account: '',
+      password: ''
   	}
   },
   components:{

src/page/main/right-panel/baozheng/cus-service/index.vue

@@ -107,7 +107,7 @@ export default{
     data(){
       return {
         centerDialogVisible:false,
-        speechContext:'13906025858',
+        speechContext:'',
         activeName:'second',
         obs:[],
         baseInfo:[

src/page/main/right-panel/baozheng/index.vue

@@ -30,7 +30,7 @@
             <compre-picture></compre-picture>
           </div>
         </el-tab-pane> -->
-        <el-tab-pane label="其他" name="sixth"><div class="tool-body">暂时未开放此功能！</div></el-tab-pane>
+        <el-tab-pane label="其他" name="sixth"><div class="tool-body"><el-button type="danger" plain @click="logout">退出</el-button></div></el-tab-pane>
       </el-tabs>
     </div>  
   </div>
@@ -74,12 +74,14 @@ export default{
         if('second'==e.name){
 
         }
-        console.log(e.name)
-        console.log(43434)
       },
       ...mapActions('baozheng',[
         'changePanel',
+        'changeLogin'
       ]),
+      logout(){
+        this.changeLogin(false)
+      }
     }
 }
 </script>

src/page/main/right-panel/index.vue

@@ -28,8 +28,8 @@ export default{
       return {
         activeName:'second',
         ruleForm2:{
-          account:'13521750803',
-          passwd:'123123'
+          account:'',
+          passwd:''
         }
       }    
     },

src/router/index.js

 import Vue from 'vue'
 import Router from 'vue-router'
-
+import { getToken } from '@/utils/auth'
 Vue.use(Router)
 
 const router = new Router({
@@ -19,7 +19,14 @@ const router = new Router({
       children: [
           {
             path: 'chat',
-            component:()=> import('@/page/main/chat/chat.vue')
+            component:()=> import('@/page/main/chat/chat.vue'),
+            beforeEnter: (to, from, next) => {
+              if(getToken()){
+                next()
+              }else{
+                next(false)
+              }
+            }
           },
           {
             path: 'friend',

src/store/modules/baozheng.js

@@ -69,6 +69,9 @@ const baozheng = {
     },
     changeLogin({ commit, state }, value){
       commit('CHANGE_LOGINSTATUS', value)
+      if(!value){
+        auth.removeTokenChenzhen()
+      }
     },
     login:({ dispatch, commit }, value)=>{
         return new Promise((resolve, reject) => {

src/store/modules/user.js

@@ -21,7 +21,7 @@ const user = {
     userInfo:{},
     noshowMassageTotal:0,
     wsObject:null,
-    img: 'static/images/UserAvatar.jpg',
+    img: 'https://cdn-images.baozheng.cc/uploads/content/file/data/000/000/090/df6886a6.jpg',
     whichPane:panelStatus.CHART,
     messagesPage:1,
     messagesPer:30,
@@ -236,14 +236,6 @@ const user = {
           dispatch('connected')
           // storage.set('account', state)
         }).on('connect_error', () => {
-            MessageBox('连接被迫断开,重新登录！', '提示', {
-              confirmButtonText: '确定',
-              type: 'warning'
-            }).then(() => {
-              window.location.href="/"
-            }).catch(() => {
-              console.log(2)        
-            });
           console.log("connect_error")
         }).on('disconnect', () => {
             MessageBox('连接被迫断开,重新登录！', '提示', {

src/utils/baozhengRequest.js

@@ -13,6 +13,7 @@ const service = axios.create({
 service.interceptors.request.use(
   config => {
      config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+    
     // if (store.getters.token) {
       config.headers['Authorization'] = getTokenChenzhen() // 让每个请求携带自定义token 请根据实际情况自行修改
     // }
@@ -34,9 +35,9 @@ service.interceptors.response.use(
     if(response.data.code != 200){
       console.log(43434343434)
       // Message.error(response.data.message);
-      // if(response.data.code == 401){
-      //   // store.
-      // }
+      if(response.data.code == 401){
+        console.log('没登录')
+      }
     }
     return response.data
     // if (res.code !== 20000) {
@@ -74,14 +75,7 @@ service.interceptors.response.use(
       type: 'error',
       duration: 5 * 1000
     })
-     MessageBox('连接被迫断开,重新登录！', '提示', {
-              confirmButtonText: '确定',
-              type: 'warning'
-            }).then(() => {
-              window.location.href="/"
-            }).catch(() => {
-              console.log(2)        
-            });
+    
     return Promise.reject(error)
   }
 )