bug修改

src/components/libraryListItem/index.vue

@@ -2,7 +2,7 @@
   <div class="libraryListItem flex-h" @click="itemClick(data)">
     <div class="img">
       <a>
-        <img :src="data.BookImg || defaultimg" class="centerLabel cover" alt>
+        <img :src="(data.BookImg || defaultimg) + '?x-oss-process=style/compress-rotate'" class="centerLabel cover" alt>
       </a>
       <span v-if="type === 1" :class="data.BorrowStatus=='0'?'active':''">{{myBookStatus}}</span>
     </div>
@@ -11,7 +11,7 @@
         <span>{{data.BookName}}</span>
         <h5 v-if="!type">{{data.BookDescription}}</h5>
         <div v-if="!type" class="flex-h" style="margin-top: .06rem;">
-          <span class="flex-item">{{data.Author}} 著</span>
+          <span class="flex-item">{{data.Author == '' ? '': data.Author + '著'}} </span>
           <span class="status" :class="{'active' : status != 1 && status != 0 && status != 4}" @click="appointmentBook(data.BookId)">{{bookStatus}}</span>
         </div>
         <div v-if="!type" class="flex-h">
@@ -61,7 +61,7 @@ export default {
   props: ['data', 'type', 'status'],
   data () {
     return {
-      defaultimg: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/voting/yttj_banner.png',
+      defaultimg: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/book_default.png',
     }
   },
   computed: {

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

@@ -6,7 +6,7 @@
           <i class="iconfont icon-sousuo"></i>
           <div class="flex-item">
             <div>
-              <input type="text" v-model="searchKey" placeholder="请输入图书名">
+              <input type="text" v-model="searchKey" autofocus="autofocus" placeholder="请输入图书名">
             </div>
           </div>
         </div>
@@ -91,6 +91,9 @@ export default {
     }
   },
   mounted () {
+    // this.$nextTick(() => {
+    //   document.getElementById("seltxt").focus()
+    // })
   },
   components: {
     loadMore,

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

@@ -35,12 +35,12 @@
         </div>
       </div>
     </slideTabH>
-    <van-dialog v-model="showDialog" :show-confirm-button="false">
+    <van-dialog v-model="showDialog" :show-confirm-button="false" :closeOnClickOverlay="true">
       <div class="borrowedRecordContent flex-h" @click="showDialog = false">
         <div class="img">
           <a>
             <img
-              :src="currentItem.BookImg"
+              :src="(currentItem.BookImg || defaultimg) + '?x-oss-process=style/compress-rotate'"
               class="centerLabel"
               style="width: 100%;
                 height: 100%;
@@ -83,6 +83,7 @@ export default {
       currentItem: {},
       borrowshow: false,
       reserveshow: false,
+      defaultimg: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/book_default.png',
     }
   },
   created () {

src/pages/user/mainPage/index.vue

@@ -34,7 +34,7 @@ export default {
         name: '城咖啡'
       }, {
         pathName: 'libraryIndex',
-        name: '图书馆'
+        name: '在线书吧'
       }, {
         pathName: 'userCenter',
         name: '会员'

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

@@ -7,8 +7,9 @@
             <i class="iconfont icon-sousuo"></i>
             <router-link
               class="flex-item"
+              style="line-height: .3rem;color: #ccc;"
               :to="{name: 'booksSearch', query: {caseid: currentCaseId}}"
-            >{{indexSearchKey}}</router-link>
+            >书本名称</router-link>
           </div>
           <a @click="showDialog = true">
             <i class="iconfont icon-dingwei"></i>
@@ -26,7 +27,7 @@
             <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>
+            <img src="https://spaceofcheng.oss-cn-beijing.aliyuncs.com/icon_more.png" alt>
             <span>更多</span>
           </a>
         </nav>
@@ -58,7 +59,7 @@
         <div class="dialogContent">
           <span class="title">确认在线预约当前图书?</span>
           <div>
-            <span style="color: #666;">在线预约需在{{reserveEndDate}}前前往案场借阅图书, 否则 将取消预约资格</span>
+            <span style="color: #666;font-size:0.14rem;">在线预约需在{{reserveEndDate}}前前往案场借阅图书, 否则将取消预约资格</span>
           </div>
           <div class="btn">
             <a @click="sureAppointmentBook">确定</a>
@@ -108,6 +109,7 @@ export default {
       navList: x => x.types.list,
       books: x => x.recommends,
       mineBooks: x => x.minebooks,
+      bookcaseid: x => x.bookcaseid,
     }),
     reserveEndDate () {
       return toolClass.calDate(7)
@@ -118,7 +120,7 @@ export default {
     radio,
     loadMore
   },
-  created () {
+  mounted () {
     if (!this.CaseList.length || this.CaseList === null) {
       this.getCaseList().then((res) => {
         (res.cases || []).map((item) => {
@@ -147,6 +149,7 @@ export default {
       'getMineBook',
       'reserveBook',
       'updateRecommendBookLeftNum',
+      'setBookCase',
     ]),
     Location () {
       let that = this
@@ -157,37 +160,52 @@ export default {
         thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
       }).then(() => {
       })
-      wx.getLocation({
-        type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-        success: function (res) {
-          let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
-          let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
-          for (let i = 0; i < that.CaseList.length; i++) {
-            let result = that.CaseList[i].Coordinate.split(",")
-            let latitude2 = parseFloat(result[0])
-            let longitude2 = parseFloat(result[1])
-            if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
-              that.currentCaseId = that.CaseList[i].CaseId
-              that.currentCaseName = that.CaseList[i].CaseName
+      console.log(this.bookcaseid)
+      if(this.bookcaseid === '') {
+        wx.getLocation({
+          type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+          success: function (res) {
+            let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
+            let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
+            for (let i = 0; i < that.CaseList.length; i++) {
+              let result = that.CaseList[i].Coordinate.split(",")
+              let latitude2 = parseFloat(result[0])
+              let longitude2 = parseFloat(result[1])
+              if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
+                that.currentCaseId = that.CaseList[i].CaseId
+                that.caseId = that.currentCaseId
+                that.setBookCase(that.caseid)
+                that.currentCaseName = that.CaseList[i].CaseName
+              }
             }
-          }
-          if (!that.currentCaseId || !that.currentCaseName) {
+            if (!that.currentCaseId || !that.currentCaseName) {
+              that.currentCaseId = ((that.CaseList || [])[0] || {}).CaseId
+              that.caseId = that.currentCaseId
+              that.setBookCase(that.caseid)
+              that.currentCaseName = ((that.CaseList || [])[0] || {}).CaseName
+            }
+            that.init()
+          },
+          cancel: function () {
+            that.currentCaseId = ((that.CaseList || [])[0] || {}).CaseId
+            that.caseId = that.currentCaseId
+            that.setBookCase(that.caseid)
+            that.currentCaseName = ((that.CaseList || [])[0] || {}).CaseName
+            that.init()
+          },
+          fail: function () {
             that.currentCaseId = ((that.CaseList || [])[0] || {}).CaseId
+            that.caseId = that.currentCaseId
+            that.setBookCase(that.caseid)
             that.currentCaseName = ((that.CaseList || [])[0] || {}).CaseName
+            that.init()
           }
-          that.init()
-        },
-        cancel: function () {
-          that.currentCaseId = ((that.CaseList || [])[0] || {}).CaseId
-          that.currentCaseName = ((that.CaseList || [])[0] || {}).CaseName
-          that.init()
-        },
-        fail: function () {
-          that.currentCaseId = ((that.CaseList || [])[0] || {}).CaseId
-          that.currentCaseName = ((that.CaseList || [])[0] || {}).CaseName
-          that.init()
-        }
-      })
+        })
+      } else {
+        this.currentCaseId = this.bookcaseid
+        this.caseId = this.bookcaseid
+        this.currentCaseName = (this.CaseList.filter(x => x.CaseId === this.currentCaseId)[0] || {}).CaseName
+      }
     },
     selectCaseId () { // 选择案场
       if (this.currentCaseId !== this.caseId) {
@@ -195,6 +213,7 @@ export default {
         this.CaseList.map((item) => {
           if (item.CaseId === this.currentCaseId) this.currentCaseName = item.CaseName
         })
+        this.setBookCase(this.caseId)
         this.page = 1
         this.init()
       }

src/store/book/index.js

@@ -12,6 +12,7 @@ export default {
       list: []
     },
     minebooks: {},
+    bookcaseid: '',
   },
   mutations: {
     updateTypeList (state, payload) {
@@ -66,6 +67,9 @@ export default {
         })
       }
     },
+    updateBookCase (state, caseid) {
+      state.bookcaseid = caseid
+    }
   },
   actions: {
     getBookType ({ commit }, payload) {
@@ -149,5 +153,8 @@ export default {
     updateRecommendBookLeftNum ({ commit }, bookid) {
       commit('updateRecommendBookLeftNum', bookid)
     },
+    setBookCase ({ commit }, caseid) {
+      commit('updateBookCase', caseid)
+    },
   }
 }