修改微信支付无法使用的问题
This commit is contained in:
41
main.js
41
main.js
@ -8,15 +8,8 @@ import dialog from './utils/dialog'
|
||||
import cookie from '@/utils/store/cookie'
|
||||
import cuCustom from '@/components/colorui/components/cu-custom.vue'
|
||||
|
||||
import {
|
||||
parseRoute,
|
||||
_router,
|
||||
parseQuery
|
||||
} from '@/utils'
|
||||
import {
|
||||
VUE_APP_RESOURCES_URL,
|
||||
VUE_APP_API_URL
|
||||
} from '@/config'
|
||||
import { parseRoute, _router, parseQuery } from '@/utils'
|
||||
import { VUE_APP_RESOURCES_URL, VUE_APP_API_URL } from '@/config'
|
||||
Vue.component('cu-custom', cuCustom)
|
||||
Vue.config.productionTip = false
|
||||
Vue.config.devtools = process.env.NODE_ENV !== 'production'
|
||||
@ -71,25 +64,9 @@ deviceType = 'routine'
|
||||
// #ifdef H5
|
||||
// H5编译的代码
|
||||
|
||||
import {
|
||||
wechat,
|
||||
clearAuthStatus,
|
||||
oAuth,
|
||||
auth,
|
||||
toAuth,
|
||||
pay,
|
||||
openAddress,
|
||||
openShareAll,
|
||||
openShareAppMessage,
|
||||
openShareTimeline,
|
||||
wechatEvevt,
|
||||
ready,
|
||||
wxShowLocation
|
||||
} from '@/libs/wechat'
|
||||
import { wechat, clearAuthStatus, oAuth, auth, toAuth, pay, openAddress, openShareAll, openShareAppMessage, openShareTimeline, wechatEvevt, ready, wxShowLocation } from '@/libs/wechat'
|
||||
|
||||
import {
|
||||
isWeixin
|
||||
} from '@/utils'
|
||||
import { isWeixin } from '@/utils'
|
||||
const CACHE_KEY = 'clear_0.0.1'
|
||||
|
||||
if (!cookie.has(CACHE_KEY)) {
|
||||
@ -108,10 +85,9 @@ if (urlSpread) {
|
||||
// H5编译的代码
|
||||
// 判断是否是微信浏览器
|
||||
async function init() {
|
||||
|
||||
if (isWeixin()) {
|
||||
deviceType = 'weixin'
|
||||
let wechatInit = wechat();
|
||||
let wechatInit = wechat()
|
||||
if (wechatInit) {
|
||||
await oAuth()
|
||||
}
|
||||
@ -126,9 +102,7 @@ Vue.prototype.$deviceType = deviceType
|
||||
|
||||
Vue.mixin({
|
||||
onLoad() {
|
||||
const {
|
||||
$mp
|
||||
} = this.$root
|
||||
const { $mp } = this.$root
|
||||
this._route = parseRoute($mp)
|
||||
},
|
||||
onShow() {
|
||||
@ -140,9 +114,6 @@ Vue.mixin({
|
||||
$VUE_APP_RESOURCES_URL() {
|
||||
return VUE_APP_RESOURCES_URL
|
||||
},
|
||||
$deviceType() {
|
||||
return deviceType
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
|
@ -508,6 +508,7 @@ export default {
|
||||
if (this.$deviceType == 'app') {
|
||||
from.from = 'app'
|
||||
}
|
||||
console.log(this.$deviceType)
|
||||
// #ifdef MP-WEIXIN
|
||||
subscribeMessage()
|
||||
// #endif
|
||||
|
Reference in New Issue
Block a user