From 5cb503c9e75627a30c9d7c6c86356392235d989d Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Sat, 8 Oct 2022 17:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=AD=E5=BF=83=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/uc.scss           |  1 +
 src/components/PortalHeader.vue     | 32 +++++++--------
 src/components/UcHeader/Index.vue   | 60 +++--------------------------
 src/layout/components/AppMain.vue   | 32 +++++++++++++--
 src/views/portal/article/Detail.vue |  2 +-
 src/views/portal/article/Index.vue  |  2 +-
 src/views/portal/qa/Answer.vue      |  2 +-
 src/views/portal/qa/Index.vue       |  2 +-
 8 files changed, 55 insertions(+), 78 deletions(-)

diff --git a/src/assets/styles/uc.scss b/src/assets/styles/uc.scss
index f1db6c34..bf1479bf 100644
--- a/src/assets/styles/uc.scss
+++ b/src/assets/styles/uc.scss
@@ -1,6 +1,7 @@
 /**
  * 用户中心的一些通用样式，定义在这里面
  */
+
  .uc-center-page{
     font-size: 18px;
     font-weight: 600;
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index c135396c..83e9d3c0 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="portal-header">
-    <div class="portal-top">
+    <div class="portal-top" :style="{color:textColor}">
         <div class="portal-top-left">
           <div class="portal-top-logo">
             <img src="../assets/logo/logo.png" v-if="current == 'qa'" style="width:160px;height: 27px;" />
@@ -8,24 +8,24 @@
           </div>
           <div class="portal-top-nav">
             <div class="top-nav" :class="current == 'index' ? 'current-nav' : ''">
-              <router-link to="/index">首页
+              <router-link to="/index" :style="{color:textColor}">首页
               <div :class="current == 'index' ? 'nav-bottbor' : ''"></div>
             </router-link></div>
-            <div class="top-nav" :class="current == 'course' ? 'current-nav' : ''">
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'course' ? 'current-nav' : ''">
               <router-link to="/course">课程
               <div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
               </router-link></div>
-            <div class="top-nav" :class="current == 'article' ? 'current-nav' : ''">
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'article' ? 'current-nav' : ''">
               <router-link to="/article">文章
               <div :class="current == 'article' ? 'nav-bottbor' : ''"></div>
               </router-link></div>
-            <div class="top-nav" :class="current == 'qa' ? 'current-nav' : ''">
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'qa' ? 'current-nav' : ''">
               <router-link to="/qa">问答
               <div :class="current == 'qa' ? 'nav-bottbor' : ''"></div>
               </router-link></div>
             <div class="top-nav">
               <el-dropdown placement="bottom" @command="handleCommand">
-                <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;">专区</span>
+                <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">专区</span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="one">BOE系列公开课</el-dropdown-item>
                   <el-dropdown-item command="two" divided>Grow180</el-dropdown-item>
@@ -35,10 +35,10 @@
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
-            <div class="top-nav" :class="current == 'case' ? 'current-nav' : ''"><router-link to="/case">推荐案例
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? 'current-nav' : ''"><router-link to="/case">推荐案例
             <div :class="current == 'case' ? 'nav-bottbor' : ''"></div>
             </router-link></div>
-            <div class="top-nav" :class="current == 'follow' ? 'current-nav' : ''"><router-link to="/follow">我的关注
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? 'current-nav' : ''"><router-link to="/follow">我的关注
             <div :class="current == 'follow' ? 'nav-bottbor' : ''"></div>
             </router-link></div>
           </div>
@@ -87,7 +87,7 @@
              </div>
              <div class="person-action-item">
                 <el-dropdown>
-                  <div class="el-dropdown-link" style="display:flex">
+                  <div class="el-dropdown-link" style="display:flex" :style="{color:textColor}">
                     <div class="person-action-index">
                       <div v-if="userInfo.avatar !== '' " class="user-avatar">
                           <img :src="userInfo.avatar"  style="width: 30px;height: 30px;"/>
@@ -107,11 +107,11 @@
                 </el-dropdown>
             </div>
             <div class="person-action-item">
-              <div v-if="current == 'qa'" class="person-action-index" style="color:#333333" @click="logout()">
+              <div v-if="current == 'qa'" class="person-action-index" :style="{color:textColor}" @click="logout()">
                 <svg-icon  style="margin-right: 4px;font-size:22px;" icon-class="black-out"></svg-icon>登出
               </div>
-              <div v-else class="person-action-index" style="color:#fff" @click="logout()">
-                <svg-icon  style="margin-right: 4px;font-size:22px;color: #333333;" icon-class="white-out"></svg-icon>登出
+              <div v-else class="person-action-index" :style="{color:textColor}" @click="logout()">
+                <svg-icon  style="margin-right: 4px;font-size:22px;" icon-class="white-out"></svg-icon>登出
               </div>
             </div>
           </div>
@@ -127,9 +127,7 @@ import apiMessage from '@/api/system/message.js';
 import apiBoeCourse from '@/api/boe/course.js';
 import InterestCollection from '@/components/Portal/interestCollection.vue'
 import GuideBox from '@/components/Portal/guideBox.vue'
-import {
-  userAvatarText
-} from "@/utils/tools.js";
+import {userAvatarText} from "@/utils/tools.js";
 export default {
   props: {
     current: {
@@ -140,6 +138,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    textColor:{
+      type: String,
+      default: '',
+    },
     goSearch:{
       type: Number,
       default: 0,
diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue
index 63044990..ad71ea4e 100644
--- a/src/components/UcHeader/Index.vue
+++ b/src/components/UcHeader/Index.vue
@@ -61,58 +61,8 @@
            <div class="learning-qus">我的U币（累计）</div>
            <div class="learning-an"><span>{{uinfo.uCurrency}}</span></div>
         </div>
-        <div @click="jumrank" class="list">
-          BOE 排行榜 >>
-        </div>
+        <div @click="jumrank" class="list"> BOE 排行榜 >></div>
       </div>
-      <!-- <div style="display: flex;justify-content: flex-start;">
-       
-        
-        <div style="padding-left: 15px;">
-          <div style="height: 38px;padding-left: 5px;">
-              <span style="font-size: 20px;font-weight: 500;color: #333;">{{userInfo.name}}</span>
-              <span style="padding-left: 10px;color: #888888;font-size: 12px;cursor: pointer;">
-                <el-link @click="toPage('/user/Setting')" icon="el-icon-setting" type="info" :underline="false">个人设置</el-link>
-              </span>
-          </div>
-          <div style="height: 35px;padding-left: 5px;color:#7a7a7a;">
-            <span style="color: #7a7a7a;padding-right: 15px;" v-if="orgInfo">{{orgInfo}}</span>
-            目前海没有实时更新的策略，暂未处理
-            <span>学习时长：{{userInfo.studyTotalH}}小时</span>
-          </div>
-          <div>
-            <router-link to="/study/index"><span :class="{identity:true,active:curIdentity==1}" @click="setCurIdentity(1)">学员</span></router-link>
-            <router-link to="/teacher/index"><span v-if="identity == 2 || identity == 5" :class="{identity:true,active:curIdentity==2}" @click="setCurIdentity(2)">教师</span></router-link>
-            <router-link to="/manager/index"><span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)">管理员</span></router-link>
-          </div>
-        </div>
-      </div> -->
-      <!-- <div style="display: flex;justify-content: flex-end;padding-top: 35px;"> -->
-        <!-- q1没有课程表，所以这里先隐藏
-          <div v-if="curIdentity==2" style="padding: 0px 40px 0px 0px;color: #1EA0FA;text-align: center;">
-            <div><i style="font-size: 40px;" class="el-icon-date"></i> <br/>授课表</div>
-          </div>
-          -->
-          <!---->
-          <!-- <div>
-            <div tabindex="1" class="upicon" @click="toPage('/user/myshare')">
-              <i  class="el-icon-share"></i>
-              <div>我分享的</div>
-            </div>
-          </div>
-          <div>
-            <div tabindex="2" class="upicon" @click="toPage('/user/toshare')">
-              <i  class="el-icon-s-promotion"></i>
-              <div>分享给我的</div>
-            </div>
-          </div>
-          <div>
-            <div tabindex="3" class="upicon" @click="toPage('/user/favorites')">
-              <i  class="el-icon-star-on"></i>
-              <div>我的收藏</div>
-            </div>
-          </div> -->
-      <!-- </div> -->
     </div>
   </div>
 </template>
@@ -184,7 +134,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
                 this.uinfo.uCurrency = item.total;
               }
             });
-           } 
+           }
         })
       },
       setCurIdentity(iden){
@@ -254,7 +204,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
          vertical-align: top;
      }
    }
