1218

package.json

@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "element-ui": "^2.4.6",
+    "jsbarcode": "^3.11.0",
     "vue": "^2.5.17",
     "weixin-js-sdk": "^1.3.3"
   },

src/components/libraryListItem/index.vue

@@ -2,20 +2,20 @@
   <div class="libraryListItem flex-h">
     <div class="img">
       <a>
-        <img :src="data.img" class="centerLabel cover" alt>
+        <img :src="data.BookImg" class="centerLabel cover" alt>
       </a>
     </div>
     <div class="flex-item">
       <div>
-        <span>{{data.name}}</span>
+        <span>{{data.BookName}}</span>
         <div class="flex-h" style="margin-top: .06rem;">
-          <span class="flex-item">{{data.author}} 著</span>
-          <span class="status" @click="appointmentBook(data.id)">{{data.status}}</span>
+          <span class="flex-item">{{data.Author}} 著</span>
+          <span class="status" @click="appointmentBook(data.BookId)">{{data.Status}}</span>
         </div>
         <div class="flex-h">
-          <span class="flex-item">{{data.publishingHouses}}</span>
+          <span class="flex-item">{{data.Publisher}}</span>
           <span>剩余可借
-            <em>{{data.stock}}</em>本
+            <em>{{data.LeftNum}}</em>本
           </span>
         </div>
       </div>

src/pages/bodyCheck/app.js

@@ -1,7 +1,7 @@
 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

@@ -1,7 +1,7 @@
 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.vue

@@ -23,14 +23,14 @@ export default {
     })
   },
   created () {
-    if (location.search && this.toolClass.UrlSearch(location.search).code) {
-      this.code = this.toolClass.UrlSearch(location.search).code
-    } else {
-      this.code = null
-    }
-    this.getUserInfo({ org: this.org, code: this.code }).then(() => {
+    // if (location.search && this.toolClass.UrlSearch(location.search).code) {
+    //   this.code = this.toolClass.UrlSearch(location.search).code
+    // } else {
+    //   this.code = null
+    // }
+    // this.getUserInfo({ org: this.org, code: this.code }).then(() => {
       this.showPage = true
-    })
+    //})
   },
   methods: {
     ...actions(['getUserInfo'])

src/pages/user/app.js

@@ -1,7 +1,7 @@
 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/navList/index.vue

@@ -3,8 +3,8 @@
     <div>
       <nav class="nav">
         <a v-for="(item, index) in navList" :key="index" @click="navClick(item)">
-          <img :src="item.icon" alt>
-          <span>{{item.name}}</span>
+          <img :src="item.BookTypeImg" alt>
+          <span>{{item.BookTypeName}}</span>
         </a>
       </nav>
     </div>
@@ -13,31 +13,32 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex'
-const { mapActions: mapAppActions } = createNamespacedHelpers('app')
-const { mapState: mapLibraryState, mapActions: mapLibraryAction } = createNamespacedHelpers('library')
+const { mapState: mapBookState, mapActions: mapBookAction } = createNamespacedHelpers('book')
 export default {
   data () {
     return {
+      caseid: '',
     }
   },
   created () {
+    this.caseid = this.$route.query.caseid
+    this.getBookType({
+      caseid: this.caseid,
+      page: 1,
+      pagesize: 10000,
+    })
   },
   computed: {
-    ...mapState({
-      CaseList: x => x.app.CaseList,
-    }),
-    ...mapLibraryState({
-      navList: x => x.navList
+    ...mapBookState({
+      navList: x => x.types.list
     })
   },
   components: {
   },
   methods: {
-    ...mapAppActions([
-      'getCaseList',
-    ]),
-    ...mapLibraryAction(['getNavList']),
+    ...mapBookAction(['getBookType']),
     navClick (item) {
+      this.$router.push({ name: 'booksList', query: { type: item.BookTypeId } })
     }
   }
 }

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

@@ -15,15 +15,19 @@
         </a>
       </div>
       <nav class="nav">
-        <a v-for="(item, index) in navList" :key="index" @click="navClick(item)">
-          <img :src="item.icon" alt>
-          <span>{{item.name}}</span>
+        <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()">
+          <img src="https://spaceofcheng.oss-cn-beijing.aliyuncs.com/test-icon8.png" alt>
+          <span>更多</span>
         </a>
       </nav>
       <div class="list">
         <h1>精选推荐</h1>
         <ul>
-          <li v-for="(item, index) in bookList" :key="index">
+          <li v-for="(item, index) in books.list" :key="index">
             <libraryListItem :data="item" @appointmentBook="appointmentBook"></libraryListItem>
           </li>
         </ul>
@@ -60,7 +64,7 @@ import libraryListItem from '../../../../components/libraryListItem/index'
 import radio from '../../../../components/radio/index'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapAppActions } = createNamespacedHelpers('app')
-const { mapState: mapLibraryState, mapActions: mapLibraryActions, mapMutations: mapLibraryMutations } = createNamespacedHelpers('library')
+const { mapState: mapBookState, mapActions: mapBookActions } = createNamespacedHelpers('book')
 export default {
   name: '',
   data () {
@@ -70,7 +74,10 @@ export default {
       caseId: '',
       currentCaseId: '',
       currentCaseName: '',
-      cases: []
+      cases: [],
+      indexSearchKey: '',
+      page: 1,
+      pagesize: 10,
     }
   },
   computed: {
@@ -78,10 +85,9 @@ export default {
       userInfo: x => x.userCenter.userInfo,
       CaseList: x => x.app.CaseList
     }),
-    ...mapLibraryState({
-      navList: x => x.navList,
-      bookList: x => x.bookList,
-      indexSearchKey: x => x.indexSearchKey
+    ...mapBookState({
+      navList: x => x.types.list,
+      books: x => x.recommends
     }),
   },
   components: {
@@ -97,6 +103,9 @@ export default {
             id: item.CaseId
           })
         })
+        this.currentCaseId = ((res.cases || [])[0] || {}).CaseId
+        this.currentCaseName = ((res.cases || [])[0] || {}).CaseName
+        this.init()
       })
     } else {
       (this.CaseList || []).map((item) => {
@@ -105,27 +114,36 @@ export default {
           id: item.CaseId
         })
       })
