Szx 2 éve
szülő
commit
54b5070c1e

BIN
src/assets/imgs/home_free.png


BIN
src/assets/imgs/home_pre.png


BIN
src/assets/imgs/home_rank.png


BIN
src/assets/imgs/画板(8).png


+ 2 - 2
src/assets/less/category.less

@@ -17,14 +17,14 @@
           position: relative;
         }
         .cur_bar {
-          color: #000000;
+          color: #E5401C;
           font-size: 36px;
           font-weight: bold;
         }
         .choose-bar {
           width: 38px;
           height: 4px;
-          background-color: #000000;
+          background-color: #E5401C;
           border-radius: 2px;
           margin-top: 10px;
         }

+ 1 - 1
src/assets/less/home.less

@@ -23,7 +23,7 @@
     .choose-bar {
       width: 38px;
       height: 4px;
-      background-color: #fff;
+      background-color: #E5401C;
       border-radius: 2px;
       margin-top: 10px;
     }

+ 1 - 1
src/assets/less/leaderboard.less

@@ -25,7 +25,7 @@
       .choose-bar {
         width: 38px;
         height: 4px;
-        background-color: black;
+        background-color: #e5401c;
         border-radius: 2px;
         margin-top: 10px;
       }

+ 1 - 1
src/assets/less/shelf.less

@@ -89,7 +89,7 @@
           .choose-bar {
             width: 38px;
             height: 4px;
-            background-color: #000000;
+            background-color: #E5401C;
             border-radius: 2px;
             margin-top: 10px;
           }

+ 3 - 3
src/views/Free/index.ux

