ytj

src/components/libraryListItem/index.vue

@@ -12,7 +12,7 @@
         <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="status active" @click="appointmentBook(data.BookId)">{{bookStatus}}</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">
           <span class="flex-item">{{data.Publisher}}</span>
@@ -27,10 +27,12 @@
         <div v-if="type === 1" class="flex-h">
           <span class="flex-item">{{data.CaseName}}</span>
           <span v-if="data.BorrowStatus=='3' || data.BorrowStatus=='2'">已归还</span>
-          <span v-if="data.BorrowStatus == '1'">已借阅
+          <span v-if="data.BorrowStatus == '1'">
+            已借阅
             <em>{{borrowDay}}</em>天
           </span>
-          <span v-if="data.BorrowStatus == '0'">已逾期
+          <span v-if="data.BorrowStatus == '0'">
+            已逾期
             <em>{{lateDay}}</em>天
           </span>
         </div>
@@ -38,7 +40,9 @@
           <span class="flex-item">预约时间：{{toolClass.dateFormat(data.ReserveDate)}}</span>
         </div>
         <div v-if="type === 2" class="flex-h" style="margin-top: 0;">
-          <span class="flex-item">预约资格将保留至：{{toolClass.dateFormat(data.ReserveEndDate, 'yyyy-MM-dd')}}</span>
+          <span
+            class="flex-item"
+          >预约资格将保留至：{{toolClass.dateFormat(data.ReserveEndDate, 'yyyy-MM-dd')}}</span>
         </div>
         <div v-if="type === 2" class="flex-h" style="margin-top: 0;">
           <span class="flex-item">{{data.CaseName}}</span>
@@ -50,6 +54,7 @@
 
 <script>
 import toolClass from '../../util/util'