+      this.currentCaseId = ((this.CaseList || [])[0] || {}).CaseId
+      this.currentCaseName = ((this.CaseList || [])[0] || {}).CaseName
+      this.init()
     }
   },
   methods: {
     ...mapAppActions(['getCaseList']),
-    ...mapLibraryActions(['getNavList', 'getRecommendBookList']),
-    ...mapLibraryMutations(['emptyNavInfo', 'emptyRecommendBookList']),
+    ...mapBookActions(['getBookType', 'getRecommendBook']),
     selectCaseId () { // 选择案场
       if (this.currentCaseId !== this.caseId) {
         this.currentCaseId = this.caseId
         this.CaseList.map((item) => {
           if (item.CaseId === this.currentCaseId) this.currentCaseName = item.CaseName
         })
-        this.emptyNavInfo() // 清空nav
-        this.getNavList() // 获取nav
-        this.emptyRecommendBookList() // 清空精选推荐书籍列表
-        this.getRecommendBookList() // 获取精选推荐书籍列表
+        this.page = 1
+        this.init()
       }
       this.showDialog = false
     },
     init () { // 初始化
-
+      this.getBookType({
+        caseid: this.currentCaseId,
+        page: 1,
+        pagesize: 10,
+      })
+      this.getRecommendBook({
+        caseid: this.currentCaseId,
+        page: this.page,
+        pagesize: this.pagesize,
+      })
     },
     appointmentBook () { // 预约图书
       this.showAppointmentDialog = true
@@ -134,11 +152,10 @@ export default {
       this.showAppointmentDialog = false
     },
     navClick (item) { // 点击nav
-      if (item.id === 'more') {
-        this.$router.push({ name: 'libraryNavList' })
-      } else {
-        this.$router.push({ name: 'booksList', query: { id: item.id } })
-      }
+      this.$router.push({ name: 'booksList', query: { type: item.BookTypeId } })
+    },
+    moreNav () {
+      this.$router.push({ name: 'libraryNavList', query: {caseid: this.currentCaseId} })
     }
   }
 }

src/store/book/index.js

@@ -0,0 +1,56 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    types: [],
+    recommends: [],
+  },
+  mutations: {
+    updateTypeList (state, payload) {
+      state.types = payload
+    },
+    updateRecommendBooks (state, payload) {
+      state.recommends = payload
+    },
+  },
+  actions: {
+    getBookType ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.library.getNavList,
+          queryData: {
+            ...payload
+          },
+          urlData: {
+            caseid: payload.caseid,
+          }
+        }).then(res => {
+          commit('updateTypeList', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    getRecommendBook ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.library.getRecommendBookList,
+          queryData: {
+            ...payload
+          },
+          urlData: {
+            caseid: payload.caseid,
+          }
+        }).then(res => {
+          commit('updateRecommendBooks', res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+  }
+}

src/store/index.js

@@ -31,6 +31,7 @@ export const modules = {
   making: () => require('./making/index').default,
   customization: () => require('./customization/index').default,
   library: () => require('./library/index').default,
+  book: () => require('./book/index').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/util/api.js

@@ -336,11 +336,11 @@ const $api = {
   library: {
     getNavList: { // 获取图书馆nav
       method: 'get',
-      url: `${baseUrl}${wechat}/`
+      url: `${baseUrl}${wechat}/booktype/:caseid`
     },
     getRecommendBookList: { // 获取精选推荐书籍列表
       method: 'get',
-      url: `${baseUrl}${wechat}/`
+      url: `${baseUrl}${wechat}/book/recommend/:caseid`
     },
     getBookListByType: { // 获取分类书籍列表
       method: 'get',

vue.config.js

@@ -23,10 +23,10 @@ module.exports = {
     proxy: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        // target: 'http://192.168.0.62:8080', // wf
+        target: 'http://localhost:8080', // wf
         // target: 'http://192.168.0.102:8080', // hyq
         // target: 'http://192.168.0.11', // ys
-        target: 'http://dev.ycjcjy.com', // frp
+        // target: 'http://dev.ycjcjy.com', // frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {
         //   '^/api': '/api-v2/api'