Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/components/HeaderSearch/index.vue

 <template>
   <div :class="{'show':show}" class="header-search">
-    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
+<!--    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />-->
+    <el-image :src="searchNav"  @click.stop="click" style="width: 18px;height: 19px;vertical-align: middle;" > </el-image>
     <el-select
       ref="headerSearchSelect"
       v-model="search"
@@ -22,6 +23,7 @@
 // make search results more in line with expectations
 import Fuse from 'fuse.js/dist/fuse.min.js'
 import path from 'path'
+import searchNav from '@/assets/images/search-nav.png'
 
 export default {
   name: 'HeaderSearch',
@@ -31,7 +33,8 @@ export default {
       options: [],
       searchPool: [],
       show: false,
-      fuse: undefined
+      fuse: undefined,
+      searchNav
     }
   },
   computed: {
@@ -150,7 +153,6 @@ export default {
 <style lang="scss" scoped>
 .header-search {
   font-size: 0 !important;
-
   .search-icon {
     cursor: pointer;
     font-size: 18px;

src/components/SizeSelect/index.vue

 <template>
   <el-dropdown trigger="click" @command="handleSetSize">
     <div>
-      <svg-icon class-name="size-icon" icon-class="size" />
+<!--      <svg-icon class-name="size-icon" icon-class="size" />-->
+      <el-image style="width: 21px; height: 16px" :src="layoutLogo"></el-image>
     </div>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item v-for="item of sizeOptions" :key="item.value" :disabled="size===item.value" :command="item.value">
@@ -13,9 +14,11 @@
 </template>
 
 <script>
+import layoutLogo from '@/assets/images/layout-logo.png'
 export default {
   data() {
     return {
+      layoutLogo,
       sizeOptions: [
         { label: 'Default', value: 'default' },
         { label: 'Medium', value: 'medium' },

src/layout/components/Navbar.vue

@@ -8,8 +8,8 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
 
-        <el-badge :value="notReadTotal" class="right-menu-item">
-          <el-button size="small" @click="notRead">未读消息</el-button>
+        <el-badge :value="notReadTotal" class="right-menu-item badge">
+         <el-image style="width: 22px;height: 20px;" :src="unreadMessage"></el-image>
         </el-badge>
 
 
@@ -30,7 +30,7 @@
 
       </template>
 
-      <el-select v-model="locale" placeholder="语言" class="right-menu-item" style="width: 116px;" @change="localeChange">
+      <el-select v-model="locale" placeholder="语言" class="right-menu-item select-nav"  @change="localeChange">
         <el-option v-for="dict in langDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
       </el-select>
 
@@ -67,10 +67,12 @@ import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
 import {getLocale, saveLocale} from "@/utils/db";
 import {LangEnum} from "@/utils/constants";
+import unreadMessage from  "@/assets/images/unread-message.png"
 
 export default {
   data() {
     return {
+      unreadMessage,
       locale: getLocale(),
       // 枚举
       langDatas: LangEnum.LANG,
@@ -176,7 +178,12 @@ export default {
     &:focus {
       outline: none;
     }
-
+    ::v-deep.el-badge{
+     .el-badge__content{
+       top: 13px;
+       right:15px;
+     }
+    }
     .right-menu-item {
       display: inline-block;
       padding: 0 8px;
@@ -184,7 +191,7 @@ export default {
       font-size: 18px;
       color: #5a5e66;
       vertical-align: text-bottom;
-
+      margin-right: 6px;
       &.hover-effect {
         cursor: pointer;
         transition: background .3s;
@@ -194,7 +201,17 @@ export default {
         }
       }
     }
-
+   ::v-deep.select-nav{
+     width: 110px;
+     height: 32px;
+     vertical-align: top;
+     .el-input__inner{
+       font-size: 14px;
+       font-family: PingFang SC;
+       font-weight: 400;
+       color: #D9D9D9;
+     }
+   }
     .avatar-container {
       margin-right: 30px;
 
@@ -204,17 +221,18 @@ export default {
 
         .user-avatar {
           cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+          vertical-align: sub;
         }
 
         .el-icon-caret-bottom {
           cursor: pointer;
           position: absolute;
-          right: -20px;
-          top: 25px;
-          font-size: 12px;
+          right: -16px;
+          top: 10px;
+          font-size: 14px;
         }
       }
     }

src/views/ecw/customerToBeAssigned/index.vue

@@ -104,10 +104,13 @@
       title="客服"
       :visible.sync="transferShow"
       width="30%">
-      <div style="width: 100%;min-height: 100px">
-        <el-radio-group v-model="service">
-          <el-radio style="margin: 5px;" v-for="(item,index) in customerServiceList" :key="index" :label="item.id">{{item.nickname}}</el-radio>
-        </el-radio-group>
+      <div style="width: 100%;min-height: 200px;text-align: center;">
+<!--        <el-radio-group v-model="service">-->
+<!--          <el-radio style="margin: 5px;" v-for="(item,index) in customerServiceList" :key="index" :label="item.id">{{item.nickname}}</el-radio>-->
+<!--        </el-radio-group>-->
+        <el-select filterable v-model="service">
+          <el-option v-for="(item,index) in customerServiceList" :key="index" :label="item.nickname" :value="item.id"></el-option>
+        </el-select>
       </div>
       <span slot="footer" class="dialog-footer">
     <el-button @click="transferShow = false">取 消</el-button>
@@ -323,6 +326,7 @@ export default {
     },
     //分配客服
     distribution(row){
+      this.service = row.customerService;
       this.transferData = row;
       this.transferShow =true;
     },

src/views/ecw/oceanCustomer/index.vue

@@ -100,10 +100,13 @@
       title="客服"
       :visible.sync="transferShow"
       width="30%">
-      <div style="width: 100%;min-height: 100px">
-        <el-radio-group v-model="service">
-          <el-radio style="margin: 5px;" v-for="(item,index) in customerServiceList" :key="index" :label="item.id">{{item.nickname}}</el-radio>
-        </el-radio-group>
+      <div style="width: 100%;min-height: 200px;text-align: center">
+       <el-select filterable v-model="service">
+         <el-option v-for="(item,index) in customerServiceList" :key="index" :label="item.nickname" :value="item.id"></el-option>
+       </el-select>
+<!--        <el-radio-group v-model="service">-->
+<!--          <el-radio style="margin: 5px;" v-for="(item,index) in customerServiceList" :key="index" :label="item.id">{{item.nickname}}</el-radio>-->
+<!--        </el-radio-group>-->
       </div>
       <span slot="footer" class="dialog-footer">
     <el-button @click="transferShow = false">取 消</el-button>
@@ -334,6 +337,7 @@ export default {
     },
     //分配客服
     distribution(row){
+      this.service = row.customerService
       this.transferData = row;
       this.transferShow =true;
     },