|
|
@@ -55,15 +55,15 @@ function weixinSq() {
|
|
|
// 微信授权后跳转页面
|
|
|
try {
|
|
|
// 判断是否真实路由模式
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
// const type = router.mode === "history"?'':'/#'
|
|
|
// let ul = encodeURIComponent(store.state.baseURL + store.state.urlFile +type+ '/pages/redirect/redirect');
|
|
|
- let ul = encodeURIComponent(store.state.baseURL + store.state.urlFile + '/#/pages/redirect/redirect');
|
|
|
-=======
|
|
|
+ // let ul = encodeURIComponent(store.state.baseURL + store.state.urlFile + '/#/pages/redirect/redirect');
|
|
|
+
|
|
|
const type = router.mode === "history"?'':'/#'
|
|
|
console.log(type)
|
|
|
let ul = encodeURIComponent(store.state.baseURL + store.state.urlFile +type+ '/pages/redirect/redirect');
|
|
|
->>>>>>> bdca7df13a2787003bb166924df55385c0b76707
|
|
|
+
|
|
|
// 打开微信授权页面
|
|
|
let url =
|
|
|
'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
|
