diff --git a/components/ShareInfo.vue b/components/ShareInfo.vue
index 83a5bb4..93a4777 100644
--- a/components/ShareInfo.vue
+++ b/components/ShareInfo.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue
index 42dc004..4592f4f 100644
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@@ -26,6 +26,7 @@ export default {
return {};
},
onShow() {
+
var url = handleQrCode();
// 判断是否是分销
if (url) {
diff --git a/pages/orderAdmin/OrderCancellation/index.vue b/pages/orderAdmin/OrderCancellation/index.vue
index e44a364..5055048 100644
--- a/pages/orderAdmin/OrderCancellation/index.vue
+++ b/pages/orderAdmin/OrderCancellation/index.vue
@@ -9,9 +9,9 @@
立即核销
-
+
diff --git a/utils/index.js b/utils/index.js
index ee14890..0a5a1f1 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -158,6 +158,11 @@ export const login = () => {
return new Promise((resolve, reject) => {
console.log('获取环境商')
getProvider().then(provider => {
+ console.log('当前的环境商')
+ console.log(provider)
+ if (!provider) {
+ reject()
+ }
// 调用登录接口
console.log('调用登录接口')
uni.login({
@@ -496,7 +501,7 @@ export function routerPermissions(url, type) {
})
} else {
// 如果不是小程序跳转到登录页
- console.log('当前是app,开始处理app登录方法')
+ console.log('当前无法自动登录,开始处理登录方法')
push({
path: '/pages/user/Login/index',
})