From f2a20329c7b782ace5b5df1789538eb91d55f905 Mon Sep 17 00:00:00 2001
From: gaoxs <gaoxs@gaoxsdeMacBook-Pro.local>
Date: Fri, 7 Aug 2020 17:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86uni=E5=85=BC=E5=AE=B9H5?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/ShareInfo.vue | 2 +-
pages/Loading/index.vue | 1 +
pages/orderAdmin/OrderCancellation/index.vue | 4 ++--
utils/index.js | 7 ++++++-
4 files changed, 10 insertions(+), 4 deletions(-)
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 @@
<template>
<view v-if="shareInfoStatus" class="poster-first">
<view class="mask-share">
- <image src="@/static/images/s/share-info.png" @click="shareInfoClose" />
+ <!-- <image src="@/static/images/share-info.png" @click="shareInfoClose" /> -->
</view>
</view>
</template>
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 @@
</view>
<view class="bnt" @click="storeCancellation">立即核销</view>
</view>
- <view class="scan" v-if="iswechat">
+ <!-- <view class="scan" v-if="iswechat">
<image src="@/static/images/scan.gif" @click="openQRCode" />
- </view>
+ </view> -->
<WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff>
</view>
</template>
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',
})