解决冲突

src/api/index.js

@@ -15,8 +15,8 @@ export const getHomeList = (sex) => {
 
 
 //充值记录
-export const rechargeApi = () => {
-  return fly.get("/order/chargeRecordLists");
+export const rechargeApi = (params) => {
+  return fly.get("/order/chargeRecordLists",params);
 };
 
 
@@ -42,7 +42,15 @@ export const getSimilarBooks = (category_id, bid) => {
     bid
   })
 }
-
+//获取章节消费记录
+export const chapterApi = (params) => {
+  return fly.get("/order/chapterOrderList",params);
+};
+//获取全本消费记录
+export const bookApi = (params) => {
+  console.log('aaaa')
+  return fly.get("/order/bookOrderList",params);
+};
 // 获取充值列表
 export const getChargeList = () => {
   return fly.get("/order/chargeList");
@@ -52,4 +60,7 @@ export const getChargeList = () => {
 export const getUserShelfBooks = () => {
   return fly.get(`/userShelfBooks`);
 };
-
+//获取用户信息
+export const getUserInfo = () => {
+  return fly.get(`/userinfo`);
+};

src/manifest.json

@@ -46,7 +46,7 @@
     "logLevel": "debug"
   },
   "router": {
-    "entry": "views/Shelf",
+    "entry": "views/Index",
     "pages": {
       "views/Index": {
         "component": "index"

src/views/Consume/index.ux

@@ -12,50 +12,108 @@
     </div>
     <list class="consume-wrap">
       <block if="curTab === 0">
-        <block for="consumeList">
+        <block for="{{chapter.list}}">
           <list-item type="chapter" class="consume-item">
             <div class="consume-info">
-              <text class="name">爱妃在上</text>
-              <text class="chapter">第339章：爱妃，好久不见</text>
-              <text class="create">2019-08-28 14:11:11</text>
+              <text class="name">{{$item.book_name}}</text>
+              <text class="chapter">{{$item.chapter_name}}</text>
+              <text class="create">{{$item.created_at}}</text>
             </div>
-            <text class="consume-price">54 书币</text>
+            <text class="consume-price">{{$item.fee}}书币</text>
           </list-item>
         </block>
       </block>
       <block elif="curTab === 1">
-        <block for="consumeList">
+        <block for="{{book.list}}">
           <list-item type="book" class="consume-item">
             <div class="consume-info">
-              <text class="name">爱妃在上</text>
-              <text class="create">2019-08-28 14:11:11</text>
+              <text class="name">{{$item.book_name}}</text>
+              <text class="create">{{$item.created_at}}</text>
             </div>
-            <text class="consume-price">54 书币</text>
+            <text class="consume-price">{{$item.fee}}书币</text>
           </list-item>
         </block>
       </block>
       <list-item type="page" class="consume-wrap">
-        <x-page current="{{1}}" total="{{2}}" @prev="prev" @next="next"></x-page>
+        <x-page current="{{currentPage.current}}" total="{{currentPage.total}}" @prev="prev" @next="next"></x-page>
       </list-item>
     </list>
   </div>
 </template>
 
 <script>
+import { chapterApi, bookApi } from "../../api/index";
 export default {
   private: {
     curTab: 0,
     tabs: ["章节", "整本"],
-    consumeList: [1, 2, 3, 4, 5, 5, 23, 523, 213, 1, 23, 3, 4, 2, 1],
+    chapter: {
+      list: [],
+      page: {
+        total: 0,
+        current: 1
+      },
+    },
+    book: {
+      list: [],
+      page: {
+        total: 0,
+        current: 1
+      },
+    },
+    currentPage: {
+      total: 0,
+      current: 1
+    }
+
+  },
+  onInit() {
+    this.getOrderChapter();
+  },
+  async getOrderChapter(page = 1, page_size = 10) {
+    let res = await chapterApi({ page: page, page_size });
+    let { list, meta } = res;
+    let pages = { total: meta.last_page, current: meta.current_page };
+    this.chapter = { ...this.chapter, list, page: pages };
+    this.currentPage = pages;
+  },
+  async getOrderBook(page = 1, page_size = 2) {
+    let res = await bookApi({ page: page, page_size });
+    let { list, meta } = res;
+    let pages = { total: meta.last_page, current: meta.current_page };
+    this.book = { ...this.book, list, page: pages };
+    this.currentPage = pages;
   },
   tabChange(index) {
     this.curTab = index;
+    switch (index) {
+      case 0:
+        this.getOrderChapter();
+        break;
+      case 1:
+        this.getOrderBook();
+        break;
+    }
   },
   prev() {
-    console.log("上一页");
+    switch (this.curTab) {
+      case 0:
+        this.getOrderChapter(--this.currentPage.current);
+        break;
+      case 1:
+        this.getOrderBook(--this.currentPage.current);
+        break;
+    }
   },
   next() {
-    console.log("下一页");
+    switch (this.curTab) {
+      case 0:
+        this.getOrderChapter(++this.currentPage.current);
+        break;
+      case 1:
+        this.getOrderBook(++this.currentPage.current);
+        break;
+    }
   }
 }
 </script>

src/views/Recharge/index.ux

@@ -10,7 +10,7 @@
       <div class="balance-bar">
         <div class="balance">
           <text>余额：</text>
-          <text class="balance-number">123123</text>
+          <text class="balance-number">{{user.balance}}</text>
           <text>书币</text>
         </div>
         <text class="pay-btn" @click="toPay">立即充值</text>
@@ -22,38 +22,55 @@
         <text class="title">充值订单</text>
       </div>
       <div class="recharge-list">
-        <block for="rechargeList">
+        <block for="{{rechargeList}}">
           <div class="recharge-item">
             <div class="item-info">
               <text class="item-name">订单号：</text>
-              <text class="item-number">1231241234234123123123</text>
+              <text class="item-number">{{$item.trade_no}}</text>
               <div class="item-pay">
                 <text>充值</text>
-                <text class="pay-number">0.01</text>
+                <text class="pay-number">{{$item.price}}</text>
                 <text>元</text>
               </div>
             </div>
-            <text class="item-status un-pay">未支付</text>
+            <text class="item-status">{{$item.status==='UNPAID'?'未支付':'已支付'}}</text>
           </div>
         </block>
       </div>
     </div>
-    <x-page current="{{1}}" total="{{2}}" @prev="prev" @next="next"></x-page>
+    <x-page current="{{page.current}}" total="{{page.total}}" @prev="prev" @next="next"></x-page>
   </div>
 </template>
 
 <script>
 import router from "@system.router";
-import {rechargeApi} from "../../api/index";
+import { rechargeApi, getUserInfo } from "../../api/index";
 export default {
   private: {
-    rechargeList: [1, 2, 3, 4, 5, 6, 76, 78]
+    rechargeList: [],
+    user:{},
+    page:{
+      total:0,
+      current:1
+    },
+    user: {},
   },
-   onReady(){
-    console.log('asdasd')
-    rechargeApi().then(r=>{
-      console.log(r,'a')
-    })
+  onInit() {
+    this.getOrder();
+    this.getUserInfo();
+  },
+  async getUserInfo(){
+    let user =await getUserInfo();
+    this.user=user;
+  },
+  async getOrder(page=1,page_size=10) {
+    let res= await rechargeApi({page:page,page_size});
+    let {list,meta}=res;
+    this.rechargeList=list;
+    this.page={
+      total:meta.last_page,
+      current:meta.current_page
+    }
   },
   toPay() {
     router.push({
@@ -61,10 +78,10 @@ export default {
     })
   },
   prev() {
-    console.log("上一页");
+    this.getOrder(--this.page.current);
   },
   next() {
-    console.log("下一页");
+    this.getOrder(++this.page.current);
   }
 }
 </script>