Merge branch 'dev/v1.0.9_zsy' of jianyu/page_pc_stationSocial into feature/v1.0.9

src/components/CustomerInfo.vue

@@ -20,7 +20,7 @@
     </div>
     <div class="info-content" v-loading="loading">
       <div class="item_" v-show="active === 1">
-        <div v-show="showProblemList && userInfo.isTourist !== 2">
+        <div v-show="showProblemList">
           <problemList :uid="userId" :list="clintProblemInfo.list" @back="viewMoreProblem"></problemList>
         </div>
         <div  v-show="!showProblemList">
@@ -39,7 +39,7 @@
             </div>
             <div v-else class="empty-text">暂无订阅</div>
           </Cell>
-          <Cell class="problem-tag-cell" v-if="clintProblemInfo.current_cycle && userInfo.isTourist !== 2">
+          <Cell class="problem-tag-cell" v-if="clintProblemInfo.current_cycle">
             <template #title>
               <span>用户问题标签</span>
               <span class="view-more" @click="viewMoreProblem(true)" v-if="clintProblemInfo.list.length > 0">更多<i class="el-icon-arrow-right"></i></span>

src/components/search/index.vue

@@ -2,19 +2,19 @@
   <div class="search-filter">
     <div class="search-item">
       <span class="search-label long-search-label">人工客服介入：</span>
-       <el-select v-model="involvedVal" placeholder="全部" clearable value-key :popper-append-to-body="false">
+      <el-select v-model="involvedVal" placeholder="全部" clearable value-key popper-class="involved-select-popover" :popper-append-to-body="false">
         <el-option
-          v-for="item in involvedOptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+            v-for="item in involvedOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
         >
         </el-option>
       </el-select>
     </div>
     <div class="search-item">
       <span class="search-label">是否游客：</span>
-      <el-select v-model="isTourist" placeholder="全部" clearable value-key :popper-append-to-body="false">
+      <el-select v-model="isTourist" placeholder="全部" clearable popper-class="tourist-select-popover" value-key :popper-append-to-body="false">
         <el-option
             v-for="item in visitorOptions"
             :key="item.value"
@@ -70,10 +70,6 @@ export default {
     return {
       // 人工客服是否介入
       involvedOptions: [
-        {
-          value: 0,
-          label: '全部'
-        },
         {
           value: 1,
           label: '是'
@@ -98,7 +94,7 @@ export default {
           label: '否'
         }
       ],
-      involvedVal: 0,
+      involvedVal: null,
       isTourist: 0,
       phoneVal: '',
       timeVal: ''
@@ -183,26 +179,46 @@ export default {
     .el-select__caret{
       line-height: 28px;
     }
+    .el-select-dropdown {
+      margin-top:0;
+      .popper__arrow{
+        display: none;
+      }
+
+    }
     .el-select-dropdown__item.selected{
       color: $color_main;
     }
-    .el-scrollbar{
-      height: 96px;
+    .involved-select-popover{
+      .el-scrollbar{
+        height: 65px;
+      }
+      .el-select-dropdown__wrap{
+        height:  65px;
+        max-height: unset;
+        overflow: auto;
+      }
     }
-    .el-select-dropdown__wrap{
-      height: 96px;
-      max-height: unset;
-      overflow: auto;
+    .tourist-select-popover{
+      .el-scrollbar{
+        height: 96px;
+      }
+      .el-select-dropdown__wrap{
+        height: 96px;
+        max-height: unset;
+        overflow: auto;
+      }
     }
+
     .el-select-dropdown__list{
       padding: 0;
     }
     .el-select-dropdown__item{
       height: 32px;
-      // &.hover,
-      // &:hover{
-      //   background-color: ;
-      // }
+       &.hover,
+       &:hover{
+         background-color: #ECECEC;
+       }
     }
   }
 }