From 0a24ffeb3eff074c8f11e9f94fdf2c2cb4929799 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Fri, 10 Nov 2023 13:08:29 +0800
Subject: [PATCH] fix:小程序详情修改
---
App.vue | 105 ++++++++++++++++++++++++----------------------------
1 files changed, 49 insertions(+), 56 deletions(-)
diff --git a/App.vue b/App.vue
index 3c6773b..442e41d 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,6 @@
getDic
} from '@/utils/login.js' // ������������
import store from '@/store/index.js'
- import routingIntercept from '@/utils/permission.js'
import {
httpPost,
httpGet
@@ -13,22 +12,22 @@
console.log('optionsonShow', options)
if (options.scene === 1007 || options.scene === 1014 || options.scene === 1008) {
// ������������������������������������
- this.getWXCode()
+ // this.getWXCode()
}
},
onLaunch() {
// ������������������
let token = uni.getStorageSync('token')
- console.log('apptoken', token)
+ console.log('apptoken1', !token)
if (!token) {
uni.login({
provider: 'weixin',
success: loginRes => {
- console.log('loginRes', loginRes)
+ console.log('loginRes1', loginRes)
httpGet('/AppUser/wx/login', {
'code': loginRes.code
}).then(result => {
- routingIntercept()
+ console.log('AppUser1', result)
try {
if (result.data.code === 0) {
uni.clearStorageSync()
@@ -79,59 +78,53 @@
*
*/
getWXCode() {
- let token = uni.getStorageSync('token')
- console.log('apptoken', token)
- if (!token) {
- uni.login({
- provider: 'weixin',
- success: loginRes => {
- console.log('loginRes', loginRes)
- httpGet('/AppUser/wx/login', {
- 'code': loginRes.code
- }).then(result => {
- routingIntercept()
- try {
- if (result.data.code === 0) {
- uni.clearStorageSync()
- uni.setStorageSync('userInfor', JSON.stringify(result.data))
- uni.setStorageSync('tonken', result.data.token)
- uni.setStorageSync('openId', result.data.openId)
- getDic()
- this.$isResolve()
- } else {
- uni.clearStorageSync()
- uni.setStorageSync('openId', result.data.openId)
- uni.showModal({
- title: '���������',
- content: '������������������������������������������',
- showCancel: false,
- confirmText: '������',
- success: res => {
- if (res.confirm) {
- uni.reLaunch({
- url: '/pages/login/login',
- })
- }
- },
- })
- this.$isResolve()
- }
- } catch (e) {
- console.error(e)
+ uni.login({
+ provider: 'weixin',
+ success: loginRes => {
+ console.log('loginRes2', loginRes)
+ httpGet('/AppUser/wx/login', {
+ 'code': loginRes.code
+ }).then(result => {
+ console.log('AppUser2', result)
+ try {
+ if (result.data.code === 0) {
+ uni.clearStorageSync()
+ uni.setStorageSync('userInfor', JSON.stringify(result.data))
+ uni.setStorageSync('tonken', result.data.token)
+ uni.setStorageSync('openId', result.data.openId)
+ getDic()
+ this.$isResolve()
+ } else {
+ uni.clearStorageSync()
+ uni.setStorageSync('openId', result.data.openId)
+ uni.showModal({
+ title: '���������',
+ content: '������������������������������������������',
+ showCancel: false,
+ confirmText: '������',
+ success: res => {
+ if (res.confirm) {
+ uni.reLaunch({
+ url: '/pages/login/login',
+ })
+ }
+ },
+ })
+ this.$isResolve()
}
- }).catch(errors => {
- console.log('appdddd', errors)
- uni.showToast({
- title: errors,
- icon: 'none',
- })
- this.$isResolve()
+ } catch (e) {
+ console.error(e)
+ }
+ }).catch(errors => {
+ console.log('appdddd2', errors)
+ uni.showToast({
+ title: errors,
+ icon: 'none',
})
- }
- })
- } else {
- this.$isResolve()
- }
+ this.$isResolve()
+ })
+ }
+ })
},
getLogin(data) {
// ������������������������code������������������������
--
Gitblit v1.8.0