Merge branch 'master' of iqiyoo:zhuishuyun_quickapp_front

src/api/index.js

@@ -100,19 +100,19 @@ export const deleteShelfBook = params => {
 };
 
 // 充值h5
-export const getConfigOfWxH5Pay = (params) => {
+export const getConfigOfWxH5Pay = params => {
   return fly.get("/goToH5Pay", params);
 };
 
 // 充值app
-export const getConfigOfWxAppPay = (params) => {
+export const getConfigOfWxAppPay = params => {
   return fly.get("/goToPay", params);
 };
 
 // 支付宝充值
-export const getConfigOfAliPay = (params) => {
-  return fly.get("/goToAliPay", params)
-}
+export const getConfigOfAliPay = params => {
+  return fly.get("/goToAliPay", params);
+};
 
 //获取用户信息
 export const getUserInfo = () => {
@@ -135,9 +135,9 @@ export const userSign = () => {
 };
 
 // 查询微信支付订单的成功性 - h5
-export const checkWxOrder = (order) => {
-  return fly.get("/checkOrder", { order: order })
-}
+export const checkWxOrder = order => {
+  return fly.get("/checkOrder", { order: order });
+};
 //用户签到
 export const chapterOrders = params => {
   return fly.get(
@@ -146,7 +146,15 @@ export const chapterOrders = params => {
 };
 //用户客服二维码
 export const getCustomQrcode = () => {
-  return fly.get(
-    `/customer_img`
-  );
+  return fly.get(`/customer_img`);
+};
+
+// 尾页推荐
+export const readOverRecommend = params => {
+  return fly.get("/books/readOverRecommend", params);
+};
+
+//催更
+export const urgeUpdate = params => {
+  return fly.post(`/user/urgeUpdate`, params);
 };

src/assets/less/readerover.less

@@ -0,0 +1,56 @@
+.readerover {
+  flex-direction: column;
+  padding: 20px;
+  .top-box {
+    .unfinished-box {
+      width: 100%;
+      height: 400px;
+      justify-content: center;
+      .reminder {
+        width: 200px;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        margin-top: 280px;
+      }
+    }
+    .over-box {
+      background: linear-gradient(#badaff, #fff);
+      justify-content: center;
+      border-radius: 500px;
+      width: 400px;
+      height: 400px;
+      margin: 0 auto;
+      flex-direction: column;
+      .overimg {
+        margin-top: 20px;
+        height: 300px;
+        width: 200px;
+        justify-items: center;
+        margin: 0 auto;
+      }
+      text {
+        margin: 0 auto;
+      }
+    }
+  }
+  .recommend-title {
+    margin: 20px 0;
+    width: 100%;
+    justify-content: space-between;
+  }
+  .book-info {
+    margin-left: 40px;
+    flex-direction: column;
+    align-items: flex-start;
+    .info {
+      margin-top: 30px;
+      lines: 3;
+      text-overflow: ellipsis;
+    }
+  }
+  .booklist {
+    margin-top: 20px;
+    justify-content: space-between;
+  }
+}

src/manifest.json

@@ -97,6 +97,9 @@
       },
       "views/Sign": {
         "component": "index"
+      },
+      "views/Raderover": {
+        "component": "index"
       }
     },
     "widgets": {}
@@ -163,6 +166,11 @@
       "views/Detail": {
         "titleBarText": "详情页",
         "menu": false
+      },
+      "views/Raderover": {
+        "titleBarText": "阅读器",
+        "menu": false,
+        "titleBar": false
       }
     }
   }

src/views/Raderover/index.ux

@@ -0,0 +1,73 @@
+<import name="x-book" src="../../components/book/book.ux"></import>
+<template>
+    <div class='readerover'>
+        <div class='top-box'>
+            <div if='bookstatus.status==0'>
+                <stack class="unfinished-box">
+                    <img class='' src="https://cdn-novel.iycdm.com/static/img/nocompletev2.jpg" alt="">
+                    <div>
+                        <img @click='urgeUpdate()' if='urge_status==0' class='reminder' src="../../assets/imgs/push-more.png" alt="">
+                        <img else class='reminder' src="../../assets/imgs/push-more-suc.png" alt="">
+                    </div>
+                </stack>
+            </div>
+            <div class="over-box" if='bookstatus.status==1'>
+                <img class='overimg' src="https://cdn-novel.iycdm.com/h5/complete.png" alt="">
+                <text>本书已经看完啦</text>
+            </div>
+        </div>
+        <div class='recommend-title'>
+            <text>作者推荐</text>
+            <text @click='changebooklist()'>换一换</text>
+        </div>
+        <div>
+            <x-book multi="{{true}}" width="{{180}}" book="{{bookdata[0]}}" prevent="{{true}}">
+                <div class="book-info">
+                    <text class="name">{{bookdata[0]&&bookdata[0].book_name}}</text>
+                    <div>
+                        <text class="info">{{bookdata[0]&&bookdata[0].book_summary}}</text>
+                    </div>
+                </div>
+            </x-book>
+        </div>
+        <div class='booklist'>
+            <block for="{{bookdata.slice(1)}}">
+                <x-book book='{{$item}}'></x-book>
+            </block>
+        </div>
+    </div>
+</template>
+<script>
+import { readOverRecommend, urgeUpdate } from "../../api";
+import prompt from '@system.prompt'
+
+export default {
+    protected: {
+        bid: ""
+    },
+    private: {
+        bookdata: [],
+        bookstatus: {},
+        urge_status: 0
+    },
+    onInit() {
+        this.changebooklist()
+    },
+    urgeUpdate() {
+        urgeUpdate({ bid: this.bid }).then(r => {
+            this.urge_status = 1
+            prompt.showToast({ message: '催更成功' })
+        })
+    },
+    changebooklist() {
+        readOverRecommend({ bid: this.bid }).then(r => {
+            this.bookdata = r.recommend_result
+            this.bookstatus = r.book_status
+            this.urge_status = r.book_status.urge_status
+        })
+    }
+}
+</script>
+<style lang="less">
+@import "../../assets/less/readerover.less";
+</style>

src/views/Reader/index.ux

@@ -110,6 +110,15 @@ export default {
   },
   getNextChapter() {
     console.log("get next chapter");
+    if (this.bookinfo.next_cid == 0) {
+      router.push({
+        uri: "/views/Raderover",
+        params: {
+          bid: this.bid
+        }
+      })
+      return
+    }
     this.getChapters(this.bookinfo.bid, this.bookinfo.next_cid)
   }
 }

src/views/Shelf/index.ux

@@ -11,7 +11,7 @@
       </block>
     </div>
     <div class="shelf-total {{current === 1 ? 'shelf-total__inRecent' : ''}}">
-      <text>共35本</text>
+      <text>共{{booksize}}本</text>
       <text class="manager" @click="changeMode">{{modeText}}</text>
     </div>
     <block if="current === 0">
@@ -74,6 +74,7 @@ export default {
       isDelMode: false,
       modeText: "管理",
       mockList: [],
+      booksize: 0,
       typeList: [
         {
           name: "我的书架",
@@ -103,6 +104,7 @@ export default {
         m.cover_url = m.cover
         delete m.cover
       })
+      this.booksize = r.length
       this.mockList = r
     })
   },