+import { mapState } from 'vuex'
 
 export default {
   name: '',
@@ -59,9 +64,12 @@ export default {
     }
   },
   computed: {
-    bookStatus() {
+    ...mapState({
+      user: item => item.userCenter.userInfo.customer
+    }),
+    bookStatus () {
       let status = '在线预约'
-      switch(this.status) {
+      switch (this.status) {
         case '4':
           status = '已预约'
           break
@@ -74,9 +82,9 @@ export default {
       }
       return status
     },
-    myBookStatus() {
+    myBookStatus () {
       let status = ''
-      switch(this.data.BorrowStatus) {
+      switch (this.data.BorrowStatus) {
         case '4':
           status = '已预约'
           break
@@ -95,11 +103,11 @@ export default {
       }
       return status
     },
-    lateDay() {
+    lateDay () {
       const nowdata = new Date()
       return toolClass.diffDate(new Date(this.data.EndDate), nowdata)
     },
-    borrowDay() {
+    borrowDay () {
       const nowdata = new Date()
       return toolClass.diffDate(new Date(this.data.BorrowDate), nowdata)
     }
@@ -110,7 +118,11 @@ export default {
   },
   methods: {
     appointmentBook (id) {
-      if(this.status == '4' || this.status == '1' || this.status == '0'){
+      if (this.status == '4' || this.status == '1' || this.status == '0') {
+        return
+      }
+      if (!this.user.Phone) {
+        this.$router.push({ name: 'bindMobile' })
         return
       }
       this.$emit('appointmentBook', id)
@@ -156,7 +168,7 @@ export default {
       line-height: 0.25rem;
       border-radius: 0.25rem;
       padding: 0 0.15rem;
-      &.active{
+      &.active {
         background: #fc5534;
       }
     }

src/components/vue-load-more/index.vue

@@ -12,7 +12,7 @@
           <span class="down-tip">下拉更新</span>
           <span class="up-tip">松开刷新数据</span>
           <span class="refresh-tip">加载中……</span>
-        </slot> -->
+        </slot>-->
       </header>
       <slot></slot>
       <footer class="load-more" v-show="!dataList.noFlag">
@@ -67,9 +67,7 @@ export default {
       downFlag: false // 用来显示是否加载中
     }
   },
-  created () {
-    console.log(this.dataList)
-  },
+  created () { },
   methods: {
     touchStart (e) {
       this.startY = e.targetTouches[0].pageY

src/pages/user/App.vue

@@ -12,7 +12,7 @@ export default {
   name: 'app',
   data () {
     return {
-      showPage: true 
+      showPage: false 
     }
   },
   components: {},
@@ -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(() => {
-    //   this.showPage = true
-    // })
+    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/bindMobile/bindMobile.vue

@@ -108,10 +108,7 @@ export default {
     console.log(1123)
   },
   methods: {
-    ...actions(['getCaseInfo']),
-    ...actions(['getCaptcha']),
-    ...actions(['submitData']),
-    ...actions(['recommendCode']),
+    ...actions(['getCaseInfo', 'getCaptcha', 'submitData', 'recommendCode', 'getUserInfo']),
     // onConfirmC (value, index) {
     //   this.caseName = value.CaseName
     //   this.postData.case = value.CaseId
@@ -216,10 +213,11 @@ export default {
                   window.location.href = `${window.location.origin}/game/luckdraw/${from}`
                 }, 2000)
               } else {
-                setTimeout(() => {
-                  // this.$router.push({name: 'userCenter'})
-                  window.history.go(-1)
-                }, 2000)
+                this.getUserInfo().then(() => {
+                  setTimeout(() => {
+                    window.history.go(-1)
+                  }, 2000)
+                })
               }
             }).catch(() => {
               console.log(111)
@@ -239,10 +237,11 @@ export default {
               window.location.href = `${window.location.origin}/game/luckdraw/${from}`
             }, 2000)
           } else {
-            setTimeout(() => {
-              // this.$router.push({name: 'userCenter'})
-              window.history.go(-1)
-            }, 2000)
+            this.getUserInfo().then(() => {
+              setTimeout(() => {
+                window.history.go(-1)
+              }, 2000)
+            })
           }
         }).catch(() => {
           console.log(111)

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

@@ -164,6 +164,9 @@ export default {
         width: 0.7rem;
         display: block;
         margin: 0 auto;
+        .centerLabel{
+          
+        }
       }
       span {
         width: 100%;

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

@@ -78,6 +78,8 @@ import toolClass from '../../../../util/util'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapAppActions } = createNamespacedHelpers('app')
 const { mapState: mapBookState, mapActions: mapBookActions } = createNamespacedHelpers('book')
+import wxsdk from '../../../../util/share'
+const wx = require('weixin-js-sdk')
 export default {
   name: '',
   data () {
@@ -90,7 +92,7 @@ export default {
       cases: [],
       indexSearchKey: '',
       page: 1,
-      pagesize: 3,
+      pagesize: 10,
       scrollData: {
         noFlag: false // 暂无更多数据显示
       },
@@ -125,9 +127,7 @@ export default {
             id: item.CaseId
           })
         })
-        this.currentCaseId = ((res.cases || [])[0] || {}).CaseId
-        this.currentCaseName = ((res.cases || [])[0] || {}).CaseName
-        this.init()
+        this.Location()
       })
     } else {
       (this.CaseList || []).map((item) => {
@@ -136,9 +136,7 @@ export default {
           id: item.CaseId
         })
       })
-      this.currentCaseId = ((this.CaseList || [])[0] || {}).CaseId
-      this.currentCaseName = ((this.CaseList || [])[0] || {}).CaseName
-      this.init()
+      this.Location()
     }
   },
   methods: {
@@ -150,6 +148,38 @@ export default {
       'reserveBook',
       'updateRecommendBookLeftNum',
     ]),
+    Location () {
+      let that = this
+      wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+        title: '城的空间',
+        desc: '城的空间',
+        link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
+        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
+              }
+            }
+            if (!that.currentCaseId || !that.currentCaseName) {
+              that.currentCaseId = ((that.CaseList || [])[0] || {}).CaseId
+              that.currentCaseName = ((that.CaseList || [])[0] || {}).CaseName
+            }
+            that.init()
+          }
+        })
+      })
+    },
     selectCaseId () { // 选择案场
       if (this.currentCaseId !== this.caseId) {
         this.currentCaseId = this.caseId
@@ -172,7 +202,9 @@ export default {
       //   page: this.page,
       //   pagesize: this.pagesize,
       // })
-      this.onInfinite()
+      this.$nextTick(() => {
+        this.onInfinite()
+      })
     },
     onInfinite () {
       this.getMineBook({

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

@@ -58,9 +58,9 @@
             <img src="../../../../common/icon/pointer.png" width="100%" height="100%" alt>
           </div>
           <span>积分</span>
-          <span>
-            ￥{{Nums.vipbalance}}
-            <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i>
+          <span>0
+            <!-- ￥{{Nums.vipbalance}} -->
+            <!-- <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i> -->
           </span>
         </div>
       </div>

src/store/book/index.js

@@ -8,7 +8,9 @@ export default {
     recommends: {
       list: []
     },
-    books: {},
+    books: {
+      list: []
+    },
     minebooks: {},
   },
   mutations: {
@@ -16,22 +18,32 @@ export default {
       state.types = payload
     },
     updateRecommendBooks (state, payload) {
-      payload.list ? state.recommends.list = state.recommends.list.concat(payload.list) : null
+      if (payload.page === 1) {
+        state.recommends.list = payload.list
+      } else {
+        payload.list ? state.recommends.list = state.recommends.list.concat(payload.list) : null
+      }
     },
     updateBookList (state, payload) {
-      state.books = payload
+      if (payload.page === 1) {
+        state.books.list = payload.list
+      } else {
+        payload.list ? state.books.list = state.books.list.concat(payload.list) : null
+      }
     },
     updateMineBook (state, payload) {
       state.minebooks = payload
     },
-    updateRecommendBookLeftNum(state, bookid) {
-      state.recommends = {...state.recommends, list: state.recommends.list.map(x => {
-        if(x.BookId == bookid){
-          x.LeftNum = x.LeftNum - 1
+    updateRecommendBookLeftNum (state, bookid) {
+      state.recommends = {
+        ...state.recommends, list: state.recommends.list.map(x => {
+          if (x.BookId == bookid) {
+            x.LeftNum = x.LeftNum - 1
+            return x
+          }
           return x
-        }
-        return x
-      })}
+        })
+      }
       // let list = state.recommends.list
       // list = list.map(x => {
       //   if(x.BookId == bookid){
@@ -43,14 +55,16 @@ export default {
       // list.splice(list.findIndex(item => item.LeftNum < 1), 1)
       // state.recommends = {...state.recommends, list}
     },
-    updateBookLeftNum(state, bookid) {
-      state.books = {...state.books, list: state.books.list.map(x => {
-        if(x.BookId == bookid){
-          x.LeftNum = x.LeftNum - 1
+    updateBookLeftNum (state, bookid) {
+      state.books = {
+        ...state.books, list: state.books.list.map(x => {
+          if (x.BookId == bookid) {
+            x.LeftNum = x.LeftNum - 1
+            return x
+          }
           return x
-        }
-        return x
-      })}
+        })
+      }
     },
   },
   actions: {
@@ -133,12 +147,12 @@ export default {
         }).catch((err) => {
           reject(err)
         })
-      }) 
+      })
     },
-    updateBookLeftNum({ commit }, bookid) {
+    updateBookLeftNum ({ commit }, bookid) {
       commit('updateBookLeftNum', bookid)
     },
-    updateRecommendBookLeftNum({ commit }, bookid) {
+    updateRecommendBookLeftNum ({ commit }, bookid) {
       commit('updateRecommendBookLeftNum', bookid)
     },
   }

vue.config.js

@@ -18,8 +18,10 @@ module.exports = {
   baseUrl: './',
   // 生产环境是否生成 sourceMap 文件
   productionSourceMap: true,
-  // devtool: 'source-map',
-  chainWebpack: config => config.plugins.delete('named-chunks'),
+  chainWebpack: config => { // webpack配置，值位对象时会合并配置，为方法时会改写配置
+    config.devtool = 'source-map'
+    config.plugins.delete('named-chunks')
+  },
   devServer: {
     proxy: {
       '/api': {