浏览代码

样式修改

lilei 4 年之前
父节点
当前提交
0e4b7d2314

+ 2 - 2
src/components/NoticeIcon/NoticeIcon.vue

@@ -48,7 +48,7 @@
   </a-popover> -->
   <span @click="fetchNotice" class="header-notice" ref="noticeRef">
     <a-badge count="12">
-      <a-icon style="font-size: 16px; padding: 4px" type="bell" />
+      <a-icon style="font-size: 16px; padding: 0 5px" type="bell" />
     </a-badge>
   </span>
 </template>
@@ -88,7 +88,7 @@ export default {
   .header-notice{
     display: inline-block;
     transition: all 0.3s;
-
+    margin: 0 10px;
     span {
       vertical-align: initial;
     }

+ 2 - 17
src/components/tools/UserMenu.vue

@@ -1,17 +1,12 @@
 <template>
   <div class="user-wrapper">
     <div class="content-box">
-      <!-- <a href="https://pro.loacg.com/docs/getting-started" target="_blank">
-        <span class="action">
-          <a-icon type="question-circle-o"></a-icon>
-        </span>
-      </a> -->
       <notice-icon class="action"/>
-      <span style="margin: 0 5px;">{{ nickname }}</span>
       <a-dropdown>
         <span class="action ant-dropdown-link user-dropdown-menu">
           <!-- <a-avatar class="avatar" size="small" :src="avatar==''?defaultAvatar:avatar"/> -->
           <!-- <a-icon type="user" /> -->
+          {{ nickname }}
           <a-icon type="down" />
         </span>
         <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
@@ -21,18 +16,8 @@
               <span>修改密码</span>
             </router-link>
           </a-menu-item>
-          <!-- <a-menu-item key="1">
-            <router-link :to="{ name: 'settings' }">
-              <a-icon type="setting"/>
-              <span>账户设置</span>
-            </router-link>
-          </a-menu-item>
-          <a-menu-item key="2" disabled>
-            <a-icon type="setting"/>
-            <span>测试</span>
-          </a-menu-item> -->
           <a-menu-divider/>
-          <a-menu-item key="3">
+          <a-menu-item key="1">
             <a href="javascript:;" @click="handleLogout">
               <a-icon type="logout"/>
               <span>退出登录</span>

+ 1 - 1
src/views/salesManagement/giftRecord/list.vue

@@ -108,7 +108,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 220
+          this.tableHeight = window.innerHeight - 260
         }
         // 创建时间
         if (this.time && this.time.length > 0) {

+ 1 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -153,7 +153,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight
+          this.tableHeight = window.innerHeight - 260
         }
         // 审核时间
         if (this.time && this.time.length > 0) {

+ 1 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -220,7 +220,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 320
+          this.tableHeight = window.innerHeight - 440
         }
         // 创建时间
         if (this.time && this.time.length > 0) {

+ 1 - 1
src/views/salesManagement/salesReturn/list.vue

@@ -185,7 +185,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 320
+          this.tableHeight = window.innerHeight - 440
         }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {

+ 1 - 1
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -118,7 +118,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight
+          this.tableHeight = window.innerHeight - 260
         }
         // 创建时间
         if (this.time && this.time.length > 0) {