1219

src/pages/user/library/booksList/index.vue

@@ -1,16 +1,20 @@
 <template>
   <div class="mainPage">
     <div>
+      <div class="noData" v-if="show && (books.list || []).length < 1">
+        <img src="../../../../common/icon/kong.png" alt>
+        <span>暂无内容</span>
+      </div>
       <ul>
-        <li v-for="(item, index) in (books.list || [])" :key="index">
-          <libraryListItem :data="item" @appointmentBook="appointmentBook"></libraryListItem>
+        <li v-for="(item, index) in (books.list || [])" :key="index" v-if="show">
+          <libraryListItem :data="item" :status="mineBookStatus(item)" @appointmentBook="appointmentBook"></libraryListItem>
         </li>
       </ul>
       <van-dialog v-model="showAppointmentDialog" :show-confirm-button="false">
         <div class="dialogContent">
           <span class="title">确认在线预约当前图书?</span>
           <div>
-            <span style="color: #666;">在线预约需在2018年12月20日前前往案场借阅图书, 否则 将取消预约资格</span>
+            <span style="color: #666;">在线预约需在{{reserveEndDate}}前前往案场借阅图书, 否则 将取消预约资格</span>
           </div>
           <div class="btn">
             <a @click="sureAppointmentBook">确定</a>
@@ -25,6 +29,7 @@
 <script>
 import libraryListItem from '../../../../components/libraryListItem/index'
 import { createNamespacedHelpers } from 'vuex'
+import toolClass from '../../../../util/util'
 const { mapState: mapBookState, mapActions: mapBookAction } = createNamespacedHelpers('book')
 export default {
   data () {
@@ -35,18 +40,30 @@ export default {
         bookType: '',
         page: 1,
         pagesize: 10,
-      }
+      },
+      reserveBookId: '',
+      show: false,
     }
   },
   created () {
     this.query.bookType = this.$route.query.type
     this.query.caseid = this.$route.query.caseid
-    this.getBookList(this.query)
+    this.getBookList(this.query).then(() => {
+      this.show = true
+    })
+    this.getMineBook({
+      page: 1,
+      pagesize: 1000,
+    })
   },
   computed: {
     ...mapBookState({
-      books: x => x.books
-    })
+      books: x => x.books,
+      mineBooks: x => x.minebooks,
+    }),
+    reserveEndDate() {
+      return toolClass.calDate(7)
+    }
   },
   components: {
     libraryListItem,
@@ -54,12 +71,26 @@ export default {
   methods: {
     ...mapBookAction([
       'getBookList',
+      "getMineBook",
+      "reserveBook",
     ]),
-    appointmentBook () { // 预约图书
+    appointmentBook (id) { // 预约图书
+      this.reserveBookId = id
       this.showAppointmentDialog = true
     },
     sureAppointmentBook () { // 确定预约图书
+      this.reserveBook({
+        bookid: this.reserveBookId,
+      }).then(() => {
+        this.getMineBook({
+          page: 1,
+          pagesize: 1000,
+        })
+      })
       this.showAppointmentDialog = false
+    },
+    mineBookStatus (item) {
+      return ((this.mineBooks.list || []).filter(x => x.BookId === item.BookId && (x.BorrowStatus == '4' || x.BorrowStatus == '1' || x.BorrowStatus == '0'))[0] || {}).BorrowStatus
     }
   }
 }
@@ -77,6 +108,26 @@ export default {
     -webkit-overflow-scrolling: touch;
     transform: translateZ(0);
     -webkit-transform: translateZ(0);
+    .noData {
+      width: 100%;
+      margin: 0.5rem auto 0;
+      position: relative;
+      overflow: hidden;
+      img {
+        width: 0.7rem;
+        display: block;
+        margin: 0 auto;
+      }
+      span {
+        width: 100%;
+        display: block;
+        text-align: center;
+        line-height: 0.3rem;
+        color: #b4b4b4;
+        font-size: 0.14rem;
+        margin: 0.05rem auto 0;
+      }
+    }
     >ul{
       padding: 0 .16rem;
       margin-bottom: .1rem;

src/pages/user/library/booksSearch/index.vue

@@ -25,7 +25,7 @@
         </div>
         <ul v-else>
           <li v-for="(item, index) in books.list" :key="index">
-            <libraryListItem :data="item" @appointmentBook="appointmentBook"></libraryListItem>
+            <libraryListItem :data="item" :status="mineBookStatus(item)" @appointmentBook="appointmentBook"></libraryListItem>
           </li>
         </ul>
       </div>
@@ -34,7 +34,7 @@
       <div class="dialogContent">
         <span class="title">确认在线预约当前图书?</span>
         <div>
-          <span style="color: #666;">在线预约需在2018年12月20日前前往案场借阅图书, 否则 将取消预约资格</span>
+          <span style="color: #666;">在线预约需在{{reserveEndDate}}前前往案场借阅图书, 否则 将取消预约资格</span>
         </div>
         <div class="btn">
           <a @click="sureAppointmentBook">确定</a>
@@ -47,6 +47,7 @@
 
 <script>
 import libraryListItem from '../../../../components/libraryListItem/index'
+import toolClass from '../../../../util/util'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapState: mapBookState, mapActions: mapBookAction } = createNamespacedHelpers('book')
 export default {
@@ -60,15 +61,24 @@ export default {
       page: 1,
       pagesize: 10,
       doSearchKey: '',
+      reserveBookId: '',
     }
   },
   created () {
     this.caseid = this.$route.query.caseid
+    this.getMineBook({
+      page: 1,
+      pagesize: 1000,
+    })
   },
   computed: {
     ...mapBookState({
       books: x => x.books,
-    })
+      mineBooks: x => x.minebooks,
+    }),
+    reserveEndDate() {
+      return toolClass.calDate(7)
+    }
   },
   mounted () {
   },
@@ -78,6 +88,8 @@ export default {
   methods: {
     ...mapBookAction([
       'getBookList',
+      'getMineBook',
+      'reserveBook',
     ]),
     search () { // 搜索
       if (this.searchKey !== '') {
@@ -87,10 +99,19 @@ export default {
         this.$toast('搜索关键词不能为空')
       }
     },
-    appointmentBook () { // 预约图书
+    appointmentBook (id) { // 预约图书
+      this.reserveBookId = id
       this.showAppointmentDialog = true
     },
     sureAppointmentBook () { // 确定预约图书
+      this.reserveBook({
+        bookid: this.reserveBookId,
+      }).then(() => {
+        this.getMineBook({
+          page: 1,
+          pagesize: 1000,
+        })
+      })
       this.showAppointmentDialog = false
     },
     getSearchList () {
@@ -103,6 +124,9 @@ export default {
         this.showSearch = true
       })
     },
+    mineBookStatus (item) {
+      return ((this.mineBooks.list || []).filter(x => x.BookId === item.BookId && (x.BorrowStatus == '4' || x.BorrowStatus == '1' || x.BorrowStatus == '0'))[0] || {}).BorrowStatus
+    }
   }
 }
 </script>

src/pages/user/library/borrowedRecord/index.vue

@@ -9,7 +9,11 @@
     >
       <div class="subMain" slot="slideTabH-1">
         <div>
-          <ul>
+          <div class="noData" v-if="borrowshow && (borrowBooks.list || []).length < 1">
+            <img src="../../../../common/icon/kong.png" alt>
+            <span>暂无内容</span>
+          </div>
+          <ul v-if="borrowshow">
             <li v-for="(item, index) in borrowBooks.list" :key="index">
               <libraryListItem :data="item" :type="1" @itemClick="borrowedRecordClick"></libraryListItem>
             </li>
@@ -19,7 +23,11 @@
       <div class="subMain" slot="slideTabH-2">
         <div>
           <span>请在资格保留时间内至案场借阅图书，超出预约时间将取消预约资格</span>
-          <ul>
+          <div class="noData" v-if="reserveshow && (reserveBooks.list || []).length < 1">
+            <img src="../../../../common/icon/kong.png" alt>
+            <span>暂无内容</span>
+          </div>
+          <ul v-if="reserveshow">
             <li v-for="(item, index) in reserveBooks.list" :key="index">
               <libraryListItem :data="item" :type="2"></libraryListItem>
             </li>
@@ -67,6 +75,8 @@ export default {
       reserveBooks: {},
       borrowBooks: {},
       currentItem: {},
+      borrowshow: false,
+      reserveshow: false,
     }
   },
   created () {
@@ -124,8 +134,10 @@ export default {
       }).then((res) => {
         if(status == '1') {
           _that.borrowBooks = res
+          _that.borrowshow = true
         } else {
           _that.reserveBooks = res
+          _that.reserveshow = true
         }
       })
     }
