bug fix

public/index.html

@@ -8,6 +8,8 @@
     charset="utf-8" />
   <link rel="stylesheet" href="//at.alicdn.com/t/font_775069_clu263vfyod.css">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <script src="https://res.wx.qq.com/mmbizwap/zh_CN/htmledition/js/vconsole/3.0.0/vconsole.min.js"></script>
+  <script> new VConsole(); </script>
   <!-- <script src="https://jsconsole.com/js/remote.js?34f890f2-39c4-46f7-9d9e-7a8cb29a6007"></script> -->
   <!-- <script src="//cdn.bootcss.com/eruda/1.5.2/eruda.min.js"></script>
   <script>eruda.init();</script> -->

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

@@ -123,7 +123,7 @@ export default {
     radio,
     loadMore
   },
-  mounted () {
+  created () {
     if (!this.CaseList.length || this.CaseList === null) {
       this.getCaseList().then((res) => {
         (res.cases || []).map((item) => {
@@ -132,7 +132,7 @@ export default {
             id: item.CaseId
           })
         })
-        this.Location()
+        this.detectLoc().then(() => this.init()).catch(() => this.init())
       })
     } else {
       (this.CaseList || []).map((item) => {
@@ -141,7 +141,7 @@ export default {
           id: item.CaseId
         })
       })
-      this.Location()
+      this.detectLoc().then(() => this.init()).catch(() => this.init())
     }
   },
   methods: {
@@ -165,46 +165,98 @@ export default {
       }
       this.$router.push({name: 'booksSearch', query: {caseid: this.currentCaseId}})
     },
-    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(() => {
-      })
-      if(!this.bookcaseid) {
-        setTimeout(() => {
-          if(that.latitude == '' || that.longitude == '') {
-            that.currentCaseId = ((that.CaseList || [])[0] || {}).CaseId
+    detectLoc () {
+      return new Promise((resolve, reject) => {
+        let hasSol = false
+        const startDt = (new Date).getTime()
+
+        const t = window.setInterval(() => {
+          const nw = (new Date).getTime()
+
+          if (hasSol) {
+            window.clearInterval(t)
+            return
+          }
+
+          // 500 毫秒还未定位则直接取消定位
+          if ((nw - startDt) >= 500) {
+            hasSol = true
+            window.clearInterval(t)
+
+            this.setDefaultCase(((this.CaseList || [])[0] || {}).CaseId)
+            reject('定位超时 ...')
+          }
+        }, 100)
+
+        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(() => {
+          if (hasSol) return
+          hasSol = true
+          const that = this
+
+          // 如果已经存在案场
+          if (!!that.bookcaseid) {
+            that.currentCaseId = that.bookcaseid
+            that.caseId = that.bookcaseid
+            that.currentCaseName = (that.CaseList.filter(x => x.CaseId === that.currentCaseId)[0] || {}).CaseName
+            resolve()
           } else {
-            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(that.latitude, that.longitude, latitude2, longitude2) < 500) {
-                that.currentCaseId = that.CaseList[i].CaseId
-              }
-            }
+            // 如果没有案场
+            wx.getLocation({
+              type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+              success: function (res) {
+                that.latitude = res.latitude // 纬度，浮点数，范围为90 ~ -90
+                that.longitude = res.longitude // 经度，浮点数，范围为180 ~ -180。
+                console.log('获取到位置 ->', that.latitude, that.longitude)
+              },
+              complete: function () {
+                console.log('获取位置后, 不管成功与否', that.latitude, that.longitude)
+
+                if(that.latitude && that.longitude ) {
+                  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(that.latitude, that.longitude, latitude2, longitude2) < 500) {
+                      that.currentCaseId = that.CaseList[i].CaseId
+                    }
+                  }
+                }
+
+                if(!that.currentCaseId) {
+                  that.currentCaseId = ((that.CaseList || [])[0] || {}).CaseId
+                }
+
+                that.setDefaultCase(that.currentCaseId)
+                resolve()
+              },
+            })
+          }
+        }).catch((err) => {
+          console.log('微信初始化失败', err.message)
+          if (hasSol) return
+          hasSol = true
+
+          // 如果已经存在案场
+          if (!!this.bookcaseid) {
+            this.setDefaultCase(this.bookcaseid)
+          } else {
+            this.setDefaultCase(((that.CaseList || [])[0] || {}).CaseId)
           }
-          that.caseId = that.currentCaseId
-          that.setBookCase(that.caseId)
-          that.currentCaseName = ((that.CaseList || [])[0] || {}).CaseName
-          that.init()
-        }, 500)
-        wx.getLocation({
-          type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-          success: function (res) {
-            that.latitude = res.latitude // 纬度，浮点数，范围为90 ~ -90
-            that.longitude = res.longitude // 经度，浮点数，范围为180 ~ -180。
-          },
+
+          reject()
         })
-      } else {
-        this.currentCaseId = this.bookcaseid
-        this.caseId = this.bookcaseid
-        this.currentCaseName = (this.CaseList.filter(x => x.CaseId === this.currentCaseId)[0] || {}).CaseName
-      }
+      })
+    },
+    setDefaultCase(caseID) {
+      this.setBookCase(caseID)
+      this.caseId = caseID
+      this.currentCaseId = caseID
+      this.currentCaseName = (this.CaseList.filter(x => x.CaseId === caseID)[0] || {}).CaseName
     },
     selectCaseId () { // 选择案场
       if (this.currentCaseId !== this.caseId) {

src/util/share.js

@@ -39,7 +39,11 @@ function wxsdk (params, config) {
       wx.ready(function () {
         wx.onMenuShareTimeline(shareData)
         wx.onMenuShareAppMessage(shareData)
-        resolve('success')
+        resolve(wx)
+      })
+
+      wx.error(function(err) {
+        reject(err)
       })
     }).catch((err) => {
       reject(err)