ytj

package.json

@@ -36,6 +36,7 @@
     "vue-croppa": "^1.3.8",
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.5.17",
-    "vuex": "^3.0.1"
+    "vuex": "^3.0.1",
+    "weixin-jsapi": "^1.1.0"
   }
 }

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

@@ -135,13 +135,14 @@ import logo from '../../../../common/icon/indexlogo.jpg'
 import wxsdk from '../../../../util/share'
 import noMore from '../../../../components/noMore/noMore'
 import { mapState, createNamespacedHelpers } from 'vuex'
+import wx from 'weixin-jsapi'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
 const { mapState: mpRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
 const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('myCard')
 const { mapActions: mapUserCenterActions } = createNamespacedHelpers('userCenter')
-const wx = require('weixin-js-sdk')
+// const wx = require('weixin-js-sdk')
 
 export default {
   name: '',

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

@@ -127,8 +127,9 @@ import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import toolClass from '../../../../util/util'
 import { mapState, createNamespacedHelpers } from 'vuex'
+import wx from 'weixin-jsapi'
 const { mapState: mapIndexState, mapActions: mapIndexActions } = createNamespacedHelpers('index')
-const wx = require('weixin-js-sdk')
+// const wx = require('weixin-js-sdk')
 import wxsdk from '@/util/share'
 export default {
   name: '',

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

@@ -81,7 +81,8 @@ const { mapActions: mapAppActions } = createNamespacedHelpers('app')
 const { mapState: mapBookState, mapActions: mapBookActions } = createNamespacedHelpers('book')
 import { Toast } from '../../../../../node_modules/vant';
 import wxsdk from '../../../../util/share'
-const wx = require('weixin-js-sdk')
+import wx from 'weixin-jsapi'
+// const wx = require('weixin-js-sdk')
 export default {
   name: '',
   data () {
@@ -170,23 +171,23 @@ export default {
         let hasSol = false
         const startDt = (new Date).getTime()
 
-        const t = window.setInterval(() => {
-          const nw = (new Date).getTime()
+        // const t = window.setInterval(() => {
+        //   const nw = (new Date).getTime()
 
-          if (hasSol) {
-            window.clearInterval(t)
-            return
-          }
+        //   if (hasSol) {
+        //     window.clearInterval(t)
+        //     return
+        //   }
 
-          // 500 毫秒还未定位则直接取消定位
-          if ((nw - startDt) >= 500) {
-            hasSol = true
-            window.clearInterval(t)
+        //   // 500 毫秒还未定位则直接取消定位
+        //   if ((nw - startDt) >= 500) {
+        //     hasSol = true
+        //     window.clearInterval(t)
 
-            this.setDefaultCase(((this.CaseList || [])[0] || {}).CaseId)
-            reject('定位超时 ...')
-          }
-        }, 100)
+        //     this.setDefaultCase(((this.CaseList || [])[0] || {}).CaseId)
+        //     reject('定位超时 ...')
+        //   }
+        // }, 100)
 
         wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
           title: '城的空间',
@@ -194,6 +195,7 @@ export default {
           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(() => {
+          console.log(wx.getLocation)
           if (hasSol) return
           hasSol = true
           const that = this
@@ -213,7 +215,8 @@ export default {
                 that.longitude = res.longitude // 经度，浮点数，范围为180 ~ -180。
                 console.log('获取到位置 ->', that.latitude, that.longitude)
               },
-              complete: function () {
+              complete: function (res) {
+                console.log(res)
                 console.log('获取位置后, 不管成功与否', that.latitude, that.longitude)
 
                 if(that.latitude && that.longitude ) {

src/pages/user/majorProjectsDetail/index.vue

@@ -83,7 +83,8 @@ import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapProjectActions, mapState: mapProjectState } = createNamespacedHelpers('majorProjects')
-const wx = require('weixin-js-sdk')
+import wx from 'weixin-jsapi'
+// const wx = require('weixin-js-sdk')
 
 export default {
   name: '',

src/pages/user/majorProjectsList/index.vue

@@ -35,7 +35,8 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapIndexActions } = createNamespacedHelpers('index')
-const wx = require('weixin-js-sdk')
+import wx from 'weixin-jsapi'
+// const wx = require('weixin-js-sdk')
 import wxsdk from '@/util/share'
 export default {
   name: '',

src/util/share.js

@@ -1,8 +1,9 @@
 import Ajax from './ajax'
 import api from './api'
+import wx from 'weixin-jsapi'
 
 function wxsdk (params, config) {
-  const wx = require('weixin-js-sdk')
+  // const wx = require('weixin-js-sdk')
   console.log(config)
   const shareData = {
     title: config.title, // 分享标题