@@ -181,12 +181,12 @@ export default {
     position: relative;
     text {
       font-size: 30px;
-      color: #999;
+      color: #E5401C;
       // padding: 34px 0;
     }
 
     .cur {
-      color: #fff;
+      color: #E5401C;
       font-size: 36px;
       font-weight: bold;
     }
@@ -194,7 +194,7 @@ export default {
     .choose-bar {
       width: 38px;
       height: 4px;
-      background-color: #fff;
+      background-color: #E5401C;
       border-radius: 2px;
       margin-top: 10px;
     }

+ 81 - 49
src/views/Home/index.ux

@@ -25,39 +25,49 @@
     </div>
 
     <list class="list-content">
+      <list-item type="entrance">
+        <div class="entrance_block">
+          <div>
+            <image
+              src="../../assets/imgs/home_read.png"
+              @click="toMyRead"
+            ></image>
+            <text>最近阅读</text>
+          </div>
+          <div>
+            <image
+              src="../../assets/imgs/leader_board.png"
+              @click="jump('Leaderboard')"
+            ></image>
+            <text>排行榜</text>
+          </div>
+          <div>
+            <image
+              src="../../assets/imgs/home_free.png"
+              @click="jump('Free')"
+            ></image>
+            <text>限时免费</text>
+          </div>
+        </div>
+      </list-item>
+      <list-item type="swipe">
+        <swiper class="swipe-bar" autoplay="true" indicator="false">
+          <block for="b in banner.books">
+            <div class="swipe-item">
+              <image
+                class="cover"
+                src="{{b.banner_url}}"
+                @click="pageRouter(b)"
+              ></image>
+            </div>
+          </block>
+        </swiper>
+      </list-item>
+
       <block for="bookObj in list">
-        <list-item type="swipe">
-          <swiper class="swipe-bar" autoplay="true" indicator="false">
-            <block for="b in banner.books">
-              <div class="swipe-item">
-                <image
-                  class="cover"
-                  src="{{b.banner_url}}"
-                  @click="pageRouter(b)"
-                ></image>
-              </div>
-            </block>
-          </swiper>
-        </list-item>
         <list-item type="simple" class="book-list__wrap" if="$idx % 3 === 0">
           <div class="book-list_content">
             <div class="book-list__title">
-              <text>{{ bookObj.lable }}</text>
-            </div>
-            <div class="book-list">
-              <block for="book in bookObj.books">
-                <x-book multi="{{false}}" book="{{book}}"></x-book>
-              </block>
-            </div>
-          </div>
-        </list-item>
-        <list-item
-          type="multi"
-          class="book-list__wrap book-list__wrap--multi"
-          else
-        >
-          <div class="book-list_content">
-            <div class="book-list__title">
               <text class="border"></text>
               <text>{{ bookObj.lable }}</text>
             </div>
@@ -85,6 +95,22 @@
             </div>
           </div>
         </list-item>
+        <list-item
+          type="multi"
+          class="book-list__wrap book-list__wrap--multi"
+          else
+        >
+          <div class="book-list_content">
+            <div class="book-list__title">
+              <text>{{ bookObj.lable }}</text>
+            </div>
+            <div class="book-list">
+              <block for="book in bookObj.books">
+                <x-book multi="{{false}}" book="{{book}}"></x-book>
+              </block>
+            </div>
+          </div>
+        </list-item>
       </block>
     </list>
   </div>
@@ -113,10 +139,6 @@ export default {
         {
           name: '女生',
           index: 1
-        },
-        {
-          name: '限时免费',
-          index: 2
         }
       ],
       banner: [],
@@ -125,7 +147,6 @@ export default {
     }
   },
   async onInit() {
-    this.current = 1
     await this.getCityListByTabChange()
     this.$on('refreshData', this.broadevt)
     this.$watch('current', 'getCityListByTabChange')
@@ -133,11 +154,6 @@ export default {
   },
   typeChange(index) {
     this.current = index
-    if (index == 2) {
-      router.push({
-        uri: '/views/Free',
-      })
-    }
   },
   watchPropsChange(v) {
     if (v === 0) this.getCityListByTabChange(this.current)
@@ -185,6 +201,15 @@ export default {
 .home-wrap {
   background-color: #f5f5f5;
   flex-direction: column;
+  .home_title {
+    height: 112px;
+    background-color: #fff;
+    text {
+      padding: 0 30px;
+      font-size: 36px;
+      color: #E5401C;
+    }
+  }
   .type-wrap_content {
     background-color: #fff;
     .type-wrap {
@@ -199,11 +224,11 @@ export default {
         position: relative;
         text {
           font-size: 30px;
-          color: #999;
+          color: #d7d7ff;
         }
 
         .cur {
-          color: #000000;
+          color: #E5401C;
           font-size: 36px;
           font-weight: bold;
         }
@@ -211,20 +236,28 @@ export default {
         .choose-bar {
           width: 38px;
           height: 4px;
-          background-color: #000000;
+          background-color: #E5401C;
           border-radius: 2px;
           margin-top: 10px;
         }
       }
     }
   }
-
+  .free {
+    background-color: #ffffff;
+    width: 100%;
+    padding-top: 10px;
+    .free_warp {
+      margin: 0 auto;
+    }
+  }
   .entrance_block {
     background-color: #ffffff;
     width: 100%;
     padding: 30px;
     display: flex;
     justify-content: space-around;
+    text-align: center;
     div {
       flex-direction: column;
       text {
@@ -232,14 +265,15 @@ export default {
         text-align: center;
       }
       image {
-        height: 83px;
-        width: 690px;
+        margin: 0 auto;
+        height: 80px;
+        width: 80px;
       }
     }
   }
 
   .type-bar {
-    background-color: #fff;
+    background-color: #ffffff;
     padding: 20px;
     .search-bar__wrap {
       flex: 1;
@@ -262,7 +296,6 @@ export default {
       }
     }
   }
-
   .search-bar {
     padding: 24px;
 
@@ -291,10 +324,8 @@ export default {
   .swipe-bar {
     height: 260px;
     background-color: #fff;
-    border-radius: 20px;
     .swipe-item {
       padding: 0px 24px;
-
       .swipe-item__info {
         flex: 1;
         flex-direction: column;
@@ -332,6 +363,7 @@ export default {
   }
 
   .book-list__wrap {
+    padding: 0 24px;
     flex-direction: column;
     .book-list_content {
       border-radius: 20px;

+ 2 - 2
src/views/My/index.ux

@@ -171,14 +171,14 @@ export default {
     }
   },
   async watchPropsChange(v) {
-    if (v === 4) {
+    if (v === 3) {
       //let s = (await storage.get({ key: 'send_order_id' })).data
       //if (s) this.send_order_id = s
       this.getUser()
     }
   },
   broadevt(evt) {
-    if (evt.detail.current == 4) {
+    if (evt.detail.current == 3) {
       this.getUser()
     }
   },