Explorar el Código

各页面增加提示

natasha hace 5 días
padre
commit
d7306fa9a4

+ 1 - 1
src/App.vue

@@ -129,6 +129,6 @@ export default {
   background: #f2f3f5;
   // min-width: 1440px;
   min-height: 100%;
-  padding-top: 64px;
+  padding-top: 96px;
 }
 </style>

+ 109 - 68
src/components/Header.vue

@@ -2,75 +2,89 @@
   <!-- 顶部登录导航 -->
 
   <!-- :style="{ background: headerBg }" -->
+
   <div class="LoginNav" :class="[type == 'black' ? 'LoginNav-black' : '']">
-    <div class="logo">
-      <div class="logo-name" @click="cutLoginReg">
-        <!-- 二十一世纪英语智慧阅读平台 -->
-        <!-- <img src="../assets/logo.png" /> -->
-        <svg-icon icon-class="logos"></svg-icon>
-      </div>
-      <ul class="logo-projectlist">
-        <li
-          v-for="(itemI, indexI) in projectList"
-          :key="indexI"
-          :class="indexI == LoginNavIndex ? 'active' : ''"
-          @click="handleCommand(indexI)"
-        >
-          {{ itemI.name }}
-          <!-- <img
+    <div class="LoginNav-inner">
+      <div class="logo">
+        <div class="logo-name" @click="cutLoginReg">
+          <!-- 二十一世纪英语智慧阅读平台 -->
+          <!-- <img src="../assets/logo.png" /> -->
+          <svg-icon icon-class="logos"></svg-icon>
+        </div>
+        <ul class="logo-projectlist">
+          <li
+            v-for="(itemI, indexI) in projectList"
+            :key="indexI"
+            :class="indexI == LoginNavIndex ? 'active' : ''"
+            @click="handleCommand(indexI)"
+          >
+            {{ itemI.name }}
+            <!-- <img
             class="active-img"
             v-if="indexI == LoginNavIndex"
             src="../assets/common/header_active.png"
           /> -->
-        </li>
-      </ul>
-    </div>
-    <div class="userName">
-      <!-- <div :style="{background : userBg}" @click="handleLink('search','')"><img src="../assets/common/icon-search.png" /><label>搜索</label></div> -->
-      <!-- <div :style="{background : userBg}"><img src="../assets/common/icon-shopping.png" /><label>购物车</label></div> -->
-      <!-- <div :style="{background : userBg}" @click="handleLink('peraonal','like')"><img src="../assets/common/icon-like.png" /><label>收藏夹</label></div> -->
-      <!-- <div :style="{background : userBg}" @click="handleLink('peraonal','')"><img src="../assets/common/icon-user.png" /></div> -->
-      <div
-        @click="handleLink('search', '')"
-        title="搜索"
-        class="search-btn"
-        aria-placeholder="搜索内容"
-      >
-        <svg-icon icon-class="search"></svg-icon>
-        搜索内容
+          </li>
+        </ul>
       </div>
-      <!-- <div @click="handleLink('peraonal','like')" title="收藏夹"><svg-icon icon-class="like-line"></svg-icon></div> -->
-      <div class="login" v-if="!userShow">
-        <a @click="toLogin">登录</a>
-        <a @click="handleLink('register', '')">注册</a>
+      <div class="userName">
+        <!-- <div :style="{background : userBg}" @click="handleLink('search','')"><img src="../assets/common/icon-search.png" /><label>搜索</label></div> -->
+        <!-- <div :style="{background : userBg}"><img src="../assets/common/icon-shopping.png" /><label>购物车</label></div> -->
+        <!-- <div :style="{background : userBg}" @click="handleLink('peraonal','like')"><img src="../assets/common/icon-like.png" /><label>收藏夹</label></div> -->
+        <!-- <div :style="{background : userBg}" @click="handleLink('peraonal','')"><img src="../assets/common/icon-user.png" /></div> -->
+        <div
+          @click="handleLink('search', '')"
+          title="搜索"
+          class="search-btn"
+          aria-placeholder="搜索内容"
+        >
+          <svg-icon icon-class="search"></svg-icon>
+          搜索内容
+        </div>
+        <!-- <div @click="handleLink('peraonal','like')" title="收藏夹"><svg-icon icon-class="like-line"></svg-icon></div> -->
+        <div class="login" v-if="!userShow">
+          <a @click="toLogin">登录</a>
+          <a @click="handleLink('register', '')">注册</a>
+        </div>
+        <el-dropdown @command="handleChange" v-else>
+          <span class="el-dropdown-link">
+            <el-image
+              :src="
+                touxiang
+                  ? touxiang
+                  : userMessage.image_url
+                  ? userMessage.image_url
+                  : require('../assets/avatar.png')
+              "
+              fit="cover"
+              style="width: 24px; height: 24px; margin: 0 8px"
+            >
+            </el-image>
+            <span class="name">{{ userMessage.user_name }}</span
+            ><i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="personal">个人中心</el-dropdown-item>
+            <el-dropdown-item
+              command="orgManage"
+              v-if="userMessage.is_org_manager === 'true'"
+              >机构管理</el-dropdown-item
+            >
+            <el-dropdown-item command="logout">退出登录</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </div>
-      <el-dropdown @command="handleChange" v-else>
-        <span class="el-dropdown-link">
-          <el-image
-            :src="
-              touxiang
-                ? touxiang
-                : userMessage.image_url
-                ? userMessage.image_url
-                : require('../assets/avatar.png')
-            "
-            fit="cover"
-            style="width: 24px; height: 24px; margin: 0 8px"
-          >
-          </el-image>
-          <span class="name">{{ userMessage.user_name }}</span
-          ><i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="personal">个人中心</el-dropdown-item>
-          <el-dropdown-item
-            command="orgManage"
-            v-if="userMessage.is_org_manager === 'true'"
-            >机构管理</el-dropdown-item
+    </div>
+    <div class="notice">
+      <div class="notice-content">
+        <img :src="require('../assets/notice.png')" />
+        <span>
+          因附带数字阅读功能,需后台制作,智慧阅读平台数字报刊更新时间为:报纸出版<b
+            >当周周二17:30</b
           >
