From b8fdaafacca7c800aab911a20ac168e2eb88378c Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 9 Sep 2022 17:56:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue | 36 +++++++++++++++------------------
 src/icons/svg/messfff.svg       | 23 +++++++++++++++++++++
 src/views/Index.vue             | 16 +++++++--------
 src/views/portal/qa/Index.vue   |  3 +++
 4 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 src/icons/svg/messfff.svg

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 08c7b467..b2922829 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -45,32 +45,35 @@
         </div>
         <div style="flex:1;display: flex;justify-content: flex-end;align-items: center;">
           <div v-if="goSearch !=10">
-            <el-input v-show="!hideSearch" placeholder="搜索" style="width: 260px;border-radius: 20px !important;" @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" class="input-with-select">
-              <el-select v-if="current == 'index'" v-model="findType" style="width: 75px;" slot="prepend" placeholder="请选择">
+            <el-input v-show="!hideSearch" placeholder="搜索" style="width: 260px;border-radius: 20px !important;" @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" >
+              <el-select  v-model="findType" style="width: 75px; border-radius:20px !important;" slot="prepend" placeholder="请选择">
                 <el-option label="课程" value="1"></el-option>
                 <el-option label="案例" value="2"></el-option>
                 <el-option label="文章" value="3"></el-option>
                 <el-option label="问答" value="4"></el-option>
                 <!-- <el-option label="专区" value="5"></el-option> -->
               </el-select>
-              <!-- <el-button slot="append" icon="el-icon-search" @click="searchJump()">搜索</el-button> -->
-              <el-button slot="append" icon="el-icon-search" @click="searchJump()" class="input-with-select-btn"></el-button>
+              <el-button  @click="searchJump()" type="primary" size="mini">搜索</el-button>
             </el-input>
           </div>
           <div class="person-action" >
             <!-- 消息 -->
-            <el-link class="person-action-index" type="primary" style="margin-right:10px;" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link>
+            <el-link v-if="current == 'qa'" class="person-action-index" type="primary" style="margin-right:10px; color:#333;" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link>
+            <el-link v-else class="person-action-index" type="primary" style="margin-right:10px; color:#fff;" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link>
             <!-- <el-link type="primary" @click="logout()" icon="el-icon-switch-button" :underline="false">退出</el-link> -->
             <el-badge class="person-action-index message-count"  :value="userMsg" :hidden="userMsg == 0">
               <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
                  <el-link  type="primary" :href="`${webBaseUrl}/message`" :underline="false">
-                  <svg-icon style="margin-right: 0;font-size:26px;" icon-class="message"></svg-icon>
+                  <svg-icon v-if="current == 'qa'"  style="margin-right: 0;font-size:26px;" icon-class="message"></svg-icon>
+                  <svg-icon v-else style="margin-right: 0;font-size:26px;" icon-class="messfff"></svg-icon>
                  </el-link>
               </el-tooltip>
             </el-badge>
             <el-dropdown class="person-action-index">
               <span class="el-dropdown-link">
-                <span style="color: #333;">学员</span><i class="el-icon-arrow-down el-icon--right"></i>
+                 <span v-if="current == 'qa'" style="color: #333;">学员</span> 
+                <span v-else style="color: #fff;">学员</span><i class="el-icon-arrow-down el-icon--right"></i>
+               
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item>学员</el-dropdown-item>
@@ -87,7 +90,8 @@
               </div>
               </a>
             </div>
-            <div style="color:#333;font-size: 16px;font-weight: 600;">{{userInfo.name}}</div>
+            <div v-if="current == 'qa'" style="color:#000;font-size: 16px;font-weight: 600;">{{userInfo.name}}</div>
+            <div v-else style="color:#fff;font-size: 16px;font-weight: 600;">{{userInfo.name}}</div>
           </div>
         </div>
       </div>
