|
|
@@ -11,17 +11,17 @@ export function getPageUrl(config) {
|
|
|
let path = '/' + page.route;
|
|
|
let url = '';
|
|
|
// 获取对象可枚举键值列表
|
|
|
- let objKeys= Object.keys(page.options);
|
|
|
+ let objKeys = Object.keys(page.options);
|
|
|
// 判断有无传值
|
|
|
- if(objKeys.length>0){
|
|
|
+ if (objKeys.length > 0) {
|
|
|
// 循环赋值对象数据
|
|
|
- for(let a in page.options) {
|
|
|
+ for (let a in page.options) {
|
|
|
// 判断有无邀请人
|
|
|
- if(a!='spread'){
|
|
|
- url += a+"="+page.options[a]+"&"
|
|
|
+ if (a != 'spread') {
|
|
|
+ url += a + "=" + page.options[a] + "&"
|
|
|
}
|
|
|
}
|
|
|
- path += '?' + url.substr(0,url.length-1);
|
|
|
+ path += '?' + url.substr(0, url.length - 1);
|
|
|
}
|
|
|
// 返回处理邀请人后的邀请地址
|
|
|
return path
|
|
|
@@ -35,19 +35,36 @@ export function interceptor() {
|
|
|
let url = '/pages/login/login'
|
|
|
// #ifdef H5
|
|
|
// 判断是否为公众号调用微信授权登录
|
|
|
- let weichatBrowser = uni.getStorageSync('weichatBrowser');
|
|
|
- if (weichatBrowser) {
|
|
|
- url = '/pages/public/wxLogin';
|
|
|
+ // let ua =
|
|
|
+
|
|
|
+ if (navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger') {
|
|
|
+ let weichatBrowser = uni.getStorageSync('weichatBrowser');
|
|
|
+ if (weichatBrowser) {
|
|
|
+ url = '/pages/public/wxLogin';
|
|
|
+ }
|
|
|
+ if (pageUrl != url) {
|
|
|
+ uni.navigateTo({
|
|
|
+ url
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ uni.showModal({
|
|
|
+ title: '提示',
|
|
|
+ content: '请使用微信扫码！',
|
|
|
+ })
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
// #endif
|
|
|
// #ifdef MP-WEIXIN
|
|
|
url = '/pages/public/wxLogin';
|
|
|
- // #endif
|
|
|
if (pageUrl != url) {
|
|
|
uni.navigateTo({
|
|
|
url
|
|
|
})
|
|
|
}
|
|
|
+ // #endif
|
|
|
}
|
|
|
|
|
|
// 保存页面
|
|
|
@@ -58,14 +75,14 @@ export function saveUrl() {
|
|
|
let path = '/' + page.route;
|
|
|
let url = '';
|
|
|
// 获取对象可枚举键值列表
|
|
|
- let objKeys= Object.keys(page.options);
|
|
|
+ let objKeys = Object.keys(page.options);
|
|
|
// 判断有无传值
|
|
|
- if(objKeys.length>0){
|
|
|
+ if (objKeys.length > 0) {
|
|
|
// 循环赋值对象数据
|
|
|
- for(let a in page.options) {
|
|
|
- url += a+"="+page.options[a]+"&"
|
|
|
+ for (let a in page.options) {
|
|
|
+ url += a + "=" + page.options[a] + "&"
|
|
|
}
|
|
|
- path += '?' + url.substr(0,url.length-1);
|
|
|
+ path += '?' + url.substr(0, url.length - 1);
|
|
|
}
|
|
|
// uni.showModal({
|
|
|
// title: '地址',
|
|
|
@@ -78,10 +95,10 @@ export function saveUrl() {
|
|
|
// })
|
|
|
// }
|
|
|
// })
|
|
|
- console.log(path,'pathpathpathpathpath')
|
|
|
- uni.setStorageSync('present', path);
|
|
|
+ console.log(path, 'pathpathpathpathpath')
|
|
|
+ uni.setStorageSync('present', path);
|
|
|
+
|
|
|
|
|
|
-
|
|
|
// // 获取当前页面
|
|
|
// let page = getActionPage();
|
|
|
// // 获取跳转前路由地址
|
|
|
@@ -99,4 +116,4 @@ export function saveUrl() {
|
|
|
// }
|
|
|
// console.log(path,1)
|
|
|
// uni.setStorageSync('present', path);
|
|
|
-}
|
|
|
+}
|