-  
+
    .medalbutt{
      color: #333333;
      font-size: 14px;
@@ -262,10 +212,10 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
     //  float: left;
      margin-top: 6px;
    }
- 
+
 }
 .personalData{
- 
+
   flex: 1;
   padding-top: 40px;
   padding-left: 115px;
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5ffa877b..8729b3bc 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,12 +1,12 @@
 <template>
-  <section class="app-main xcontent">
+  <section class="app-main xuc-content">
     <div style="display: flex;">
-      <div style="height: 100%;width: 227px;">
+      <div style="height: 100%;width: 210px;">
         <uc-menu></uc-menu>
         <!-- <div style="height: 20px;"></div> -->
       </div>
       <!-- width: 990px; -->
-      <div class="main-body" style="padding: 30px 30px;flex:1; background-color: #fff;margin-left: 32px;">
+      <div class="main-body" style="padding: 30px 20px;flex:1; background-color: #fff;margin-left: 32px;">
         <!-- <div style="margin-bottom: 10px;padding:10px; border-bottom: 1px solid #dbdbdb;"> -->
           <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item :to="{ path: '/uc/index' }"><i class="el-icon-arrow-right"></i>个人中心</el-breadcrumb-item>
@@ -60,7 +60,7 @@ export default {
   //width: 1500px;
   // width: 1000px;
   // margin: 0 auto;
-  padding-top: 10px;
+  padding-top: 20px;
   position: relative;
   overflow: hidden;
 }
@@ -98,6 +98,30 @@ export default {
   display: block;
   margin: 5px 10px;
 }
+.xuc-content{
+  margin: 0px auto;
+}
+@media screen and (max-width: 1366px){
+  .xuc-content {
+    width: 1100px;
+  }
+}
+@media screen and (max-width: 1680px) and (min-width:1367px){
+  .xuc-content {
+    width: 1300px;
+  }
+}
+@media screen and (max-width: 1920px) and (min-width: 1681px){
+  .xuc-content {
+    width: 1600px;
+  }
+}
+
+@media screen and (min-width: 1921px){
+  .xuc-content {
+    width: 1800px;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue
index 170ef8d0..74b3b4c9 100644
--- a/src/views/portal/article/Detail.vue
+++ b/src/views/portal/article/Detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="article-index">
     <div class="article-banner">
-    <portal-header current="article" :goSearch="3"></portal-header>
+    <portal-header current="article" textColor="#ffffff" :goSearch="3"></portal-header>
     </div>
     <div style="padding-top:30px">
       <div class="xcontent2">
diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index b725e48e..459556e8 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -1,7 +1,7 @@
 2<template>
   <div id="article-list-content" class="article-list-content">
     <div class="article-banner">
-      <portal-header current="article" @emitInput="emitInput"></portal-header>
+      <portal-header current="article" textColor="#ffffff" @emitInput="emitInput"></portal-header>
     </div>
     <!--内容区域-->
     <div style="padding-top:30px" class="">
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index 1a3e26db..2205dd4a 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="answer-detail">
     <div class="qa-banner">
-      <portal-header current="qa" :goSearch="4"></portal-header>
+      <portal-header current="qa" textColor="#000000" :goSearch="4"></portal-header>
     </div>
     <div style="padding-top:30px" >
       <div class="xcontent2">
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 0e9287be..e6249078 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="qa-list-content" class="qa-list-content">
     <div class="qa-banner">
-      <portal-header current="qa" class="qa-nav" @emitInput="emitInput"></portal-header>
+      <portal-header current="qa" textColor="#000000" class="qa-nav" @emitInput="emitInput"></portal-header>
     </div>
 
     <div style="padding-top:30px" class="portal-content">