-          <el-dropdown-item command="logout">退出登录</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+          (寒暑假除外)。</span
+        >
+      </div>
     </div>
     <el-dialog
       :visible.sync="loginFlag"
@@ -238,19 +252,24 @@ export default {
 
 <style lang="scss" scoped>
 .LoginNav {
-  height: 64px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  box-sizing: border-box;
-  background: #00adef;
+  height: 96px;
+
   // border-bottom: 1px solid rgba(255, 255, 255, 0.12);
   z-index: 10;
-  padding: 0 24px;
   position: fixed;
   width: 100%;
   top: 0;
   left: 0;
+  background: #00adef;
+  &-inner {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding: 0 24px;
+    height: 64px;
+  }
+
   .logo {
     display: flex;
     align-items: center;
@@ -399,6 +418,28 @@ export default {
   //   }
   // }
 }
+.notice {
+  width: 100%;
+  background: #f8d7da;
+  padding: 5px 0;
+  &-content {
+    width: 1200px;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    color: #721c24;
+    gap: 10px;
+    font-size: 16px;
+    justify-content: center;
+    img {
+      width: 22px;
+    }
+    b {
+      font-size: 18px;
+      color: #ee1c24;
+    }
+  }
+}
 </style>
 <style lang="scss">
 .LoginNav {

+ 1 - 1
src/styles/index.scss

@@ -84,7 +84,7 @@ ul {
     position: fixed;
     width: 100%;
     left: 0;
-    top: 64px;
+    top: 96px;
     z-index: 3;
     &-left {
         display: flex;

+ 1 - 1
src/views/bookShelf/articleDetail.vue

@@ -1952,7 +1952,7 @@ export default {
     .mene-right {
       position: fixed;
       right: 10px;
-      top: 144px;
+      top: 176px;
       width: 152px;
       max-height: 80%;
       overflow: auto;

+ 2 - 2
src/views/bookStore/Subscribe.vue

@@ -7,13 +7,13 @@
       :LoginNavIndex="1"
       ref="header"
     />
-    <div class="notice">
+    <!-- <div class="notice">
       <div class="notice-content">
         <img :src="require('../../assets/notice.png')" />
         因附带数字阅读功能,需后台制作,智慧阅读平台数字报刊更新时间为:报纸出版当周周二17:30
         (寒暑假除外)。
       </div>
-    </div>
+    </div> -->
     <div class="navBar" v-if="info">
       <div class="navBar-left">
         <a class="goback" @click="$router.go(-1)"

+ 1 - 27
src/views/bookStore/index.vue

@@ -6,13 +6,7 @@
       :userBg="'rgba(0, 0, 0, 0.24)'"
       :LoginNavIndex="1"
     />
-    <div class="notice">
-      <div class="notice-content">
-        <img :src="require('../../assets/notice.png')" />
-        因附带数字阅读功能,需后台制作,智慧阅读平台数字报刊更新时间为:报纸出版当周周二17:30
-        (寒暑假除外)。
-      </div>
-    </div>
+
     <div class="banner">
       <!-- <el-carousel
         type="card"
@@ -512,26 +506,6 @@ export default {
     line-height: 1.4;
   }
 }
-.notice {
-  position: fixed;
-  width: 100%;
-  background: linear-gradient(118deg, #ae52c5 14.09%, #fff2cc 97.82%);
-  padding: 5px 0;
-  z-index: 1;
-  &-content {
-    width: 1200px;
-    margin: 0 auto;
-    display: flex;
-    align-items: center;
-    color: #fff;
-    gap: 10px;
-    font-size: 18px;
-    justify-content: center;
-    img {
-      width: 22px;
-    }
-  }
-}
 </style>
 <style lang="scss">
 .el-carousel__item--card {