用户卡片信息填充 logo的客户端加载 右侧弹框的调整

components/pc/myAnswer.vue

@@ -3,7 +3,7 @@
     <div class="my-answer">
       <div class="title">这个是问题的标题</div>
       <div class="content">
-        <p class="content-secondary">我的回答<span v-if="isAdopt">(已采纳)</span></p>
+        <p class="content-secondary">我的回答<span v-if="isAdopt">(已解决)</span></p>
         <p class="content-main">这个是回答的内容</p>
       </div>
       <div class="footer">

components/pc/pageHeader.vue

@@ -4,9 +4,16 @@
     <div class="container-header">
       <div class="header-center">
         <div class="header-center-l">
-          <embed src="../../assets/svg/logo.svg" width="111" height="26"
-                 type="image/svg+xml"
-                 pluginspage="http://www.adobe.com/svg/viewer/install/" />
+          <div class="logo__wrap" >
+            <div class="abs" @click.stop="routeToHome"></div>
+            <div class="logo">
+              <embed :src="BCLogo" width="111" height="26"
+                     type="image/svg+xml"
+                     pluginspage="http://www.adobe.com/svg/viewer/install/" />
+            </div>
+          </div>
+
+
 
           <ul>
             <nuxt-link tag="li" to="/">
@@ -60,7 +67,6 @@
           <yun-icon name="notification" color="#ccc" hoverColor="#F8A06F"
                     @mouseover.native="changeStateShowBox(3)" @mouseleave.native="changeStateHideBox(3)"></yun-icon>
           <img class="user-photo" @mouseleave="changeStateHideBox(2)" :src="this.$store.state.userProfile.avatar" alt="" @mouseover="changeStateShowBox(2)" />
-          <transition  name="fade">
             <ul class="abs-box abs-box1"  v-if="showHideBox1" @mouseover="changeStateShowBox(1)" @mouseleave="changeStateHideBox(1)">
               <li>
                 <nuxt-link tag="span" to="/project/release">发布项目</nuxt-link>
@@ -81,8 +87,6 @@
 
               </li>
             </ul>
-          </transition>
-          <transition  name="fade">
           <ul class="abs-box abs-box2"  v-if="showHideBox2" @mouseover="changeStateShowBox(2)" @mouseleave="changeStateHideBox(2)">
             <li>
               <nuxt-link tag="span" to="/personal-center/home/project">我的主页</nuxt-link>
@@ -104,10 +108,8 @@
             <li @click="consoleF()">打印token</li>
             <li @click="handleLogout">安全退出</li>
           </ul>
-          </transition>
-          <transition  name="fade">
+
             <alerts-card class="abs-box3"  v-if="showHideBox3" @mouseover.native="changeStateShowBox(3)" @mouseleave.native="changeStateHideBox(3)"></alerts-card>
-          </transition>
         </div>
 
       </div>
@@ -124,7 +126,7 @@
   import AlertsCard from './alertsMessage/alertsCard';
   import config from '../../action/config';
   const Cookie = process.client ? require('js-cookie') : null
-
+  import Logo from '../../assets/svg/logo.svg'
     export default {
       name:'container-header',
       data(){
@@ -140,6 +142,7 @@
           hideBox3Time:null,
           route:'home',
           progressShow:false,
+          BCLogo:null
         }
       },
 
@@ -152,7 +155,8 @@
         this.progressShow = true;
         setTimeout(()=>{
           this.progressShow = false;
-        },900)
+        },900);
+         this.BCLogo = Logo
       },
       watch:{
         $route(route){
@@ -293,6 +297,43 @@
         .header-center-l{
           @extend %flex-row-spb;
           justify-content: flex-start;
+          .logo__wrap{
+            width:111*$length;
+            height:66*$length;
+            @extend %flex-row-center;
+            @extend %animate-transition;
+
+            position: relative;
+            &:hover{
+              filter:brightness(1.3);
+            }
+            .logo{
+              width:111*$length;
+              height:100%;
+              @extend %flex-row-center;
+
+              font-size: 0;
+              embed{
+                @extend %cursorPointer;
+                svg{
+
+                }
+              }
+
+            }
+            .abs{
+              position: absolute;
+              top:0;
+              right:0;
+              width:100%;
+              height:100%;
+              @extend %cursorPointer;
+              opacity:0;
+
+            }
+          }
+
+
 
           >ul{
             margin-left:61*$length;

components/pc/userCard.vue

@@ -13,33 +13,33 @@
       <div class="footer">
         <div class="footer-item">
           <p>项目</p>
-          <h6>{{projectNum}}</h6>
+          <h6>{{statistics.projectNum}}</h6>
         </div>
 
         <div class="footer-item">
           <p>博客</p>
-          <h6>{{blogNum}}</h6>
+          <h6>{{statistics.blogNum}}</h6>
         </div>
 
         <div class="footer-item">
           <p>回答</p>
-          <h6>{{answerNum}}</h6>
+          <h6>{{statistics.questionNum}}</h6>
         </div>
 
         <div class="footer-item">
           <p>人气</p>
-          <h6>{{popularity}}</h6>
+          <h6>{{statistics.visitedNum}}</h6>
         </div>
       </div>
     </div>
     <div class="user-card2">
       <div class="card2-item1">
         <p>关注</p>
-        <h6>{{follow}}</h6>
+        <h6>{{statistics.followedNum}}</h6>
       </div>
       <div class="card2-item2">
         <p>粉丝</p>
-        <h6>{{fans}}</h6>
+        <h6>{{statistics.fansNum}}</h6>
       </div>
     </div>
   </div>
@@ -64,6 +64,7 @@
           popularity:6,
           follow:7,
           fans:7,
+          statistics:{}
         }
       },
       props:{
@@ -93,6 +94,7 @@
               this.gender= data.gender;
               this.signature = data.signature;
               this.userAvatar = data.userAvatar;
+              this.statistics = data.statistics;
             }
           })
         },

pages/answer/index.vue

@@ -15,7 +15,7 @@
           <answer-card card-type="2" v-for="(val,index) in QuestionList" :info="val" :key="val.questionId"></answer-card>
         </card-container>
         <div class="pagination">
-          <pagination style="margin: 0 auto;" pages="pages" v-on:listenPageChange="changePage"></pagination>
+          <pagination style="margin: 0 auto;" :pages="pages" v-on:listenPageChange="changePage"></pagination>
         </div>
       </div>
       <div class="answer-container__right">