调整首页

src/components/Header.vue

@@ -139,7 +139,7 @@ export default {
     // 切换项目
     handleCommand(command) {
       this.toUrl = "";
-      if (this.projectList[command].url !== "/bookShelf") {
+      if (this.projectList[command].url === "/bookCity") {
         this.$router.push({
           path: this.projectList[command].url,
         });
@@ -181,14 +181,30 @@ export default {
         this.headerBorder +
         "&&&" +
         this.headerBg;
-      this.$router.push({
-        path: "/" + link,
-        query: {
-          headerConfig: encodeURIComponent(url),
-          type: encodeURIComponent(type),
-          id: link === "orgManage" ? this.userMessage.org_id : "",
-        },
-      });
+      if (link !== "search") {
+        this.$router.push({
+          path: "/" + link,
+          query: {
+            headerConfig: encodeURIComponent(url),
+            type: encodeURIComponent(type),
+            id: link === "orgManage" ? this.userMessage.org_id : "",
+          },
+        });
+      } else {
+        if (this.userMessage) {
+          this.$router.push({
+            path: "/" + link,
+            query: {
+              headerConfig: encodeURIComponent(url),
+              type: encodeURIComponent(type),
+              id: link === "orgManage" ? this.userMessage.org_id : "",
+            },
+          });
+        } else {
+          this.toUrl = "/" + link;
+          this.loginFlag = true;
+        }
+      }
     },
     handleChange(com) {
       if (com === "personal") {
@@ -238,7 +254,7 @@ export default {
       font-size: 0;
       z-index: 2;
       .svg-icon {
-        width: 204px;
+        width: 224px;
         height: 32px;
         color: #ffffff;
       }

src/components/common/BookListModule.vue

@@ -32,7 +32,7 @@
         </template>
         <template v-if="name === 'baozhi'">
           <a class="img-box" @click="toSubscribe">
-            <img src="../../assets/baozhi-ding.png" class="baozhi-ding" />
+            <img src="../../assets/baozhi-ding.png" class="baozhi-dings-1" />
           </a>
         </template>
         <template v-if="name === 'jingdu'">
@@ -40,7 +40,10 @@
             <img src="../../assets/jingdu-ding.png" class="baozhi-dings" />
           </a>
         </template>
-        <div class="item-box">
+        <div
+          class="item-box"
+          :class="[name === 'kecheng' ? 'item-box-list' : '']"
+        >
           <template v-if="name === 'jingdu'">
             <BookPeruseCard
               :item="item"
@@ -52,9 +55,6 @@
               class="item item-jingdu"
               v-for="(item, index) in list"
               :key="index + 'todayNew'"
-              :style="{
-                marginLeft: index == 0 ? '0' : '24px',
-              }"
             />
           </template>
           <template v-else>
@@ -68,9 +68,6 @@
               class="item"
               v-for="(item, index) in list"
               :key="index + 'todayNew'"
-              :style="{
-                marginLeft: index == 0 ? '0' : '24px',
-              }"
             />
           </template>
         </div>
@@ -244,8 +241,14 @@ export default {
   .item-box {
     display: flex;
     flex: 1;
-    overflow: auto;
     padding-bottom: 40px;
+    flex-flow: wrap;
+    column-gap: 24px;
+    row-gap: 24px;
+    &-list {
+      flex-flow: nowrap;
+      overflow: auto;
+    }
     &::-webkit-scrollbar {
       display: none;
     }
@@ -273,7 +276,11 @@ export default {
   }
   .baozhi-dings {
     width: 304px;
-    height: 332px;
+    height: 689px;
+  }
+  .baozhi-dings-1 {
+    width: 304px;
+    height: 793px;
   }
 }
 </style>

src/views/bookShelf/components/PracticeModel.vue

@@ -352,12 +352,20 @@
                   v-else
                   src="../../../assets/voice-gif.png"
                 />
+
                 <span
                   v-if="microphoneStatus"
                   class="record-time"
                   :style="{ color: '#F2555A', fontWeight: '600' }"
                   >{{ handleDateTime(recordtime) }}</span
                 >
+                <span
+                  v-else
+                  :style="{
+                    color: colorObj.type === 'armyGreen' ? '#7C8983' : '',
+                  }"
+                  >点击录音</span
+                >
               </div>
               <div
                 class="operate-item"

src/views/bookStore/all.vue

@@ -7,24 +7,18 @@
       :LoginNavIndex="this.$route.query.from ? 1 : 0"
     />
     <div class="banner">
-      <el-carousel height="320px" trigger="click" arrow="never">
-        <el-carousel-item v-for="item in 2" :key="item">
-          <!-- 如果有跳转链接 则跳转 否则只展示 -->
-          <!-- <a v-if="item" href="#" target="_blank">
-                    <el-image
-                        class="image"
-                        :src="require('../../assets/banner'+item+'.png')"
-                        :fit="'cover'">
-                    </el-image>
-                </a> -->
-          <el-image
-            class="image"
-            :src="require('../../assets/banner' + (2 + item) + '.png')"
-            :fit="'cover'"
-          >
-          </el-image>
-        </el-carousel-item>
-      </el-carousel>
+      <el-image
+        class="image"
+        :src="require('../../assets/banner3.png')"
+        :fit="'cover'"
+        style="
+          width: 1200px;
+          height: 308px;
+          margin: 0 auto;
+          border-radius: 16px;
+        "
+      >
+      </el-image>
     </div>
     <div class="filt-box">
       <div class="filt-inner">
@@ -798,13 +792,17 @@ export default {
   padding-bottom: 50px;
   .banner {
     width: 100%;
+    margin-bottom: 40px;
     font-size: 0;
+    padding-top: 32px;
+    background: linear-gradient(180deg, #00adef 0%, rgba(0, 173, 239, 0) 100%);
     img {
       max-width: 100%;
     }
     .image {
       width: 100%;
       height: 100%;
+      display: block;
     }
   }
   .filt-box {

src/views/bookStore/index.vue

@@ -20,7 +20,12 @@
         class="image"
         :src="require('../../assets/banner3.png')"
         :fit="'cover'"
-        style="width: 1200px; height: 308px; margin: 0 auto"
+        style="
+          width: 1200px;
+          height: 308px;
+          margin: 0 auto;
+          border-radius: 16px;
+        "
       >
       </el-image>
       <!-- </el-carousel-item>
@@ -219,7 +224,7 @@ export default {
     getIssueList() {
       let MethodName = "/ShopServer/Client/ShopHomeQuery/QueryIssueList";
       let data = {
-        top_n: 4,
+        top_n: 8,
         goods_type: 2,
       };
       getLogin(MethodName, data)
@@ -255,7 +260,7 @@ export default {
     getPeruseList() {
       let MethodName = "/ShopServer/Client/ShopHomeQuery/QueryIreadArticleList";
       let data = {
-        top_n: 4,
+        top_n: 8,
       };
       getLogin(MethodName, data)
         .then((res) => {