Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/pages/bodyCheck/app.js

 import Vue from 'vue'
 import App from './App.vue'
 import Vant from 'vant'
-import 'vant/lib/vant-css/index.css'
+import 'vant/lib/index.css'
 import router from './router'
 import store from '../../store/index'
 import Vuex from 'vuex'

src/pages/sales/app.js

 import Vue from 'vue'
 import App from './App.vue'
 import Vant from 'vant'
-import 'vant/lib/vant-css/index.css'
+import 'vant/lib/index.css'
 import router from './router'
 import store from '../../store/index'
 import Vuex from 'vuex'

src/pages/user/app.js

 import Vue from 'vue'
 import App from './App.vue'
 import Vant from 'vant'
-import 'vant/lib/vant-css/index.css'
+import 'vant/lib/index.css'
 import router from './router'
 import store from '../../store/index'
 import Vuex from 'vuex'

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

   <div class="mainPage">
     <div>
       <ul>
-        <li v-for="(item, index) in bookTypeList" :key="index">
+        <li v-for="(item, index) in (books.list || [])" :key="index">
           <libraryListItem :data="item" @appointmentBook="appointmentBook"></libraryListItem>
         </li>
       </ul>
 
 <script>
 import libraryListItem from '../../../../components/libraryListItem/index'
-import { mapState, createNamespacedHelpers } from 'vuex'
-const { mapActions: mapAppActions } = createNamespacedHelpers('app')
-const { mapState: mapLibraryState, mapActions: mapLibraryAction } = createNamespacedHelpers('library')
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapBookState, mapActions: mapBookAction } = createNamespacedHelpers('book')
 export default {
   data () {
     return {
-      showAppointmentDialog: false
+      showAppointmentDialog: false,
+      query: {
+        caseid: '',
+        bookType: '',
+        page: 1,
+        pagesize: 10,
+      }
     }
   },
   created () {
+    this.query.bookType = this.$route.query.type
+    this.query.caseid = this.$route.query.caseid
+    this.getBookList(this.query)
   },
   computed: {
-    ...mapState({
-      CaseList: x => x.app.CaseList,
-    }),
-    ...mapLibraryState({
-      navList: x => x.navList,
-      bookTypeList: x => x.bookTypeList
+    ...mapBookState({
+      books: x => x.books
     })
   },
   components: {
     libraryListItem,
   },
   methods: {
-    ...mapAppActions([
-      'getCaseList',
+    ...mapBookAction([
+      'getBookList',
     ]),
-    ...mapLibraryAction(['getBookListByType']),
-    navClick (item) {
-    },
     appointmentBook () { // 预约图书
       this.showAppointmentDialog = true
     },

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

       </div>
       <a @click="search">搜索</a>
     </div>
-    <div class="searchRemark" v-if="showSearchRemark">
+    <div class="searchRemark" v-if="showSearch">
       <span>
         关于“
-        <em>{{indexSearchKey}}</em>”的搜索结果：
+        <em>{{doSearchKey}}</em>”的搜索结果：
       </span>
     </div>
-    <div class="flex-item">
+    <div class="flex-item" :hidden="!showSearch">
       <div>
-        <div class="noData" v-if="noData">
+        <div class="noData" v-if="(books.list || []).length < 1">
           <img src="../../../../common/icon/kong.png" alt>
           <span>暂无内容</span>
         </div>
-        <ul>
-          <li v-for="(item, index) in searchBooksList" :key="index">
+        <ul v-else>
+          <li v-for="(item, index) in books.list" :key="index">
             <libraryListItem :data="item" @appointmentBook="appointmentBook"></libraryListItem>
           </li>
         </ul>
 <script>
 import libraryListItem from '../../../../components/libraryListItem/index'
 import { mapState, createNamespacedHelpers } from 'vuex'
-const { mapActions: mapAppActions } = createNamespacedHelpers('app')
-const { mapState: mapLibraryState, mapActions: mapLibraryAction, mapMutations: mapLibraryMutations } = createNamespacedHelpers('library')
+const { mapState: mapBookState, mapActions: mapBookAction } = createNamespacedHelpers('book')
 export default {
   data () {
     return {
       searchKey: '',
-      showSearchRemark: false,
+      showSearch: false,
       noData: false,
-      showAppointmentDialog: false
+      showAppointmentDialog: false,
+      caseid: '',
+      page: 1,
+      pagesize: 10,
+      doSearchKey: '',
     }
   },
   created () {
+    this.caseid = this.$route.query.caseid
   },
   computed: {
-    ...mapState({
-      CaseList: x => x.app.CaseList,
-    }),
-    ...mapLibraryState({
-      indexSearchKey: x => x.indexSearchKey,
-      searchBooksList: x => x.searchBooksList
+    ...mapBookState({
+      books: x => x.books,
     })
   },
   mounted () {
-    this.$nextTick(() => {
-      this.searchKey = this.indexSearchKey || ''
-    })
   },
   components: {
     libraryListItem
   },
   methods: {
-    ...mapAppActions([
-      'getCaseList',
+    ...mapBookAction([
+      'getBookList',
     ]),
-    ...mapLibraryAction(['']),
-    ...mapLibraryMutations(['setIndexSearchKey']),
     search () { // 搜索
       if (this.searchKey !== '') {
-        this.setIndexSearchKey(this.searchKey)
-        this.showSearchRemark = true
+        this.doSearchKey = this.searchKey
+        this.getSearchList()
       } else {
         this.$toast('搜索关键词不能为空')
       }
     sureAppointmentBook () { // 确定预约图书
       this.showAppointmentDialog = false
     },
+    getSearchList () {
+      this.getBookList({
+        caseid: this.caseid,
+        name: this.doSearchKey,
+        page: this.page,
+        pagesize: this.pagesize,
+      }).then(() => {
+        this.showSearch = true
+      })
+    },
   }
 }
 </script>

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

   methods: {
     ...mapBookAction(['getBookType']),
     navClick (item) {
-      this.$router.push({ name: 'booksList', query: { type: item.BookTypeId } })
+      this.$router.push({ name: 'booksList', query: { type: item.BookTypeId, caseid: this.caseid } })
     }
   }
 }

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

         </a>
       </div>
       <nav class="nav">
-        <a v-for="(item, index) in navList" v-if="navList.length < 9 || index<7" :key="index" @click="navClick(item)">
+        <a v-for="(item, index) in navList" v-if="(navList || []).length < 9 || index<7" :key="index" @click="navClick(item)">
           <img :src="item.BookTypeImg" alt>
           <span>{{item.BookTypeName}}</span>
         </a>
-        <a v-if="navList.length >8 " @click="moreNav()">
+        <a v-if="(navList || []).length >8 " @click="moreNav()">
           <img src="https://spaceofcheng.oss-cn-beijing.aliyuncs.com/test-icon8.png" alt>
           <span>更多</span>
         </a>
       this.showAppointmentDialog = false
     },
     navClick (item) { // 点击nav
-      this.$router.push({ name: 'booksList', query: { type: item.BookTypeId } })
+      this.$router.push({ name: 'booksList', query: { type: item.BookTypeId, caseid: this.currentCaseId } })
     },
     moreNav () {
       this.$router.push({ name: 'libraryNavList', query: {caseid: this.currentCaseId} })

src/store/book/index.js

 export default {
   namespaced: true,
   state: {
-    types: [],
-    recommends: [],
+    types: {},
+    recommends: {},
+    books: {},
   },
   mutations: {
     updateTypeList (state, payload) {
     updateRecommendBooks (state, payload) {
       state.recommends = payload
     },
+    updateBookList (state, payload) {
+      state.books = payload
+    }
   },
   actions: {
     getBookType ({ commit }, payload) {
           reject(err)
         })
       })
-    }
+    },
+    getBookList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.library.getBookList,
+          queryData: {
+            ...payload
+          },
+        }).then(res => {
+          commit('updateBookList', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
   }
 }

src/util/api.js

       method: 'get',
       url: `${baseUrl}${wechat}/book/recommend/:caseid`
     },
-    getBookListByType: { // 获取分类书籍列表
+    getBookList: { // 获取书籍列表
       method: 'get',
-      url: `${baseUrl}${wechat}/`
+      url: `${baseUrl}${wechat}/book`
     }
   }
 }