|
@@ -3,7 +3,6 @@
|
|
|
|
|
|
import Vue from 'vue'
|
|
|
import { VueJsonp } from 'vue-jsonp'
|
|
|
-Vue.use(VueJsonp)
|
|
|
import App from './App'
|
|
|
import router from './router'
|
|
|
import store from './store/store' // 引入store
|
|
@@ -17,8 +16,11 @@ import clipboard from 'clipboard'
|
|
|
import 'vant/lib/index.css'
|
|
|
import wx from 'weixin-js-sdk'
|
|
|
import VConsole from 'vconsole';
|
|
|
-const vconsole = new VConsole()
|
|
|
import request from "@/utils/request"
|
|
|
+import { getWxOpenId } from './script/wxGetOpenId.js'
|
|
|
+import common from './script/common.js'
|
|
|
+Vue.use(VueJsonp)
|
|
|
+new VConsole()
|
|
|
Vue.prototype.$axios = request
|
|
|
Vue.prototype.$wx = wx
|
|
|
Vue.component('tabbar', tabbar)
|
|
@@ -28,9 +30,9 @@ Vue.component('backindex', backIndex)
|
|
|
Vue.config.productionTip = false
|
|
|
Vue.use(Vant)
|
|
|
Vue.use(resource)
|
|
|
-import common from './script/common.js'
|
|
|
Vue.use(common)
|
|
|
Vue.prototype.clipboard = clipboard
|
|
|
+
|
|
|
// 时间戳过滤器
|
|
|
Vue.filter('dateFormat', (dataStr) => {
|
|
|
var time = new Date(dataStr)
|
|
@@ -52,7 +54,7 @@ Vue.filter('dateFormat', (dataStr) => {
|
|
|
|
|
|
|
|
|
// import { getWxOpenId } from './script/wxGetOpenId.js'
|
|
|
-import { getWxOpenId } from './script/wxGetOpenId.js'
|
|
|
+
|
|
|
const whiteList = ['/Login']
|
|
|
router.beforeEach((to, from, next) => {
|
|
|
// if (to.matched.some(record => record.meta.needLogin)) { // 判断该路由是否需要登录权限
|
|
@@ -64,7 +66,9 @@ router.beforeEach((to, from, next) => {
|
|
|
} else if (!localStorage.getItem('openid')) {
|
|
|
console.log('无openId')
|
|
|
// overallExample.getOpenid()
|
|
|
- getWxOpenId()
|
|
|
+ getWxOpenId().then(() => {
|
|
|
+ next()
|
|
|
+ })
|
|
|
console.log('overallExample.getOpenid()走完了')
|
|
|
} else {
|
|
|
console.log('什么都有')
|