添加当前会话页面

src/App.vue

@@ -94,8 +94,8 @@ export default {
 			}
 			vm.POST('/contents/login/header',req).then((res) => {
 				if(res.code == '000000') {
-					vm.userName = res.data.userName
-					vm.authList = res.data.systemInfoList
+					vm.userName = res.data.userName;
+					vm.authList = res.data.systemInfoList;
 				}
 			})
 		}

src/router/router.js

@@ -16,6 +16,9 @@ const waitingSessionEdit = r => require.ensure([], () => r(require('../views/IM/
 const searchMessageList = r => require.ensure([], () => r(require('../views/IM/search-message/list.vue')), 'waitingSessionList')
 const searchMessageDetail = r => require.ensure([], () => r(require('../views/IM/search-message/detail.vue')), 'waitingSessionEdit')
 
+const currentSessionIndex = r => require.ensure([], () => r(require('../views/IM/current-session/index.vue')), 'currentMessageIndex')
+const currentSessionDetail = r => require.ensure([], () => r(require('../views/IM/current-session/detail.vue')), 'currentMessageDetail')
+
 export default [{
     path: '/',
     component: App,
@@ -29,12 +32,18 @@ export default [{
         }, {
             path: '/waiting-session-edit',
             component: waitingSessionEdit
-        },  {
+        }, {
             path: '/search-message-list',
             component: searchMessageList
         }, {
             path: '/search-message-detail',
             component: searchMessageDetail
+        },  {
+            path: '/current-session-index',
+            component: currentSessionIndex
+        }, {
+            path: '/current-session-detail',
+            component: currentSessionDetail
         }, {
             path: '/questionNaire',
             component: questionNaire
@@ -42,7 +51,6 @@ export default [{
             path: '/home',
             component: home
         },
-
         {
             path: '/discuss-list',
             component: discuss

src/utils/env-config.js

@@ -3,12 +3,11 @@
  */
 export const envConfig = {
   development: {
-    baseUrl: 'https://dev-sc.yunqueyi.com/',
+    baseUrl: 'https://dev-sc.yunqueyi.com',
     // // baseUrl: 'http://10.177.15.180:10202/',
     // // baseUrl: 'http://192.168.140.14:10201/',
 
-    // baseUrl: 'https://test1-sc.yunqueyi.com/',
-    //baseUrl: 'https://uat-sc.yunqueyi.com/',
+    // baseUrl: 'https://test1-sc.yunqueyi.com',
     // baseUrl:   'https://uat-sc.yunqueyi.com',
 
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",

src/views/IM/current-session/index.vue

+<template>
+  <div class="current-session-wrap">
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
+    <section class="component-content screenSet" id="screenSet">
+      <article class="left">
+        <div class="header">
+          <span>我的任务(3)</span>
+          <span>再来一个</span>
+        </div>
+        <p class="c-num">当前等待会话：4个</p>
+        <ul class="session-list">
+          <li class="item">
+            <div class="left">
+              <img src="../../../assets/image/img.jpg" alt="">
+            </div>
+            <div class="right">
+              <p class="top">
+                <span class="name">公华</span>
+                <span class="time">19:20</span>
+              </p>
+              <p class="bottom">少即是多</p>
+            </div>
+          </li>
+          <li class="item">
+
+          </li>
+          <li class="item">
+
+          </li>
+        </ul>
+      </article>
+      <article class="center">
+
+      </article>
+      <article class="right">
+
+      </article>
+    </section>
+  </div>
+</template>
+<script>
+import BreadCrumb from "@/components/breadcrumb.vue";
+import { doUpload, getFilePath } from "@/utils/qiniu-util";
+import { validateWord } from "@/utils/validate.js";
+import { openLoading, closeLoading } from "@/utils/utils";
+import * as commonUtil from "@/utils/utils";
+let vm = null;
+export default {
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      curmbFirst: "云鹊客服",
+      curmbSecond: "当前会话",
+    };
+  },
+  computed: {},
+  created() {
+
+  },
+  // 挂载到Dom完成时
+  mounted: function() {
+    commonUtil.resizeHeight();
+  },
+  methods: {
+    // 列表查询
+
+  }
+};
+</script>
+<style lang="scss" scoped>
+.current-session-wrap {
+  .component-content {
+    display: flex;
+    flex-direction: row;
+    min-height: 600px;
+    min-width: 1200px;
+    font-size: 14px;
+    .left {
+      width: 270px;
+      // padding: 0 25px 15px;
+      border-right: 2px solid #F5F5F5;
+      .header {
+        display: flex;
+        flex-direction: row;
+        height: 52px;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 25px;
+        & > span:first-child {
+          font-size: 16px;
+        }
+        & > span:last-child {
+          color: #0D9078;
+          cursor: pointer;
+        }
+      }
+      .c-num {
+        padding: 0 25px;
+        height: 40px;
+        line-height: 40px;
+        background: #FFFBE6;
+      }
+      .session-list {
+        width: 100%;
+        & > .item {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          .left {
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+            img {
+              width: 100%;
+              height: 100%;
+            }
+          }
+          .right {
+
+          }
+        }
+      }
+    }
+    .center {
+      flex: 1;
+    }
+    .right {
+      width: 240px;
+      border-left: 2px solid #F5F5F5;
+    }
+    background: #fff;
+
+  }
+}
+</style>
\ No newline at end of file

src/views/IM/search-message/list.vue

@@ -3,7 +3,7 @@
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
     <div class="component-content screenSet" id="screenSet">
       <!-- <div class="search-title">查询条件</div> -->
-      <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
+      <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;margin-right:0px;">
         <el-form ref="serchForm" inline :model="searchParam" label-width="15px" style="width:100%;text-align:right;">
             <el-form-item label="">
               <el-input clearable v-model="searchParam.theme" size="mini" placeholder="请输入用户电话" ><el-button slot="append" icon="el-icon-search"></el-button></el-input>
@@ -14,7 +14,7 @@
             <el-form-item label="">
               <el-input clearable v-model="searchParam.name" size="mini" placeholder="请输入客服名" ><el-button slot="append" icon="el-icon-search"></el-button></el-input>
             </el-form-item>
-            <el-form-item label="" style="margin-bottom: 10px;">
+            <el-form-item label="" style="position:relative;top:-8px;left:0;margin-bottom: 0px;">
                 <el-date-picker v-model="searchParam.name" size="mini" type="date" placeholder="请选择日期"></el-date-picker>
             </el-form-item>              
         </el-form>
@@ -67,7 +67,7 @@ export default {
   },
   data() {
     return {
-      curmbFirst: "客服IM",
+      curmbFirst: "云鹊客服",
       curmbSecond: "消息查询",
       searchParam: {
         theme: "",

src/views/IM/waiting-session/list.vue

@@ -36,7 +36,7 @@ export default {
   },
   data() {
     return {
-      curmbFirst: "客服IM",
+      curmbFirst: "云鹊客服",
       curmbSecond: "等待会话",
       searchParam: {
         theme: "",

src/views/layout/header.vue

@@ -17,7 +17,7 @@
       </el-dropdown>
     </div>
     <!--导航-->
-    <div class="user-info">
+    <!-- <div class="user-info">
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           {{'系统切换'}}
@@ -29,7 +29,7 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -156,8 +156,8 @@ export default {
     font-size: 16px;
     color: #838683;
     .el-dropdown-link {
-      position: relative;
-      display: inline-block;
+      display: flex;
+      align-items: center;
       padding-left: 50px;
       color: #838683;
       cursor: pointer;
@@ -165,9 +165,7 @@ export default {
       font-size: 14px;
     }
     .user-logo {
-      position: absolute;
-      left: 10px;
-      top: 20px;
+      margin-right: 6px;
       width: 30px;
       height: 30px;
       border-radius: 50%;

src/views/layout/slidebar.vue

@@ -60,7 +60,7 @@ export default {
   },
   methods: {
     getNav() {
-      this.POST("basic-data/menu/list", { systemType: 26 }).then(res => {
+      this.POST("/basic-data/menu/list", { systemType: 26 }).then(res => {
         if (res.code == "000000") {
           let { vueMenuDtos } = res.data;
 
@@ -72,7 +72,7 @@ export default {
             title: "等待会话"
           },{
             icon: null,
-            index: "waiting-session-list-1",
+            index: "current-session-index",
             subs: [],
             title: "当前会话"
           },{