wly首阅

src/assets/less/home.less

@@ -4,9 +4,9 @@
   // padding: 0px 10px;
   .home_title {
     height: 112px;
-    background-color: #BD8757;
+    background-color: #79BA70;
     text {
-      padding: 0 30px;
+      padding: 0 0 0 30px;
       font-size: 36px;
       color:  white;
     }
@@ -17,24 +17,23 @@
   }
   .type-wrap_content {
     // background-color:  #61A9C0;
-    padding: 0px 30px;
+    // padding: 0px 30px;
     .type-wrap {
       // background-color:  #61A9C0;;
-      margin: 20px 0px 0px 0px;
       flex-direction: row;
       .type-item {
-        padding: 0 15px;
+        // padding: 0 15px;
         justify-content: center;
         align-items: center;
         flex-direction: column;
         position: relative;
         text {
           font-size: 30px;
-          color: #999999;
+          color: #FFFFFF;
         }
 
         .cur {
-          color: #BD8757;
+          color: #FFFFFF;
           font-size: 36px;
           font-weight: bold;
         }
@@ -42,7 +41,7 @@
         .choose-bar {
           width: 38px;
           height: 4px;
-          background-color: #BD8757;
+          background-color: #FFFFFF;
           border-radius: 2px;
           margin-top: 10px;
         }
@@ -75,29 +74,44 @@
 
   .type-bar {
     background-color: #ffffff;
-    padding: 20px;
-    .search-bar__wrap {
-      flex: 1;
-      // background-color: #f7f7f7;
-      background-color: #ffffff;
-      height: 62px;
-      padding: 0 14px;
-      border-radius: 30px;
-      align-items: center;
+    padding: 20px 30px;
+    // .search-bar__wrap {
+    //   flex: 1;
+    //   // background-color: #f7f7f7;
+    //   background-color: #ffffff;
+    //   height: 62px;
+    //   padding: 0 14px;
+    //   border-radius: 30px;
+    //   align-items: center;
+
+    //   image {
+    //     margin-right: 20px;
+    //     width: 36px;
+    //     height: 36px;
+    //   }
 
+    //   text {
+    //     flex: 1;
+    //     font-size: 24px;
+    //     color: #999;
+    //   }
+    // }
+    .type-bar-item{
+      width: 100%;
+      justify-content: space-between;
       image {
-        margin-right: 20px;
-        width: 36px;
-        height: 36px;
+        width: 330px;
       }
-
-      text {
-        flex: 1;
-        font-size: 24px;
-        color: #999;
+    }
+    .function-bar-item {
+      width: 100%;
+      justify-content: space-between;
+       image {
+        width: 150px;
       }
     }
   }
+  
   .search-bar {
     padding: 24px;
     margin-left: 100px;
@@ -126,12 +140,13 @@
   }
 
   .swipe-bar {
-    height: 290px;
+    height:290px;
+    // margin-top: 13px;
     // background: linear-gradient(to bottom, #61A9C0 50%, #fff 50%);
-    
+    background-color: white;
     .swipe-item {
       // padding: 30px 24px 0px;
-      padding: 0px 30px;
+      padding: 25px 30px;
       .swipe-item__info {
         flex: 1;
         flex-direction: column;
@@ -167,10 +182,14 @@
         // border-radius: 6px;
       }
     }
+    .switch-bar{
+      margin-top: 30px;
+    }
   }
 
   .book-list__wrap {
     // padding: 0 24px;
+    margin-top: 20px;
     padding: 0px 30px;
     flex-direction: column;
     .book-list_content {

src/assets/less/my.less

@@ -3,7 +3,7 @@
   background-color: #f7f7f7;
   .page_title {
     height: 143px;
-    background-color:  #BD8757;
+    background-color:  #79BA70;
     text {
       padding: 0 30px;
       font-size: 36px;
@@ -27,7 +27,7 @@
     height: 150px;
     background-color: #fff;
     border-radius: 20px;
-    margin: 200px auto 0;
+    margin: 300px auto 0;
     padding: 30px;
     justify-content: space-between;
     align-items: center;
@@ -60,7 +60,7 @@
     .pay-btn {
       width: 150px;
       height: 60px;
-      background-color:  #BD8757;
+      background-color:  #FFA614;
       border-radius: 30px;
       align-items: center;
       text-align: center;
@@ -69,9 +69,12 @@
     }
   }
   .user-info__wrap {
-    background: linear-gradient(180deg, #BD8757 1%, #BD8757 100%);
+    // background: linear-gradient(180deg, #BD8757 1%, #BD8757 100%);
+    background-color: #79BA70;
     padding: 40px 30px 80px 30px;
     align-items: center;
+    justify-content: center;
+    flex-direction: column;
     margin-bottom: 140px;
     width: 100%;
     image {
@@ -90,12 +93,13 @@
   }
   .uesr-info__message {
     flex-direction: column;
-    justify-content: space-around;
+    justify-content: center;
+    align-items: center;
     height: 124px;
     .un-Login {
       width: 120px;
       height: 50px;
-      background-color:  #BD8757;
+      background-color:  #79BA70;
       border-radius: 30px;
       border: 1px solid #ffffff;
       justify-content: center;
@@ -119,7 +123,7 @@
   .my_coupon {
     height: 200px;
     width: 95%;
-    background-color: white;
+    // background-color: #79BA70;
     margin: 0 auto 30px;
     border-radius: 20px;
     .task-rukou-img {

src/assets/less/shelf.less

@@ -3,11 +3,11 @@
   flex-direction: column;
   // height: 100%;
   .shelf_title {
-    height: 112px;
-    background-color: #BD8757;
+    height: 142px;
+    background-color: #79BA70;
     margin-bottom: 30px;
     text {
-      padding: 0 30px;
+      padding-left: 30px;
       font-size: 36px;
       color:  white;
     }
@@ -20,16 +20,30 @@
     background-color: #F2F2F2;
     align-items: center;
     justify-content: space-around;
-
-    .shelf-first__content {
+    .image-recommend {
+      position: absolute;
+      width: 130px;
+      height: 50px;
+      right: 0px;
+      top: 0px;
+      image {
+        width: 130px;
+        height: 50px;
+      }
+    }
+    .shelf-first__content { 
+      width: 100%;
+      height: 350x;
+      align-items: center;
+      justify-content: center;
       image{
         height: 190px;
       }
       .book-info__multi {
         width:470px;
-        height: 190px;
         flex-direction: column;
         margin-left: 30px;
+
         .name {
           height: 32px;
           font-size: 32px;
@@ -40,12 +54,13 @@
   
         .intro {
           height: 100px;
+          margin-top: 20px;
           font-size: 24px;
           color: #666;
-          line-height: 33px;
+          line-height: 32px;
           lines: 2;
           text-overflow: ellipsis;
-          margin-top: 15px;
+          
         }
       }
     }
@@ -77,7 +92,6 @@
           padding: 0 14px;
           border-radius: 30px;
           align-items: center;
-
           image {
             margin-right: 20px;
             width: 36px;

src/manifest.json

@@ -1,6 +1,6 @@
 {
-  "package": "com.beidao.kuaiying.quanwang",
-  "name": "全网阅读",
+  "package": "com.beidao.kuaiying.shouyue",
+  "name": "首阅阅读",
   "versionName": "1.0.1",
   "versionCode": 1,
   "minPlatformVersion": 1070,
@@ -57,7 +57,7 @@
   "config": {
     "logLevel": "debug",
     "data": {
-      "yinsi_addr":"https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/quanwang-privacy.htm"
+      "yinsi_addr":"https://zhuishuyun.oss-cn-hangzhou.aliyuncs.com/qapp/privacy/shouyue-privacy.htm"
     }
   },
   "router": {
@@ -151,7 +151,7 @@
     "themeMode": 0,
     "pages": {
       "views/Index": {
-        "titleBarBackgroundColor":"#BD8757",
+        "titleBarBackgroundColor":"#79BA70",
         "titleBarText": "全网看书",
         "menubarData": {
           "menubar": false
@@ -159,7 +159,7 @@
         "titleBar": false
       },
       "views/Home": {
-        "titleBarText": "书城",
+        "titleBarText": "精选",
         "menubarData": {
           "menubar": false
         }

src/views/Home/index.ux

@@ -2,29 +2,30 @@
 
 <template>
   <div class="home-wrap">
-    <div class="home_title"><text>精选</text></div>
-    <div class="type-wrap_content">
-      <div class="type-wrap">
-        <block for="type in typeList">
-          <div class="type-item" @click="typeChange(type.index)">
-            <text class="{{type.index === current ? 'cur' : ''}}">{{
-              type.name
-            }}</text>
-            <text class="choose-bar" show="{{type.index === current}}"></text>
-          </div>
-        </block>
-        <!-- <text class="feebar-text"  @click="toPage('Free')">限时免费</text> -->
-      </div>
-      <div class="search-bar">
-        <div class="search-bar__wrap">
-          <text @click="toCategory">请输入书名或者作者名</text
-          ><image
-            src="https://yueduyun.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/img/search.png"
-          ></image>
+    <!-- <div class="home_title"><text>精选</text></div> -->
+    <div class="home_title">
+      <div class="type-wrap_content">
+        <div class="type-wrap">
+          <block for="type in typeList">
+            <div class="type-item" @click="typeChange(type.index)">
+              <text class="{{type.index === current ? 'cur' : ''}}">{{
+                type.name
+              }}</text>
+              <text class="choose-bar" show="{{type.index === current}}"></text>
+            </div>
+          </block>
+          <!-- <text class="feebar-text"  @click="toPage('Free')">限时免费</text> -->
         </div>
+        <!-- <div class="search-bar">
+          <div class="search-bar__wrap">
+            <text @click="toCategory">请输入书名或者作者名</text
+            ><image
+              src="https://yueduyun.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/img/search.png"
+            ></image>
+          </div>
+        </div> -->
       </div>
     </div>
-
     <!-- <div class="type-bar">
       <div class="search-bar__wrap">
         <text @click="toCategory">请输入书名或者作者名</text
@@ -33,7 +34,6 @@
         ></image>
       </div>
     </div> -->
-
     <list class="list-content">
       <list-item type="swipe" class="swipe-bar">
         <swiper class="swipe-bar" autoplay="true" indicator="false">
@@ -48,6 +48,20 @@
           </block>
         </swiper>
       </list-item>
+      <list-item class="type-bar">
+        <div class="type-bar-item">
+          <image src="../../assets/imgs/classify_img.png" @click="jump('Category')"></image>
+          <image src="../../assets/imgs/list_rank.png" @click="jump('Leaderboard')"></image>
+        </div>
+      </list-item>
+      <list-item class="type-bar">
+        <div class="function-bar-item">
+          <image src="../../assets/imgs/search_img.png" @click="toCategory"></image>
+          <image src="../../assets/imgs/task_welfare.png" @click="toTaskWelfare('Task')"></image>
+          <image src="../../assets/imgs/limit_free.png"  @click="jump('Free')"></image>
+          <image src="../../assets/imgs/recent_read.png" @click="toMyRead"></image>
+        </div>
+      </list-item>
       <!-- <list-item type="entrance">
         <div class="entrance_block">
           <div>
@@ -204,6 +218,11 @@ export default {
       }
     }
   },
+  toTaskWelfare(page) {
+    router.push({
+      uri: `/views/${page}`,
+    })
+  },
   toMyRead() {
     this.$emit('change')
   },

src/views/Index/index.ux

@@ -13,7 +13,7 @@
         <tab-content>
           <shelf-page @change="pageTohome" tabindex="{{current}}"></shelf-page>
           <home-page @change="pageSwitch" tabindex="{{current}}"></home-page>
-          <category-page tabindex="{{current}}"></category-page>
+          <!-- <category-page tabindex="{{current}}"></category-page> -->
           <my-page @customer="openCustomer" tabindex="{{current}}"></my-page>
         </tab-content>
       </tabs>
@@ -119,25 +119,25 @@ export default {
         index: 0
       },
       {
-        name: '书城',
+        name: '精选',
         title: '天天好书',
         icon: '../../assets/imgs/home.png',
         active_icon: '../../assets/imgs/home_choose.png',
         index: 1
       },
-      {
-        name: '分类',
-        title: '分类',
-        icon: '../../assets/imgs/classify.png',
-        active_icon: '../../assets/imgs/classify_choose.png',
-        index: 2
-      },
+      // {
+      //   name: '分类',
+      //   title: '分类',
+      //   icon: '../../assets/imgs/classify.png',
+      //   active_icon: '../../assets/imgs/classify_choose.png',
+      //   index: 2
+      // },
       {
         name: '我的',
         title: '个人中心',
         icon: '../../assets/imgs/my.png',
         active_icon: '../../assets/imgs/my_choose.png',
-        index: 3
+        index: 2
       }
     ],
     // current: 0,
@@ -185,7 +185,7 @@ export default {
     this.back_alert = sign_out_app_show
     this.getCoustom()
     this.getUser()
-    this.current = 1;
+    this.current = 0;
   },
   goActicity() {
     router.push({
@@ -237,7 +237,6 @@ export default {
     this.showShortPop = !value.detail.installed
   },
   watchCurrent(i) {
-    console.log('watching', i)
     this.current = i
   },
   async getUser() {

src/views/My/index.ux

@@ -13,7 +13,7 @@
           >
           <text class="un-Login" @click="goToLogin" else>未登录</text>
           <text>ID：{{ user.id }}</text>
-          <!-- <text class="vip-card" if="{{user.is_vip}}">免费阅读卡还剩{{ user.vip_days }}</text> -->
+          <text class="vip-card" if="{{user.is_vip}}">免费阅读卡还剩{{ user.vip_days }}</text>
         </div>
       </div>
       <div class="my-collect">

src/views/Shelf/index.ux

@@ -2,14 +2,19 @@
 
 <template>
   <div class="shelfs">
-    <div class="shelf_title"><text>书架</text></div>
+    <div class="shelf_title">
+      <text>书架</text>
+    </div>
     <div if="{{Object.keys(firstBook).length > 0}}" class="book_detail">
+      <div class="image-recommend">
+        <image src="../../assets/imgs/recommend-book.png"></image>
+      </div>
       <div class="shelf-first__content">
         <image src="{{firstBook.cover_url}}"></image>
         <div class="book-info__multi">
-          <text class="name">{{ firstBook.book_name }}</text>
-          <text class="intro">{{ firstBook.intro }}</text>
-          <text> {{firstBook.subtext}} </text>
+            <text class="name">{{ firstBook.book_name }}</text>
+            <text class="intro">{{ firstBook.intro }}</text>
+            <text> {{firstBook.subtext}} </text>  
         </div>
       </div>        
     </div>
@@ -188,32 +193,23 @@ export default {
         delete m.cover
         delete m.cid
       })
-    
       this.booksize = r.length
-      // 获取书架的第一本书
-      // r.forEach((element,index) => {
-      //   index === 0 ? this.firstBook = element : this.firstBook;
-      //   return;
-      // });
       if(this.booksize > 0){
         this.firstBook = r[0];
         this.firstBook.subtext = this.firstBook.author+"·"+(this.firstBook.status ==0 ? "连载·":"完结·")+(this.firstBook.size < 10000 ? this.firstBook.size : (this.firstBook.size/10000).toFixed(2)+"万");
       }
-
-      // console.log("this.firstBook:",this.firstBook,"this.firstBook.length",Object.keys(this.firstBook).length);
       this.mockList = r
       this.isinit = true
-      console.log(this.mockList);
-      // console.log("firstBook:",this.firstBook);
     })
   },
   deleteBook(book) {
     deleteShelfBook({ bid: book.book_id }).then(r => {
       this.getUserShelfBooks(true)
-    })
+    });
   },
   changeMode() {
-    this.isDelMode = !this.isDelMode
+    this.isDelMode = !this.isDelMode;
+    this.getUserShelfBooks(true)
   },
   listenMode(v) {
     this.modeText = v ? '' : '管理'