Merge branch '6.3' into 6.5

src/App.vue

@@ -144,7 +144,7 @@ export default {
     // 监听用户信息变化，只在初始化时获取一次任务数据
     userInfo: {
       handler(newVal, oldVal) {
-        if (newVal && newVal.id && (!oldVal || !oldVal.id)) {
+        if (newVal && newVal.id && (!oldVal || !oldVal.id) && this.token) {
           console.log('用户信息初始化完成，获取任务数据:', newVal)
           // 只在用户信息第一次设置时获取任务数据
           this.getTaskUnReadData()

src/api/user.js

@@ -125,6 +125,20 @@ export function getClientStatus(data) {
     data
   })
 }
-
-
+// 获取客服号绑定的客服人员
+export function getUserList(data) {
+  return request({
+    url: '/api/corp/getCserByUser',
+    method: 'post',
+    data
+  })
+}
+// 选择客服人员登录
+export function cserSelected(data) {
+  return request({
+    url: '/api/sidebar_login/cserSelected',
+    method: 'post',
+    data
+  })
+}
 

src/router/index.js

@@ -86,7 +86,7 @@ const routes = [
   {
     path: '/login',
     name: 'login',
-    component: () => import('../views/login.vue')
+    component: () => import('../views/newLogin.vue')
   },
 ]
 const router = new VueRouter({

src/views/userInfo/userInfo.vue

@@ -22,7 +22,7 @@ import roleInfo from '@/views/roleInfo.vue'
 import orderList from '@/views/orderList.vue'
 import violationRecord from '@/views/ViolationRecord.vue'
 import { mapState, mapMutations } from 'vuex'
-
+import Cookies from 'js-cookie'
 export default {
   name: 'userInfo',
   components: {