@@ -143,6 +155,26 @@ export default {
     -webkit-overflow-scrolling: touch;
     transform: translateZ(0);
     -webkit-transform: translateZ(0);
+    .noData {
+      width: 100%;
+      margin: 0.5rem auto 0;
+      position: relative;
+      overflow: hidden;
+      img {
+        width: 0.7rem;
+        display: block;
+        margin: 0 auto;
+      }
+      span {
+        width: 100%;
+        display: block;
+        text-align: center;
+        line-height: 0.3rem;
+        color: #b4b4b4;
+        font-size: 0.14rem;
+        margin: 0.05rem auto 0;
+      }
+    }
     > div {
       width: 100%;
       position: relative;

src/pages/user/mainPage/libraryIndex/index.vue

@@ -182,7 +182,7 @@ export default {
       this.$router.push({ name: 'libraryNavList', query: {caseid: this.currentCaseId} })
     },
     mineBookStatus (item) {
-      return ((this.mineBooks.list || []).filter(x => x.BookId === item.BookId)[0] || {}).BorrowStatus
+      return ((this.mineBooks.list || []).filter(x => x.BookId === item.BookId && (x.BorrowStatus == '4' || x.BorrowStatus == '1' || x.BorrowStatus == '0'))[0] || {}).BorrowStatus
     }
   }
 }

src/pages/user/mainPage/userCenter/index.vue

@@ -15,7 +15,7 @@
             <div></div>
           </div>
           <div v-if="user.Phone" class="code">
-            <div>卡号：2334546456456</div>
+            <div>卡号：{{user.Barcode}}</div>
             <svg style="width:100%" id="barcode"></svg>
           </div>
           <div v-else class="bind">
@@ -121,7 +121,7 @@ export default {
         this.AccountInfo = JSON.parse(this.user.AccountInfo)
         this.$nextTick(() => {
           if (this.user.Phone) {
-            JsBarcode("#barcode", "2334546456456", {
+            JsBarcode("#barcode", this.user.Barcode, {
               lineColor: '#000000',
               height: 60,
               displayValue: false