@@ -259,10 +263,8 @@ export default {
 <style scoped rel="stylesheet/scss" lang="scss">
 
   ::v-deep .el-input__inner{
-    border-radius: 20px;
-    border: 1px solid #333333;
+    border-radius: 6px;
     border-right: none;
-    background: rgba(255,255,255,0.12);
   }
 ::v-deep .el-badge__content.is-fixed {
   right: 10px;
@@ -288,7 +290,6 @@ export default {
       margin-left: 40px;
       font-size: 16px;
       font-weight: 600;
-      color: #333333 !important;
     }
     ::v-deep .message-count{
       margin-right: 20px;
@@ -332,23 +333,18 @@ export default {
   }
 }
 ::v-deep .el-input-group__prepend {
-  border-radius: 0;
+  // border-radius: 0;
 }
 ::v-deep .el-input-group__append {
   // padding: 0px 5px;
   // color: #fff;
   // background: #588afc;
-  border: 1px solid #333333;
+  // border: 1px solid #333333;
   border-radius: 0 20px 20px 0;
   border-left: none;
   background: rgba(255,255,255,0.12);
 }
- .input-with-select-btn {
-  font-size:18px !important;
-  color: #333333 !important;
-  margin: 0 !important;
-  padding: 0 !important;
-}
+ 
 .message-count a {
   color: #858d99;
   font-size: 24px;
diff --git a/src/icons/svg/messfff.svg b/src/icons/svg/messfff.svg
new file mode 100644
index 00000000..5f58fda6
--- /dev/null
+++ b/src/icons/svg/messfff.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>消息</title>
+    <defs>
+        <polygon id="path-1" points="5.0748738e-17 0 16 0 16 16 5.0748738e-17 16"></polygon>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="21.个人中心-编辑资料" transform="translate(-1527.000000, -25.000000)">
+            <g id="消息" transform="translate(1527.000000, 25.000000)">
+                <g id="编组-2" fill="#F6F7FA" opacity="0.103236607">
+                    <rect id="矩形备份" x="0" y="0" width="26" height="26" rx="13"></rect>
+                </g>
+                <g id="编组-12" transform="translate(5.000000, 5.000000)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <g id="Clip-2"></g>
+                    <path d="M12.8940698,6.91998844 C12.8940698,4.7096267 11.2903046,2.85915676 9.12938721,2.36963668 L9.12938721,1.88001156 C9.12938721,1.28239788 8.62492049,0.8 7.99996704,0.8 C7.37507951,0.8 6.87061279,1.28239788 6.87061279,1.88001156 L6.87061279,2.36963668 C4.7096075,2.85915676 3.10593017,4.7096267 3.10593017,6.91998844 L3.10593017,10.8800168 L1.6,12.3199832 L1.6,13.0399559 L14.4,13.0399559 L14.4,12.3199832 L12.8940698,10.8800168 L12.8940698,6.91998844 Z M7.99996704,15.2 C8.10542588,15.2 8.20326092,15.1927728 8.30120581,15.1711961 C8.79055677,15.077557 9.19718845,14.7536333 9.38538853,14.3216161 C9.46074765,14.1487924 9.50589722,13.9615982 9.50589722,13.7599496 L6.49412476,13.7599496 C6.49412476,14.5519847 7.17176367,15.2 7.99996704,15.2 Z" id="Fill-1" fill="#FFFFFF" mask="url(#mask-2)"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 8e0ff11e..513cd63a 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -5,7 +5,7 @@
     <div id="container" style="z-index:99;">
 <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length">
 <swiper-slide  style="margin: 0 auto;" v-for="(item , idx ) in resonimg" :key="idx" class="swiper-slide games">
-  <div class="bannbox"  :style="{ 'background': `url(${fileBaseUrl + item.image})`}" >
+  <div class="bannbox"  :style="{ 'background': `url(${fileBaseUrl + item.image}) no-repeat 100% / 100%`}" >
   </div>
   <img class="banner-img" style=" margin: 0 auto;" :src=" fileBaseUrl + item.image" alt="">
 </swiper-slide>
@@ -723,10 +723,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.swiper-pagination-fraction, .swiper-pagination-custom, .swiper-container-horizontal > .swiper-pagination-bullets {
-  width: 108px;
-  height: 38px;
-}
+// .swiper-pagination-fraction, .swiper-pagination-custom, .swiper-container-horizontal > .swiper-pagination-bullets {
+//   width: 108px;
+//   height: 38px;
+// }
 
 .bannbox{
   width: 100%;
@@ -749,11 +749,11 @@ export default {
 }
 .banner-img{
   height: 520px;
-  text-align: center;
   position:absolute;
   top: 0;
-  left: 25%;
-  z-index: 888;
+  left:0;
+  right:0;
+  transform:(-50%,-50%);
 }
 .course-banner{
     height: 520px;
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 98c73292..d6580564 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -428,6 +428,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+::v-deep.el-input__inner {
+  background-color: #fff !important;
+}
 ::v-deep .top-nav{
   color: #333;
 }