From fdd13dcab53a44a12dd1192e5887c3a249c59614 Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Tue, 20 Oct 2020 15:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=BB=98=E8=AE=A4=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E6=A1=86=EF=BC=9B=E6=9B=BF=E6=8D=A2=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E9=A1=B6=E9=83=A8header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/css/main.css                    |  4 +-
 public/static/img/avator_default.svg          | 17 ++++++++
 .../custom-header/components/user_center.vue  |  3 +-
 src/components/custom-header/index.vue        | 41 ++++++++++++++++---
 src/filters/resolveAvator.js                  |  2 +-
 src/views/components_web/head/head.vue        | 14 +++----
 src/views/components_web/newProj/newProj.vue  |  1 -
 src/views/main_web/index/index.vue            | 24 +++++++++++
 8 files changed, 88 insertions(+), 18 deletions(-)
 create mode 100644 public/static/img/avator_default.svg

diff --git a/public/static/css/main.css b/public/static/css/main.css
index 32028044..20f9afe6 100644
--- a/public/static/css/main.css
+++ b/public/static/css/main.css
@@ -2895,7 +2895,6 @@ button:focus {
 .user_Img img {
 	max-width: 100px;
 	max-height: 100px;
-	cursor: pointer;
 }
 
 .userNamelabel {
@@ -3060,6 +3059,9 @@ button:focus {
 .eidtimg {
 	position: relative;
 }
+.eidtimg > img {
+	cursor: pointer;
+}
 
 .eidtimg>div {
 	position: absolute;
diff --git a/public/static/img/avator_default.svg b/public/static/img/avator_default.svg
new file mode 100644
index 00000000..eb733cd1
--- /dev/null
+++ b/public/static/img/avator_default.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>模块/基本组件/头像备份</title>
+    <defs>
+        <circle id="path-1" cx="50" cy="50" r="50"></circle>
+    </defs>
+    <g id="模块/基本组件/头像备份" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Mask" fill="#D1D1D6" xlink:href="#path-1"></use>
+        <g id="Avatar" mask="url(#mask-2)">
+            <rect id="BG" x="0" y="0" width="100" height="100"></rect>
+            <path d="M100,99.3078825 L100,100 L1.66030665,100 C5.23100363,91.9169982 13.6306985,89.1904249 20.7769733,86.8083333 C21.1603171,86.6805521 21.5478067,86.5791667 21.91864,86.4666667 C32.8269733,83.1208333 35.4353067,80.225 36.41864,77.0291667 C38.2269733,76.2208333 38.9019733,75.6666667 39.2603067,73.7458333 C39.4853067,72.525 39.6603067,68.4291667 39.4894733,67.0083333 C38.45614,66 37.89364,63.4041667 37.39364,62.3666667 C36.2353067,59.9666667 36.03114,58.725 34.91864,54.6875 C34.7478067,54.1458333 34.38114,54.1125 34.1228067,54.0083333 C33.7353067,53.8458333 33.3978067,53.5875 33.0394733,53.1 C32.0269733,51.7291667 32.6603067,50.9541667 31.7103067,48.35 C30.5019733,45.3875 30.0144733,42.4625 30.9353067,41.5875 C31.55614,41.0333333 31.9728067,41.3916667 32.2769733,41.5041667 C32.4769733,41.5791667 32.3228067,41.075 32.14364,40.3458333 C31.4144733,37.3625 31.3728067,31.4125 31.3728067,31.4125 C31.1103067,28.9208333 31.1978067,26.6291667 32.8478067,23.1541667 C34.4728067,19.6041667 35.9269733,20.3875 36.74364,19.475 C40.1894733,15.5958333 43.35614,15.4958333 45.7353067,14.4708333 C51.08114,12.1625 55.5894733,14.2083333 59.19364,15.7166667 C60.7103067,16.3708333 65.13114,16.875 66.60614,20.1375 C67.46864,22.0375 68.2228067,25.2833333 68.5144733,25.575 C68.8228067,26.975 68.9894733,29.2333333 68.83114,31.7083333 C68.6353067,34.7666667 68.63114,37.2958333 67.90614,40.2791667 C67.7228067,41.0041667 67.5644733,41.5125 67.76864,41.4333333 C68.0728067,41.3208333 68.4519733,40.9083333 69.0728067,41.4625 C69.9894733,42.3375 69.8019733,45.3875 68.59364,48.35 C67.6478067,50.9541667 68.16864,51.4333333 67.5644733,52.5 C67.30614,52.9666667 67.1269733,53.5958333 66.34364,53.8791667 C66.0853067,53.975 65.76864,54.2041667 65.6478067,54.7625 C64.80614,58.6875 64.59364,59.4041667 63.7103067,62.35 C63.38114,63.45 62.6269733,65.8208333 61.63114,66.7541667 C61.4228067,68.4416667 61.9144733,72.7708333 62.1978067,73.7458333 C62.85614,76.0291667 63.4853067,76.475 64.76864,77.0291667 C66.3478067,80.3291667 67.5644733,84.6333333 79.6728067,86.5583333 C80.2228067,86.6458333 80.79364,86.7291667 81.3894733,86.8083333 C82.0779768,86.8998128 89.6948448,90.1178715 91.24364,91.6666667 C93.9380911,94.3611178 97.0681463,96.8377669 100,99.3078825 Z" fill="#E5E5EA"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/components/custom-header/components/user_center.vue b/src/components/custom-header/components/user_center.vue
index 99777bd2..65878e34 100644
--- a/src/components/custom-header/components/user_center.vue
+++ b/src/components/custom-header/components/user_center.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="user_center">
     <i
-      class="Cicon midIcon icon font_family icon-gerenshezhi"
+      class="Cicon icon font_family icon-gerenshezhi"
       title="系统设置"
       @click="openSetPain"
     />
@@ -1070,7 +1070,6 @@ export default {
   },
   async mounted() {
     const userInfo = await getUserInfo(this.$store.state.accountId);
-    console.log(userInfo);
     this.user = userInfo;
   },
   data() {
diff --git a/src/components/custom-header/index.vue b/src/components/custom-header/index.vue
index f1436e75..135594d3 100644
--- a/src/components/custom-header/index.vue
+++ b/src/components/custom-header/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="yiyun_headerbox" :class="{ white: theme === 'white', black: theme === 'black'  }">
+  <div class="yiyun_headerbox" :class="{ white: theme === 'white', black: theme === 'black', scorllbaron: isWindowScrollIng }">
     <!-- :class="isPage_workspace||isHead_display?'header_t':'header_w'" -->
     <div><!-- class="bg_f0" -->
       <div class="yiyun_warpContent">
@@ -20,10 +20,11 @@
               </div>
             </div>
           </div>
-          <div class="yiyun-col-4">
-            <div class="yiyun_headerfr_item_r">
-              <user-center v-if="showUserCenter" />
+          <div class="yiyun-col-4 right">
+            <div class="yiyun_row">
               <slot name="right" />
+              <user-center v-if="showUserCenter" />
+            </div>
               <!-- <div>
                 <span @click="openSetPain">
                   <i class="Cicon midIcon icon font_family icon-gerenshezhi" title="系统设置"></i>
@@ -32,7 +33,6 @@
                   <i class="Cicon midIcon icon font_family icon-icon_huishouzhan" title="回收站"></i>
                 </span>
               </div>-->
-            </div>
           </div>
         </div>
       </div>
@@ -63,10 +63,13 @@ export default {
   },
   data() {
     return {
+      isWindowScrollIng: false,
       noop: () => {},
     };
   },
   mounted: function () {
+    // 监听滚动事件
+    window.addEventListener("scroll", this.handleScroll.bind(this), true);
     // 隐藏消息通知
     // if (sessionStorage.userId && sessionStorage.userId != '') {
     //   this.setTip();
@@ -75,6 +78,14 @@ export default {
     // setInterval(this.loadMsg, 6 * 10000);
   },
   methods: {
+    /**
+     * 检测bigbody滚动距离添加样式
+     */
+    handleScroll: function () {
+      let scrollBody = document.getElementById("bigbody");
+      // let scrollnav = document.getElementById("bignav");
+      this.isWindowScrollIng = scrollBody.scrollTop > 0;
+    },
     navBack() {
       if(this.onBackBtnClick) {
         this.onBackBtnClick();
@@ -83,13 +94,17 @@ export default {
       this.$router.go(-1);
     },
   },
+  beforeDestroy() {
+    // 销毁监听
+    window.removeEventListener("scroll", this.handleScroll);
+  },
   watch: {
     
   },
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
   .black {
     color: #fff;
   }
@@ -101,5 +116,19 @@ export default {
     vertical-align: top;
     min-height: 10px;
     float: none;
+    &.right {
+      height: 48px;
+      .yiyun_row {
+        display: flex;
+        height: 100%;
+        justify-content: flex-end;
+        align-items: center;
+        > span, div {
+          flex: none;
+          margin-left: 24px;
+        }
+      }
+      
+    }
   }
 </style>
diff --git a/src/filters/resolveAvator.js b/src/filters/resolveAvator.js
index 24ebd3a9..cbf46bcd 100644
--- a/src/filters/resolveAvator.js
+++ b/src/filters/resolveAvator.js
@@ -1,3 +1,3 @@
 import { getFileUrl } from '@/services/oss';
 
-export default imgSrc => getFileUrl(imgSrc) || '/static/img/avator_default.jpg';
\ No newline at end of file
+export default imgSrc => getFileUrl(imgSrc) || '/static/img/avator_default.svg';
\ No newline at end of file
diff --git a/src/views/components_web/head/head.vue b/src/views/components_web/head/head.vue
index dd329e6d..daf160ba 100644
--- a/src/views/components_web/head/head.vue
+++ b/src/views/components_web/head/head.vue
@@ -1964,13 +1964,13 @@ export default {
       this.isShow();
       switch (this.$route.name) {
         //用户前台-------------------
-        case "index":
-          this.isPage_index = true;
-          this.isTitle_web = true;
-          this.isPage_Index_toolBar = true;
-          this.isPage_cloudIndex_toolBar = false;
-          this.setTip();
-          break;
+        // case "index":
+        //   this.isPage_index = true;
+        //   this.isTitle_web = true;
+        //   this.isPage_Index_toolBar = true;
+        //   this.isPage_cloudIndex_toolBar = false;
+        //   this.setTip();
+        //   break;
         case "projnotice":
           (this.isPage_projNotice = true), (this.isTitle_web = true);
           this.isPage_Index_toolBar = true;
diff --git a/src/views/components_web/newProj/newProj.vue b/src/views/components_web/newProj/newProj.vue
index 81a39aec..b7eaa510 100644
--- a/src/views/components_web/newProj/newProj.vue
+++ b/src/views/components_web/newProj/newProj.vue
@@ -1424,7 +1424,6 @@
         const templateListRes = await templateService.queryTemplateList();
         const templateList = templateListRes.Data || [];
         this.templateList = templateList;
-        console.log(templateList);
         if(this.templateList && this.templateList.length) {
           this.selectTemlateID = templateList[0].Id;
         }
diff --git a/src/views/main_web/index/index.vue b/src/views/main_web/index/index.vue
index 6ff46080..0f0ee4cc 100644
--- a/src/views/main_web/index/index.vue
+++ b/src/views/main_web/index/index.vue
@@ -17,6 +17,16 @@
 </style>
 <template>
   <div id="app" v-cloak>
+    <custom-header :backBtnTitle="currentPlatform.orgName" title="我的项目" :showUserCenter="true" >
+      <template #right>
+        <span v-on:click="toRecycle">
+          <i
+            class="Cicon icon font_family icon-icon_huishouzhan"
+            title="回收站"
+          ></i>
+        </span>
+      </template>
+    </custom-header>
     <div class="layout_content">
       <section class="yiyun_warpContent">
         <div class="yiyun-rows mt-20" id="new">
@@ -206,6 +216,7 @@
 
 <script>
 import commonJs from "@/common/webCommon";
+import CustomHeader from "@/components/custom-header";
 import DistWork from "@/views/components_web/distWork/distWork";
 import NewProj from "@/views/components_web/newProj/newProj";
 import ProjSetting from "@/views/components_web/projSetting/projSetting";
@@ -218,10 +229,12 @@ export default {
     DistWork,
     NewProj,
     ProjSetting,
+    CustomHeader,
   },
   data() {
     const { currentPlatform } = this.$store.state;
     return {
+      currentPlatform,
       isUserPerm: haveAccess(currentPlatform.accessList, AccessCode.ProjectManager),
       nowDate: "",
       nowTime: "",
@@ -297,6 +310,17 @@ export default {
     sessionStorage.dotIndex = this.ind;
   },
   methods: {
+    /**
+     * 进入回收站
+     */
+    toRecycle: function () {
+      this.$router.push({
+        name: "recycle",
+        params: {
+          title: "我的项目",
+        },
+      });
+    },
     /*
      * 关闭新建项目弹框
      */